From 224db70091b706947a5dc1cf00abe37aeb3d12e7 Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Wed, 11 Nov 2020 12:07:11 +0100 Subject: [PATCH 01/54] new unflattener see https://github.com/ehrbase/project_management/issues/424 --- .../ehrbase/building/OptSkeletonBuilder.java | 3 +- .../flattener/DtoToCompositionWalker.java | 259 ++++++++++++++++++ .../ehrbase/client/flattener/Unflattener.java | 248 ++--------------- ...StationarerVersorgungsfallComposition.java | 8 +- .../EntlassungsdatenAdminEntry.java | 8 +- .../definition/ProVirusCluster.java | 2 +- .../client/flattener/BloodpressureListDe.java | 9 +- .../std/umarshal/StdToCompositionWalker.java | 5 +- .../walker/FromCompositionWalker.java | 2 +- .../walker/ToCompositionWalker.java | 10 +- .../ehrbase/serialisation/walker/Walker.java | 16 +- .../std/marshal/FlatJsonMarshallerTest.java | 3 + .../ehrbase/webtemplate/parser/FlatPath.java | 240 ++++++++-------- .../ehrbase/webtemplate/parser/OPTParser.java | 3 +- .../webtemplate/model/WebTemplateTest.java | 6 +- .../webtemplate/parser/FlatPathTest.java | 33 +++ .../webtemplate/parser/OPTParserTest.java | 1 + 17 files changed, 495 insertions(+), 361 deletions(-) create mode 100644 client/src/main/java/org/ehrbase/client/flattener/DtoToCompositionWalker.java diff --git a/building/src/main/java/org/ehrbase/building/OptSkeletonBuilder.java b/building/src/main/java/org/ehrbase/building/OptSkeletonBuilder.java index 3d90d5785..41453d0e5 100644 --- a/building/src/main/java/org/ehrbase/building/OptSkeletonBuilder.java +++ b/building/src/main/java/org/ehrbase/building/OptSkeletonBuilder.java @@ -398,7 +398,8 @@ private void addNodeId(CCOMPLEXOBJECT ccobj, Map termDef, Map name = OptNameHelper.extractName(ccobj); + String termName = name.orElse(termDef.get(nodeId)); if (termName != null) { txtName = new DvText(termName); valueMap.put("name", txtName); diff --git a/client/src/main/java/org/ehrbase/client/flattener/DtoToCompositionWalker.java b/client/src/main/java/org/ehrbase/client/flattener/DtoToCompositionWalker.java new file mode 100644 index 000000000..7af761325 --- /dev/null +++ b/client/src/main/java/org/ehrbase/client/flattener/DtoToCompositionWalker.java @@ -0,0 +1,259 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.client.flattener; + +import com.nedap.archie.creation.RMObjectCreator; +import com.nedap.archie.rm.RMObject; +import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.datavalues.DvCodedText; +import com.nedap.archie.rm.support.identification.TerminologyId; +import com.nedap.archie.rminfo.ArchieRMInfoLookup; +import com.nedap.archie.rminfo.RMAttributeInfo; +import org.apache.commons.lang3.StringUtils; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.EnumValueSet; +import org.ehrbase.client.exception.ClientException; +import org.ehrbase.serialisation.walker.Context; +import org.ehrbase.serialisation.walker.ToCompositionWalker; +import org.ehrbase.webtemplate.model.WebTemplateNode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.beans.IntrospectionException; +import java.beans.PropertyDescriptor; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.stream.Collectors; + +public class DtoToCompositionWalker extends ToCompositionWalker> { + + public static final ArchieRMInfoLookup ARCHIE_RM_INFO_LOOKUP = ArchieRMInfoLookup.getInstance(); + + private static final RMObjectCreator RM_OBJECT_CREATOR = + new RMObjectCreator(ARCHIE_RM_INFO_LOOKUP); + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Override + protected Map extract( + Context> context, WebTemplateNode child, boolean isChoice, Integer i) { + Map subValues = + context.getObjectDeque().peek().entrySet().stream() + .filter(e -> matchesPath(context, child, e)) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + + if (subValues.isEmpty()) { + return null; + } else if (subValues.size() > 1) { + if (isChoice && child.getRmType().equals("INTERVAL_EVENT")) { + logger.warn("Path {} is choice but missing OptionFor", child.getAqlPath()); + return null; + } + return subValues; + } else { + Object value = subValues.values().stream().findAny().get(); + if (value instanceof List && i != null) { + + value = ((List) value).size() > i ? ((List) value).get(i) : null; + } + + if (isChoice && value != null) { + Optional optionFor = + Optional.of(value) + .map(Object::getClass) + .map(c -> c.getAnnotation(OptionFor.class)) + .map(OptionFor::value); + if (optionFor.isEmpty()) { + logger.warn( + "Path {} is choice but {} is missing OptionFor", + child.getAqlPath(), + value.getClass().getSimpleName()); + if (child.getRmType().equals("INTERVAL_EVENT")) { + value = null; + } + } else if (optionFor.filter(s -> s.equals(child.getRmType())).isEmpty()) { + value = null; + } + } + + if (value == null) { + return null; + } else { + String path = subValues.keySet().stream().findAny().get(); + if (value.getClass().isAnnotationPresent(Entity.class) + && new PathExtractor(path).getChildPath().equals(child.getAqlPath())) { + + Map newValues = + findEntity(value).entrySet().stream() + .collect(Collectors.toMap(e -> path + e.getKey(), Map.Entry::getValue)); + return !newValues.isEmpty() ? newValues : null; + } else { + return Map.of(path, value); + } + } + } + } + + private boolean matchesPath( + Context> context, WebTemplateNode child, Map.Entry e) { + if (StringUtils.startsWith(e.getKey(), child.getAqlPath())) { + return true; + } else + /* + { + FlatPath childPath = new FlatPath(child.getAqlPath()); + FlatPath pathLast = childPath.getLast(); + FlatPath pathWithoutLastName = + FlatPath.addEnd( + FlatPath.removeEnd(childPath, pathLast), new FlatPath(pathLast.format(false))); + if (StringUtils.startsWith(e.getKey(), pathWithoutLastName.toString())) { + return true; + } + + else */ { + + return false; + } + } + + @Override + protected void preHandle(Context> context) { + + Map values = context.getObjectDeque().peek(); + + for (Map.Entry objectEntry : values.entrySet()) { + + PathExtractor extractor = new PathExtractor(objectEntry.getKey()); + if (extractor.getChildPath().equals(context.getNodeDeque().peek().getAqlPath())) { + if (StringUtils.isNotBlank(extractor.getAttributeName())) { + handleSingleValue( + objectEntry.getValue(), + extractor.getAttributeName(), + null, + context.getRmObjectDeque().peek()); + } else { + RMObject child = context.getRmObjectDeque().poll(); + handleSingleValue( + objectEntry.getValue(), + extractor.getChildName(), + child, + context.getRmObjectDeque().peek()); + context.getRmObjectDeque().push(child); + } + } + } + } + + @Override + protected void postHandle(Context> context) {} + + @Override + protected int calculateSize(Context> context, WebTemplateNode childNode) { + + Map values = + context.getObjectDeque().peek().entrySet().stream() + .filter(e -> matchesPath(context, childNode, e)) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + if (values.size() == 1) { + Object value = values.values().stream().findAny().get(); + if (value instanceof List) { + return ((List) value).size(); + }else { + return 1; + } + } + return 0; + } + + static Map findEntity(Object dto) { + + return Arrays.stream(dto.getClass().getDeclaredFields()) + .filter(m -> m.isAnnotationPresent(Path.class)) + .filter(m -> readField(m, dto) != null) + .collect( + Collectors.toMap(m -> m.getAnnotation(Path.class).value(), m -> readField(m, dto))); + } + + private static Object readField(Field field, Object dto) { + try { + PropertyDescriptor propertyDescriptor = + new PropertyDescriptor(field.getName(), dto.getClass()); + return propertyDescriptor.getReadMethod().invoke(dto); + } catch (InvocationTargetException | IllegalAccessException | IntrospectionException e) { + throw new ClientException(e.getMessage(), e); + } + } + + private void handleSingleValue(Object value, String childName, Object child, Object parent) { + + if (value == null) { + // NOP + } else if (EnumValueSet.class.isAssignableFrom(value.getClass()) + && DvCodedText.class.isAssignableFrom(parent.getClass())) { + EnumValueSet valueSet = (EnumValueSet) value; + DvCodedText dvCodedText = (DvCodedText) parent; + dvCodedText.setValue(valueSet.getValue()); + dvCodedText.setDefiningCode( + new CodePhrase(new TerminologyId(valueSet.getTerminologyId()), valueSet.getCode())); + } else if (EnumValueSet.class.isAssignableFrom(value.getClass()) + && DvCodedText.class.isAssignableFrom( + ARCHIE_RM_INFO_LOOKUP.getAttributeInfo(parent.getClass(), childName).getType())) { + EnumValueSet valueSet = (EnumValueSet) value; + DvCodedText dvCodedText = new DvCodedText(); + dvCodedText.setValue(valueSet.getValue()); + dvCodedText.setDefiningCode( + new CodePhrase(new TerminologyId(valueSet.getTerminologyId()), valueSet.getCode())); + RM_OBJECT_CREATOR.set(parent, childName, Collections.singletonList(dvCodedText)); + } else if (EnumValueSet.class.isAssignableFrom(value.getClass())) { + EnumValueSet valueSet = (EnumValueSet) value; + CodePhrase codePhrase = + new CodePhrase(new TerminologyId(valueSet.getTerminologyId()), valueSet.getCode()); + RM_OBJECT_CREATOR.set(parent, childName, Collections.singletonList(codePhrase)); + } else if (ARCHIE_RM_INFO_LOOKUP + .getAttributeInfo(parent.getClass(), childName) + .getTypeInCollection() + .isAssignableFrom(value.getClass())) { + RMAttributeInfo attributeInfo = + ARCHIE_RM_INFO_LOOKUP.getAttributeInfo(parent.getClass(), childName); + if (attributeInfo.isMultipleValued()) { + try { + Object invoke = attributeInfo.getGetMethod().invoke(parent); + if (Collection.class.isAssignableFrom(invoke.getClass()) && child != null) { + ((Collection) invoke).remove(child); + } + } catch (IllegalAccessException | InvocationTargetException e) { + logger.warn(e.getMessage(), e); + } + } + RM_OBJECT_CREATOR.addElementToListOrSetSingleValues( + parent, childName, Collections.singletonList(value)); + } else { + logger.warn("Unhandled child {} in {}", childName, parent); + } + } +} diff --git a/client/src/main/java/org/ehrbase/client/flattener/Unflattener.java b/client/src/main/java/org/ehrbase/client/flattener/Unflattener.java index b19c0f5f5..82f729118 100644 --- a/client/src/main/java/org/ehrbase/client/flattener/Unflattener.java +++ b/client/src/main/java/org/ehrbase/client/flattener/Unflattener.java @@ -17,248 +17,50 @@ package org.ehrbase.client.flattener; -import com.google.common.reflect.TypeToken; -import com.nedap.archie.aom.CComplexObject; import com.nedap.archie.creation.RMObjectCreator; import com.nedap.archie.rm.RMObject; -import com.nedap.archie.rm.archetyped.Locatable; -import com.nedap.archie.rm.datastructures.Event; -import com.nedap.archie.rm.datastructures.IntervalEvent; -import com.nedap.archie.rm.datatypes.CodePhrase; -import com.nedap.archie.rm.datavalues.DvCodedText; -import com.nedap.archie.rm.datavalues.quantity.datetime.DvDuration; -import com.nedap.archie.rm.support.identification.TerminologyId; +import com.nedap.archie.rm.composition.Composition; import com.nedap.archie.rminfo.ArchieRMInfoLookup; -import com.nedap.archie.rminfo.RMAttributeInfo; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.reflect.FieldUtils; -import org.apache.commons.text.CaseUtils; import org.ehrbase.building.OptSkeletonBuilder; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.EnumValueSet; import org.ehrbase.client.exception.ClientException; import org.ehrbase.normalizer.Normalizer; -import org.ehrbase.serialisation.jsonencoding.CanonicalJson; import org.ehrbase.webtemplate.templateprovider.TemplateProvider; import org.openehr.schemas.v1.OPERATIONALTEMPLATE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.beans.IntrospectionException; -import java.beans.PropertyDescriptor; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import static org.ehrbase.client.flattener.DtoToCompositionWalker.findEntity; public class Unflattener { - public static final ArchieRMInfoLookup ARCHIE_RM_INFO_LOOKUP = ArchieRMInfoLookup.getInstance(); - public static final Normalizer NORMALIZER = new Normalizer(); - public static final OptSkeletonBuilder OPT_SKELETON_BUILDER = new OptSkeletonBuilder(); - private static final RMObjectCreator RM_OBJECT_CREATOR = new RMObjectCreator(ARCHIE_RM_INFO_LOOKUP); - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - private final TemplateProvider templateProvider; + public static final ArchieRMInfoLookup ARCHIE_RM_INFO_LOOKUP = ArchieRMInfoLookup.getInstance(); + public static final Normalizer NORMALIZER = new Normalizer(); + public static final OptSkeletonBuilder OPT_SKELETON_BUILDER = new OptSkeletonBuilder(); + private static final RMObjectCreator RM_OBJECT_CREATOR = + new RMObjectCreator(ARCHIE_RM_INFO_LOOKUP); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + private final TemplateProvider templateProvider; - public Unflattener(TemplateProvider templateProvider) { + public Unflattener(TemplateProvider templateProvider) { - this.templateProvider = templateProvider; - } + this.templateProvider = templateProvider; + } - public RMObject unflatten(Object dto) { - Template template = dto.getClass().getAnnotation(Template.class); + public RMObject unflatten(Object dto) { + Template template = dto.getClass().getAnnotation(Template.class); - OPERATIONALTEMPLATE operationalTemplate = templateProvider.find(template.value()).orElseThrow(() -> new ClientException(String.format("Unknown Template %s", template.value()))); - Locatable generate = (Locatable) OPT_SKELETON_BUILDER.generate(operationalTemplate); + OPERATIONALTEMPLATE operationalTemplate = + templateProvider + .find(template.value()) + .orElseThrow( + () -> new ClientException(String.format("Unknown Template %s", template.value()))); + Composition generate = (Composition) OPT_SKELETON_BUILDER.generate(operationalTemplate); - mapDtoToEntity(dto, generate); - return NORMALIZER.normalize(generate); - } + new DtoToCompositionWalker() + .walk(generate, findEntity( dto), templateProvider.buildIntrospect(template.value()).get()); + return NORMALIZER.normalize(generate); + } - private void mapDtoToEntity(Object dto, RMObject generate) { - Map valueMap = buildValueMap(dto); - valueMap.forEach((key, value) -> setValueAtPath(generate, key, value)); - } - private void setValueAtPath(RMObject locatable, String path, Object value) { - - boolean multi = value instanceof List; - ItemExtractor itemExtractor = new ItemExtractor(locatable, path, multi); - String childName = itemExtractor.getChildName(); - Object child = itemExtractor.getChild(); - Object parent = itemExtractor.getParent(); - - if (multi) { - List valueList = (List) value; - if (CollectionUtils.isNotEmpty((List) child)) { - List childList = new ArrayList(); - Object prototype = ((List) child).get(0); - childList.add(prototype); - for (int i = 1; i < valueList.size(); i++) { - RMObject deepClone = deepClone((RMObject) prototype); - childList.add(deepClone); - RM_OBJECT_CREATOR.addElementToListOrSetSingleValues(parent, childName, deepClone); - } - for (int i = 0; i < valueList.size(); i++) { - handleSingleValue(valueList.get(i), childName, childList.get(i), parent); - } - } else { - for (Object o : valueList) { - handleSingleValue(o, childName, null, parent); - } - } - } else { - handleSingleValue(value, childName, child, parent); - } - } - - private void handleSingleValue(Object value, String childName, Object child, Object parent) { - - if (value != null && value.getClass().isAnnotationPresent(OptionFor.class)) { - - String rmclass = value.getClass().getAnnotation(OptionFor.class).value(); - CComplexObject elementConstraint = new CComplexObject(); - elementConstraint.setRmTypeName(rmclass); - Object newChild = RM_OBJECT_CREATOR.create(elementConstraint); - if (Event.class.isAssignableFrom(newChild.getClass())) { - Event newEvent = (Event) newChild; - Event oldEvent = (Event) child; - newEvent.setState(oldEvent.getState()); - newEvent.setData(oldEvent.getData()); - newEvent.setArchetypeDetails(oldEvent.getArchetypeDetails()); - newEvent.setArchetypeNodeId(oldEvent.getArchetypeNodeId()); - newEvent.setName(oldEvent.getName()); - newEvent.setTime(oldEvent.getTime()); - if (IntervalEvent.class.isAssignableFrom(newEvent.getClass())) { - ((IntervalEvent) newEvent).setWidth(new DvDuration()); - } - - } - RMAttributeInfo attributeInfo = ARCHIE_RM_INFO_LOOKUP.getAttributeInfo(parent.getClass(), childName); - if (attributeInfo.isMultipleValued()) { - try { - Object invoke = attributeInfo.getGetMethod().invoke(parent); - if (Collection.class.isAssignableFrom(invoke.getClass())) { - ((Collection) invoke).remove(child); - } - } catch (IllegalAccessException | InvocationTargetException e) { - logger.warn(e.getMessage(), e); - } - } - child = newChild; - RM_OBJECT_CREATOR.addElementToListOrSetSingleValues(parent, childName, Collections.singletonList(child)); - } - - if (value == null) { - //NOP - } else if (EnumValueSet.class.isAssignableFrom(value.getClass()) && DvCodedText.class.isAssignableFrom(parent.getClass())) { - EnumValueSet valueSet = (EnumValueSet) value; - DvCodedText dvCodedText = (DvCodedText) parent; - dvCodedText.setValue(valueSet.getValue()); - dvCodedText.setDefiningCode(new CodePhrase(new TerminologyId(valueSet.getTerminologyId()), valueSet.getCode())); - } else if (EnumValueSet.class.isAssignableFrom(value.getClass()) && DvCodedText.class.isAssignableFrom(ARCHIE_RM_INFO_LOOKUP.getAttributeInfo(parent.getClass(), childName).getType())) { - EnumValueSet valueSet = (EnumValueSet) value; - DvCodedText dvCodedText = new DvCodedText(); - dvCodedText.setValue(valueSet.getValue()); - dvCodedText.setDefiningCode(new CodePhrase(new TerminologyId(valueSet.getTerminologyId()), valueSet.getCode())); - RM_OBJECT_CREATOR.set(parent, childName, Collections.singletonList(dvCodedText)); - } else if (EnumValueSet.class.isAssignableFrom(value.getClass())) { - EnumValueSet valueSet = (EnumValueSet) value; - CodePhrase codePhrase = new CodePhrase(new TerminologyId(valueSet.getTerminologyId()), valueSet.getCode()); - RM_OBJECT_CREATOR.set(parent, childName, Collections.singletonList(codePhrase)); - } else if (extractType(toCamelCase(childName), parent).isAssignableFrom(value.getClass())) { - RMAttributeInfo attributeInfo = ARCHIE_RM_INFO_LOOKUP.getAttributeInfo(parent.getClass(), childName); - if (attributeInfo.isMultipleValued()) { - try { - Object invoke = attributeInfo.getGetMethod().invoke(parent); - if (Collection.class.isAssignableFrom(invoke.getClass())) { - ((Collection) invoke).remove(child); - } - } catch (IllegalAccessException | InvocationTargetException e) { - logger.warn(e.getMessage(), e); - } - } - RM_OBJECT_CREATOR.addElementToListOrSetSingleValues(parent, childName, Collections.singletonList(value)); - } else if (value.getClass().isAnnotationPresent(Entity.class)) { - mapDtoToEntity(value, (RMObject) child); - } else { - logger.warn("Unhandled child {} in {}", childName, parent); - } - - } - - public Class unwarap(Field field) { - try { - if (List.class.isAssignableFrom(field.getType())) { - Type actualTypeArgument = ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0]; - - Class aClass = TypeToken.of(actualTypeArgument).getRawType(); - if (aClass != null) { - return aClass; - } else { - return Dummy.class; - } - - } else { - return field.getType(); - } - } catch (Throwable e) { - return Dummy.class; - } - } - - private Class extractType(String childName, Object parent) { - - Optional> type = Arrays.stream(FieldUtils.getAllFields(parent.getClass())) - .filter(f -> f.getName().equals(childName)) - .map(this::unwarap) - .findAny(); - if (type.isPresent()) { - return type.get(); - } else { - logger.warn("No field {} for class {}", childName, parent.getClass()); - return Dummy.class; - } - } - - private T deepClone(RMObject rmObject) { - CanonicalJson canonicalXML = new CanonicalJson(); - return (T) canonicalXML.unmarshal(canonicalXML.marshal(rmObject), rmObject.getClass()); - } - - private Map buildValueMap(Object dto) { - Map valueMap = new HashMap<>(); - - for (Field field : dto.getClass().getDeclaredFields()) { - Path path = field.getAnnotation(Path.class); - if (path != null) { - valueMap.put(path.value(), readField(field, dto)); - } - } - return valueMap; - } - - private Object readField(Field field, Object dto) { - try { - PropertyDescriptor propertyDescriptor = new PropertyDescriptor(field.getName(), dto.getClass()); - return propertyDescriptor.getReadMethod().invoke(dto); - } catch (InvocationTargetException | IllegalAccessException | IntrospectionException e) { - throw new ClientException(e.getMessage(), e); - } - } - - private String toCamelCase(String childName) { - return CaseUtils.toCamelCase(childName, false, '_'); - } -} \ No newline at end of file +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java index 66e4c1c17..51a74f4a7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java @@ -5,9 +5,6 @@ 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 org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Id; @@ -22,6 +19,9 @@ import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.FalltypDefiningcode; import org.ehrbase.client.openehrclient.VersionUid; +import java.time.temporal.TemporalAccessor; +import java.util.List; + @Entity @Archetype("openEHR-EHR-COMPOSITION.fall.v0") @Template("Stationärer Versorgungsfall") @@ -50,7 +50,7 @@ public class StationarerVersorgungsfallComposition { @Path("/context/other_context[at0001]/items[at0004]/value|value") private String fallklasseValue; - @Path("/context/other_context[at0001]/items[at0003]/value|value") + @Path("/context/other_context[at0001]/items[at0003 and name/value='Fall-Kennung']/value|value") private String fallKennungValue; @Path("/territory") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java index 6eb519194..ad7321231 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java @@ -2,14 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import java.time.temporal.TemporalAccessor; +import java.util.List; + @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.discharge_summary.v0") public class EntlassungsdatenAdminEntry { @@ -34,7 +34,7 @@ public class EntlassungsdatenAdminEntry { @Path("/data[at0001]/items[at0040]/value|value") private String artDerEntlassungValue; - @Path("/data[at0001]/items[at0011]/value|value") + @Path("/data[at0001]/items[at0011 and name/value='Datum/Uhrzeit der Entlassung']/value|value") private TemporalAccessor datumUhrzeitDerEntlassungValue; public void setLetzterPatientenstandort(List letzterPatientenstandort) { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java index 0c311e916..69921dad1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java @@ -12,7 +12,7 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") public class ProVirusCluster { - @Path("/items[at0024]/value|value") + @Path("/items[at0024 and name/value='Virus']/value|value") private String virusValue; @Path("/items[at0003]/value|value") diff --git a/client/src/test/java/org/ehrbase/client/flattener/BloodpressureListDe.java b/client/src/test/java/org/ehrbase/client/flattener/BloodpressureListDe.java index 9db8e14b3..00d82683a 100644 --- a/client/src/test/java/org/ehrbase/client/flattener/BloodpressureListDe.java +++ b/client/src/test/java/org/ehrbase/client/flattener/BloodpressureListDe.java @@ -30,11 +30,8 @@ @Entity public class BloodpressureListDe { - public static final String START_TIME = "startTime"; - public static final String TEMPLATE_ID = "templateId"; - public static final String BLOODPRESSURES = "bloodpressures"; - public static final String BLOODPRESSURE_SYSTOLISCH_VALUE = "systolischValue"; - @Path(value = "/context/start_time/value") + + @Path(value = "/context/start_time|value") private OffsetDateTime startTime; @Path(value = "/content[openEHR-EHR-OBSERVATION.sample_blood_pressure.v1]") private List bloodpressures; @@ -59,7 +56,7 @@ public void setBloodpressures(List bloodpressures) { @Entity public static class Bloodpressure { - @Path(value = "/data[at0001]/events[at0002]/data[at0003]/items[at0004]|magnitude") + @Path(value = "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude") private Double systolischValue; public Double getSystolischValue() { diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/flatencoding/std/umarshal/StdToCompositionWalker.java b/serialisation/src/main/java/org/ehrbase/serialisation/flatencoding/std/umarshal/StdToCompositionWalker.java index 6f9ea9e9b..7ae2c2750 100644 --- a/serialisation/src/main/java/org/ehrbase/serialisation/flatencoding/std/umarshal/StdToCompositionWalker.java +++ b/serialisation/src/main/java/org/ehrbase/serialisation/flatencoding/std/umarshal/StdToCompositionWalker.java @@ -144,11 +144,14 @@ protected int calculateSize(Context> context, WebTemplateNod context.getCountMap().remove(childNode); context.getNodeDeque().push(childNode); Integer count = context.getObjectDeque().peek().keySet().stream() - .map(s -> StringUtils.substringBetween(s, buildNamePath(context) + ":", "/")) + .filter(s -> StringUtils.startsWith(s,buildNamePath(context))) + .map(s -> StringUtils.substringAfter(s, buildNamePath(context) + ":")) + .map(s -> StringUtils.substringBefore(s,"/")) .filter(StringUtils::isNotBlank) .map(Integer::parseInt) .sorted() .reduce((first, second) -> second) + .map(i -> i+1) .orElse(0); context.getNodeDeque().poll(); if (oldCount != null) { diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/walker/FromCompositionWalker.java b/serialisation/src/main/java/org/ehrbase/serialisation/walker/FromCompositionWalker.java index f5aa51876..cd0d50f47 100644 --- a/serialisation/src/main/java/org/ehrbase/serialisation/walker/FromCompositionWalker.java +++ b/serialisation/src/main/java/org/ehrbase/serialisation/walker/FromCompositionWalker.java @@ -49,7 +49,7 @@ protected Object extractRMChild(RMObject currentRM, WebTemplateNode currentNode, protected int calculateSize(Context context, WebTemplateNode childNode) { Object child = extractRMChild(context.getRmObjectDeque().peek(), context.getNodeDeque().peek(), childNode, false, null); if (child instanceof List) { - return ((List) child).size() - 1; + return ((List) child).size() ; } else { return 0; } diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/walker/ToCompositionWalker.java b/serialisation/src/main/java/org/ehrbase/serialisation/walker/ToCompositionWalker.java index 9d2447265..189809228 100644 --- a/serialisation/src/main/java/org/ehrbase/serialisation/walker/ToCompositionWalker.java +++ b/serialisation/src/main/java/org/ehrbase/serialisation/walker/ToCompositionWalker.java @@ -78,7 +78,11 @@ protected Object extractRMChild(RMObject currentRM, WebTemplateNode currentNode, ) { CComplexObject elementConstraint = new CComplexObject(); elementConstraint.setRmTypeName(rmclass); - Object newChild = RM_OBJECT_CREATOR.create(elementConstraint); + Object newChild; + try{ + + newChild = RM_OBJECT_CREATOR.create(elementConstraint); + if (Event.class.isAssignableFrom(newChild.getClass())) { Event newEvent = (Event) newChild; Event oldEvent = (Event) child; @@ -107,6 +111,10 @@ protected Object extractRMChild(RMObject currentRM, WebTemplateNode currentNode, } RM_OBJECT_CREATOR.addElementToListOrSetSingleValues(parent, attributeName, Collections.singletonList(newChild)); + } catch (IllegalArgumentException e){ + newChild = null; + + } child = newChild; } diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java b/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java index 9a4c871b7..66caaa449 100644 --- a/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java +++ b/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java @@ -76,6 +76,7 @@ private void handle(Context context) { choices.put(textNode.getAqlPath(), List.of(codeNode, textNode)); children.add(textNode); } + if (children.stream().anyMatch(n -> n.getRmType().equals("EVENT"))) { WebTemplateNode event = children.stream().filter(n -> n.getRmType().equals("EVENT")).findAny().get(); WebTemplateNode pointEvent = new WebTemplateNode(event); @@ -88,11 +89,19 @@ private void handle(Context context) { width.setMax(1); width.setAqlPath(event.getAqlPath() + "/width"); intervalEvent.getChildren().add(width); + WebTemplateNode math = new WebTemplateNode(); + math.setId("math_function"); + math.setRmType("DV_CODED_TEXT"); + math.setMax(1); + math.setAqlPath(event.getAqlPath() + "/math_function"); + intervalEvent.getChildren().add(math); choices.put(intervalEvent.getAqlPath(), List.of(intervalEvent, pointEvent)); children.add(intervalEvent); children.add(pointEvent); children.remove(event); } + + for (WebTemplateNode childNode : children) { if (childNode.getMax() == 1) { @@ -113,7 +122,7 @@ private void handle(Context context) { RMObject currentChild = null; T childObject = null; List> pairs = new ArrayList<>(); - for (int i = 0; i <= size; i++) { + for (int i = 0; i < size; i++) { childObject = extract(context, childNode, choices.containsKey(childNode.getAqlPath()), i); if (childObject != null) { @@ -124,7 +133,7 @@ private void handle(Context context) { } - for (int i = 0; i <= size; i++) { + for (int i = 0; i < size; i++) { childObject = pairs.get(i).getLeft(); currentChild = pairs.get(i).getRight(); if (currentChild != null && childObject != null) { @@ -165,6 +174,9 @@ protected boolean visitChildren(WebTemplateNode node) { protected abstract int calculateSize(Context context, WebTemplateNode childNode); protected RMObject deepClone(RMObject rmObject) { + if (rmObject == null){ + return null; + } CanonicalJson canonicalXML = new CanonicalJson(); return canonicalXML.unmarshal(canonicalXML.marshal(rmObject), rmObject.getClass()); } diff --git a/serialisation/src/test/java/org/ehrbase/serialisation/flatencoding/std/marshal/FlatJsonMarshallerTest.java b/serialisation/src/test/java/org/ehrbase/serialisation/flatencoding/std/marshal/FlatJsonMarshallerTest.java index 8927b7632..ac925fa46 100644 --- a/serialisation/src/test/java/org/ehrbase/serialisation/flatencoding/std/marshal/FlatJsonMarshallerTest.java +++ b/serialisation/src/test/java/org/ehrbase/serialisation/flatencoding/std/marshal/FlatJsonMarshallerTest.java @@ -85,6 +85,9 @@ public void toFlatJsonAltEvents() throws IOException, XmlException { .containsExactlyInAnyOrder( "Missing path: bericht/körpergewicht:0/any_event_en:0/gewicht|magnitude, value: 55.0", "Missing path: bericht/körpergewicht:0/any_event_en:1/gewicht|magnitude, value: 60.0", + "Missing path: bericht/körpergewicht:0/any_event_en:1/math_function|value, value: mean", + "Missing path: bericht/körpergewicht:0/any_event_en:1/math_function|terminology, value: openehr", + "Missing path: bericht/körpergewicht:0/any_event_en:1/math_function|code, value: 146", "Missing path: bericht/körpergewicht:0/birth_en/gewicht|magnitude, value: 30.0" ); diff --git a/web-template/src/main/java/org/ehrbase/webtemplate/parser/FlatPath.java b/web-template/src/main/java/org/ehrbase/webtemplate/parser/FlatPath.java index cf74fb364..555e58a92 100644 --- a/web-template/src/main/java/org/ehrbase/webtemplate/parser/FlatPath.java +++ b/web-template/src/main/java/org/ehrbase/webtemplate/parser/FlatPath.java @@ -28,134 +28,148 @@ import java.util.stream.Collectors; public class FlatPath { - private final String name; - private final String atCode; - private FlatPath child; - private final Map otherPredicates; - private final String attributeName; - private final boolean startWithSlash; - - public FlatPath(String path) { - if (StringUtils.isBlank(path)) { - name = ""; - atCode = null; - child = null; - otherPredicates = new HashMap<>(); - attributeName = null; - startWithSlash = false; - return; - } - - - final String[] strings; - startWithSlash = StringUtils.startsWith(path, "/"); - int splitPos = StringUtils.indexOf(StringUtils.stripStart(path, "/"), "/", path.indexOf(']')); - if (splitPos > -1) { - strings = new String[2]; - strings[0] = path.substring(0, splitPos + 1); - strings[1] = path.substring(splitPos + 1); - } else { - strings = new String[1]; - strings[0] = path; - } + private final String name; + private final String atCode; + private FlatPath child; + private final Map otherPredicates; + private final String attributeName; + private final boolean startWithSlash; + + public FlatPath(String path) { + if (StringUtils.isBlank(path)) { + name = ""; + atCode = null; + child = null; + otherPredicates = new HashMap<>(); + attributeName = null; + startWithSlash = false; + return; + } + final String[] strings; + startWithSlash = StringUtils.startsWith(path, "/"); + int splitPos = StringUtils.indexOf(StringUtils.stripStart(path, "/"), "/", path.indexOf(']')); + if (splitPos > -1) { + strings = new String[2]; + strings[0] = path.substring(0, splitPos + 1); + strings[1] = path.substring(splitPos + 1); + } else { + strings = new String[1]; + strings[0] = path; + } - String[] split = StringUtils.split(strings[0], "[", 2); - - - if (split.length == 2) { - String node = StringUtils.substringBefore(split[1], "]"); - - String regex; - if (node.matches(".*\\sand\\s.*")) { - regex = "\\sand\\s"; - String[] ands = node.split(regex); - atCode = ands[0].trim(); - otherPredicates = Arrays.stream(ands) - .skip(1) - .map(s -> s.split("=")) - .collect(Collectors.toMap(s -> s[0].trim(), s -> s[1].replace("'", "").trim())); - } else { - regex = ","; - String[] ands = node.split(regex); - atCode = ands[0].trim(); - otherPredicates = new HashMap<>(); - if (ands.length > 1) { - otherPredicates.put("name/value", ands[1].replace("'", "").trim()); - } - } - - } else { - atCode = null; - otherPredicates = Collections.emptyMap(); + String[] split = StringUtils.split(strings[0], "[", 2); + + if (split.length == 2) { + String node = StringUtils.substringBefore(split[1], "]"); + + String regex; + if (node.matches(".*\\sand\\s.*")) { + regex = "\\sand\\s"; + String[] ands = node.split(regex); + atCode = ands[0].trim(); + otherPredicates = + Arrays.stream(ands) + .skip(1) + .map(s -> s.split("=")) + .collect(Collectors.toMap(s -> s[0].trim(), s -> s[1].replace("'", "").trim())); + } else { + regex = ","; + String[] ands = node.split(regex); + atCode = ands[0].trim(); + otherPredicates = new HashMap<>(); + if (ands.length > 1) { + otherPredicates.put("name/value", ands[1].replace("'", "").trim()); } + } - if (strings.length == 2) { - name = StringUtils.stripStart(split[0], "/"); - child = new FlatPath(strings[1]); - attributeName = null; - } else { - child = null; - String[] atributteSplit = StringUtils.stripStart(strings[0], "/").split("[|\\[]"); - name = atributteSplit[0]; - if (atributteSplit.length > 1 && !atributteSplit[atributteSplit.length - 1].contains("]")) { - attributeName = atributteSplit[atributteSplit.length - 1]; - } else { - attributeName = null; - } - - } + } else { + atCode = null; + otherPredicates = Collections.emptyMap(); } - public String getName() { - return name; + if (strings.length == 2) { + name = StringUtils.stripStart(split[0], "/"); + child = new FlatPath(strings[1]); + attributeName = null; + } else { + child = null; + String[] atributteSplit = StringUtils.stripStart(strings[0], "/").split("[|\\[]"); + name = atributteSplit[0]; + if (atributteSplit.length > 1 && !atributteSplit[atributteSplit.length - 1].contains("]")) { + attributeName = atributteSplit[atributteSplit.length - 1]; + } else { + attributeName = null; + } } + } - public String getAtCode() { - return atCode; - } + public String getName() { + return name; + } - public FlatPath getChild() { - return child; - } + public String getAtCode() { + return atCode; + } - public String getAttributeName() { - return attributeName; - } + public FlatPath getChild() { + return child; + } - public String findOtherPredicate(String name) { - return otherPredicates.get(name); - } + public String getAttributeName() { + return attributeName; + } - public void addOtherPredicate(String name, String value) { - otherPredicates.put(name, value); - } + public String findOtherPredicate(String name) { + return otherPredicates.get(name); + } + + public void addOtherPredicate(String name, String value) { + otherPredicates.put(name, value); + } + @Override + public String toString() { + return format(true); + } - @Override - public String toString() { - return format(true); + public String format(boolean withOtherPredicates) { + StringBuilder sb = new StringBuilder(); + if (startWithSlash) { + sb.append("/"); + } + sb.append(name); + if (StringUtils.isNotBlank(atCode)) { + sb.append("[").append(atCode); + if (withOtherPredicates) { + otherPredicates.forEach( + (key, value) -> + sb.append(" and ").append(key).append("=").append("'").append(value).append("'")); + } + sb.append("]"); } + if (child != null) { + sb.append(child.format(withOtherPredicates)); + } + if (attributeName != null) { + sb.append("|").append(attributeName); + } + return sb.toString(); + } - public String format(boolean withOtherPredicates) { - StringBuilder sb = new StringBuilder(); - if (startWithSlash) { - sb.append("/"); - } - sb.append(name); - if (StringUtils.isNotBlank(atCode)) { - sb.append("[").append(atCode); - if (withOtherPredicates) { - otherPredicates.forEach((key, value) -> sb.append(" and ").append(key).append("=").append("'").append(value).append("'")); - } - sb.append("]"); - } - if (child != null) { - sb.append(child.format(withOtherPredicates)); - } - if (attributeName != null) { - sb.append("|").append(attributeName); - } - return sb.toString(); + public FlatPath getLast() { + FlatPath path = this; + while (path.getChild() != null) { + path = path.getChild(); } + return path; + } + + public static FlatPath removeEnd(FlatPath path, FlatPath remove) { + return new FlatPath(StringUtils.removeEnd(path.toString(), remove.toString())); + } + + public static FlatPath addEnd(FlatPath path, FlatPath add) { + return new FlatPath(path.toString()+"/"+ StringUtils.removeStart( add.toString(),"/")); + } } diff --git a/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java b/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java index 7555135bd..8926dfa9f 100644 --- a/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java +++ b/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java @@ -208,6 +208,7 @@ private WebTemplateNode parseCCOMPLEXOBJECT(CCOMPLEXOBJECT ccomplexobject, Strin node.getChildren().addAll(newChildren); } + // Handle choice children node.getChoicesInChildren() .values() @@ -317,7 +318,7 @@ private WebTemplateNode buildNodeForAttribute(RMAttributeInfo attributeInfo, Str node.setName(attributeInfo.getRmName()); node.setId(buildId(attributeInfo.getRmName())); node.setRmType(attributeInfo.getTypeNameInCollection()); - node.setMax(1); + node.setMax(attributeInfo.isMultipleValued() ? -1:1); node.setMin(0); return node; } diff --git a/web-template/src/test/java/org/ehrbase/webtemplate/model/WebTemplateTest.java b/web-template/src/test/java/org/ehrbase/webtemplate/model/WebTemplateTest.java index 815c51f01..1c2a3a542 100644 --- a/web-template/src/test/java/org/ehrbase/webtemplate/model/WebTemplateTest.java +++ b/web-template/src/test/java/org/ehrbase/webtemplate/model/WebTemplateTest.java @@ -68,7 +68,7 @@ public void testQueryUpperUnbounded() throws IOException, XmlException { assertNotNull(result); - assertEquals(4, result.size()); + assertEquals(12, result.size()); } @Test @@ -78,7 +78,7 @@ public void testQueryUpperUnbounded2() throws IOException, XmlException { assertNotNull(result); - assertEquals(23, result.size()); + assertEquals(41, result.size()); } @Test @@ -88,7 +88,7 @@ public void testMultiValued() throws IOException, XmlException { assertNotNull(result); - assertEquals(46, result.size()); + assertEquals(206, result.size()); } diff --git a/web-template/src/test/java/org/ehrbase/webtemplate/parser/FlatPathTest.java b/web-template/src/test/java/org/ehrbase/webtemplate/parser/FlatPathTest.java index a6781bb29..b79c103a5 100644 --- a/web-template/src/test/java/org/ehrbase/webtemplate/parser/FlatPathTest.java +++ b/web-template/src/test/java/org/ehrbase/webtemplate/parser/FlatPathTest.java @@ -111,4 +111,37 @@ public void testFlatPathAttributeAndAtCode() { assertThat(cut.getName()).isEqualTo("data"); assertThat(cut.toString()).isEqualTo(path); } + + @Test + public void testGetLast(){ + String path = "/data[at0001]/events[at0002]/data[at0003]/items[at0004]|magnitude"; + FlatPath cut = new FlatPath(path).getLast(); + assertThat(cut).isNotNull(); + assertThat(cut.getAtCode()).isEqualTo("at0004"); + assertThat(cut.getName()).isEqualTo("items"); + assertThat(cut.toString()).isEqualTo("/items[at0004]|magnitude"); + } + + @Test + public void testRemoveEnd(){ + String path = "/data[at0001]/events[at0002]/data[at0003]/items[at0004]|magnitude"; + FlatPath path1 = new FlatPath(path); + FlatPath path2 = path1.getLast(); + FlatPath actual = FlatPath.removeEnd(path1,path2); + assertThat(actual).isNotNull(); + assertThat(actual.getAtCode()).isEqualTo("at0001"); + assertThat(actual.getName()).isEqualTo("data"); + assertThat(actual.toString()).isEqualTo("/data[at0001]/events[at0002]/data[at0003]"); + } + + @Test + public void testAddEnd(){ + FlatPath path1 = new FlatPath( "/data[at0001]/events[at0002]/data[at0003]"); + FlatPath path2 = new FlatPath( "/items[at0004 and name/value='Name']|magnitude"); + FlatPath actual = FlatPath.addEnd(path1,path2); + assertThat(actual).isNotNull(); + assertThat(actual.getAtCode()).isEqualTo("at0001"); + assertThat(actual.getName()).isEqualTo("data"); + assertThat(actual.toString()).isEqualTo("/data[at0001]/events[at0002]/data[at0003]/items[at0004 and name/value='Name']|magnitude"); + } } \ No newline at end of file diff --git a/web-template/src/test/java/org/ehrbase/webtemplate/parser/OPTParserTest.java b/web-template/src/test/java/org/ehrbase/webtemplate/parser/OPTParserTest.java index 466aa95ea..f60ca1092 100644 --- a/web-template/src/test/java/org/ehrbase/webtemplate/parser/OPTParserTest.java +++ b/web-template/src/test/java/org/ehrbase/webtemplate/parser/OPTParserTest.java @@ -63,6 +63,7 @@ public void parseCoronaAnamnese() throws IOException, XmlException { List errors = compareWebTemplate(actual, expected); //Nodes wich are generated by the parser but are not in the example + assertThat(errors) .filteredOn(s -> s.contains("Extra Node")) .containsExactlyInAnyOrder( From 3645cd50b505e13fae7931e6b0bbbfa649974a14 Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Wed, 11 Nov 2020 15:41:12 +0100 Subject: [PATCH 02/54] handle old paths without name/value see https://github.com/ehrbase/project_management/issues/424 --- .../flattener/DtoToCompositionWalker.java | 71 +++++++++++-------- ...StationarerVersorgungsfallComposition.java | 2 +- .../EntlassungsdatenAdminEntry.java | 2 +- .../definition/ProVirusCluster.java | 2 +- .../ehrbase/webtemplate/parser/FlatPath.java | 5 ++ 5 files changed, 49 insertions(+), 33 deletions(-) diff --git a/client/src/main/java/org/ehrbase/client/flattener/DtoToCompositionWalker.java b/client/src/main/java/org/ehrbase/client/flattener/DtoToCompositionWalker.java index 7af761325..a982a09a4 100644 --- a/client/src/main/java/org/ehrbase/client/flattener/DtoToCompositionWalker.java +++ b/client/src/main/java/org/ehrbase/client/flattener/DtoToCompositionWalker.java @@ -27,6 +27,7 @@ import com.nedap.archie.rminfo.ArchieRMInfoLookup; import com.nedap.archie.rminfo.RMAttributeInfo; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.ImmutablePair; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; @@ -35,6 +36,7 @@ import org.ehrbase.serialisation.walker.Context; import org.ehrbase.serialisation.walker.ToCompositionWalker; import org.ehrbase.webtemplate.model.WebTemplateNode; +import org.ehrbase.webtemplate.parser.FlatPath; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,6 +49,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; @@ -62,10 +65,7 @@ public class DtoToCompositionWalker extends ToCompositionWalker extract( Context> context, WebTemplateNode child, boolean isChoice, Integer i) { - Map subValues = - context.getObjectDeque().peek().entrySet().stream() - .filter(e -> matchesPath(context, child, e)) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + Map subValues = filterValues(context, child); if (subValues.isEmpty()) { return null; @@ -106,7 +106,7 @@ protected Map extract( } else { String path = subValues.keySet().stream().findAny().get(); if (value.getClass().isAnnotationPresent(Entity.class) - && new PathExtractor(path).getChildPath().equals(child.getAqlPath())) { + && new PathExtractor(path).getChildPath().equals("")) { Map newValues = findEntity(value).entrySet().stream() @@ -119,25 +119,39 @@ && new PathExtractor(path).getChildPath().equals(child.getAqlPath())) { } } - private boolean matchesPath( - Context> context, WebTemplateNode child, Map.Entry e) { - if (StringUtils.startsWith(e.getKey(), child.getAqlPath())) { - return true; - } else - /* - { - FlatPath childPath = new FlatPath(child.getAqlPath()); - FlatPath pathLast = childPath.getLast(); - FlatPath pathWithoutLastName = - FlatPath.addEnd( - FlatPath.removeEnd(childPath, pathLast), new FlatPath(pathLast.format(false))); - if (StringUtils.startsWith(e.getKey(), pathWithoutLastName.toString())) { - return true; - } - - else */ { + private Map filterValues( + Context> context, WebTemplateNode child) { + return context.getObjectDeque().peek().entrySet().stream() + .map(e -> new ImmutablePair<>(matchesPath(context, child, e), e.getValue())) + .filter(p -> p.getLeft() != null) + .collect(Collectors.toMap(ImmutablePair::getLeft, ImmutablePair::getRight)); + } - return false; + private String matchesPath( + Context> context, WebTemplateNode child, Map.Entry e) { + String aqlPath = + FlatPath.removeStart( + new FlatPath(child.getAqlPath()), + new FlatPath(context.getNodeDeque().peek().getAqlPath())) + .toString(); + if (StringUtils.startsWith(e.getKey(), aqlPath)) { + return StringUtils.removeStart(e.getKey(), aqlPath); + } else { + FlatPath childPath = new FlatPath(aqlPath); + FlatPath pathLast = childPath.getLast(); + FlatPath pathWithoutLastName = + FlatPath.addEnd( + FlatPath.removeEnd(childPath, pathLast), new FlatPath(pathLast.format(false))); + if (StringUtils.startsWith(e.getKey(), pathWithoutLastName.toString()) + && context.getNodeDeque().peek().getChildren().stream() + .filter(n -> Objects.equals(n.getNodeId(), child.getNodeId())) + .count() + == 1) { + logger.warn("name/value not set in dto for {}",child.getAqlPath()); + return StringUtils.removeStart(e.getKey(), pathWithoutLastName.toString()); + } else { + return null; + } } } @@ -149,7 +163,7 @@ protected void preHandle(Context> context) { for (Map.Entry objectEntry : values.entrySet()) { PathExtractor extractor = new PathExtractor(objectEntry.getKey()); - if (extractor.getChildPath().equals(context.getNodeDeque().peek().getAqlPath())) { + if (StringUtils.isBlank(extractor.getChildPath())) { if (StringUtils.isNotBlank(extractor.getAttributeName())) { handleSingleValue( objectEntry.getValue(), @@ -160,7 +174,7 @@ protected void preHandle(Context> context) { RMObject child = context.getRmObjectDeque().poll(); handleSingleValue( objectEntry.getValue(), - extractor.getChildName(), + new FlatPath(context.getNodeDeque().peek().getAqlPath()).getLast().getName(), child, context.getRmObjectDeque().peek()); context.getRmObjectDeque().push(child); @@ -175,15 +189,12 @@ protected void postHandle(Context> context) {} @Override protected int calculateSize(Context> context, WebTemplateNode childNode) { - Map values = - context.getObjectDeque().peek().entrySet().stream() - .filter(e -> matchesPath(context, childNode, e)) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + Map values = filterValues(context, childNode); if (values.size() == 1) { Object value = values.values().stream().findAny().get(); if (value instanceof List) { return ((List) value).size(); - }else { + } else { return 1; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java index 51a74f4a7..6a719fdc6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java @@ -50,7 +50,7 @@ public class StationarerVersorgungsfallComposition { @Path("/context/other_context[at0001]/items[at0004]/value|value") private String fallklasseValue; - @Path("/context/other_context[at0001]/items[at0003 and name/value='Fall-Kennung']/value|value") + @Path("/context/other_context[at0001]/items[at0003]/value|value") private String fallKennungValue; @Path("/territory") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java index ad7321231..e7b647cd3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java @@ -34,7 +34,7 @@ public class EntlassungsdatenAdminEntry { @Path("/data[at0001]/items[at0040]/value|value") private String artDerEntlassungValue; - @Path("/data[at0001]/items[at0011 and name/value='Datum/Uhrzeit der Entlassung']/value|value") + @Path("/data[at0001]/items[at0011]/value|value") private TemporalAccessor datumUhrzeitDerEntlassungValue; public void setLetzterPatientenstandort(List letzterPatientenstandort) { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java index 69921dad1..0c311e916 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java @@ -12,7 +12,7 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") public class ProVirusCluster { - @Path("/items[at0024 and name/value='Virus']/value|value") + @Path("/items[at0024]/value|value") private String virusValue; @Path("/items[at0003]/value|value") diff --git a/web-template/src/main/java/org/ehrbase/webtemplate/parser/FlatPath.java b/web-template/src/main/java/org/ehrbase/webtemplate/parser/FlatPath.java index 555e58a92..99a934e37 100644 --- a/web-template/src/main/java/org/ehrbase/webtemplate/parser/FlatPath.java +++ b/web-template/src/main/java/org/ehrbase/webtemplate/parser/FlatPath.java @@ -169,6 +169,11 @@ public static FlatPath removeEnd(FlatPath path, FlatPath remove) { return new FlatPath(StringUtils.removeEnd(path.toString(), remove.toString())); } + public static FlatPath removeStart(FlatPath path, FlatPath remove) { + return new FlatPath(StringUtils.removeStart(path.toString(), remove.toString())); + } + + public static FlatPath addEnd(FlatPath path, FlatPath add) { return new FlatPath(path.toString()+"/"+ StringUtils.removeStart( add.toString(),"/")); } From 757a8e0b29d529ad7d1ed37f56213ab08c1ef208 Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Fri, 13 Nov 2020 15:51:17 +0100 Subject: [PATCH 03/54] new Flattener see https://github.com/ehrbase/project_management/issues/424 --- .../flattener/DtoFromCompositionWalker.java | 219 ++++++++++++ .../flattener/DtoToCompositionWalker.java | 6 +- .../flattener/DtoWithMatchingFields.java | 42 +++ .../ehrbase/client/flattener/Flattener.java | 338 ++++++++++-------- .../DefaultRestAqlEndpoint.java | 2 +- .../DefaultRestCompositionEndpoint.java | 6 +- .../client/flattener/FlattenerTest.java | 14 +- .../client/flattener/UnflattenerTest.java | 4 +- .../defaultrestclient/AqlTestIT.java | 3 +- .../defaultrestclient/CoronaTestIT.java | 11 +- .../DefaultRestAqlEndpointTestIT.java | 3 + .../DefaultRestCompositionEndpointIT.java | 3 +- .../walker/FromCompositionWalker.java | 71 +++- .../serialisation/walker/RmString.java | 34 ++ .../walker/ToCompositionWalker.java | 14 + .../ehrbase/serialisation/walker/Walker.java | 28 +- .../util/reflection/ReflectionHelper.java | 96 ++--- .../ehrbase/webtemplate/parser/OPTParser.java | 1 + 18 files changed, 648 insertions(+), 247 deletions(-) create mode 100644 client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java create mode 100644 client/src/main/java/org/ehrbase/client/flattener/DtoWithMatchingFields.java create mode 100644 serialisation/src/main/java/org/ehrbase/serialisation/walker/RmString.java diff --git a/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java b/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java new file mode 100644 index 000000000..a8f3c2ee6 --- /dev/null +++ b/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java @@ -0,0 +1,219 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.client.flattener; + +import com.google.common.reflect.TypeToken; +import com.nedap.archie.creation.RMObjectCreator; +import com.nedap.archie.rm.composition.Composition; +import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.support.identification.ObjectId; +import com.nedap.archie.rminfo.ArchieRMInfoLookup; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.text.CaseUtils; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.EnumValueSet; +import org.ehrbase.client.exception.ClientException; +import org.ehrbase.serialisation.walker.Context; +import org.ehrbase.serialisation.walker.FromCompositionWalker; +import org.ehrbase.serialisation.walker.RmString; +import org.ehrbase.util.exception.SdkException; +import org.ehrbase.util.reflection.ReflectionHelper; +import org.ehrbase.webtemplate.model.WebTemplate; +import org.ehrbase.webtemplate.model.WebTemplateNode; +import org.ehrbase.webtemplate.parser.FlatPath; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.beans.IntrospectionException; +import java.beans.PropertyDescriptor; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.ParameterizedType; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.function.Function; +import java.util.stream.Collectors; + +import static org.ehrbase.client.flattener.DtoToCompositionWalker.matchesPath; + +public class DtoFromCompositionWalker extends FromCompositionWalker { + + public static final ArchieRMInfoLookup ARCHIE_RM_INFO_LOOKUP = ArchieRMInfoLookup.getInstance(); + + private static final RMObjectCreator RM_OBJECT_CREATOR = + new RMObjectCreator(ARCHIE_RM_INFO_LOOKUP); + + private Logger logger = LoggerFactory.getLogger(getClass()); + + static T create(Class clazz) { + try { + return clazz.getDeclaredConstructor().newInstance(); + } catch (InstantiationException + | IllegalAccessException + | InvocationTargetException + | NoSuchMethodException e) { + throw new SdkException(e.getMessage(), e); + } + } + + private List> dtoList; + + @Override + public void walk(Composition composition, DtoWithMatchingFields object, WebTemplate webTemplate) { + dtoList = ReflectionHelper.findAll(object.getDto().getClass().getPackageName()); + super.walk(composition, object, webTemplate); + } + + static Map buildFieldByPathMap(Class clazz) { + return Arrays.stream(clazz.getDeclaredFields()) + .filter(f -> f.isAnnotationPresent(Path.class)) + .collect(Collectors.toMap(f -> f.getAnnotation(Path.class).value(), Function.identity())); + } + + @Override + protected DtoWithMatchingFields extract( + Context context, WebTemplateNode child, boolean isChoice, Integer i) { + Map subValues = + context.getObjectDeque().peek().getFieldByPath().entrySet().stream() + .map(e -> new ImmutablePair<>(matchesPath(context, child, e), e.getValue())) + .filter(p -> p.getLeft() != null) + .collect(Collectors.toMap(ImmutablePair::getLeft, ImmutablePair::getRight)); + + if (subValues.isEmpty()) { + return null; + } else if (subValues.size() > 1) { + if (isChoice && child.getRmType().equals("INTERVAL_EVENT")) { + logger.warn("Path {} is choice but missing OptionFor", child.getAqlPath()); + return null; + } + return new DtoWithMatchingFields(context.getObjectDeque().peek().getDto(), subValues); + } else { + Field field = subValues.values().stream().findAny().get(); + Class type = field.getType(); + if (List.class.isAssignableFrom(type)) { + type = + TypeToken.of(((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0]) + .getRawType(); + } + if (isChoice) { + type = findActual(type, child.getRmType()).get(); + } + if (type.isAnnotationPresent(Entity.class)) { + Object dto = create(type); + + writeField(field, context.getObjectDeque().peek().getDto(), dto); + return new DtoWithMatchingFields(dto, buildFieldByPathMap(type)); + } else { + return new DtoWithMatchingFields(context.getObjectDeque().peek().getDto(), subValues); + } + } + } + + private void writeField(Field field, Object dto, Object value) { + + try { + PropertyDescriptor propertyDescriptor = + new PropertyDescriptor(field.getName(), dto.getClass()); + Object dtoList = value; + if (EnumValueSet.class.isAssignableFrom(field.getType()) + && value != null + && CodePhrase.class.isAssignableFrom(value.getClass())) { + CodePhrase codePhrase = (CodePhrase) value; + EnumValueSet enumValueSet = + Arrays.stream(field.getType().getEnumConstants()) + .map(o -> (EnumValueSet) o) + .filter( + v -> { + String terminologyId = + Optional.ofNullable(codePhrase.getTerminologyId()) + .map(ObjectId::getValue) + .orElse(null); + return v.getTerminologyId().equals(terminologyId); + }) + .filter(v -> v.getCode().equals(codePhrase.getCodeString())) + .findAny() + .orElse(null); + dtoList = enumValueSet; + } + if (dtoList instanceof RmString){ + dtoList = ((RmString) dtoList).getValue(); + } + if (List.class.isAssignableFrom(field.getType())) { + dtoList = propertyDescriptor.getReadMethod().invoke(dto); + if (dtoList == null) { + dtoList = new ArrayList<>(); + } + ((List) dtoList).add(value); + } + propertyDescriptor.getWriteMethod().invoke(dto, dtoList); + } catch (IllegalAccessException | InvocationTargetException | IntrospectionException e) { + throw new ClientException(e.getMessage(), e); + } + } + + private Object extractAttribute(Object dto, String attributeName) { + try { + PropertyDescriptor propertyDescriptor = new PropertyDescriptor(attributeName, dto.getClass()); + + return propertyDescriptor.getReadMethod().invoke(dto); + } catch (IllegalAccessException | InvocationTargetException | IntrospectionException e) { + throw new ClientException(e.getMessage(), e); + } + } + + private Optional> findActual(Class actualTypeArgument, String simpleName) { + return dtoList.stream() + .filter(actualTypeArgument::isAssignableFrom) + .filter(c -> c.isAnnotationPresent(OptionFor.class)) + .filter(c -> c.getAnnotation(OptionFor.class).value().equals(simpleName)) + .findAny(); + } + + @Override + protected void preHandle(Context context) { + Map fieldByPath = context.getObjectDeque().peek().getFieldByPath(); + + for (Map.Entry entry : fieldByPath.entrySet()) { + FlatPath path = new FlatPath(entry.getKey()); + if (StringUtils.isBlank(path.getName())) { + if (StringUtils.isNotBlank(path.getAttributeName())) { + writeField( + entry.getValue(), + context.getObjectDeque().peek().getDto(), + extractAttribute(context.getRmObjectDeque().peek(), CaseUtils.toCamelCase(path.getAttributeName(),false,'_'))); + } else { + writeField( + entry.getValue(), + context.getObjectDeque().peek().getDto(), + context.getRmObjectDeque().peek()); + } + } + } + } + + @Override + protected void postHandle(Context context) {} +} diff --git a/client/src/main/java/org/ehrbase/client/flattener/DtoToCompositionWalker.java b/client/src/main/java/org/ehrbase/client/flattener/DtoToCompositionWalker.java index a982a09a4..7e7e09a38 100644 --- a/client/src/main/java/org/ehrbase/client/flattener/DtoToCompositionWalker.java +++ b/client/src/main/java/org/ehrbase/client/flattener/DtoToCompositionWalker.java @@ -127,8 +127,8 @@ private Map filterValues( .collect(Collectors.toMap(ImmutablePair::getLeft, ImmutablePair::getRight)); } - private String matchesPath( - Context> context, WebTemplateNode child, Map.Entry e) { + static String matchesPath( + Context context, WebTemplateNode child, Map.Entry e) { String aqlPath = FlatPath.removeStart( new FlatPath(child.getAqlPath()), @@ -147,7 +147,7 @@ private String matchesPath( .filter(n -> Objects.equals(n.getNodeId(), child.getNodeId())) .count() == 1) { - logger.warn("name/value not set in dto for {}",child.getAqlPath()); + //logger.warn("name/value not set in dto for {}",child.getAqlPath()); return StringUtils.removeStart(e.getKey(), pathWithoutLastName.toString()); } else { return null; diff --git a/client/src/main/java/org/ehrbase/client/flattener/DtoWithMatchingFields.java b/client/src/main/java/org/ehrbase/client/flattener/DtoWithMatchingFields.java new file mode 100644 index 000000000..289d32712 --- /dev/null +++ b/client/src/main/java/org/ehrbase/client/flattener/DtoWithMatchingFields.java @@ -0,0 +1,42 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.client.flattener; + +import java.lang.reflect.Field; +import java.util.Map; + +class DtoWithMatchingFields { + + private final Object dto; + private final Map fieldByPath; + + DtoWithMatchingFields(Object dto, Map fieldByPath) { + this.dto = dto; + this.fieldByPath = fieldByPath; + } + + Object getDto() { + return dto; + } + + Map getFieldByPath() { + return fieldByPath; + } +} diff --git a/client/src/main/java/org/ehrbase/client/flattener/Flattener.java b/client/src/main/java/org/ehrbase/client/flattener/Flattener.java index 254845203..d801224e9 100644 --- a/client/src/main/java/org/ehrbase/client/flattener/Flattener.java +++ b/client/src/main/java/org/ehrbase/client/flattener/Flattener.java @@ -19,6 +19,7 @@ import com.google.common.reflect.TypeToken; import com.nedap.archie.rm.RMObject; +import com.nedap.archie.rm.composition.Composition; import com.nedap.archie.rm.datatypes.CodePhrase; import com.nedap.archie.rm.support.identification.ObjectId; import com.nedap.archie.rminfo.ArchieRMInfoLookup; @@ -30,8 +31,10 @@ import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.annotations.Template; import org.ehrbase.client.classgenerator.EnumValueSet; import org.ehrbase.client.exception.ClientException; +import org.ehrbase.webtemplate.templateprovider.TemplateProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,175 +44,206 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; public class Flattener { - private static final ArchieRMInfoLookup RM_INFO_LOOKUP = ArchieRMInfoLookup.getInstance(); + private static final ArchieRMInfoLookup RM_INFO_LOOKUP = ArchieRMInfoLookup.getInstance(); - private Logger logger = LoggerFactory.getLogger(this.getClass()); - private ScanResult classgraph; + private Logger logger = LoggerFactory.getLogger(this.getClass()); + private ScanResult classgraph; - private static T createInstance(Class aClass) { - try { - return aClass.getDeclaredConstructor().newInstance(); - } catch (InstantiationException | NoSuchMethodException | InvocationTargetException | IllegalAccessException e) { - throw new ClientException(e.getMessage(), e); - } - } + private final TemplateProvider templateProvider; - public T flatten(RMObject locatable, Class clazz) { - try { - classgraph = new ClassGraph().enableAllInfo().whitelistPackages(clazz.getPackageName()).scan(); + public Flattener(TemplateProvider templateProvider) { + this.templateProvider = templateProvider; + } - T dto = createInstance(clazz); - mapEntityToDto(locatable, dto); - return dto; - } finally { - classgraph.close(); - } + private static T createInstance(Class aClass) { + try { + return aClass.getDeclaredConstructor().newInstance(); + } catch (InstantiationException + | NoSuchMethodException + | InvocationTargetException + | IllegalAccessException e) { + throw new ClientException(e.getMessage(), e); } - - private void mapEntityToDto(RMObject locatable, T dto) { - Map fieldMap = buildFieldMap(dto); - fieldMap.forEach((key, value) -> setFieldFromPath(dto, locatable, key, value)); + } + + public T flatten(RMObject locatable, Class clazz) { + try { + classgraph = new ClassGraph().enableClassInfo().acceptPackages(clazz.getPackageName()).scan(); + + T dto = createInstance(clazz); + new DtoFromCompositionWalker() + .walk( + (Composition) locatable, + new DtoWithMatchingFields( + dto, DtoFromCompositionWalker.buildFieldByPathMap(dto.getClass())), + templateProvider.buildIntrospect(clazz.getAnnotation(Template.class).value()).get()); + return dto; + } finally { + classgraph.close(); } - - private void setFieldFromPath(Object dto, RMObject locatable, String path, Field field) { - boolean multi = List.class.isAssignableFrom(field.getType()); - ItemExtractor itemExtractor = new ItemExtractor(locatable, path, multi); - Object child = itemExtractor.getChild(); - - - if (multi) { - - final List childList; - - if (child == null) { - childList = Collections.emptyList(); - } else if (List.class.isAssignableFrom(child.getClass())) { - childList = (List) child; - } else { - childList = Collections.singletonList(child); - } - - List dtoList = new ArrayList<>(); - - Type actualTypeArgument = ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0]; - - Class aClass = TypeToken.of(actualTypeArgument).getRawType(); - - for (Object childItem : childList) { - - if (aClass.isAnnotationPresent(Entity.class)) { - - Object dtoItem = createInstance(aClass); - mapEntityToDto((RMObject) childItem, dtoItem); - dtoList.add(dtoItem); - } else if (field.isAnnotationPresent(Choice.class)) { - String simpleName = Optional.ofNullable(childItem).map(Object::getClass).map(RM_INFO_LOOKUP::getTypeInfo).map(RMTypeInfo::getRmName).orElse(""); - Class type = findActual((Class) actualTypeArgument, simpleName) - .orElseThrow(() -> new ClientException(String.format("No Option for %s ", simpleName))); - Object dtoItem = createInstance(type); - mapEntityToDto((RMObject) childItem, dtoItem); - dtoList.add(dtoItem); - } else if (aClass.isAssignableFrom(childItem.getClass())) { - - dtoList.add(childItem); - } else { - logger.warn("Incompatible Typ {} {}", aClass, child != null ? child.getClass() : "null"); - } - - } - writeField(field, dto, dtoList); + } + + private void mapEntityToDto(RMObject locatable, T dto) { + Map fieldMap = buildFieldMap(dto); + fieldMap.forEach((key, value) -> setFieldFromPath(dto, locatable, key, value)); + } + + private void setFieldFromPath(Object dto, RMObject locatable, String path, Field field) { + boolean multi = List.class.isAssignableFrom(field.getType()); + ItemExtractor itemExtractor = new ItemExtractor(locatable, path, multi); + Object child = itemExtractor.getChild(); + + if (multi) { + + final List childList; + + if (child == null) { + childList = Collections.emptyList(); + } else if (List.class.isAssignableFrom(child.getClass())) { + childList = (List) child; + } else { + childList = Collections.singletonList(child); + } + + List dtoList = new ArrayList<>(); + + Type actualTypeArgument = + ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0]; + + Class aClass = TypeToken.of(actualTypeArgument).getRawType(); + + for (Object childItem : childList) { + + if (aClass.isAnnotationPresent(Entity.class)) { + + Object dtoItem = createInstance(aClass); + mapEntityToDto((RMObject) childItem, dtoItem); + dtoList.add(dtoItem); + } else if (field.isAnnotationPresent(Choice.class)) { + String simpleName = + Optional.ofNullable(childItem) + .map(Object::getClass) + .map(RM_INFO_LOOKUP::getTypeInfo) + .map(RMTypeInfo::getRmName) + .orElse(""); + Class type = + findActual((Class) actualTypeArgument, simpleName) + .orElseThrow( + () -> new ClientException(String.format("No Option for %s ", simpleName))); + Object dtoItem = createInstance(type); + mapEntityToDto((RMObject) childItem, dtoItem); + dtoList.add(dtoItem); + } else if (aClass.isAssignableFrom(childItem.getClass())) { + + dtoList.add(childItem); } else { - if (child == null) // field is done - return; - handleSingleField(dto, field, child); + logger.warn("Incompatible Typ {} {}", aClass, child != null ? child.getClass() : "null"); } - + } + writeField(field, dto, dtoList); + } else { + if (child == null) // field is done + return; + handleSingleField(dto, field, child); } - - - private Optional> findActual(Class actualTypeArgument, String simpleName) { - return classgraph.getClassesImplementing(actualTypeArgument.getName()) - .stream() - .map(ClassInfo::loadClass) - .map(c -> (Class) c) - .filter(c -> c.isAnnotationPresent(OptionFor.class)) - .filter(c -> c.getAnnotation(OptionFor.class).value().equals(simpleName)) - .findAny(); + } + + private Optional> findActual(Class actualTypeArgument, String simpleName) { + return classgraph.getClassesImplementing(actualTypeArgument.getName()).stream() + .map(ClassInfo::loadClass) + .map(c -> (Class) c) + .filter(c -> c.isAnnotationPresent(OptionFor.class)) + .filter(c -> c.getAnnotation(OptionFor.class).value().equals(simpleName)) + .findAny(); + } + + private void writeField(Field field, Object dto, Object dtoList) { + + try { + PropertyDescriptor propertyDescriptor = + new PropertyDescriptor(field.getName(), dto.getClass()); + propertyDescriptor.getWriteMethod().invoke(dto, dtoList); + } catch (IllegalAccessException | InvocationTargetException | IntrospectionException e) { + throw new ClientException(e.getMessage(), e); } - - private void writeField(Field field, Object dto, Object dtoList) { - - try { - PropertyDescriptor propertyDescriptor = new PropertyDescriptor(field.getName(), dto.getClass()); - propertyDescriptor.getWriteMethod().invoke(dto, dtoList); - } catch (IllegalAccessException | InvocationTargetException | IntrospectionException e) { - throw new ClientException(e.getMessage(), e); - } + } + + private void handleSingleField(Object dto, Field field, Object child) { + + Class fieldType = field.getType(); + + if (field.isAnnotationPresent(Choice.class)) { + String simpleName = + Optional.ofNullable(child) + .map(Object::getClass) + .map(RM_INFO_LOOKUP::getTypeInfo) + .map(RMTypeInfo::getRmName) + .orElse(""); + Class type = findActual(fieldType, simpleName).orElse(null); + if (type != null) { + fieldType = type; + } else { + logger.warn("No implementation of {} for {}", fieldType, simpleName); + } } - private void handleSingleField(Object dto, Field field, Object child) { - - Class fieldType = field.getType(); - - if (field.isAnnotationPresent(Choice.class)) { - String simpleName = Optional.ofNullable(child).map(Object::getClass).map(RM_INFO_LOOKUP::getTypeInfo).map(RMTypeInfo::getRmName).orElse(""); - Class type = findActual(fieldType, simpleName) - .orElse(null); - if (type != null) { - fieldType = type; - } else { - logger.warn("No implementation of {} for {}", fieldType, simpleName); - } - } - - if (fieldType.isAnnotationPresent(Entity.class)) { - - Object subDto = createInstance(fieldType); - try { - - mapEntityToDto((RMObject) child, subDto); - } catch (RuntimeException e) { - throw e; - } - writeField(field, dto, subDto); - - } else if (EnumValueSet.class.isAssignableFrom(fieldType) && child != null && CodePhrase.class.isAssignableFrom(child.getClass())) { - CodePhrase codePhrase = (CodePhrase) child; - EnumValueSet enumValueSet = Arrays.stream(fieldType.getEnumConstants()) - .map(o -> (EnumValueSet) o) - .filter(v -> { - String terminologyId = Optional.ofNullable(codePhrase.getTerminologyId()) - .map(ObjectId::getValue) - .orElse(null); - return v.getTerminologyId().equals(terminologyId); - }) - .filter(v -> v.getCode().equals(codePhrase.getCodeString())) - .findAny() - .orElse(null); - writeField(field, dto, enumValueSet); - } else if (child == null || fieldType.isAssignableFrom(child.getClass())) { - - writeField(field, dto, child); - } else { - logger.warn("Incompatible Typ {} {}", fieldType, child.getClass()); - } - + if (fieldType.isAnnotationPresent(Entity.class)) { + + Object subDto = createInstance(fieldType); + try { + + mapEntityToDto((RMObject) child, subDto); + } catch (RuntimeException e) { + throw e; + } + writeField(field, dto, subDto); + + } else if (EnumValueSet.class.isAssignableFrom(fieldType) + && child != null + && CodePhrase.class.isAssignableFrom(child.getClass())) { + CodePhrase codePhrase = (CodePhrase) child; + EnumValueSet enumValueSet = + Arrays.stream(fieldType.getEnumConstants()) + .map(o -> (EnumValueSet) o) + .filter( + v -> { + String terminologyId = + Optional.ofNullable(codePhrase.getTerminologyId()) + .map(ObjectId::getValue) + .orElse(null); + return v.getTerminologyId().equals(terminologyId); + }) + .filter(v -> v.getCode().equals(codePhrase.getCodeString())) + .findAny() + .orElse(null); + writeField(field, dto, enumValueSet); + } else if (child == null || fieldType.isAssignableFrom(child.getClass())) { + + writeField(field, dto, child); + } else { + logger.warn("Incompatible Typ {} {}", fieldType, child.getClass()); } + } - private Map buildFieldMap(Object dto) { - Map fieldMap = new HashMap<>(); + private Map buildFieldMap(Object dto) { + Map fieldMap = new HashMap<>(); - for (Field field : dto.getClass().getDeclaredFields()) { - Path path = field.getAnnotation(Path.class); - if (path != null) { - fieldMap.put(path.value(), field); - } - } - return fieldMap; + for (Field field : dto.getClass().getDeclaredFields()) { + Path path = field.getAnnotation(Path.class); + if (path != null) { + fieldMap.put(path.value(), field); + } } - + return fieldMap; + } } diff --git a/client/src/main/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestAqlEndpoint.java b/client/src/main/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestAqlEndpoint.java index c3bf3f5ab..b13868ca1 100644 --- a/client/src/main/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestAqlEndpoint.java +++ b/client/src/main/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestAqlEndpoint.java @@ -139,7 +139,7 @@ private Object extractValue(String valueAsString, Class aClass) throws com.fa object = null; } else if (aClass.isAnnotationPresent(Entity.class)) { RMObject locatable = AQL_OBJECT_MAPPER.readValue(valueAsString, RMObject.class); - object = new Flattener().flatten(locatable, aClass); + object = new Flattener(defaultRestClient.getTemplateProvider()).flatten(locatable, aClass); if (locatable instanceof Composition) { addVersion(object, new VersionUid(((Composition) locatable).getUid().getValue())); } diff --git a/client/src/main/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestCompositionEndpoint.java b/client/src/main/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestCompositionEndpoint.java index ad505debc..716c5a45b 100644 --- a/client/src/main/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestCompositionEndpoint.java +++ b/client/src/main/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestCompositionEndpoint.java @@ -33,7 +33,6 @@ import java.util.Optional; import java.util.UUID; -import static org.ehrbase.client.openehrclient.defaultrestclient.DefaultRestClient.*; import static org.ehrbase.client.openehrclient.defaultrestclient.DefaultRestEhrEndpoint.EHR_PATH; public class DefaultRestCompositionEndpoint implements CompositionEndpoint { @@ -95,8 +94,9 @@ public T mergeCompositionEntity(T entity) { @Override public Optional find(UUID compositionId, Class clazz) { Optional composition = defaultRestClient.httpGet(defaultRestClient.getConfig().getBaseUri().resolve(EHR_PATH + ehrId.toString() + COMPOSITION_PATH + compositionId.toString()), Composition.class); - Optional t = composition - .map(c -> new Flattener().flatten(c, clazz)); + Optional t = + composition.map( + c -> new Flattener(defaultRestClient.getTemplateProvider()).flatten(c, clazz)); if (t.isPresent()) { addVersion(t.get(), new VersionUid(composition.get().getUid().getValue())); } diff --git a/client/src/test/java/org/ehrbase/client/flattener/FlattenerTest.java b/client/src/test/java/org/ehrbase/client/flattener/FlattenerTest.java index eeb17f8b0..40182402a 100644 --- a/client/src/test/java/org/ehrbase/client/flattener/FlattenerTest.java +++ b/client/src/test/java/org/ehrbase/client/flattener/FlattenerTest.java @@ -71,7 +71,7 @@ public class FlattenerTest { @Test public void testFlatten() { - Flattener cut = new Flattener(); + Flattener cut = new Flattener(new TestDataTemplateProvider()); BloodpressureListDe bloodpressureListDe = TestData.buildExampleBloodpressureListDe(); RMObject rmObject = new Unflattener(new TestDataTemplateProvider()).unflatten(bloodpressureListDe); @@ -87,7 +87,7 @@ public void testFlatten() { @Test public void testFlattenEhrbaseBloodPressureSimpleDeV0() { - Flattener cut = new Flattener(); + Flattener cut = new Flattener(new TestDataTemplateProvider()); EhrbaseBloodPressureSimpleDeV0Composition bloodPressureSimpleDeV0 = TestData.buildEhrbaseBloodPressureSimpleDeV0(); RMObject rmObject = new Unflattener(new TestDataTemplateProvider()).unflatten(bloodPressureSimpleDeV0); @@ -119,7 +119,7 @@ public void testFlattenEhrbaseBloodPressureSimpleDeV0() { @Test public void testFlattenEhrbaseMultiOccurrenceDeV1() { - Flattener cut = new Flattener(); + Flattener cut = new Flattener(new TestDataTemplateProvider()); EhrbaseMultiOccurrenceDeV1Composition bloodPressureSimpleDeV0 = TestData.buildEhrbaseMultiOccurrenceDeV1(); RMObject rmObject = new Unflattener(new TestDataTemplateProvider()).unflatten(bloodPressureSimpleDeV0); @@ -146,7 +146,7 @@ public void testFlattenEhrbaseMultiOccurrenceDeV1() { @Test public void testFlattenAllTypes() throws IOException { Composition composition = new CanonicalXML().unmarshal(IOUtils.toString(CompositionTestDataCanonicalXML.ALL_TYPES.getStream(), StandardCharsets.UTF_8), Composition.class); - Flattener cut = new Flattener(); + Flattener cut = new Flattener(new TestDataTemplateProvider()); TestAllTypesEnV1Composition actual = cut.flatten(composition, TestAllTypesEnV1Composition.class); assertThat(actual).isNotNull(); assertThat(actual.getTestAllTypes().get(0).getChoice().getClass()).isEqualTo(TestAllTypesChoiceDvcount.class); @@ -156,7 +156,7 @@ public void testFlattenAllTypes() throws IOException { @Test public void testFlattenCorona() throws IOException { Composition composition = new CanonicalJson().unmarshal(IOUtils.toString(CompositionTestDataCanonicalJson.CORONA.getStream(), StandardCharsets.UTF_8), Composition.class); - Flattener cut = new Flattener(); + Flattener cut = new Flattener(new TestDataTemplateProvider()); CoronaAnamneseComposition actual = cut.flatten(composition, CoronaAnamneseComposition.class); assertThat(actual).isNotNull(); assertThat(actual.getSymptome()).isNotNull(); @@ -167,7 +167,7 @@ public void testFlattenCorona() throws IOException { @Test public void testFlattenAltEvents() { Composition composition = (Composition) new Unflattener(new TestDataTemplateProvider()).unflatten(buildAlternativeEventsComposition()); - Flattener cut = new Flattener(); + Flattener cut = new Flattener(new TestDataTemplateProvider()); AlternativeEventsComposition actual = cut.flatten(composition, AlternativeEventsComposition.class); assertThat(actual).isNotNull(); assertThat(actual.getKorpergewicht()).size().isEqualTo(1); @@ -195,7 +195,7 @@ public void testFlattenAltEvents() { @Test public void testFlattenEpisodeOfCare() { Composition composition = (Composition) new Unflattener(new TestDataTemplateProvider()).unflatten(buildEpisodeOfCareComposition()); - Flattener cut = new Flattener(); + Flattener cut = new Flattener(new TestDataTemplateProvider()); EpisodeOfCareComposition actual = cut.flatten(composition, EpisodeOfCareComposition.class); assertThat(actual).isNotNull(); assertThat(actual.getEpisodeofcare()).size().isEqualTo(1); diff --git a/client/src/test/java/org/ehrbase/client/flattener/UnflattenerTest.java b/client/src/test/java/org/ehrbase/client/flattener/UnflattenerTest.java index 8f17f7ad6..6f887c7bc 100644 --- a/client/src/test/java/org/ehrbase/client/flattener/UnflattenerTest.java +++ b/client/src/test/java/org/ehrbase/client/flattener/UnflattenerTest.java @@ -152,7 +152,7 @@ public void testUnflattenEhrbaseBloodPressureSimpleDeV0() { @Test public void testUnflattenCorona() throws IOException { Composition expected = new CanonicalJson().unmarshal(IOUtils.toString(CompositionTestDataCanonicalJson.CORONA.getStream(), StandardCharsets.UTF_8), Composition.class); - Flattener flattener = new Flattener(); + Flattener flattener = new Flattener(new TestDataTemplateProvider()); CoronaAnamneseComposition coronaAnamneseComposition = flattener.flatten(expected, CoronaAnamneseComposition.class); Unflattener cut = new Unflattener(new TestDataTemplateProvider()); @@ -202,7 +202,7 @@ public void testUnflattenEhrbaseMultiOccurrenceDeV1() { @Test public void testUnflattenAllTypes() throws IOException { Composition composition = new CanonicalXML().unmarshal(IOUtils.toString(CompositionTestDataCanonicalXML.ALL_TYPES.getStream(), StandardCharsets.UTF_8), Composition.class); - Flattener flattener = new Flattener(); + Flattener flattener = new Flattener(new TestDataTemplateProvider()); TestAllTypesEnV1Composition testAllTypesEnV1 = flattener.flatten(composition, TestAllTypesEnV1Composition.class); TestAllTypesChoiceDvquantity choiceDvquantity = new TestAllTypesChoiceDvquantity(); diff --git a/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/AqlTestIT.java b/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/AqlTestIT.java index 68bcc81d6..bb90516ea 100644 --- a/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/AqlTestIT.java +++ b/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/AqlTestIT.java @@ -43,6 +43,7 @@ import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.EhrbaseBloodPressureSimpleDeV0Composition; import org.ehrbase.client.flattener.Flattener; import org.ehrbase.client.openehrclient.OpenEhrClient; +import org.ehrbase.client.templateprovider.TestDataTemplateProvider; import org.ehrbase.serialisation.jsonencoding.CanonicalJson; import org.ehrbase.test_data.composition.CompositionTestDataCanonicalJson; import org.junit.BeforeClass; @@ -373,7 +374,7 @@ public void testExecute11() throws IOException { UUID ehr = openEhrClient.ehrEndpoint().createEhr(); Composition composition = new CanonicalJson().unmarshal(IOUtils.toString(CompositionTestDataCanonicalJson.CORONA.getStream(), StandardCharsets.UTF_8), Composition.class); - Flattener flattener = new Flattener(); + Flattener flattener = new Flattener(new TestDataTemplateProvider()); CoronaAnamneseComposition coronaAnamneseComposition = flattener.flatten(composition, CoronaAnamneseComposition.class); openEhrClient.compositionEndpoint(ehr).mergeCompositionEntity(coronaAnamneseComposition); diff --git a/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/CoronaTestIT.java b/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/CoronaTestIT.java index 5d15e3d76..5c17f674c 100644 --- a/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/CoronaTestIT.java +++ b/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/CoronaTestIT.java @@ -52,13 +52,14 @@ import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.StationarerVersorgungsfallCompositionContainment; import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.AufnahmedatenAdminEntryContainment; -import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.EntlassungsdatenAdminEntry; import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.EntlassungsdatenAdminEntryContainment; import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.VirologischerBefundComposition; import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.VirologischerBefundCompositionContainment; -import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.*; +import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.BefundObservationContainment; +import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.KulturClusterContainment; +import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.ProVirusClusterContainment; +import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.ProbeClusterContainment; import org.ehrbase.client.flattener.Flattener; -import org.ehrbase.client.flattener.Unflattener; import org.ehrbase.client.openehrclient.OpenEhrClient; import org.ehrbase.client.templateprovider.TestDataTemplateProvider; import org.ehrbase.serialisation.jsonencoding.CanonicalJson; @@ -92,7 +93,7 @@ public void testCorona() throws IOException { UUID ehr = openEhrClient.ehrEndpoint().createEhr(); Composition composition = new CanonicalJson().unmarshal(IOUtils.toString(CompositionTestDataCanonicalJson.CORONA.getStream(), StandardCharsets.UTF_8), Composition.class); - Flattener flattener = new Flattener(); + Flattener flattener = new Flattener(new TestDataTemplateProvider()); CoronaAnamneseComposition coronaAnamneseComposition = flattener.flatten(composition, CoronaAnamneseComposition.class); openEhrClient.compositionEndpoint(ehr).mergeCompositionEntity(coronaAnamneseComposition); @@ -159,7 +160,7 @@ public void testCoronaWithJoin() throws IOException { UUID ehr = openEhrClient.ehrEndpoint().createEhr(); Composition composition = new CanonicalJson().unmarshal(IOUtils.toString(CompositionTestDataCanonicalJson.CORONA.getStream(), StandardCharsets.UTF_8), Composition.class); - Flattener flattener = new Flattener(); + Flattener flattener = new Flattener(new TestDataTemplateProvider()); CoronaAnamneseComposition coronaAnamneseComposition = flattener.flatten(composition, CoronaAnamneseComposition.class); openEhrClient.compositionEndpoint(ehr).mergeCompositionEntity(coronaAnamneseComposition); openEhrClient.compositionEndpoint(ehr).mergeCompositionEntity(TestData.buildEhrbaseBloodPressureSimpleDeV0()); diff --git a/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestAqlEndpointTestIT.java b/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestAqlEndpointTestIT.java index db4b85889..487cc6200 100644 --- a/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestAqlEndpointTestIT.java +++ b/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestAqlEndpointTestIT.java @@ -43,6 +43,7 @@ import org.ehrbase.client.openehrclient.OpenEhrClient; import org.ehrbase.client.openehrclient.VersionUid; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -129,6 +130,7 @@ public void testExecuteCustomConverters() { @Test + @Ignore public void testExecuteEntityQuery() { UUID ehr = openEhrClient.ehrEndpoint().createEhr(); @@ -163,6 +165,7 @@ public void testExecuteEntityQuery() { @Test + @Ignore public void testExecuteEntityQueryWhere() { UUID ehr = openEhrClient.ehrEndpoint().createEhr(); diff --git a/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestCompositionEndpointIT.java b/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestCompositionEndpointIT.java index 9c87e0001..e51356445 100644 --- a/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestCompositionEndpointIT.java +++ b/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestCompositionEndpointIT.java @@ -44,6 +44,7 @@ import org.ehrbase.client.openehrclient.CompositionEndpoint; import org.ehrbase.client.openehrclient.OpenEhrClient; import org.ehrbase.client.openehrclient.VersionUid; +import org.ehrbase.client.templateprovider.TestDataTemplateProvider; import org.ehrbase.serialisation.jsonencoding.CanonicalJson; import org.ehrbase.test_data.composition.CompositionTestDataCanonicalJson; import org.junit.BeforeClass; @@ -184,7 +185,7 @@ public void testVirologischerBefund() throws IOException { assertThat(composition.itemsAtPath("/content[openEHR-EHR-OBSERVATION.laboratory_test_result.v1]/data[at0001]/events[at0002]/data[at0003]")).isNotNull(); - Flattener flattener = new Flattener(); + Flattener flattener = new Flattener(new TestDataTemplateProvider()); VirologischerBefundComposition virologischerBefundComposition = flattener.flatten(composition, VirologischerBefundComposition.class); assertThat(virologischerBefundComposition.getBefund()).isNotNull(); diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/walker/FromCompositionWalker.java b/serialisation/src/main/java/org/ehrbase/serialisation/walker/FromCompositionWalker.java index cd0d50f47..2fdfc54e9 100644 --- a/serialisation/src/main/java/org/ehrbase/serialisation/walker/FromCompositionWalker.java +++ b/serialisation/src/main/java/org/ehrbase/serialisation/walker/FromCompositionWalker.java @@ -21,37 +21,70 @@ import com.nedap.archie.rm.RMObject; import com.nedap.archie.rminfo.ArchieRMInfoLookup; +import org.apache.commons.lang3.tuple.ImmutablePair; import org.ehrbase.webtemplate.model.WebTemplateNode; import java.util.List; +import java.util.Map; public abstract class FromCompositionWalker extends Walker { - public static final ArchieRMInfoLookup ARCHIE_RM_INFO_LOOKUP = ArchieRMInfoLookup.getInstance(); + public static final ArchieRMInfoLookup ARCHIE_RM_INFO_LOOKUP = ArchieRMInfoLookup.getInstance(); - protected Object extractRMChild(RMObject currentRM, WebTemplateNode currentNode, WebTemplateNode childNode, boolean isChoice, Integer count) { + protected Object extractRMChild( + RMObject currentRM, + WebTemplateNode currentNode, + WebTemplateNode childNode, + boolean isChoice, + Integer count) { - ItemExtractor itemExtractor = new ItemExtractor(currentRM, currentNode, childNode, isChoice && count == null).invoke(); + ItemExtractor itemExtractor = + new ItemExtractor(currentRM, currentNode, childNode, isChoice && count == null).invoke(); - Object child = itemExtractor.getChild(); + Object child = itemExtractor.getChild(); - if (count != null && child instanceof List) { + if (count != null && child instanceof List) { - child = ((List) child).get(count); - if (isChoice && !ARCHIE_RM_INFO_LOOKUP.getTypeInfo(childNode.getRmType()).getJavaClass().isAssignableFrom(child.getClass())) { - child = null; - } - } + child = ((List) child).get(count); + if (isChoice + && !ARCHIE_RM_INFO_LOOKUP + .getTypeInfo(childNode.getRmType()) + .getJavaClass() + .isAssignableFrom(child.getClass())) { + child = null; + } + } + if (child != null && String.class.isAssignableFrom(child.getClass())) { + child = new RmString((String) child); + } + return child; + } - return child; + @Override + protected int calculateSize(Context context, WebTemplateNode childNode) { + Object child = + extractRMChild( + context.getRmObjectDeque().peek(), + context.getNodeDeque().peek(), + childNode, + false, + null); + if (child instanceof List) { + return ((List) child).size(); + } else { + return 0; } + } - @Override - protected int calculateSize(Context context, WebTemplateNode childNode) { - Object child = extractRMChild(context.getRmObjectDeque().peek(), context.getNodeDeque().peek(), childNode, false, null); - if (child instanceof List) { - return ((List) child).size() ; - } else { - return 0; - } + protected ImmutablePair extractPair(Context context, WebTemplateNode currentNode, Map> choices, WebTemplateNode childNode, Integer i) { + RMObject currentChild = null; + T childObject = null; + currentChild = (RMObject) extractRMChild(context.getRmObjectDeque().peek(), currentNode, childNode, choices.containsKey(childNode.getAqlPath()), i); + + if (currentChild != null) { + childObject = extract(context, childNode, choices.containsKey(childNode.getAqlPath()), i); } + + ImmutablePair pair = new ImmutablePair<>(childObject, currentChild); + return pair; + } } diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/walker/RmString.java b/serialisation/src/main/java/org/ehrbase/serialisation/walker/RmString.java new file mode 100644 index 000000000..28b43fc73 --- /dev/null +++ b/serialisation/src/main/java/org/ehrbase/serialisation/walker/RmString.java @@ -0,0 +1,34 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.serialisation.walker; + +import com.nedap.archie.rm.RMObject; + +public class RmString extends RMObject { + final String value; + + public RmString(String value) { + this.value = value; + } + + public String getValue() { + return value; + } +} diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/walker/ToCompositionWalker.java b/serialisation/src/main/java/org/ehrbase/serialisation/walker/ToCompositionWalker.java index 189809228..1047ce669 100644 --- a/serialisation/src/main/java/org/ehrbase/serialisation/walker/ToCompositionWalker.java +++ b/serialisation/src/main/java/org/ehrbase/serialisation/walker/ToCompositionWalker.java @@ -31,6 +31,7 @@ import com.nedap.archie.rm.datavalues.quantity.datetime.DvDuration; import com.nedap.archie.rminfo.RMAttributeInfo; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.ImmutablePair; import org.ehrbase.webtemplate.model.WebTemplateNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,6 +40,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.Map; public abstract class ToCompositionWalker extends Walker { @@ -120,4 +122,16 @@ protected Object extractRMChild(RMObject currentRM, WebTemplateNode currentNode, return child; } + + protected ImmutablePair extractPair(Context context, WebTemplateNode currentNode, Map> choices, WebTemplateNode childNode, Integer i) { + RMObject currentChild = null; + T childObject = null; + childObject = extract(context, childNode, choices.containsKey(childNode.getAqlPath()), i); + if (childObject != null) { + currentChild = (RMObject) extractRMChild(context.getRmObjectDeque().peek(), currentNode, childNode, choices.containsKey(childNode.getAqlPath()), i); + } + + ImmutablePair pair = new ImmutablePair<>(childObject, currentChild); + return pair; + } } diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java b/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java index 66caaa449..a1ac269d2 100644 --- a/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java +++ b/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java @@ -105,11 +105,10 @@ private void handle(Context context) { for (WebTemplateNode childNode : children) { if (childNode.getMax() == 1) { - T childObject = extract(context, childNode, choices.containsKey(childNode.getAqlPath()), null); - Object child = null; - if (childObject != null) { - child = extractRMChild(context.getRmObjectDeque().peek(), currentNode, childNode, choices.containsKey(childNode.getAqlPath()), null); - } + + ImmutablePair pair = extractPair(context, currentNode, choices, childNode, null); + T childObject = pair.getLeft(); + Object child = pair.getRight(); if (child != null && childObject != null) { context.getNodeDeque().push(childNode); @@ -119,21 +118,19 @@ private void handle(Context context) { } } else { int size = calculateSize(context, childNode); - RMObject currentChild = null; - T childObject = null; + List> pairs = new ArrayList<>(); for (int i = 0; i < size; i++) { + ImmutablePair pair = extractPair(context, currentNode, choices, childNode, i); - childObject = extract(context, childNode, choices.containsKey(childNode.getAqlPath()), i); - if (childObject != null) { - currentChild = (RMObject) extractRMChild(context.getRmObjectDeque().peek(), currentNode, childNode, choices.containsKey(childNode.getAqlPath()), i); - } - - pairs.add(new ImmutablePair<>(childObject, currentChild)); + pairs.add(pair); } + for (int i = 0; i < size; i++) { + RMObject currentChild = null; + T childObject = null; childObject = pairs.get(i).getLeft(); currentChild = pairs.get(i).getRight(); if (currentChild != null && childObject != null) { @@ -157,6 +154,8 @@ private void handle(Context context) { context.getObjectDeque().remove(); } + protected abstract ImmutablePair extractPair(Context context, WebTemplateNode currentNode, Map> choices, WebTemplateNode childNode, Integer i); + protected abstract Object extractRMChild(RMObject currentRM, WebTemplateNode currentNode, WebTemplateNode childNode, boolean isChoice, Integer count); @@ -231,9 +230,12 @@ public ItemExtractor invoke() { } if (currentRM instanceof Pathable) { + try{ child = ((Pathable) currentRM).itemsAtPath(childPath.format(false)); if (child == null || ((List) child).isEmpty()) { child = ((Pathable) currentRM).itemAtPath(childPath.format(false)); + }} catch (RuntimeException e){ + child = null; } parent = ((Pathable) currentRM).itemAtPath(parentAql); } else if (currentRM instanceof DvInterval) { diff --git a/util/src/main/java/org/ehrbase/util/reflection/ReflectionHelper.java b/util/src/main/java/org/ehrbase/util/reflection/ReflectionHelper.java index 847e8be26..bee02f800 100644 --- a/util/src/main/java/org/ehrbase/util/reflection/ReflectionHelper.java +++ b/util/src/main/java/org/ehrbase/util/reflection/ReflectionHelper.java @@ -24,58 +24,74 @@ import org.ehrbase.util.exception.SdkException; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.stream.Collectors; -/** - * Helper class to find Configurations classes in the classpath. - */ +/** Helper class to find Configurations classes in the classpath. */ public class ReflectionHelper { - private static Map, Map> cache = new HashMap<>(); - - private ReflectionHelper() { - } + private static Map, Map> cache = new HashMap<>(); - /** - * Returns a Map containing all implementing classes of the interface {@code root} with key the class they are associated to as subclass of {@link ClassDependent} - * - * @param root A Interface extending {@link ClassDependent } - * @param - * @param - * @return - */ - public static > Map, S> buildMap(Class root) { + private ReflectionHelper() {} + /** + * Returns a Map containing all implementing classes of the interface {@code root} with key the + * class they are associated to as subclass of {@link ClassDependent} + * + * @param root A Interface extending {@link ClassDependent } + * @param + * @param + * @return + */ + public static > Map, S> buildMap( + Class root) { - Map, S> classSMap = cache.get(root); + Map, S> classSMap = cache.get(root); - if (classSMap == null) { - classSMap = buildInternal(root); - cache.put(root, classSMap); - } - return classSMap; + if (classSMap == null) { + classSMap = buildInternal(root); + cache.put(root, classSMap); } + return classSMap; + } - public static > Map, S> buildInternal(Class root) { - Map, S> classSMap; - try (ScanResult result = new ClassGraph().enableClassInfo().enableAnnotationInfo() - .whitelistPackages(root.getPackage().getName()).scan()) { + public static List> findAll(String packageName) { + try (ScanResult result = + new ClassGraph() + .enableClassInfo() + .enableAnnotationInfo() + .acceptPackages(packageName) + .scan()) { + return result.getAllClasses().loadClasses(); + } + } - classSMap = result.getClassesImplementing(root.getName()).stream() - .filter(c -> !c.isAbstract()) - .map(c -> { - try { - return c.loadClass().getConstructor().newInstance(); - } catch (Exception e) { - throw new SdkException(e.getMessage(), e); - } - }) - .map(o -> (S) o) - .collect(Collectors.toMap(S::getAssociatedClass, c -> c)); - cache.put(root, classSMap); + private static > Map, S> buildInternal( + Class root) { + Map, S> classSMap; + try (ScanResult result = + new ClassGraph() + .enableClassInfo() + .enableAnnotationInfo() + .acceptPackages(root.getPackage().getName()) + .scan()) { - } - return classSMap; + classSMap = + result.getClassesImplementing(root.getName()).stream() + .filter(c -> !c.isAbstract()) + .map( + c -> { + try { + return c.loadClass().getConstructor().newInstance(); + } catch (Exception e) { + throw new SdkException(e.getMessage(), e); + } + }) + .map(o -> (S) o) + .collect(Collectors.toMap(S::getAssociatedClass, c -> c)); + cache.put(root, classSMap); } + return classSMap; + } } diff --git a/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java b/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java index 8926dfa9f..b6701d737 100644 --- a/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java +++ b/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java @@ -303,6 +303,7 @@ private void addRMAttributes(WebTemplateNode node, String aqlPath, Map !s.isComputed()) .filter(s -> !List.of("value").contains(s.getRmName())) .filter(s -> !Locatable.class.isAssignableFrom(s.getTypeInCollection())) .map(i -> buildNodeForAttribute(i, aqlPath, termDefinitionMap)) From 35de47b2295c18be426ae133c951e363448aa404 Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Fri, 13 Nov 2020 16:32:45 +0100 Subject: [PATCH 04/54] Allow flatten from non composition see https://github.com/ehrbase/project_management/issues/424 --- .../flattener/DtoFromCompositionWalker.java | 5 +- .../ehrbase/client/flattener/Flattener.java | 15 +- .../DefaultRestAqlEndpointTestIT.java | 3 - .../ehrbase/serialisation/walker/Walker.java | 497 ++++++++++-------- 4 files changed, 285 insertions(+), 235 deletions(-) diff --git a/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java b/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java index a8f3c2ee6..1ac0ce3ff 100644 --- a/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java +++ b/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java @@ -21,7 +21,7 @@ import com.google.common.reflect.TypeToken; import com.nedap.archie.creation.RMObjectCreator; -import com.nedap.archie.rm.composition.Composition; +import com.nedap.archie.rm.RMObject; import com.nedap.archie.rm.datatypes.CodePhrase; import com.nedap.archie.rm.support.identification.ObjectId; import com.nedap.archie.rminfo.ArchieRMInfoLookup; @@ -38,7 +38,6 @@ import org.ehrbase.serialisation.walker.RmString; import org.ehrbase.util.exception.SdkException; import org.ehrbase.util.reflection.ReflectionHelper; -import org.ehrbase.webtemplate.model.WebTemplate; import org.ehrbase.webtemplate.model.WebTemplateNode; import org.ehrbase.webtemplate.parser.FlatPath; import org.slf4j.Logger; @@ -82,7 +81,7 @@ static T create(Class clazz) { private List> dtoList; @Override - public void walk(Composition composition, DtoWithMatchingFields object, WebTemplate webTemplate) { + public void walk(RMObject composition, DtoWithMatchingFields object, WebTemplateNode webTemplate) { dtoList = ReflectionHelper.findAll(object.getDto().getClass().getPackageName()); super.walk(composition, object, webTemplate); } diff --git a/client/src/main/java/org/ehrbase/client/flattener/Flattener.java b/client/src/main/java/org/ehrbase/client/flattener/Flattener.java index d801224e9..1e639beef 100644 --- a/client/src/main/java/org/ehrbase/client/flattener/Flattener.java +++ b/client/src/main/java/org/ehrbase/client/flattener/Flattener.java @@ -19,7 +19,6 @@ import com.google.common.reflect.TypeToken; import com.nedap.archie.rm.RMObject; -import com.nedap.archie.rm.composition.Composition; import com.nedap.archie.rm.datatypes.CodePhrase; import com.nedap.archie.rm.support.identification.ObjectId; import com.nedap.archie.rminfo.ArchieRMInfoLookup; @@ -27,6 +26,8 @@ import io.github.classgraph.ClassGraph; import io.github.classgraph.ClassInfo; import io.github.classgraph.ScanResult; +import org.apache.commons.lang3.StringUtils; +import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; @@ -34,6 +35,7 @@ import org.ehrbase.client.annotations.Template; import org.ehrbase.client.classgenerator.EnumValueSet; import org.ehrbase.client.exception.ClientException; +import org.ehrbase.webtemplate.model.WebTemplateNode; import org.ehrbase.webtemplate.templateprovider.TemplateProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,6 +52,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; public class Flattener { @@ -78,15 +81,19 @@ private static T createInstance(Class aClass) { public T flatten(RMObject locatable, Class clazz) { try { - classgraph = new ClassGraph().enableClassInfo().acceptPackages(clazz.getPackageName()).scan(); + classgraph = new ClassGraph().enableClassInfo().enableAnnotationInfo().acceptPackages(StringUtils.removeEnd( clazz.getPackageName(),".definition")).scan(); + String templateId = classgraph.getClassesWithAnnotation(Template.class.getName()).loadClasses().get(0).getAnnotation(Template.class).value(); T dto = createInstance(clazz); + String archetypeValue = clazz.getAnnotation(Archetype.class).value(); + WebTemplateNode root = templateProvider.buildIntrospect(templateId).get().getTree().findMatching(n -> Objects.equals(n.getNodeId(), archetypeValue)).get(0); new DtoFromCompositionWalker() .walk( - (Composition) locatable, + locatable, new DtoWithMatchingFields( dto, DtoFromCompositionWalker.buildFieldByPathMap(dto.getClass())), - templateProvider.buildIntrospect(clazz.getAnnotation(Template.class).value()).get()); + root + ); return dto; } finally { classgraph.close(); diff --git a/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestAqlEndpointTestIT.java b/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestAqlEndpointTestIT.java index 487cc6200..db4b85889 100644 --- a/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestAqlEndpointTestIT.java +++ b/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestAqlEndpointTestIT.java @@ -43,7 +43,6 @@ import org.ehrbase.client.openehrclient.OpenEhrClient; import org.ehrbase.client.openehrclient.VersionUid; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -130,7 +129,6 @@ public void testExecuteCustomConverters() { @Test - @Ignore public void testExecuteEntityQuery() { UUID ehr = openEhrClient.ehrEndpoint().createEhr(); @@ -165,7 +163,6 @@ public void testExecuteEntityQuery() { @Test - @Ignore public void testExecuteEntityQueryWhere() { UUID ehr = openEhrClient.ehrEndpoint().createEhr(); diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java b/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java index a1ac269d2..e8cfb0145 100644 --- a/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java +++ b/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java @@ -46,246 +46,293 @@ public abstract class Walker { - public static final ArchieRMInfoLookup ARCHIE_RM_INFO_LOOKUP = ArchieRMInfoLookup.getInstance(); - - public void walk(Composition composition, T object, WebTemplate webTemplate) { - - Context context = new Context<>(); - - context.getNodeDeque().push(webTemplate.getTree()); - context.getObjectDeque().push(object); - context.getRmObjectDeque().push(composition); - - handle(context); - - - } - - private void handle(Context context) { - - preHandle(context); - WebTemplateNode currentNode = context.getNodeDeque().peek(); - if (visitChildren(currentNode)) { - - Map> choices = currentNode.getChoicesInChildren(); - List children = new ArrayList<>(currentNode.getChildren()); - if (children.stream().filter(n -> n.getRmType().equals("DV_CODED_TEXT")).map(WebTemplateNode::getInputs).flatMap(List::stream).map(WebTemplateInput::getSuffix).anyMatch("other"::equals)) { - WebTemplateNode codeNode = children.stream().filter(n -> n.getRmType().equals("DV_CODED_TEXT")).findAny().get(); - WebTemplateNode textNode = new WebTemplateNode(codeNode); - textNode.setRmType("DV_TEXT"); - choices.put(textNode.getAqlPath(), List.of(codeNode, textNode)); - children.add(textNode); - } - - if (children.stream().anyMatch(n -> n.getRmType().equals("EVENT"))) { - WebTemplateNode event = children.stream().filter(n -> n.getRmType().equals("EVENT")).findAny().get(); - WebTemplateNode pointEvent = new WebTemplateNode(event); - WebTemplateNode intervalEvent = new WebTemplateNode(event); - pointEvent.setRmType("POINT_EVENT"); - intervalEvent.setRmType("INTERVAL_EVENT"); - WebTemplateNode width = new WebTemplateNode(); - width.setId("width"); - width.setRmType("DV_DURATION"); - width.setMax(1); - width.setAqlPath(event.getAqlPath() + "/width"); - intervalEvent.getChildren().add(width); - WebTemplateNode math = new WebTemplateNode(); - math.setId("math_function"); - math.setRmType("DV_CODED_TEXT"); - math.setMax(1); - math.setAqlPath(event.getAqlPath() + "/math_function"); - intervalEvent.getChildren().add(math); - choices.put(intervalEvent.getAqlPath(), List.of(intervalEvent, pointEvent)); - children.add(intervalEvent); - children.add(pointEvent); - children.remove(event); - } - - - for (WebTemplateNode childNode : children) { - - if (childNode.getMax() == 1) { - - ImmutablePair pair = extractPair(context, currentNode, choices, childNode, null); - T childObject = pair.getLeft(); - Object child = pair.getRight(); - - if (child != null && childObject != null) { - context.getNodeDeque().push(childNode); - context.getObjectDeque().push(childObject); - context.getRmObjectDeque().push((RMObject) child); - handle(context); - } - } else { - int size = calculateSize(context, childNode); - - List> pairs = new ArrayList<>(); - for (int i = 0; i < size; i++) { - ImmutablePair pair = extractPair(context, currentNode, choices, childNode, i); - - pairs.add(pair); - - - } - - for (int i = 0; i < size; i++) { - RMObject currentChild = null; - T childObject = null; - childObject = pairs.get(i).getLeft(); - currentChild = pairs.get(i).getRight(); - if (currentChild != null && childObject != null) { - context.getNodeDeque().push(childNode); - context.getObjectDeque().push(childObject); - context.getRmObjectDeque().push(currentChild); - context.getCountMap().put(childNode, i); - handle(context); - } - - - } - - } + public static final ArchieRMInfoLookup ARCHIE_RM_INFO_LOOKUP = ArchieRMInfoLookup.getInstance(); + + public void walk(Composition composition, T object, WebTemplate webTemplate) { + + walk(composition, object, webTemplate.getTree()); + } + + public void walk(RMObject composition, T object, WebTemplateNode root) { + + Context context = new Context<>(); + + context.getNodeDeque().push(root); + context.getObjectDeque().push(object); + context.getRmObjectDeque().push(composition); + + handle(context); + } + + private void handle(Context context) { + + preHandle(context); + WebTemplateNode currentNode = context.getNodeDeque().peek(); + if (visitChildren(currentNode)) { + + Map> choices = currentNode.getChoicesInChildren(); + List children = new ArrayList<>(currentNode.getChildren()); + if (children.stream() + .filter(n -> n.getRmType().equals("DV_CODED_TEXT")) + .map(WebTemplateNode::getInputs) + .flatMap(List::stream) + .map(WebTemplateInput::getSuffix) + .anyMatch("other"::equals)) { + WebTemplateNode codeNode = + children.stream().filter(n -> n.getRmType().equals("DV_CODED_TEXT")).findAny().get(); + WebTemplateNode textNode = new WebTemplateNode(codeNode); + textNode.setRmType("DV_TEXT"); + choices.put(textNode.getAqlPath(), List.of(codeNode, textNode)); + children.add(textNode); + } + + if (children.stream().anyMatch(n -> n.getRmType().equals("EVENT"))) { + WebTemplateNode event = + children.stream().filter(n -> n.getRmType().equals("EVENT")).findAny().get(); + WebTemplateNode pointEvent = new WebTemplateNode(event); + WebTemplateNode intervalEvent = new WebTemplateNode(event); + pointEvent.setRmType("POINT_EVENT"); + intervalEvent.setRmType("INTERVAL_EVENT"); + WebTemplateNode width = new WebTemplateNode(); + width.setId("width"); + width.setRmType("DV_DURATION"); + width.setMax(1); + width.setAqlPath(event.getAqlPath() + "/width"); + intervalEvent.getChildren().add(width); + WebTemplateNode math = new WebTemplateNode(); + math.setId("math_function"); + math.setRmType("DV_CODED_TEXT"); + math.setMax(1); + math.setAqlPath(event.getAqlPath() + "/math_function"); + intervalEvent.getChildren().add(math); + choices.put(intervalEvent.getAqlPath(), List.of(intervalEvent, pointEvent)); + children.add(intervalEvent); + children.add(pointEvent); + children.remove(event); + } + + for (WebTemplateNode childNode : children) { + + if (childNode.getMax() == 1) { + + ImmutablePair pair = + extractPair(context, currentNode, choices, childNode, null); + T childObject = pair.getLeft(); + Object child = pair.getRight(); + + if (child != null && childObject != null) { + context.getNodeDeque().push(childNode); + context.getObjectDeque().push(childObject); + context.getRmObjectDeque().push((RMObject) child); + handle(context); + } + } else { + int size = calculateSize(context, childNode); + + List> pairs = new ArrayList<>(); + for (int i = 0; i < size; i++) { + ImmutablePair pair = + extractPair(context, currentNode, choices, childNode, i); + + pairs.add(pair); + } + + for (int i = 0; i < size; i++) { + RMObject currentChild = null; + T childObject = null; + childObject = pairs.get(i).getLeft(); + currentChild = pairs.get(i).getRight(); + if (currentChild != null && childObject != null) { + context.getNodeDeque().push(childNode); + context.getObjectDeque().push(childObject); + context.getRmObjectDeque().push(currentChild); + context.getCountMap().put(childNode, i); + handle(context); } - + } } - postHandle(context); - context.getRmObjectDeque().remove(); - context.getNodeDeque().remove(); - context.getObjectDeque().remove(); + } } - - protected abstract ImmutablePair extractPair(Context context, WebTemplateNode currentNode, Map> choices, WebTemplateNode childNode, Integer i); - - - protected abstract Object extractRMChild(RMObject currentRM, WebTemplateNode currentNode, WebTemplateNode childNode, boolean isChoice, Integer count); - - protected boolean visitChildren(WebTemplateNode node) { - RMTypeInfo typeInfo = ARCHIE_RM_INFO_LOOKUP.getTypeInfo(node.getRmType()); - return typeInfo != null && (Locatable.class.isAssignableFrom(typeInfo.getJavaClass()) || EventContext.class.isAssignableFrom(typeInfo.getJavaClass()) || DvInterval.class.isAssignableFrom(typeInfo.getJavaClass())); + postHandle(context); + context.getRmObjectDeque().remove(); + context.getNodeDeque().remove(); + context.getObjectDeque().remove(); + } + + protected abstract ImmutablePair extractPair( + Context context, + WebTemplateNode currentNode, + Map> choices, + WebTemplateNode childNode, + Integer i); + + protected abstract Object extractRMChild( + RMObject currentRM, + WebTemplateNode currentNode, + WebTemplateNode childNode, + boolean isChoice, + Integer count); + + protected boolean visitChildren(WebTemplateNode node) { + RMTypeInfo typeInfo = ARCHIE_RM_INFO_LOOKUP.getTypeInfo(node.getRmType()); + return typeInfo != null + && (Locatable.class.isAssignableFrom(typeInfo.getJavaClass()) + || EventContext.class.isAssignableFrom(typeInfo.getJavaClass()) + || DvInterval.class.isAssignableFrom(typeInfo.getJavaClass())); + } + + protected abstract T extract( + Context context, WebTemplateNode child, boolean isChoice, Integer i); + + protected abstract void preHandle(Context context); + + protected abstract void postHandle(Context context); + + protected abstract int calculateSize(Context context, WebTemplateNode childNode); + + protected RMObject deepClone(RMObject rmObject) { + if (rmObject == null) { + return null; + } + CanonicalJson canonicalXML = new CanonicalJson(); + return canonicalXML.unmarshal(canonicalXML.marshal(rmObject), rmObject.getClass()); + } + + protected String buildNamePath(Context context) { + StringBuilder sb = new StringBuilder(); + for (Iterator iterator = context.getNodeDeque().descendingIterator(); + iterator.hasNext(); ) { + WebTemplateNode node = iterator.next(); + sb.append(node.getId()); + if (node.getMax() != 1 && context.getCountMap().containsKey(node)) { + sb.append(":").append(context.getCountMap().get(node)); + } + if (iterator.hasNext()) { + sb.append("/"); + } + } + return sb.toString(); + } + + protected class ItemExtractor { + private RMObject currentRM; + private WebTemplateNode currentNode; + private WebTemplateNode childNode; + private boolean isChoice; + private String relativeAql; + private Object child; + private String parentAql; + private Object parent; + + public ItemExtractor( + RMObject currentRM, + WebTemplateNode currentNode, + WebTemplateNode childNode, + boolean isChoice) { + this.currentRM = currentRM; + this.currentNode = currentNode; + this.childNode = childNode; + this.isChoice = isChoice; } - protected abstract T extract(Context context, WebTemplateNode child, boolean isChoice, Integer i); - - protected abstract void preHandle(Context context); - - protected abstract void postHandle(Context context); - - protected abstract int calculateSize(Context context, WebTemplateNode childNode); - - protected RMObject deepClone(RMObject rmObject) { - if (rmObject == null){ - return null; - } - CanonicalJson canonicalXML = new CanonicalJson(); - return canonicalXML.unmarshal(canonicalXML.marshal(rmObject), rmObject.getClass()); + public FlatPath getRelativeAql() { + return new FlatPath(relativeAql); } - protected String buildNamePath(Context context) { - StringBuilder sb = new StringBuilder(); - for (Iterator iterator = context.getNodeDeque().descendingIterator(); iterator.hasNext(); ) { - WebTemplateNode node = iterator.next(); - sb.append(node.getId()); - if (node.getMax() != 1 && context.getCountMap().containsKey(node)) { - sb.append(":") - .append(context.getCountMap().get(node)); - } - if (iterator.hasNext()) { - sb.append("/"); - } - } - return sb.toString(); + public Object getChild() { + return child; } - protected class ItemExtractor { - private RMObject currentRM; - private WebTemplateNode currentNode; - private WebTemplateNode childNode; - private boolean isChoice; - private String relativeAql; - private Object child; - private String parentAql; - private Object parent; - - public ItemExtractor(RMObject currentRM, WebTemplateNode currentNode, WebTemplateNode childNode, boolean isChoice) { - this.currentRM = currentRM; - this.currentNode = currentNode; - this.childNode = childNode; - this.isChoice = isChoice; + public ItemExtractor invoke() { + relativeAql = + StringUtils.removeEnd( + StringUtils.removeStart(childNode.getAqlPath(), currentNode.getAqlPath()), "/"); + FlatPath childPath = new FlatPath(relativeAql); + parentAql = + StringUtils.removeEnd( + childPath.format(false), + childPath.format(false).substring(childPath.format(false).lastIndexOf("/"))); + if (StringUtils.isBlank(parentAql)) { + parentAql = "/"; + } + + if (currentRM instanceof Pathable) { + try { + child = ((Pathable) currentRM).itemsAtPath(childPath.format(false)); + if (child == null || ((List) child).isEmpty()) { + child = ((Pathable) currentRM).itemAtPath(childPath.format(false)); + } + } catch (RuntimeException e) { + child = null; } - - public FlatPath getRelativeAql() { - return new FlatPath(relativeAql); + parent = ((Pathable) currentRM).itemAtPath(parentAql); + } else if (currentRM instanceof DvInterval) { + child = + relativeAql.contains("lower") + ? ((DvInterval) currentRM).getLower() + : ((DvInterval) currentRM).getUpper(); + parent = currentRM; + } else { + throw new SdkException( + String.format("Can not extract from class %s", currentRM.getClass().getSimpleName())); + } + + if (StringUtils.isNotBlank(childPath.findOtherPredicate("name/value")) + && child instanceof List + && Locatable.class.isAssignableFrom( + ARCHIE_RM_INFO_LOOKUP.getClass(childNode.getRmType()))) { + child = + ((List) child) + .stream() + .filter( + c -> + childPath + .findOtherPredicate("name/value") + .equals(((Locatable) c).getNameAsString())) + .collect(Collectors.toList()); + // if name not found return null + if (((List) child).isEmpty()) { + child = null; } - - public Object getChild() { - return child; + } + if (isChoice && child instanceof List) { + child = + ((List) child) + .stream() + .filter( + c -> + ARCHIE_RM_INFO_LOOKUP + .getTypeInfo(c.getClass()) + .getRmName() + .equals(childNode.getRmType())) + .collect(Collectors.toList()); + // if rmType not found return null + if (((List) child).isEmpty()) { + child = null; } + } - public ItemExtractor invoke() { - relativeAql = StringUtils.removeEnd(StringUtils.removeStart(childNode.getAqlPath(), currentNode.getAqlPath()), "/"); - FlatPath childPath = new FlatPath(relativeAql); - parentAql = StringUtils.removeEnd(childPath.format(false), childPath.format(false).substring(childPath.format(false).lastIndexOf("/"))); - if (StringUtils.isBlank(parentAql)) { - parentAql = "/"; - } + if (childNode.getMax() == 1 && child instanceof List) { - if (currentRM instanceof Pathable) { - try{ - child = ((Pathable) currentRM).itemsAtPath(childPath.format(false)); - if (child == null || ((List) child).isEmpty()) { - child = ((Pathable) currentRM).itemAtPath(childPath.format(false)); - }} catch (RuntimeException e){ - child = null; - } - parent = ((Pathable) currentRM).itemAtPath(parentAql); - } else if (currentRM instanceof DvInterval) { - child = relativeAql.contains("lower") ? ((DvInterval) currentRM).getLower() : ((DvInterval) currentRM).getUpper(); - parent = currentRM; - } else { - throw new SdkException(String.format("Can not extract from class %s", currentRM.getClass().getSimpleName())); - } - - - if (StringUtils.isNotBlank(childPath.findOtherPredicate("name/value")) && child instanceof List && Locatable.class.isAssignableFrom(ARCHIE_RM_INFO_LOOKUP.getClass(childNode.getRmType()))) { - child = ((List) child).stream() - .filter(c -> childPath.findOtherPredicate("name/value").equals(((Locatable) c).getNameAsString())) - .collect(Collectors.toList()); - // if name not found return null - if (((List) child).isEmpty()) { - child = null; - } - } - if (isChoice && child instanceof List) { - child = ((List) child).stream() - .filter(c -> ARCHIE_RM_INFO_LOOKUP.getTypeInfo(c.getClass()).getRmName().equals(childNode.getRmType())) - .collect(Collectors.toList()); - // if rmType not found return null - if (((List) child).isEmpty()) { - child = null; - } - } - - if (childNode.getMax() == 1 && child instanceof List) { - - if (((List) child).isEmpty()) { - child = null; - } else { - child = ((List) child).get(0); - } - } - - if (child instanceof Element && !childNode.getRmType().equals("ELEMENT")) { - child = ((Element) child).getValue(); - } - return this; + if (((List) child).isEmpty()) { + child = null; + } else { + child = ((List) child).get(0); } + } - public FlatPath getParentAql() { - return new FlatPath(parentAql); - } + if (child instanceof Element && !childNode.getRmType().equals("ELEMENT")) { + child = ((Element) child).getValue(); + } + return this; + } - public Object getParent() { - return parent; - } + public FlatPath getParentAql() { + return new FlatPath(parentAql); + } + + public Object getParent() { + return parent; } -} \ No newline at end of file + } +} From fa1df992e9978641ff9e5795cc2f217383a121fe Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Mon, 16 Nov 2020 16:50:38 +0100 Subject: [PATCH 05/54] add RoundTripTest see https://github.com/ehrbase/project_management/issues/424 --- .../flattener/DtoFromCompositionWalker.java | 3 +- .../flattener/DtoToCompositionWalker.java | 6 + .../ehrbase/client/flattener/Flattener.java | 180 ++---------------- .../ehrbase/client/flattener/Unflattener.java | 28 ++- .../definition/TestAllTypesCluster.java | 3 +- .../client/flattener/RoundTripTest.java | 166 ++++++++++++++++ .../dbencoding/DBEncodeRoundTripTest.java | 2 +- 7 files changed, 219 insertions(+), 169 deletions(-) create mode 100644 client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java diff --git a/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java b/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java index 1ac0ce3ff..af9c35025 100644 --- a/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java +++ b/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java @@ -111,6 +111,7 @@ protected DtoWithMatchingFields extract( return new DtoWithMatchingFields(context.getObjectDeque().peek().getDto(), subValues); } else { Field field = subValues.values().stream().findAny().get(); + String path = subValues.keySet().stream().findAny().get(); Class type = field.getType(); if (List.class.isAssignableFrom(type)) { type = @@ -120,7 +121,7 @@ protected DtoWithMatchingFields extract( if (isChoice) { type = findActual(type, child.getRmType()).get(); } - if (type.isAnnotationPresent(Entity.class)) { + if (type.isAnnotationPresent(Entity.class) && StringUtils.isBlank(path)) { Object dto = create(type); writeField(field, context.getObjectDeque().peek().getDto(), dto); diff --git a/client/src/main/java/org/ehrbase/client/flattener/DtoToCompositionWalker.java b/client/src/main/java/org/ehrbase/client/flattener/DtoToCompositionWalker.java index 7e7e09a38..e074a4e30 100644 --- a/client/src/main/java/org/ehrbase/client/flattener/DtoToCompositionWalker.java +++ b/client/src/main/java/org/ehrbase/client/flattener/DtoToCompositionWalker.java @@ -65,6 +65,7 @@ public class DtoToCompositionWalker extends ToCompositionWalker extract( Context> context, WebTemplateNode child, boolean isChoice, Integer i) { + Map subValues = filterValues(context, child); if (subValues.isEmpty()) { @@ -164,6 +165,10 @@ protected void preHandle(Context> context) { PathExtractor extractor = new PathExtractor(objectEntry.getKey()); if (StringUtils.isBlank(extractor.getChildPath())) { + if ("uuid".equals(extractor.getAttributeName())){ + System.out.println("d"); + } + else if (StringUtils.isNotBlank(extractor.getAttributeName())) { handleSingleValue( objectEntry.getValue(), @@ -201,6 +206,7 @@ protected int calculateSize(Context> context, WebTemplateNod return 0; } + static Map findEntity(Object dto) { return Arrays.stream(dto.getClass().getDeclaredFields()) diff --git a/client/src/main/java/org/ehrbase/client/flattener/Flattener.java b/client/src/main/java/org/ehrbase/client/flattener/Flattener.java index 1e639beef..9fcb7cd36 100644 --- a/client/src/main/java/org/ehrbase/client/flattener/Flattener.java +++ b/client/src/main/java/org/ehrbase/client/flattener/Flattener.java @@ -17,24 +17,17 @@ package org.ehrbase.client.flattener; -import com.google.common.reflect.TypeToken; import com.nedap.archie.rm.RMObject; -import com.nedap.archie.rm.datatypes.CodePhrase; -import com.nedap.archie.rm.support.identification.ObjectId; +import com.nedap.archie.rm.composition.Composition; import com.nedap.archie.rminfo.ArchieRMInfoLookup; -import com.nedap.archie.rminfo.RMTypeInfo; import io.github.classgraph.ClassGraph; -import io.github.classgraph.ClassInfo; import io.github.classgraph.ScanResult; import org.apache.commons.lang3.StringUtils; import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Choice; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.annotations.Id; import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.EnumValueSet; import org.ehrbase.client.exception.ClientException; +import org.ehrbase.client.openehrclient.VersionUid; import org.ehrbase.webtemplate.model.WebTemplateNode; import org.ehrbase.webtemplate.templateprovider.TemplateProvider; import org.slf4j.Logger; @@ -44,14 +37,7 @@ import java.beans.PropertyDescriptor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.Optional; @@ -94,163 +80,29 @@ public T flatten(RMObject locatable, Class clazz) { dto, DtoFromCompositionWalker.buildFieldByPathMap(dto.getClass())), root ); + if (locatable instanceof Composition){ + addVersion(dto, new VersionUid(((Composition) locatable).getUid().toString())); + } return dto; } finally { classgraph.close(); } } - private void mapEntityToDto(RMObject locatable, T dto) { - Map fieldMap = buildFieldMap(dto); - fieldMap.forEach((key, value) -> setFieldFromPath(dto, locatable, key, value)); - } - - private void setFieldFromPath(Object dto, RMObject locatable, String path, Field field) { - boolean multi = List.class.isAssignableFrom(field.getType()); - ItemExtractor itemExtractor = new ItemExtractor(locatable, path, multi); - Object child = itemExtractor.getChild(); - - if (multi) { - - final List childList; - - if (child == null) { - childList = Collections.emptyList(); - } else if (List.class.isAssignableFrom(child.getClass())) { - childList = (List) child; - } else { - childList = Collections.singletonList(child); - } - - List dtoList = new ArrayList<>(); - - Type actualTypeArgument = - ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0]; - - Class aClass = TypeToken.of(actualTypeArgument).getRawType(); - - for (Object childItem : childList) { - - if (aClass.isAnnotationPresent(Entity.class)) { - - Object dtoItem = createInstance(aClass); - mapEntityToDto((RMObject) childItem, dtoItem); - dtoList.add(dtoItem); - } else if (field.isAnnotationPresent(Choice.class)) { - String simpleName = - Optional.ofNullable(childItem) - .map(Object::getClass) - .map(RM_INFO_LOOKUP::getTypeInfo) - .map(RMTypeInfo::getRmName) - .orElse(""); - Class type = - findActual((Class) actualTypeArgument, simpleName) - .orElseThrow( - () -> new ClientException(String.format("No Option for %s ", simpleName))); - Object dtoItem = createInstance(type); - mapEntityToDto((RMObject) childItem, dtoItem); - dtoList.add(dtoItem); - } else if (aClass.isAssignableFrom(childItem.getClass())) { - - dtoList.add(childItem); - } else { - logger.warn("Incompatible Typ {} {}", aClass, child != null ? child.getClass() : "null"); - } - } - writeField(field, dto, dtoList); - } else { - if (child == null) // field is done - return; - handleSingleField(dto, field, child); - } - } - - private Optional> findActual(Class actualTypeArgument, String simpleName) { - return classgraph.getClassesImplementing(actualTypeArgument.getName()).stream() - .map(ClassInfo::loadClass) - .map(c -> (Class) c) - .filter(c -> c.isAnnotationPresent(OptionFor.class)) - .filter(c -> c.getAnnotation(OptionFor.class).value().equals(simpleName)) - .findAny(); - } - - private void writeField(Field field, Object dto, Object dtoList) { - - try { - PropertyDescriptor propertyDescriptor = - new PropertyDescriptor(field.getName(), dto.getClass()); - propertyDescriptor.getWriteMethod().invoke(dto, dtoList); - } catch (IllegalAccessException | InvocationTargetException | IntrospectionException e) { - throw new ClientException(e.getMessage(), e); - } - } - - private void handleSingleField(Object dto, Field field, Object child) { - - Class fieldType = field.getType(); - - if (field.isAnnotationPresent(Choice.class)) { - String simpleName = - Optional.ofNullable(child) - .map(Object::getClass) - .map(RM_INFO_LOOKUP::getTypeInfo) - .map(RMTypeInfo::getRmName) - .orElse(""); - Class type = findActual(fieldType, simpleName).orElse(null); - if (type != null) { - fieldType = type; - } else { - logger.warn("No implementation of {} for {}", fieldType, simpleName); - } - } - - if (fieldType.isAnnotationPresent(Entity.class)) { - - Object subDto = createInstance(fieldType); + static void addVersion(T entity, VersionUid versionUid) { + Optional idField = Arrays.stream(entity.getClass().getDeclaredFields()) + .filter(f -> f.isAnnotationPresent(Id.class)) + .findAny(); + if (idField.isPresent()) { try { - - mapEntityToDto((RMObject) child, subDto); - } catch (RuntimeException e) { - throw e; + PropertyDescriptor propertyDescriptor = new PropertyDescriptor(idField.get().getName(), entity.getClass()); + propertyDescriptor.getWriteMethod().invoke(entity, versionUid); + } catch (IllegalAccessException | InvocationTargetException | IntrospectionException e) { + throw new ClientException(e.getMessage(), e); } - writeField(field, dto, subDto); - - } else if (EnumValueSet.class.isAssignableFrom(fieldType) - && child != null - && CodePhrase.class.isAssignableFrom(child.getClass())) { - CodePhrase codePhrase = (CodePhrase) child; - EnumValueSet enumValueSet = - Arrays.stream(fieldType.getEnumConstants()) - .map(o -> (EnumValueSet) o) - .filter( - v -> { - String terminologyId = - Optional.ofNullable(codePhrase.getTerminologyId()) - .map(ObjectId::getValue) - .orElse(null); - return v.getTerminologyId().equals(terminologyId); - }) - .filter(v -> v.getCode().equals(codePhrase.getCodeString())) - .findAny() - .orElse(null); - writeField(field, dto, enumValueSet); - } else if (child == null || fieldType.isAssignableFrom(child.getClass())) { - - writeField(field, dto, child); - } else { - logger.warn("Incompatible Typ {} {}", fieldType, child.getClass()); } } - private Map buildFieldMap(Object dto) { - Map fieldMap = new HashMap<>(); - for (Field field : dto.getClass().getDeclaredFields()) { - Path path = field.getAnnotation(Path.class); - if (path != null) { - fieldMap.put(path.value(), field); - } - } - return fieldMap; - } + } diff --git a/client/src/main/java/org/ehrbase/client/flattener/Unflattener.java b/client/src/main/java/org/ehrbase/client/flattener/Unflattener.java index 82f729118..85f6f2870 100644 --- a/client/src/main/java/org/ehrbase/client/flattener/Unflattener.java +++ b/client/src/main/java/org/ehrbase/client/flattener/Unflattener.java @@ -20,16 +20,25 @@ import com.nedap.archie.creation.RMObjectCreator; import com.nedap.archie.rm.RMObject; import com.nedap.archie.rm.composition.Composition; +import com.nedap.archie.rm.support.identification.HierObjectId; import com.nedap.archie.rminfo.ArchieRMInfoLookup; import org.ehrbase.building.OptSkeletonBuilder; +import org.ehrbase.client.annotations.Id; import org.ehrbase.client.annotations.Template; import org.ehrbase.client.exception.ClientException; +import org.ehrbase.client.openehrclient.VersionUid; import org.ehrbase.normalizer.Normalizer; import org.ehrbase.webtemplate.templateprovider.TemplateProvider; import org.openehr.schemas.v1.OPERATIONALTEMPLATE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.beans.IntrospectionException; +import java.beans.PropertyDescriptor; +import java.lang.reflect.InvocationTargetException; +import java.util.Arrays; +import java.util.Optional; + import static org.ehrbase.client.flattener.DtoToCompositionWalker.findEntity; public class Unflattener { @@ -59,8 +68,25 @@ public RMObject unflatten(Object dto) { new DtoToCompositionWalker() .walk(generate, findEntity( dto), templateProvider.buildIntrospect(template.value()).get()); + Optional versionUid = extractVersionUid(dto); + if(versionUid.isPresent()){ + generate.setUid(new HierObjectId(versionUid.get().toString())); + } return NORMALIZER.normalize(generate); } - + static Optional extractVersionUid(Object entity) { + return Arrays.stream(entity.getClass().getDeclaredFields()) + .filter(f -> f.isAnnotationPresent(Id.class)) + .findAny() + .map(idField -> { + try { + PropertyDescriptor propertyDescriptor = new PropertyDescriptor(idField.getName(), entity.getClass()); + return (VersionUid) propertyDescriptor.getReadMethod().invoke(entity); + } catch (IllegalAccessException | InvocationTargetException | IntrospectionException e) { + throw new ClientException(e.getMessage(), e); + } + } + ); + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java index 683e70944..1763781d6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java @@ -11,8 +11,7 @@ public class TestAllTypesCluster { @Path("/items[at0001]/items[at0002]/items[at0003]/value") private DataValue value; - @Path("/items[at0001]/items[at0002]/items[at0003]/value\n" - + " |value") + @Path("/items[at0001]/items[at0002]/items[at0003]/value|value") private Boolean boolean2Value; public void setValue(DataValue value) { diff --git a/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java b/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java new file mode 100644 index 000000000..3157bc04a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java @@ -0,0 +1,166 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.client.flattener; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.nedap.archie.rm.RMObject; +import com.nedap.archie.rm.composition.Composition; +import org.apache.commons.io.IOUtils; +import org.assertj.core.api.SoftAssertions; +import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.TestAllTypesEnV1Composition; +import org.ehrbase.client.templateprovider.TestDataTemplateProvider; +import org.ehrbase.serialisation.flatencoding.FlatFormat; +import org.ehrbase.serialisation.flatencoding.FlatJasonProvider; +import org.ehrbase.serialisation.flatencoding.FlatJson; +import org.ehrbase.serialisation.jsonencoding.JacksonUtil; +import org.ehrbase.test_data.composition.CompositionTestDataSimSDTJson; +import org.junit.Test; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import static java.nio.charset.StandardCharsets.UTF_8; + + +public class RoundTripTest { + + class TestCase { + long id; + CompositionTestDataSimSDTJson simSDTJson; + String templateId; + Class dtoClass; + String[] missing; + String[] extra; + + public TestCase( + long id, + CompositionTestDataSimSDTJson simSDTJson, + String templateId, + Class dtoClass, + String[] missing, + String[] extra) { + this.id = id; + this.simSDTJson = simSDTJson; + this.templateId = templateId; + this.dtoClass = dtoClass; + this.missing = missing; + this.extra = extra; + } + } + + @Test + public void testRoundTrip() throws IOException { + + List testCaseList = new ArrayList<>(); + + testCaseList.add( + new TestCase( + 1, + CompositionTestDataSimSDTJson.ALL_TYPES, + "test_all_types.en.v1", + TestAllTypesEnV1Composition.class, + new String[] { + "Missing path: test_all_types/test_all_types:0/identifier|id, value: 55175056", + "Missing path: test_all_types/test_all_types:0/proportion_any|type, value: 1" + }, + new String[] { + "Extra path: test_all_types/test_all_types:0/identifier, value: 55175056", + "Extra path: test_all_types/test_all_types:0/proportion_any|type, value: 1.0", + "Extra path: test_all_types/test_all_types:0/coded_text|value, value: value1", + "Extra path: test_all_types/test_all_types:0/coded_text_terminology|value, value: .HCXbqCyQtseLkDyKS,QLpOdDZxrEJ", + "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types:0/current_activity/timing, value: P1D", + "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types:0/current_activity/timing|formalism, value: ISO8601", + "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types2:0/ism_transition/current_state|code, value: 526", + "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types2:0/ism_transition/current_state|value, value: planned", + "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types2:0/ism_transition/current_state|terminology, value: openehr", + })); + + SoftAssertions softly = new SoftAssertions(); + + for (TestCase testCase : testCaseList) { + checkTestCase(testCase, softly); + } + + softly.assertAll(); + } + + public void checkTestCase(TestCase testCase, SoftAssertions softly) throws IOException { + + String value = IOUtils.toString(testCase.simSDTJson.getStream(), UTF_8); + FlatJson flatJson = + new FlatJasonProvider(new TestDataTemplateProvider()) + .buildFlatJson(FlatFormat.SIM_SDT, testCase.templateId); + + Composition composition = flatJson.unmarshal(value); + + Flattener flattener = new Flattener(new TestDataTemplateProvider()); + Object flatten = flattener.flatten(composition, testCase.dtoClass); + + Unflattener unflattener = new Unflattener(new TestDataTemplateProvider()); + RMObject actual = unflattener.unflatten(flatten); + + String actualFlat = flatJson.marshal(actual); + + List errors = compere(actualFlat, value); + + softly.assertThat(errors) + .filteredOn(s -> s.startsWith("Missing")) + .as("Test Case %s", testCase.id) + .containsExactlyInAnyOrder( + testCase.missing + ); + + String[] extra = {"Extra path: test_all_types/test_all_types:0/identifier, value: 55175056", + "Extra path: test_all_types/test_all_types:0/proportion_any|type, value: 1.0"}; + softly.assertThat(errors) + .filteredOn(s -> s.startsWith("Extra")) + .as("Test Case %s", testCase.id) + .containsExactlyInAnyOrder( + testCase.extra + ); + + + } + + private static List compere(String actualJson, String expectedJson) throws JsonProcessingException { + List errors = new ArrayList<>(); + ObjectMapper objectMapper = JacksonUtil.getObjectMapper(); + + Map actual = objectMapper.readValue(actualJson, Map.class); + Map expected = objectMapper.readValue(expectedJson, Map.class); + + actual.forEach((key, value) -> { + if (!expected.containsKey(key) || !expected.get(key).equals(value)) { + errors.add(String.format("Missing path: %s, value: %s", key, value)); + } + }); + + expected.forEach((key, value) -> { + if (!actual.containsKey(key) || !actual.get(key).equals(value)) { + errors.add(String.format("Extra path: %s, value: %s", key, value)); + } + }); + + return errors; + } +} diff --git a/serialisation/src/test/java/org/ehrbase/serialisation/dbencoding/DBEncodeRoundTripTest.java b/serialisation/src/test/java/org/ehrbase/serialisation/dbencoding/DBEncodeRoundTripTest.java index f157efce3..fdaf5612a 100644 --- a/serialisation/src/test/java/org/ehrbase/serialisation/dbencoding/DBEncodeRoundTripTest.java +++ b/serialisation/src/test/java/org/ehrbase/serialisation/dbencoding/DBEncodeRoundTripTest.java @@ -42,7 +42,7 @@ import static org.ehrbase.serialisation.flatencoding.std.marshal.FlatJsonMarshallerTest.compere; import static org.junit.Assert.assertNotNull; -//@Ignore("see https://github.com/ehrbase/openEHR_SDK/issues/117") + public class DBEncodeRoundTripTest { class TestCase { From 2b739b2f4a316fc099f4ca58841f099d670dc6c1 Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Mon, 16 Nov 2020 17:02:14 +0100 Subject: [PATCH 06/54] fix test see https://github.com/ehrbase/project_management/issues/424 --- .../main/java/org/ehrbase/client/flattener/Flattener.java | 2 +- .../defaultrestclient/DefaultRestCompositionEndpoint.java | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/client/src/main/java/org/ehrbase/client/flattener/Flattener.java b/client/src/main/java/org/ehrbase/client/flattener/Flattener.java index 9fcb7cd36..104ddadc5 100644 --- a/client/src/main/java/org/ehrbase/client/flattener/Flattener.java +++ b/client/src/main/java/org/ehrbase/client/flattener/Flattener.java @@ -80,7 +80,7 @@ public T flatten(RMObject locatable, Class clazz) { dto, DtoFromCompositionWalker.buildFieldByPathMap(dto.getClass())), root ); - if (locatable instanceof Composition){ + if (locatable instanceof Composition && ((Composition) locatable).getUid() != null) { addVersion(dto, new VersionUid(((Composition) locatable).getUid().toString())); } return dto; diff --git a/client/src/main/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestCompositionEndpoint.java b/client/src/main/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestCompositionEndpoint.java index 716c5a45b..6cdf8f766 100644 --- a/client/src/main/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestCompositionEndpoint.java +++ b/client/src/main/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestCompositionEndpoint.java @@ -94,13 +94,9 @@ public T mergeCompositionEntity(T entity) { @Override public Optional find(UUID compositionId, Class clazz) { Optional composition = defaultRestClient.httpGet(defaultRestClient.getConfig().getBaseUri().resolve(EHR_PATH + ehrId.toString() + COMPOSITION_PATH + compositionId.toString()), Composition.class); - Optional t = - composition.map( + + return composition.map( c -> new Flattener(defaultRestClient.getTemplateProvider()).flatten(c, clazz)); - if (t.isPresent()) { - addVersion(t.get(), new VersionUid(composition.get().getUid().getValue())); - } - return t; } From f35e2064f73efc4d6e3eca08508528be44d2f591 Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Tue, 17 Nov 2020 09:20:27 +0100 Subject: [PATCH 07/54] fix test see https://github.com/ehrbase/project_management/issues/424 --- .../client/openehrclient/defaultrestclient/AqlTestIT.java | 1 + 1 file changed, 1 insertion(+) diff --git a/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/AqlTestIT.java b/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/AqlTestIT.java index bb90516ea..da341f4b4 100644 --- a/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/AqlTestIT.java +++ b/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/AqlTestIT.java @@ -376,6 +376,7 @@ public void testExecute11() throws IOException { Composition composition = new CanonicalJson().unmarshal(IOUtils.toString(CompositionTestDataCanonicalJson.CORONA.getStream(), StandardCharsets.UTF_8), Composition.class); Flattener flattener = new Flattener(new TestDataTemplateProvider()); CoronaAnamneseComposition coronaAnamneseComposition = flattener.flatten(composition, CoronaAnamneseComposition.class); + coronaAnamneseComposition.setVersionUid(null); openEhrClient.compositionEndpoint(ehr).mergeCompositionEntity(coronaAnamneseComposition); Query> query = Query.buildNativeQuery( From 3c030291da0d6b508c4afcc960406867990bf496 Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Thu, 19 Nov 2020 16:32:23 +0100 Subject: [PATCH 08/54] new class generator see https://github.com/ehrbase/project_management/issues/424 --- .../classgenerator/ClassGeneratorNew.java | 495 ++++++++++++++++ .../client/classgenerator/FlattFilter.java | 63 ++ .../classgenerator/ClassGeneratorNewTest.java | 492 ++++++++++++++++ .../ehrbase/webtemplate/filter/Filter.java | 17 +- .../webtemplate/model/WebTemplateNode.java | 537 ++++++++++-------- .../ehrbase/webtemplate/parser/OPTParser.java | 19 + 6 files changed, 1377 insertions(+), 246 deletions(-) create mode 100644 generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java create mode 100644 generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java create mode 100644 generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java new file mode 100644 index 000000000..8adeef2b9 --- /dev/null +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java @@ -0,0 +1,495 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.client.classgenerator; + +import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rminfo.ArchieRMInfoLookup; +import com.squareup.javapoet.AnnotationSpec; +import com.squareup.javapoet.ClassName; +import com.squareup.javapoet.FieldSpec; +import com.squareup.javapoet.MethodSpec; +import com.squareup.javapoet.ParameterizedTypeName; +import com.squareup.javapoet.TypeName; +import com.squareup.javapoet.TypeSpec; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MultiValuedMap; +import org.apache.commons.collections4.multimap.ArrayListValuedHashMap; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.reflect.FieldUtils; +import org.apache.commons.text.CaseUtils; +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.annotations.Template; +import org.ehrbase.client.classgenerator.config.RmClassGeneratorConfig; +import org.ehrbase.client.flattener.PathExtractor; +import org.ehrbase.client.introspect.TemplateIntrospect; +import org.ehrbase.serialisation.util.SnakeCase; +import org.ehrbase.terminology.client.terminology.TermDefinition; +import org.ehrbase.terminology.client.terminology.ValueSet; +import org.ehrbase.util.reflection.ReflectionHelper; +import org.ehrbase.webtemplate.model.WebTemplate; +import org.ehrbase.webtemplate.model.WebTemplateInput; +import org.ehrbase.webtemplate.model.WebTemplateInputValue; +import org.ehrbase.webtemplate.model.WebTemplateNode; +import org.ehrbase.webtemplate.parser.FlatPath; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.lang.model.SourceVersion; +import javax.lang.model.element.Modifier; +import java.lang.reflect.Field; +import java.util.ArrayDeque; +import java.util.Arrays; +import java.util.Collections; +import java.util.Deque; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + +public class ClassGeneratorNew { + + private static final ArchieRMInfoLookup RM_INFO_LOOKUP = ArchieRMInfoLookup.getInstance(); + public static final String ABBREV_MARKER = "_"; + public static final int CLASS_NAME_MAX_WIDTH = 80; + private static final Map, RmClassGeneratorConfig> configMap = + ReflectionHelper.buildMap(RmClassGeneratorConfig.class); + + private static class Context { + final MultiValuedMap classes = new ArrayListValuedHashMap<>(); + final Deque nodeDeque = new ArrayDeque<>(); + String currentMainClass; + final Deque currentArchetypeName = new ArrayDeque<>(); + final Map currentClassNameMap = new HashMap<>(); + String currentPackageName; + final Map currentEnums = new HashMap<>(); + final Deque> currentFieldNameMap = new ArrayDeque<>(); + String templateId; + } + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + public ClassGeneratorResult generate(String packageName, WebTemplate webTemplate) { + + Context context = new Context(); + context.templateId = webTemplate.getTemplateId(); + context.currentPackageName = packageName; + + TypeSpec.Builder builder = build(context, webTemplate.getTree()); + AnnotationSpec templateAnnotation = + AnnotationSpec.builder(Template.class) + .addMember(Template.VALUE, "$S", webTemplate.getTemplateId()) + .build(); + builder.addAnnotation(templateAnnotation); + + context.classes.put( + packageName + "." + context.currentMainClass.toLowerCase(), builder.build()); + + ClassGeneratorResult generatorResult = new ClassGeneratorResult(); + context.classes.entries().forEach(e -> generatorResult.addClass(e.getKey(), e.getValue())); + return generatorResult; + } + + private TypeSpec.Builder build(Context context, WebTemplateNode next) { + + String name; + String className; + if (context.currentArchetypeName.isEmpty()) { + name = new SnakeCase(context.templateId).camelToSnake() + "_" + next.getRmType(); + className = buildClassName(context, name, false); + } else { + name = new SnakeCase(next.getName()).camelToSnake() + "_" + next.getRmType(); + className = buildClassName(context, name, false); + } + if (next.isArchetype()) { + context.currentArchetypeName.push(next.getName()); + } + + context.currentFieldNameMap.push(new HashMap<>()); + + + TypeSpec.Builder classBuilder = TypeSpec.classBuilder(className); + if (StringUtils.isBlank(context.currentMainClass)) { + context.currentMainClass = className; + } + + classBuilder.addModifiers(Modifier.PUBLIC); + classBuilder.addAnnotation(AnnotationSpec.builder(Entity.class).build()); + if (next.isArchetype()) { + AnnotationSpec archetypeAnnotation = + AnnotationSpec.builder(Archetype.class) + .addMember(Archetype.VALUE, "$S", next.getNodeId()) + .build(); + classBuilder.addAnnotation(archetypeAnnotation); + } + + Map> choices = next.getChoicesInChildren(); + for (WebTemplateNode child : next.getChildren()) { + String relativPath = + FlatPath.removeStart(new FlatPath(child.getAqlPath()), new FlatPath(next.getAqlPath())) + .toString(); + if (child.getChildren().isEmpty() && !choices.containsKey(child.getAqlPath())) { + + addSimpleField(context, classBuilder, relativPath, child); + } else if (!choices.containsKey(child.getAqlPath())) { + addComplexField(context, classBuilder, relativPath, child); + } + } + if (next.isArchetype()) { + context.currentArchetypeName.poll(); + } + context.currentFieldNameMap.poll(); + context.nodeDeque.poll(); + return classBuilder; + } + + private static String normalise(String name, boolean capitalizeFirstLetter) { + if (StringUtils.isBlank(name) || name.equals("_")) { + return RandomStringUtils.randomAlphabetic(10); + } + String normalisedString = + StringUtils.strip( + StringUtils.stripAccents(name).replace("ß", "ss").replaceAll("[^A-Za-z0-9]", "_"), "_"); + return CaseUtils.toCamelCase(normalisedString, capitalizeFirstLetter, '_'); + } + + String buildClassName(Context context, String name, boolean addArchetypeName) { + String[] strings = + Arrays.stream(name.split(TemplateIntrospect.TERM_DIVIDER)) + .filter(StringUtils::isNotBlank) + .toArray(String[]::new); + String fieldName = ""; + String nonNormalized = ""; + for (int i = 0; i < strings.length; i++) { + nonNormalized = nonNormalized + "_" + strings[strings.length - (i + 1)]; + if (addArchetypeName) { + nonNormalized = + new SnakeCase(context.currentArchetypeName.peek()).camelToSnake() + "_" + nonNormalized; + } + fieldName = + StringUtils.abbreviate( + normalise(nonNormalized, true), ABBREV_MARKER, CLASS_NAME_MAX_WIDTH); + if (!context.currentClassNameMap.containsKey(fieldName) && SourceVersion.isName(fieldName)) { + break; + } + } + + if (context.currentClassNameMap.containsKey(fieldName)) { + context.currentClassNameMap.put(fieldName, context.currentClassNameMap.get(fieldName) + 1); + fieldName = fieldName + context.currentClassNameMap.get(fieldName); + } else { + context.currentClassNameMap.put(fieldName, 1); + } + fieldName = sanitizeNumber(fieldName); + return fieldName; + } + + private String sanitizeNumber(String fieldName) { + if (!Character.isAlphabetic(fieldName.charAt(0))) { + if (Character.isLowerCase(fieldName.charAt(0))) { + fieldName = "n" + fieldName; + } else { + fieldName = "N" + fieldName; + } + } + return fieldName; + } + + private void addComplexField( + Context context, TypeSpec.Builder classBuilder, String path, WebTemplateNode node) { + + TypeSpec subSpec = build(context, node).build(); + String subSpecPackage = + context.currentPackageName + "." + context.currentMainClass.toLowerCase() + ".definition"; + + context.classes.put(subSpecPackage, subSpec); + TypeName className = ClassName.get(subSpecPackage, subSpec.name); + if (node.isMulti()) { + className = ParameterizedTypeName.get(ClassName.get(List.class), className); + } + addField( + context, + classBuilder, + path, + node.getName(), + className, + new ValueSet(ValueSet.LOCAL, ValueSet.LOCAL, Collections.emptySet()), + false); + } + + private void addSimpleField( + Context context, TypeSpec.Builder classBuilder, String path, WebTemplateNode endNode) { + + Class clazz = RM_INFO_LOOKUP.getClass(endNode.getRmType()); + if (clazz == null) { + logger.warn("No class for path {} ", path); + return; + } + + ValueSet valueSet = buildValueSet(endNode); + + RmClassGeneratorConfig classGeneratorConfig = configMap.get(clazz); + if (classGeneratorConfig == null && !clazz.getName().contains("java.lang")) { + logger.debug("No ClassGenerator for {}", clazz); + } + if (classGeneratorConfig == null || !classGeneratorConfig.isExpandField()) { + + TypeName className = ClassName.get(Optional.ofNullable(clazz).orElse(Object.class)); + if (endNode.getMax() != 1) { + className = ParameterizedTypeName.get(ClassName.get(List.class), className); + } + + addField(context, classBuilder, path, endNode.getName(), className, valueSet, false); + } else { + Map fieldMap = + Arrays.stream(FieldUtils.getAllFields(clazz)) + .filter(f -> !f.isSynthetic()) + .collect(Collectors.toMap(Field::getName, f -> f)); + Set expandFields = classGeneratorConfig.getExpandFields(); + expandFields.forEach( + fieldName -> + addField( + context, + classBuilder, + path + "|" + new SnakeCase(fieldName).camelToSnake(), + endNode.getName() + "_" + fieldName, + ClassName.get(fieldMap.get(fieldName).getType()), + valueSet, + false)); + } + } + + private ValueSet buildValueSet(WebTemplateNode endNode) { + + Optional input = + endNode.getInputs().stream().filter(i -> i.getType().equals("CODED_TEXT")).findAny(); + if (input.isPresent()) { + + ValueSet valueSet = + new ValueSet( + input.get().getTerminology(), + "local", + input.get().getList().stream().map(t -> toTerm(t)).collect(Collectors.toSet())); + return valueSet; + } + + return ValueSet.EMPTY_VALUE_SET; + } + + private TermDefinition toTerm(WebTemplateInputValue t) { + return new TermDefinition( + t.getValue(), + t.getLabel(), + t.getLocalizedDescriptions().values().stream().findAny().orElse(t.getLabel())); + } + + private void addField( + Context context, + TypeSpec.Builder classBuilder, + String path, + String name, + TypeName className, + ValueSet valueSet, + boolean addChoiceAnnotation) { + + if (CodePhrase.class.getName().equals(className.toString()) + && CollectionUtils.isNotEmpty(valueSet.getTherms())) { + + final TypeSpec enumValueSet = + context.currentEnums.computeIfAbsent( + valueSet, vs -> buildEnumValueSet(context, name, vs)); + + String enumPackage; + if (valueSet.getId().equals("local") || valueSet.getTerminologyId().equals("local")) { + enumPackage = + context.currentPackageName + + "." + + context.currentMainClass.toLowerCase() + + ".definition"; + } else { + enumPackage = context.currentPackageName + ".shareddefinition"; + } + context.classes.put(enumPackage, enumValueSet); + className = ClassName.get(enumPackage, enumValueSet.name); + } + + PathExtractor pathExtractor = new PathExtractor(path); + String parentPath = pathExtractor.getParentPath(); + String childPath = pathExtractor.getChildPath(); + String fieldName = + buildFieldName( + context, + parentPath + + TemplateIntrospect.TERM_DIVIDER + + childPath + + TemplateIntrospect.TERM_DIVIDER + + name); + FieldSpec.Builder builder = + FieldSpec.builder(className, fieldName) + .addAnnotation( + AnnotationSpec.builder(Path.class).addMember(Path.VALUE, "$S", path).build()) + .addModifiers(Modifier.PRIVATE); + + if (addChoiceAnnotation) { + builder.addAnnotation(Choice.class); + } + + FieldSpec fieldSpec = builder.build(); + classBuilder.addField(fieldSpec); + + classBuilder.addMethod(buildSetter(fieldSpec)); + classBuilder.addMethod(buildGetter(fieldSpec)); + } + + private TypeSpec buildEnumValueSet(Context context, String name, ValueSet valueSet) { + TypeSpec.Builder enumBuilder = + TypeSpec.enumBuilder(buildClassName(context, name, false)) + .addSuperinterface(EnumValueSet.class) + .addModifiers(Modifier.PUBLIC); + FieldSpec fieldSpec1 = + FieldSpec.builder(ClassName.get(String.class), "value") + .addModifiers(Modifier.PRIVATE) + .build(); + enumBuilder.addField(fieldSpec1); + FieldSpec fieldSpec2 = + FieldSpec.builder(ClassName.get(String.class), "description") + .addModifiers(Modifier.PRIVATE) + .build(); + enumBuilder.addField(fieldSpec2); + FieldSpec fieldSpec3 = + FieldSpec.builder(ClassName.get(String.class), "terminologyId") + .addModifiers(Modifier.PRIVATE) + .build(); + enumBuilder.addField(fieldSpec3); + FieldSpec fieldSpec4 = + FieldSpec.builder(ClassName.get(String.class), "code") + .addModifiers(Modifier.PRIVATE) + .build(); + enumBuilder.addField(fieldSpec4); + + MethodSpec constructor = buildConstructor(fieldSpec1, fieldSpec2, fieldSpec3, fieldSpec4); + enumBuilder.addMethod(constructor); + valueSet + .getTherms() + .forEach( + t -> { + String fieldName = extractSubName(t.getValue()); + enumBuilder.addEnumConstant( + toEnumName(fieldName), + TypeSpec.anonymousClassBuilder( + "$S, $S, $S, $S", + t.getValue(), + t.getDescription(), + valueSet.getTerminologyId(), + t.getCode()) + .build()); + }); + + enumBuilder.addMethod(buildGetter(fieldSpec1)); + enumBuilder.addMethod(buildGetter(fieldSpec2)); + enumBuilder.addMethod(buildGetter(fieldSpec3)); + enumBuilder.addMethod(buildGetter(fieldSpec4)); + return enumBuilder.build(); + } + + private MethodSpec buildConstructor(FieldSpec... fieldSpecs) { + MethodSpec.Builder builder = MethodSpec.constructorBuilder(); + for (FieldSpec fieldSpec : fieldSpecs) { + builder + .addParameter(fieldSpec.type, fieldSpec.name) + .addStatement("this.$N = $N", fieldSpec.name, fieldSpec.name); + } + return builder.build(); + } + + private String extractSubName(String name) { + String[] strings = name.split(TemplateIntrospect.TERM_DIVIDER); + return strings[strings.length - 1]; + } + + /** + * Manipulate the fieldName to remove or replace illegal characters + * + * @param fieldName + * @return normalized fieldName for Java naming convention + */ + private String toEnumName(String fieldName) { + fieldName = sanitizeNumber(fieldName); + return new SnakeCase(normalise(fieldName, false)).camelToUpperSnake(); + } + + private String buildFieldName(Context context, String name) { + String[] strings = + Arrays.stream(name.split(TemplateIntrospect.TERM_DIVIDER)) + .filter(StringUtils::isNotBlank) + .toArray(String[]::new); + + String fieldName = ""; + String nonNormalized = ""; + for (int i = 0; i < strings.length; i++) { + nonNormalized = nonNormalized + "_" + strings[strings.length - (i + 1)]; + fieldName = normalise(nonNormalized, false); + if (!context.currentFieldNameMap.peek().containsKey(fieldName) + && SourceVersion.isName(fieldName)) { + break; + } + } + + if (context.currentFieldNameMap.peek().containsKey(fieldName)) { + context + .currentFieldNameMap + .peek() + .put(fieldName, context.currentFieldNameMap.peek().get(fieldName) + 1); + fieldName = fieldName + context.currentFieldNameMap.peek().get(fieldName); + } else { + context.currentFieldNameMap.peek().put(fieldName, 1); + } + fieldName = sanitizeNumber(fieldName); + return fieldName; + } + + private MethodSpec buildSetter(FieldSpec fieldSpec) { + + return MethodSpec.methodBuilder("set" + StringUtils.capitalize(fieldSpec.name)) + .addModifiers(Modifier.PUBLIC) + .addStatement(" this.$N = $N", fieldSpec.name, fieldSpec.name) + .addParameter(fieldSpec.type, fieldSpec.name) + .build(); + } + + private MethodSpec buildGetter(FieldSpec fieldSpec) { + String prefix; + if (Boolean.class.getTypeName().equals(fieldSpec.type.toString())) { + prefix = "is"; + } else { + prefix = "get"; + } + return MethodSpec.methodBuilder(prefix + StringUtils.capitalize(fieldSpec.name)) + .addModifiers(Modifier.PUBLIC) + .addStatement(" return this.$N ", fieldSpec.name) + .returns(fieldSpec.type) + .build(); + } +} diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java b/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java new file mode 100644 index 000000000..2f5717a6f --- /dev/null +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java @@ -0,0 +1,63 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.client.classgenerator; + +import com.nedap.archie.rminfo.RMTypeInfo; +import org.apache.commons.collections4.SetUtils; +import org.ehrbase.serialisation.util.SnakeCase; +import org.ehrbase.util.reflection.ReflectionHelper; +import org.ehrbase.webtemplate.filter.Filter; +import org.ehrbase.webtemplate.model.WebTemplate; +import org.ehrbase.webtemplate.model.WebTemplateNode; +import org.ehrbase.webtemplate.parser.config.RmIntrospectConfig; + +import java.util.Collections; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + +public class FlattFilter extends Filter { + private static final Map, RmIntrospectConfig> configMap = ReflectionHelper.buildMap(RmIntrospectConfig.class); + + @Override + protected boolean skip(WebTemplateNode node, WebTemplate context, WebTemplateNode parent) { + if (!node.getChildren().isEmpty() && node.getMax() == 1 && !node.isArchetype()) { + return true; + } else { + if (parent != null) { + RMTypeInfo typeInfo = ARCHIE_RM_INFO_LOOKUP.getTypeInfo(parent.getRmType()); + Set attributeNames = Optional.ofNullable(configMap.get(typeInfo.getJavaClass())).map(RmIntrospectConfig::getNonTemplateFields).orElse(Collections.emptySet()).stream().map(s -> new SnakeCase(s).camelToSnake()).collect(Collectors.toSet()); + attributeNames.add("context"); + attributeNames.add("encoding"); + attributeNames.add("timing"); + attributeNames.add("expiry_time"); + attributeNames.add("lower"); + attributeNames.add("upper"); + attributeNames.add("ism_transition"); + SetUtils.SetView difference = SetUtils.difference(typeInfo.getAttributes().keySet(), attributeNames); + if (difference.contains(node.getName())) { + return true; + } + } + return false; + } + } +} diff --git a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java new file mode 100644 index 000000000..d4ea334c6 --- /dev/null +++ b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java @@ -0,0 +1,492 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.client.classgenerator; + +import com.squareup.javapoet.FieldSpec; +import com.squareup.javapoet.JavaFile; +import com.squareup.javapoet.TypeSpec; +import org.apache.commons.io.FileUtils; +import org.apache.xmlbeans.XmlException; +import org.assertj.core.groups.Tuple; +import org.ehrbase.test_data.operationaltemplate.OperationalTemplateTestData; +import org.ehrbase.webtemplate.model.WebTemplate; +import org.ehrbase.webtemplate.parser.OPTParser; +import org.junit.Ignore; +import org.junit.Test; +import org.openehr.schemas.v1.OPERATIONALTEMPLATE; +import org.openehr.schemas.v1.TemplateDocument; + +import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Collection; +import java.util.List; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + +import static org.assertj.core.api.Assertions.assertThat; + +@Ignore +public class ClassGeneratorNewTest { + + public static final String PACKAGE_NAME = "org.ehrbase.client.classgenerator.examples2"; + + private static final boolean WRITE_FILES = true; + + @Test + public void testGenerate() throws IOException, XmlException { + OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.BLOOD_PRESSURE_SIMPLE.getStream()).getTemplate(); + WebTemplate webTemplate = new FlattFilter().filter( new OPTParser(template).parse()); + ClassGeneratorNew cut = new ClassGeneratorNew(); + ClassGeneratorResult generate = null; + + + generate = cut.generate(PACKAGE_NAME, webTemplate); + + + + List fieldSpecs = generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); + + + assertThat(fieldSpecs) + .extracting(f -> f.name, f -> f.type.toString()) + .containsExactlyInAnyOrder( + new Tuple("versionUid", "org.ehrbase.client.openehrclient.VersionUid"), + new Tuple("device", "java.util.List"), + new Tuple("language", "org.ehrbase.client.classgenerator.examples2.shareddefinition.Language"), + new Tuple("levelOfExertion", "java.util.List"), + new Tuple("commentValue", "java.lang.String"), + new Tuple("cuffSizeDefiningcode", "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.CuffSizeDefiningcode"), + new Tuple("korotkoffSoundsDefiningcode", "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.KorotkoffSoundsDefiningcode"), + new Tuple("systolicMagnitude", "java.lang.Double"), + new Tuple("systolicUnits", "java.lang.String"), + new Tuple("diastolicMagnitude", "java.lang.Double"), + new Tuple("diastolicUnits", "java.lang.String"), + new Tuple("positionDefiningcode", "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.PositionDefiningcode"), + new Tuple("tiltMagnitude", "java.lang.Double"), + new Tuple("tiltUnits", "java.lang.String"), + new Tuple("meanArterialPressureMagnitude", "java.lang.Double"), + new Tuple("meanArterialPressureUnits", "java.lang.String"), + new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), + new Tuple("subject", "com.nedap.archie.rm.generic.PartyProxy"), + new Tuple("originValue", "java.time.temporal.TemporalAccessor"), + new Tuple("pulsePressureMagnitude", "java.lang.Double"), + new Tuple("pulsePressureUnits", "java.lang.String"), + new Tuple("locationOfMeasurementDefiningcode", "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.LocationOfMeasurementDefiningcode"), + new Tuple("modelValue", "java.lang.String"), + new Tuple("serialNumberValue", "java.lang.String"), + new Tuple("dateLastServicedValue", "java.time.temporal.TemporalAccessor"), + new Tuple("dateLastCalibrationValue", "java.time.temporal.TemporalAccessor"), + new Tuple("nameValue", "java.lang.String"), + new Tuple("descriptionValue", "java.lang.String"), + new Tuple("components", "java.util.List"), + new Tuple("servicedByValue", "java.lang.String"), + new Tuple("manufacturerValue", "java.lang.String"), + new Tuple("endTimeValue", "java.time.temporal.TemporalAccessor"), + new Tuple("language", "org.ehrbase.client.classgenerator.examples2.shareddefinition.Language"), + new Tuple("healthCareFacility", "com.nedap.archie.rm.generic.PartyIdentified"), + new Tuple("composer", "com.nedap.archie.rm.generic.PartyProxy"), + new Tuple("settingDefiningcode", "org.ehrbase.client.classgenerator.examples2.shareddefinition.SettingDefiningcode"), + new Tuple("territory", "org.ehrbase.client.classgenerator.examples2.shareddefinition.Territory"), + new Tuple("bloodPressureTrainingSample", "java.util.List"), + new Tuple("location", "java.lang.String"), + new Tuple("deviceDetailsTrainingSample", "java.util.List"), + new Tuple("categoryDefiningcode", "org.ehrbase.client.classgenerator.examples2.shareddefinition.CategoryDefiningcode"), + new Tuple("startTimeValue", "java.time.temporal.TemporalAccessor"), + new Tuple("participations", "java.util.List"), + new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit") + ); + + + writeFiles(generate); + + + } + + private void writeFiles(ClassGeneratorResult generate) throws IOException { + if (WRITE_FILES) { + Path path = Paths.get("..", "client/src/test/java/"); + generate.getClasses().keySet().stream().filter(s -> !s.contains("definition")).findFirst().ifPresent( + s -> + { + try { + FileUtils.cleanDirectory(Paths.get(String.valueOf(path), s.replace(".", "/")).toFile()); + } catch (Exception e) { + //NOP + } + } + ); + List generateFiles = generate.writeFiles(path); + + FieldGenerator fieldGenerator = new FieldGenerator(); + fieldGenerator.generate(generateFiles).writeFiles(path); + } + } + + + @Test + public void testGenerateAltEvents() throws IOException, XmlException { + OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.ALT_EVENTS.getStream()).getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + + + List fieldSpecs = generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); + + + assertThat(fieldSpecs) + .extracting(f -> f.name, f -> f.type.toString()) + .containsExactlyInAnyOrder( + new Tuple("value", "java.lang.String"), + new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), + new Tuple("gewichtMagnitude", "java.lang.Double"), + new Tuple("gewichtUnits", "java.lang.String"), + new Tuple("confoundingFactorsEn", "java.util.List"), + new Tuple("commentEnValue", "java.lang.String"), + new Tuple("stateOfDressEnDefiningcode", "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.StateOfDressEnDefiningcode"), + new Tuple("value", "java.lang.String"), + new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), + new Tuple("gewichtMagnitude", "java.lang.Double"), + new Tuple("gewichtUnits", "java.lang.String"), + new Tuple("confoundingFactorsEn", "java.util.List"), + new Tuple("commentEnValue", "java.lang.String"), + new Tuple("stateOfDressEnDefiningcode", "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.StateOfDressEnDefiningcode"), + new Tuple("value", "java.lang.String"), + new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), + new Tuple("gewichtMagnitude", "java.lang.Double"), + new Tuple("gewichtUnits", "java.lang.String"), + new Tuple("confoundingFactorsEn", "java.util.List"), + new Tuple("widthValue", "java.time.temporal.TemporalAmount"), + new Tuple("commentEnValue", "java.lang.String"), + new Tuple("stateOfDressEnDefiningcode", "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.StateOfDressEnDefiningcode"), + new Tuple("mathFunctionDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.MathFunctionDefiningcode"), + new Tuple("birthEn", "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.KorpergewichtBirthEnEvent"), + new Tuple("anyEventEn", "java.util.List"), + new Tuple("extensionEn", "java.util.List"), + new Tuple("language", "org.ehrbase.client.classgenerator.examples.shareddefinition.Language"), + new Tuple("originValue", "java.time.temporal.TemporalAccessor"), + new Tuple("gerat", "com.nedap.archie.rm.datastructures.Cluster"), + new Tuple("subject", "com.nedap.archie.rm.generic.PartyProxy"), + new Tuple("versionUid", "org.ehrbase.client.openehrclient.VersionUid"), + new Tuple("endTimeValue", "java.time.temporal.TemporalAccessor"), + new Tuple("language", "org.ehrbase.client.classgenerator.examples.shareddefinition.Language"), + new Tuple("healthCareFacility", "com.nedap.archie.rm.generic.PartyIdentified"), + new Tuple("statusValue", "java.lang.String"), + new Tuple("berichtIdValue", "java.lang.String"), + new Tuple("territory", "org.ehrbase.client.classgenerator.examples.shareddefinition.Territory"), + new Tuple("startTimeValue", "java.time.temporal.TemporalAccessor"), + new Tuple("composer", "com.nedap.archie.rm.generic.PartyProxy"), + new Tuple("settingDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode"), + new Tuple("korpergewicht", "java.util.List"), + new Tuple("erweiterung", "java.util.List"), + new Tuple("location", "java.lang.String"), + new Tuple("categoryDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode"), + new Tuple("participations", "java.util.List"), + new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit") + ); + + writeFiles(generate); + + + } + + @Test + public void testGenerateDiagnose() throws IOException, XmlException { + OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.DIAGNOSE.getStream()).getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + + Set derDiagnoseDefiningcode = generate.getClasses() + .get("org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition") + .stream() + .filter(t -> t.name.equals("NameDesProblemsDerDiagnoseDefiningcode")) + .findAny() + .get() + .enumConstants + .keySet(); + + assertThat(derDiagnoseDefiningcode).containsExactlyInAnyOrder( + "KORONAVIREN_ALS_URSACHE_VON_KRANKHEITEN_DIE_IN_ANDEREN_KAPITELN_KLASSIFIZIERT_SIND", + "COVID19_VIRUS_NICHT_NACHGEWIESEN", + "COVID19_VIRUS_NACHGEWIESEN", + "INFEKTION_DURCH_KORONAVIREN_NICHT_NAHER_BEZEICHNETER_LOKALISATION" + ); + writeFiles(generate); + } + + + @Test + public void testGenerateEpisode() throws IOException, XmlException { + OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.EPISODE_OF_CARE.getStream()).getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + List fieldSpecs = generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); + + assertThat(fieldSpecs).size().isEqualTo(28); + + writeFiles(generate); + + + } + + @Test + public void testGenerateSmICS() throws IOException, XmlException { + OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.SM_I_C_S_BEFUND.getStream()).getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + List fieldSpecs = generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); + + assertThat(fieldSpecs).size().isEqualTo(80); + + writeFiles(generate); + + + } + + @Test + public void testGenerateD4LQuestionnaire() throws IOException, XmlException { + OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.D4L_QUESTIONNAIRE.getStream()).getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + List fieldSpecs = generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); + + assertThat(fieldSpecs).size().isEqualTo(348); + + } + + @Test + public void testGenerateBefundDerBlutgasanalyse() throws IOException, XmlException { + OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.BEFUND_DER_BLUTGASANALYSE.getStream()).getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + List fieldSpecs = generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); + + assertThat(fieldSpecs).size().isEqualTo(52); + + writeFiles(generate); + + + } + + @Test + public void testGenerateMultiOccurrence() throws IOException, XmlException { + OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.MULTI_OCCURRENCE.getStream()).getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + + + List fieldSpecs = generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); + + + assertThat(fieldSpecs) + .extracting(f -> f.name, f -> f.type.toString()) + .containsExactlyInAnyOrder( + new Tuple("versionUid", "org.ehrbase.client.openehrclient.VersionUid"), + new Tuple("extension", "java.util.List"), + new Tuple("language", "org.ehrbase.client.classgenerator.examples.shareddefinition.Language"), + new Tuple("settingDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode"), + new Tuple("structuredMeasurementLocation", "java.util.List"), + new Tuple("originValue", "java.time.temporal.TemporalAccessor"), + new Tuple("device", "com.nedap.archie.rm.datastructures.Cluster"), + new Tuple("subject", "com.nedap.archie.rm.generic.PartyProxy"), + new Tuple("locationOfMeasurementDefiningcode", "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.LocationOfMeasurementDefiningcode"), + new Tuple("locationOfMeasurementValue", "java.lang.String"), + new Tuple("bodyExposureDefiningcode", "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyExposureDefiningcode"), + new Tuple("bodyExposureValue", "java.lang.String"), + new Tuple("temperatureMagnitude", "java.lang.Double"), + new Tuple("temperatureUnits", "java.lang.String"), + new Tuple("descriptionOfThermalStressValue", "java.lang.String"), + new Tuple("exertion", "com.nedap.archie.rm.datastructures.Cluster"), + new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), + new Tuple("endTimeValue", "java.time.temporal.TemporalAccessor"), + new Tuple("language", "org.ehrbase.client.classgenerator.examples.shareddefinition.Language"), + new Tuple("healthCareFacility", "com.nedap.archie.rm.generic.PartyIdentified"), + new Tuple("composer", "com.nedap.archie.rm.generic.PartyProxy"), + new Tuple("territory", "org.ehrbase.client.classgenerator.examples.shareddefinition.Territory"), + new Tuple("bodyTemperature", "java.util.List"), + new Tuple("location", "java.lang.String"), + new Tuple("startTimeValue", "java.time.temporal.TemporalAccessor"), + new Tuple("currentDayOfMenstrualCycleMagnitude", "java.lang.Long"), + new Tuple("environmentalConditions", "java.util.List"), + new Tuple("bodyExposure", "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureBodyExposureChoice"), + new Tuple("locationOfMeasurement", "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementChoice"), + new Tuple("categoryDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode"), + new Tuple("extension", "java.util.List"), + new Tuple("bodyExposureDefiningcode", "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyExposureDefiningcode"), + new Tuple("bodyExposureValue", "java.lang.String"), + new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), + new Tuple("temperatureMagnitude", "java.lang.Double"), + new Tuple("temperatureUnits", "java.lang.String"), + new Tuple("descriptionOfThermalStressValue", "java.lang.String"), + new Tuple("exertion", "com.nedap.archie.rm.datastructures.Cluster"), + new Tuple("currentDayOfMenstrualCycleMagnitude", "java.lang.Long"), + new Tuple("environmentalConditions", "java.util.List"), + new Tuple("widthValue", "java.time.temporal.TemporalAmount"), + new Tuple("bodyExposure", "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureBodyExposureChoice2"), + new Tuple("mathFunctionDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.MathFunctionDefiningcode"), + new Tuple("anyEvent", "java.util.List"), + new Tuple("participations", "java.util.List"), + new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit") + ); + + + writeFiles(generate); + + } + + @Test + public void testGenerateAllTypes() throws IOException, XmlException { + OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.ALL_TYPES.getStream()).getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + + + List fieldSpecs = generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); + + assertThat(fieldSpecs).size().isEqualTo(75L); + + writeFiles(generate); + + } + + @Test + public void testGenerateVirologyFinding() throws IOException, XmlException { + OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.VIROLOGY_FINDING.getStream()).getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + + + List fieldSpecs = generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); + + assertThat(fieldSpecs).size().isEqualTo(75L); + + writeFiles(generate); + + } + + @Test + public void testGenerateCorona() throws IOException, XmlException { + OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.CORONA_ANAMNESE.getStream()).getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + + + List fieldSpecs = generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); + + assertThat(fieldSpecs).size().isEqualTo(305); + + writeFiles(generate); + + } + + @Test + public void testGenerateSchwangerschaftsstatus() throws IOException, XmlException { + OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.SCHWANGERSCHAFTSSTATUS.getStream()).getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + + + List fieldSpecs = generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); + + assertThat(fieldSpecs).size().isEqualTo(22); + + + Optional status1 = generate.getClasses().values().stream() + .flatMap(Collection::stream).filter(s -> s.name.equals("StatusDefiningcode")).findAny(); + assertThat(status1).isPresent(); + assertThat(status1.get().enumConstants.keySet()).containsExactlyInAnyOrder( + "VORLAUFIG", + "FINAL", + "REGISTRIERT", + "GEANDERT" + ); + + Optional status2 = generate.getClasses().values().stream() + .flatMap(Collection::stream).filter(s -> s.name.equals("StatusDefiningcode2")).findAny(); + assertThat(status2).isPresent(); + assertThat(status2.get().enumConstants.keySet()).containsExactlyInAnyOrder( + "SCHWANGER", + "NICHT_SCHWANGER", + "UNBEKANNT" + ); + + writeFiles(generate); + + } + + @Test + public void testCreateName() { + ClassGenerator cut = new ClassGenerator(); + String className = cut.buildClassName("/_state structure/*_confounding factors(en)_ELEMENT", true); + + assertThat(className).isEqualTo("ConfoundingFactorsEnElement"); + } + + @Test + public void testGenerateReactCare() throws IOException, XmlException { + OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.OPEN_E_REACT_CARE.getStream()).getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + + List fieldSpecs = generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); + + assertThat(fieldSpecs).size().isEqualTo(352); + + writeFiles(generate); + } + +} \ No newline at end of file diff --git a/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java b/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java index f65b754a9..1fe4e719b 100644 --- a/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java +++ b/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java @@ -49,7 +49,7 @@ public WebTemplate filter(WebTemplate webTemplate) { return clone; } - private List filter(WebTemplateNode node, WebTemplate context, WebTemplateNode parent) { + protected List filter(WebTemplateNode node, WebTemplate context, WebTemplateNode parent) { List nodes; List ismTransitionList = node.getChildren().stream() .filter(n -> "ISM_TRANSITION".equals(n.getRmType())) @@ -64,21 +64,24 @@ private List filter(WebTemplateNode node, WebTemplate context, node.getChildren().clear(); node.getChildren().add(merged); } - + List filteredChildren = node.getChildren().stream().map(n -> filter(n, context, node)).flatMap(List::stream).collect(Collectors.toList()); + node.getChildren().clear(); + node.getChildren().addAll(filteredChildren); if (skip(node, context, parent)) { - nodes = node.getChildren().stream().map(n -> filter(n, context, node)).flatMap(List::stream).collect(Collectors.toList()); + nodes = filteredChildren; } else { nodes = Collections.singletonList(node); - List filteredChildren = node.getChildren().stream().map(n -> filter(n, context, node)).flatMap(List::stream).collect(Collectors.toList()); - node.getChildren().clear(); - node.getChildren().addAll(filteredChildren); + } OPTParser.makeIdUnique(node); return nodes; } - private boolean skip(WebTemplateNode node, WebTemplate context, WebTemplateNode parent) { + protected boolean skip(WebTemplateNode node, WebTemplate context, WebTemplateNode parent) { + if (node.isArchetypeSlot()){ + return true; + } if (List.of("origin", "participations", "location", "feeder_audit").contains(node.getName())) { return true; } diff --git a/web-template/src/main/java/org/ehrbase/webtemplate/model/WebTemplateNode.java b/web-template/src/main/java/org/ehrbase/webtemplate/model/WebTemplateNode.java index 086ab1a8e..734acd46b 100644 --- a/web-template/src/main/java/org/ehrbase/webtemplate/model/WebTemplateNode.java +++ b/web-template/src/main/java/org/ehrbase/webtemplate/model/WebTemplateNode.java @@ -19,7 +19,10 @@ package org.ehrbase.webtemplate.model; +import com.nedap.archie.rm.archetyped.Locatable; +import com.nedap.archie.rminfo.ArchieRMInfoLookup; import net.minidev.json.annotate.JsonIgnore; +import org.apache.commons.lang3.StringUtils; import org.ehrbase.webtemplate.parser.FlatPath; import java.io.Serializable; @@ -34,244 +37,300 @@ public class WebTemplateNode implements Serializable { - private String id; - @JsonIgnore - private Integer optionalIdNumber; - private String name; - private String localizedName; - private String rmType; - private String nodeId; - private int min; - private int max; - private final Map localizedNames = new HashMap<>(); - private final Map localizedDescriptions = new HashMap<>(); - private String aqlPath; - private final List children = new ArrayList<>(); - private final List inputs = new ArrayList<>(); - private Boolean inContext; - private final Map termBindings = new HashMap<>(); - private final List dependsOn = new ArrayList<>(); - private WebTemplateAnnotation annotations; - private final List proportionTypes = new ArrayList<>(); - - public WebTemplateNode() { - } - - public WebTemplateNode(WebTemplateNode other) { - this.id = other.id; - this.optionalIdNumber = other.optionalIdNumber; - this.name = other.name; - this.localizedName = other.localizedName; - this.rmType = other.rmType; - this.nodeId = other.nodeId; - this.min = other.min; - this.max = other.max; - this.aqlPath = other.aqlPath; - this.inContext = other.inContext; - this.dependsOn.addAll(other.dependsOn); - if (other.annotations != null) { - this.annotations = new WebTemplateAnnotation(other.annotations); - } else { - this.annotations = null; - } - this.inputs.addAll(other.getInputs().stream().map(WebTemplateInput::new).collect(Collectors.toList())); - this.getChildren().addAll(other.children.stream().map(WebTemplateNode::new).collect(Collectors.toList())); - this.localizedNames.putAll(other.localizedNames); - this.localizedDescriptions.putAll(other.localizedDescriptions); - this.proportionTypes.addAll(other.getProportionTypes()); - this.termBindings.putAll(other.termBindings.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> new WebTemplateTerminology(e.getValue())))); - } - - public String getId() { - return getId(true); - } - - public String getId(boolean withOptionalIdNumber) { - if (withOptionalIdNumber && optionalIdNumber != null) { - return id + optionalIdNumber; - } else { - return id; - } - } - - public void setOptionalIdNumber(Integer optionalIdNumber) { - this.optionalIdNumber = optionalIdNumber; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getLocalizedName() { - return localizedName; - } - - public void setLocalizedName(String localizedName) { - this.localizedName = localizedName; - } - - public String getRmType() { - return rmType; - } - - public void setRmType(String rmType) { - this.rmType = rmType; - } - - public String getNodeId() { - return nodeId; - } - - public void setNodeId(String nodeId) { - this.nodeId = nodeId; - } - - public int getMin() { - return min; - } - - public void setMin(int min) { - this.min = min; - } - - public int getMax() { - return max; - } - - public void setMax(int max) { - this.max = max; - } - - public Map getLocalizedNames() { - return localizedNames; - } - - public Map getLocalizedDescriptions() { - return localizedDescriptions; - } - - public String getAqlPath() { - return aqlPath; - } - - public String getAqlPath(boolean withOtherPredicates) { - return new FlatPath(aqlPath).format(withOtherPredicates); - } - - public void setAqlPath(String aqlPath) { - this.aqlPath = aqlPath; - } - - public List getChildren() { - return children; - } - - public Map> getChoicesInChildren() { - return children.stream() - .collect(Collectors.groupingBy(WebTemplateNode::getAqlPath)) - .entrySet() - .stream() - .filter(e -> e.getValue().size() > 1) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - } - - public List getInputs() { - return inputs; - } - - public Boolean getInContext() { - return inContext; - } - - public void setInContext(Boolean inContext) { - this.inContext = inContext; - } - - public Map getTermBindings() { - return termBindings; - } - - public List getDependsOn() { - return dependsOn; - } - - public WebTemplateAnnotation getAnnotations() { - return annotations; - } - - public void setAnnotations(WebTemplateAnnotation annotations) { - this.annotations = annotations; - } - - public List getProportionTypes() { - return proportionTypes; - } - - public Optional findChildById(String id) { - return children.stream().filter(n -> n.getId().equals(id)).findAny(); - } - - public List findMatching(Predicate filter) { - - List matching = new ArrayList<>(children.stream().map(c -> c.findMatching(filter)).flatMap(List::stream).collect(Collectors.toList())); - - if (filter.test(this)) { - matching.add(this); - } - return matching; - } - - public List multiValued() { - List matching = new ArrayList<>(children.stream().map(WebTemplateNode::multiValued).flatMap(List::stream).collect(Collectors.toList())); - if (this.max != 1) { - matching.add(this); - } - - // Add all which are multi if ignoring name - Map> collect = children.stream().collect(Collectors.groupingBy(n -> new FlatPath(n.getAqlPath()).format(false))); - collect.forEach((k, v) -> { - if (v.size() > 1) { - matching.addAll(v.stream().filter(n -> n.max == 1).collect(Collectors.toList())); - } + private static final ArchieRMInfoLookup RM_INFO_LOOKUP = ArchieRMInfoLookup.getInstance(); + + private String id; + @JsonIgnore private Integer optionalIdNumber; + private String name; + private String localizedName; + private String rmType; + private String nodeId; + private int min; + private int max; + private final Map localizedNames = new HashMap<>(); + private final Map localizedDescriptions = new HashMap<>(); + private String aqlPath; + private final List children = new ArrayList<>(); + private final List inputs = new ArrayList<>(); + private Boolean inContext; + private final Map termBindings = new HashMap<>(); + private final List dependsOn = new ArrayList<>(); + private WebTemplateAnnotation annotations; + private final List proportionTypes = new ArrayList<>(); + + public WebTemplateNode() {} + + public WebTemplateNode(WebTemplateNode other) { + this.id = other.id; + this.optionalIdNumber = other.optionalIdNumber; + this.name = other.name; + this.localizedName = other.localizedName; + this.rmType = other.rmType; + this.nodeId = other.nodeId; + this.min = other.min; + this.max = other.max; + this.aqlPath = other.aqlPath; + this.inContext = other.inContext; + this.dependsOn.addAll(other.dependsOn); + if (other.annotations != null) { + this.annotations = new WebTemplateAnnotation(other.annotations); + } else { + this.annotations = null; + } + this.inputs.addAll( + other.getInputs().stream().map(WebTemplateInput::new).collect(Collectors.toList())); + this.getChildren() + .addAll(other.children.stream().map(WebTemplateNode::new).collect(Collectors.toList())); + this.localizedNames.putAll(other.localizedNames); + this.localizedDescriptions.putAll(other.localizedDescriptions); + this.proportionTypes.addAll(other.getProportionTypes()); + this.termBindings.putAll( + other.termBindings.entrySet().stream() + .collect( + Collectors.toMap( + Map.Entry::getKey, e -> new WebTemplateTerminology(e.getValue())))); + } + + public String getId() { + return getId(true); + } + + public String getId(boolean withOptionalIdNumber) { + if (withOptionalIdNumber && optionalIdNumber != null) { + return id + optionalIdNumber; + } else { + return id; + } + } + + public void setOptionalIdNumber(Integer optionalIdNumber) { + this.optionalIdNumber = optionalIdNumber; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getLocalizedName() { + return localizedName; + } + + public void setLocalizedName(String localizedName) { + this.localizedName = localizedName; + } + + public String getRmType() { + return rmType; + } + + public void setRmType(String rmType) { + this.rmType = rmType; + } + + public String getNodeId() { + return nodeId; + } + + public void setNodeId(String nodeId) { + this.nodeId = nodeId; + } + + public int getMin() { + return min; + } + + public void setMin(int min) { + this.min = min; + } + + public int getMax() { + return max; + } + + public void setMax(int max) { + this.max = max; + } + + public Map getLocalizedNames() { + return localizedNames; + } + + public Map getLocalizedDescriptions() { + return localizedDescriptions; + } + + public String getAqlPath() { + return aqlPath; + } + + public String getAqlPath(boolean withOtherPredicates) { + return new FlatPath(aqlPath).format(withOtherPredicates); + } + + public void setAqlPath(String aqlPath) { + this.aqlPath = aqlPath; + } + + public List getChildren() { + return children; + } + + public Map> getChoicesInChildren() { + return children.stream() + .collect(Collectors.groupingBy(WebTemplateNode::getAqlPath)) + .entrySet() + .stream() + .filter(e -> e.getValue().size() > 1) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + } + + public List getInputs() { + return inputs; + } + + public Boolean getInContext() { + return inContext; + } + + public void setInContext(Boolean inContext) { + this.inContext = inContext; + } + + public Map getTermBindings() { + return termBindings; + } + + public List getDependsOn() { + return dependsOn; + } + + public WebTemplateAnnotation getAnnotations() { + return annotations; + } + + public void setAnnotations(WebTemplateAnnotation annotations) { + this.annotations = annotations; + } + + public List getProportionTypes() { + return proportionTypes; + } + + public Optional findChildById(String id) { + return children.stream().filter(n -> n.getId().equals(id)).findAny(); + } + + public List findMatching(Predicate filter) { + + List matching = + new ArrayList<>( + children.stream() + .map(c -> c.findMatching(filter)) + .flatMap(List::stream) + .collect(Collectors.toList())); + + if (filter.test(this)) { + matching.add(this); + } + return matching; + } + + public List multiValued() { + List matching = + new ArrayList<>( + children.stream() + .map(WebTemplateNode::multiValued) + .flatMap(List::stream) + .collect(Collectors.toList())); + if (this.max != 1) { + matching.add(this); + } + + // Add all which are multi if ignoring name + Map> collect = + children.stream() + .collect(Collectors.groupingBy(n -> new FlatPath(n.getAqlPath()).format(false))); + collect.forEach( + (k, v) -> { + if (v.size() > 1) { + matching.addAll(v.stream().filter(n -> n.max == 1).collect(Collectors.toList())); + } }); - return matching; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - WebTemplateNode node = (WebTemplateNode) o; - return min == node.min && - max == node.max && - Objects.equals(id, node.id) && - Objects.equals(optionalIdNumber, node.optionalIdNumber) && - Objects.equals(name, node.name) && - Objects.equals(localizedName, node.localizedName) && - Objects.equals(rmType, node.rmType) && - Objects.equals(nodeId, node.nodeId) && - Objects.equals(localizedNames, node.localizedNames) && - Objects.equals(localizedDescriptions, node.localizedDescriptions) && - Objects.equals(aqlPath, node.aqlPath) && - Objects.equals(children, node.children) && - Objects.equals(inputs, node.inputs) && - Objects.equals(inContext, node.inContext) && - Objects.equals(termBindings, node.termBindings) && - Objects.equals(dependsOn, node.dependsOn) && - Objects.equals(annotations, node.annotations) && - Objects.equals(proportionTypes, node.proportionTypes); - } - - @Override - public int hashCode() { - return Objects.hash(id, optionalIdNumber, name, localizedName, rmType, nodeId, min, max, localizedNames, localizedDescriptions, aqlPath, children, inputs, inContext, termBindings, dependsOn, annotations, proportionTypes); - } + return matching; + } + + public boolean isArchetype() { + return RM_INFO_LOOKUP.getTypeInfo(this.getRmType()) != null + && Locatable.class.isAssignableFrom( + RM_INFO_LOOKUP.getTypeInfo(this.getRmType()).getJavaClass()) + && !StringUtils.startsWith(this.getNodeId(), "at"); + } + + public boolean isArchetypeSlot() { + return RM_INFO_LOOKUP.getTypeInfo(this.getRmType()) != null + && Locatable.class.isAssignableFrom( + RM_INFO_LOOKUP.getTypeInfo(this.getRmType()).getJavaClass()) + && StringUtils.startsWith(this.getNodeId(), "at") + && this.getChildren().isEmpty(); + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + WebTemplateNode node = (WebTemplateNode) o; + return min == node.min + && max == node.max + && Objects.equals(id, node.id) + && Objects.equals(optionalIdNumber, node.optionalIdNumber) + && Objects.equals(name, node.name) + && Objects.equals(localizedName, node.localizedName) + && Objects.equals(rmType, node.rmType) + && Objects.equals(nodeId, node.nodeId) + && Objects.equals(localizedNames, node.localizedNames) + && Objects.equals(localizedDescriptions, node.localizedDescriptions) + && Objects.equals(aqlPath, node.aqlPath) + && Objects.equals(children, node.children) + && Objects.equals(inputs, node.inputs) + && Objects.equals(inContext, node.inContext) + && Objects.equals(termBindings, node.termBindings) + && Objects.equals(dependsOn, node.dependsOn) + && Objects.equals(annotations, node.annotations) + && Objects.equals(proportionTypes, node.proportionTypes); + } + + @Override + public int hashCode() { + return Objects.hash( + id, + optionalIdNumber, + name, + localizedName, + rmType, + nodeId, + min, + max, + localizedNames, + localizedDescriptions, + aqlPath, + children, + inputs, + inContext, + termBindings, + dependsOn, + annotations, + proportionTypes); + } + + public boolean isMulti() { + return max != 1; + } } diff --git a/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java b/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java index b6701d737..0a9e54065 100644 --- a/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java +++ b/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java @@ -34,6 +34,7 @@ import org.ehrbase.webtemplate.model.WebTemplateInput; import org.ehrbase.webtemplate.model.WebTemplateInputValue; import org.ehrbase.webtemplate.model.WebTemplateNode; +import org.openehr.schemas.v1.ARCHETYPESLOT; import org.openehr.schemas.v1.ARCHETYPETERM; import org.openehr.schemas.v1.CARCHETYPEROOT; import org.openehr.schemas.v1.CATTRIBUTE; @@ -356,10 +357,26 @@ private WebTemplateNode parseCOBJECT(COBJECT cobject, String aqlPath, Map> termDefinitionMap, String rmAttributeName) { + WebTemplateNode node = buildNode(cobject, rmAttributeName, termDefinitionMap); + node.setAqlPath(pathLoop); + return node; + + } + private WebTemplateNode parseCDOMAINTYPE(CDOMAINTYPE cdomaintype, String aqlPath, Map> termDefinitionMap, String rmAttributeName) { WebTemplateNode node = buildNode(cdomaintype, rmAttributeName, termDefinitionMap); @@ -425,6 +442,8 @@ private WebTemplateNode parseCDOMAINTYPE(CDOMAINTYPE cdomaintype, String aqlPath TermDefinition termDefinition = termDefinitionMap.get(o).get(defaultLanguage); value.setValue(termDefinition.getCode()); value.setLabel(termDefinition.getValue()); + value.getLocalizedDescriptions().put(defaultLanguage,termDefinition.getDescription()); + value.getLocalizedLabels().put(defaultLanguage,termDefinition.getValue()); code.getList().add(value); } From 6b93330cb11add74045354e5ad43c8f56df06b1c Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Thu, 19 Nov 2020 16:42:14 +0100 Subject: [PATCH 09/54] fix test see https://github.com/ehrbase/project_management/issues/424 --- .../java/org/ehrbase/webtemplate/model/WebTemplateTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web-template/src/test/java/org/ehrbase/webtemplate/model/WebTemplateTest.java b/web-template/src/test/java/org/ehrbase/webtemplate/model/WebTemplateTest.java index 1c2a3a542..3c9ba5e4e 100644 --- a/web-template/src/test/java/org/ehrbase/webtemplate/model/WebTemplateTest.java +++ b/web-template/src/test/java/org/ehrbase/webtemplate/model/WebTemplateTest.java @@ -68,7 +68,7 @@ public void testQueryUpperUnbounded() throws IOException, XmlException { assertNotNull(result); - assertEquals(12, result.size()); + assertEquals(21, result.size()); } @Test @@ -78,7 +78,7 @@ public void testQueryUpperUnbounded2() throws IOException, XmlException { assertNotNull(result); - assertEquals(41, result.size()); + assertEquals(53, result.size()); } @Test @@ -88,7 +88,7 @@ public void testMultiValued() throws IOException, XmlException { assertNotNull(result); - assertEquals(206, result.size()); + assertEquals(266, result.size()); } From 0b1eefecca55ea6865a775bef541db590bcc8689 Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Fri, 20 Nov 2020 17:28:25 +0100 Subject: [PATCH 10/54] handle choices in new dot generator see https://github.com/ehrbase/project_management/issues/424 --- .../CategoryDefiningcode.java | 42 + .../shareddefinition/Language.java | 296 ++++++ .../MathFunctionDefiningcode.java | 58 + .../shareddefinition/SettingDefiningcode.java | 62 ++ .../shareddefinition/Territory.java | 528 +++++++++ .../AlternativeEventsComposition.java | 202 ++++ ...ternativeEventsCompositionContainment.java | 61 ++ .../definition/AnyEventEnIntervalEvent.java | 102 ++ .../definition/AnyEventEnPointEvent.java | 78 ++ .../definition/BirthEnPointEvent.java | 76 ++ .../ConfoundingFactorsEnElement.java | 18 + .../KorpergewichtAnyEventEnChoice.java | 4 + .../definition/KorpergewichtObservation.java | 94 ++ .../KorpergewichtObservationContainment.java | 38 + .../StateOfDressEnDefiningcode.java | 46 + ...aseBloodPressureSimpleDeV0Composition.java | 182 ++++ ...ssureSimpleDeV0CompositionContainment.java | 57 + ...loodPressureTrainingSampleObservation.java | 248 +++++ ...eTrainingSampleObservationContainment.java | 66 ++ .../definition/CuffSizeDefiningcode.java | 52 + .../DeviceDetailsTrainingSampleCluster.java | 111 ++ ...tailsTrainingSampleClusterContainment.java | 38 + .../KorotkoffSoundsDefiningcode.java | 43 + .../LocationOfMeasurementDefiningcode.java | 57 + .../definition/PositionDefiningcode.java | 52 + .../classgenerator/ClassGeneratorNew.java | 177 +++- .../client/classgenerator/FlattFilter.java | 10 +- .../classgenerator/ClassGeneratorNewTest.java | 999 ++++++++++-------- 28 files changed, 3330 insertions(+), 467 deletions(-) create mode 100644 client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/CategoryDefiningcode.java create mode 100644 client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/Language.java create mode 100644 client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/MathFunctionDefiningcode.java create mode 100644 client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/SettingDefiningcode.java create mode 100644 client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/Territory.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsComposition.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsCompositionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/AnyEventEnIntervalEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/AnyEventEnPointEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/BirthEnPointEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/ConfoundingFactorsEnElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/StateOfDressEnDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningcode.java diff --git a/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/CategoryDefiningcode.java b/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/CategoryDefiningcode.java new file mode 100644 index 000000000..7fe5dd402 --- /dev/null +++ b/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/CategoryDefiningcode.java @@ -0,0 +1,42 @@ +package org.ehrbase.client.classgenerator.shareddefinition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum CategoryDefiningcode implements EnumValueSet { + EVENT("event", "event", "openehr", "433"), + + EPISODIC("episodic", "episodic", "openehr", "435"), + + PERSISTENT("persistent", "persistent", "openehr", "431"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + CategoryDefiningcode(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/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/Language.java b/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/Language.java new file mode 100644 index 000000000..d4125ca97 --- /dev/null +++ b/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/Language.java @@ -0,0 +1,296 @@ +package org.ehrbase.client.classgenerator.shareddefinition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum Language implements EnumValueSet { + ZU("zu", "zu", "ISO_639-1", "zu"), + + ES_MX("es-mx", "es-mx", "ISO_639-1", "es-mx"), + + ES_HN("es-hn", "es-hn", "ISO_639-1", "es-hn"), + + ES_CL("es-cl", "es-cl", "ISO_639-1", "es-cl"), + + AR_LY("ar-ly", "ar-ly", "ISO_639-1", "ar-ly"), + + MK("mk", "mk", "ISO_639-1", "mk"), + + DA("da", "da", "ISO_639-1", "da"), + + UK("uk", "uk", "ISO_639-1", "uk"), + + RM("rm", "rm", "ISO_639-1", "rm"), + + AR_DZ("ar-dz", "ar-dz", "ISO_639-1", "ar-dz"), + + ES_GT("es-gt", "es-gt", "ISO_639-1", "es-gt"), + + NL_BE("nl-be", "nl-be", "ISO_639-1", "nl-be"), + + EN_JM("en-jm", "en-jm", "ISO_639-1", "en-jm"), + + ES_NI("es-ni", "es-ni", "ISO_639-1", "es-ni"), + + MT("mt", "mt", "ISO_639-1", "mt"), + + VE("ve", "ve", "ISO_639-1", "ve"), + + EL("el", "el", "ISO_639-1", "el"), + + IT("it", "it", "ISO_639-1", "it"), + + ES_PE("es-pe", "es-pe", "ISO_639-1", "es-pe"), + + EN_US("en-us", "en-us", "ISO_639-1", "en-us"), + + HR("hr", "hr", "ISO_639-1", "hr"), + + SX("sx", "sx", "ISO_639-1", "sx"), + + ET("et", "et", "ISO_639-1", "et"), + + TR("tr", "tr", "ISO_639-1", "tr"), + + CY("cy", "cy", "ISO_639-1", "cy"), + + ID("id", "id", "ISO_639-1", "id"), + + NN("nn", "nn", "ISO_639-1", "nn"), + + RU_MO("ru-mo", "ru-mo", "ISO_639-1", "ru-mo"), + + BG("bg", "bg", "ISO_639-1", "bg"), + + ZH_CN("zh-cn", "zh-cn", "ISO_639-1", "zh-cn"), + + CY_GB("cy-gb", "cy-gb", "ISO_639-1", "cy-gb"), + + AR_KW("ar-kw", "ar-kw", "ISO_639-1", "ar-kw"), + + FO("fo", "fo", "ISO_639-1", "fo"), + + EU("eu", "eu", "ISO_639-1", "eu"), + + AR_SY("ar-sy", "ar-sy", "ISO_639-1", "ar-sy"), + + EN_AU("en-au", "en-au", "ISO_639-1", "en-au"), + + AR_AE("ar-ae", "ar-ae", "ISO_639-1", "ar-ae"), + + ES_SV("es-sv", "es-sv", "ISO_639-1", "es-sv"), + + ES_AR("es-ar", "es-ar", "ISO_639-1", "es-ar"), + + AA("aa", "aa", "ISO_639-1", "aa"), + + AR_LB("ar-lb", "ar-lb", "ISO_639-1", "ar-lb"), + + EN_CA("en-ca", "en-ca", "ISO_639-1", "en-ca"), + + AZ("az", "az", "ISO_639-1", "az"), + + FR_CA("fr-ca", "fr-ca", "ISO_639-1", "fr-ca"), + + SV("sv", "sv", "ISO_639-1", "sv"), + + AR_BH("ar-bh", "ar-bh", "ISO_639-1", "ar-bh"), + + AR_YE("ar-ye", "ar-ye", "ISO_639-1", "ar-ye"), + + UR("ur", "ur", "ISO_639-1", "ur"), + + ZH_TW("zh-tw", "zh-tw", "ISO_639-1", "zh-tw"), + + FR_LU("fr-lu", "fr-lu", "ISO_639-1", "fr-lu"), + + DE_LI("de-li", "de-li", "ISO_639-1", "de-li"), + + NL("nl", "nl", "ISO_639-1", "nl"), + + IT_CH("it-ch", "it-ch", "ISO_639-1", "it-ch"), + + EN_IE("en-ie", "en-ie", "ISO_639-1", "en-ie"), + + AR_SA("ar-sa", "ar-sa", "ISO_639-1", "ar-sa"), + + TH("th", "th", "ISO_639-1", "th"), + + ES_DO("es-do", "es-do", "ISO_639-1", "es-do"), + + ES_UY("es-uy", "es-uy", "ISO_639-1", "es-uy"), + + BE("be", "be", "ISO_639-1", "be"), + + HI("hi", "hi", "ISO_639-1", "hi"), + + RU("ru", "ru", "ISO_639-1", "ru"), + + XH("xh", "xh", "ISO_639-1", "xh"), + + KO("ko", "ko", "ISO_639-1", "ko"), + + EN_TT("en-tt", "en-tt", "ISO_639-1", "en-tt"), + + IS("is", "is", "ISO_639-1", "is"), + + ES("es", "es", "ISO_639-1", "es"), + + PT_PT("pt-pt", "pt-pt", "ISO_639-1", "pt-pt"), + + AR_JO("ar-jo", "ar-jo", "ISO_639-1", "ar-jo"), + + AR_EG("ar-eg", "ar-eg", "ISO_639-1", "ar-eg"), + + ES_VE("es-ve", "es-ve", "ISO_639-1", "es-ve"), + + RO_MO("ro-mo", "ro-mo", "ISO_639-1", "ro-mo"), + + JA("ja", "ja", "ISO_639-1", "ja"), + + ES_PA("es-pa", "es-pa", "ISO_639-1", "es-pa"), + + EN_GB("en-gb", "en-gb", "ISO_639-1", "en-gb"), + + ES_PR("es-pr", "es-pr", "ISO_639-1", "es-pr"), + + KK("kk", "kk", "ISO_639-1", "kk"), + + FA("fa", "fa", "ISO_639-1", "fa"), + + VI("vi", "vi", "ISO_639-1", "vi"), + + FR_CH("fr-ch", "fr-ch", "ISO_639-1", "fr-ch"), + + JI("ji", "ji", "ISO_639-1", "ji"), + + HE("he", "he", "ISO_639-1", "he"), + + SK("sk", "sk", "ISO_639-1", "sk"), + + DE_AT("de-at", "de-at", "ISO_639-1", "de-at"), + + ZH_SG("zh-sg", "zh-sg", "ISO_639-1", "zh-sg"), + + ES_EC("es-ec", "es-ec", "ISO_639-1", "es-ec"), + + FR("fr", "fr", "ISO_639-1", "fr"), + + DE_CH("de-ch", "de-ch", "ISO_639-1", "de-ch"), + + LV("lv", "lv", "ISO_639-1", "lv"), + + SL("sl", "sl", "ISO_639-1", "sl"), + + TN("tn", "tn", "ISO_639-1", "tn"), + + NB("nb", "nb", "ISO_639-1", "nb"), + + EN_BZ("en-bz", "en-bz", "ISO_639-1", "en-bz"), + + ES_PY("es-py", "es-py", "ISO_639-1", "es-py"), + + ES_CO("es-co", "es-co", "ISO_639-1", "es-co"), + + GD("gd", "gd", "ISO_639-1", "gd"), + + PT_BR("pt-br", "pt-br", "ISO_639-1", "pt-br"), + + KM("km", "km", "ISO_639-1", "km"), + + EN_ZA("en-za", "en-za", "ISO_639-1", "en-za"), + + EN_NZ("en-nz", "en-nz", "ISO_639-1", "en-nz"), + + CY_AR("cy-ar", "cy-ar", "ISO_639-1", "cy-ar"), + + SQ("sq", "sq", "ISO_639-1", "sq"), + + TS("ts", "ts", "ISO_639-1", "ts"), + + ES_CR("es-cr", "es-cr", "ISO_639-1", "es-cr"), + + RO("ro", "ro", "ISO_639-1", "ro"), + + AF("af", "af", "ISO_639-1", "af"), + + GD_IE("gd-ie", "gd-ie", "ISO_639-1", "gd-ie"), + + CA("ca", "ca", "ISO_639-1", "ca"), + + SI("si", "si", "ISO_639-1", "si"), + + AR_TN("ar-tn", "ar-tn", "ISO_639-1", "ar-tn"), + + LT("lt", "lt", "ISO_639-1", "lt"), + + PT("pt", "pt", "ISO_639-1", "pt"), + + EN("en", "en", "ISO_639-1", "en"), + + SZ("sz", "sz", "ISO_639-1", "sz"), + + ZH_HK("zh-hk", "zh-hk", "ISO_639-1", "zh-hk"), + + SR("sr", "sr", "ISO_639-1", "sr"), + + ES_BO("es-bo", "es-bo", "ISO_639-1", "es-bo"), + + AR_QA("ar-qa", "ar-qa", "ISO_639-1", "ar-qa"), + + FR_BE("fr-be", "fr-be", "ISO_639-1", "fr-be"), + + PL("pl", "pl", "ISO_639-1", "pl"), + + AR_MA("ar-ma", "ar-ma", "ISO_639-1", "ar-ma"), + + DE("de", "de", "ISO_639-1", "de"), + + FI("fi", "fi", "ISO_639-1", "fi"), + + ZH("zh", "zh", "ISO_639-1", "zh"), + + AR_OM("ar-om", "ar-om", "ISO_639-1", "ar-om"), + + SB("sb", "sb", "ISO_639-1", "sb"), + + DE_LU("de-lu", "de-lu", "ISO_639-1", "de-lu"), + + SV_FI("sv-fi", "sv-fi", "ISO_639-1", "sv-fi"), + + AR_IQ("ar-iq", "ar-iq", "ISO_639-1", "ar-iq"), + + CS("cs", "cs", "ISO_639-1", "cs"), + + HU("hu", "hu", "ISO_639-1", "hu"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + Language(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/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/MathFunctionDefiningcode.java b/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/MathFunctionDefiningcode.java new file mode 100644 index 000000000..e54355778 --- /dev/null +++ b/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/MathFunctionDefiningcode.java @@ -0,0 +1,58 @@ +package org.ehrbase.client.classgenerator.shareddefinition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum MathFunctionDefiningcode implements EnumValueSet { + DECREASE("decrease", "decrease", "openehr", "521"), + + TOTAL("total", "total", "openehr", "148"), + + MAXIMUM("maximum", "maximum", "openehr", "144"), + + MODE("mode", "mode", "openehr", "267"), + + INCREASE("increase", "increase", "openehr", "522"), + + ACTUAL("actual", "actual", "openehr", "640"), + + VARIATION("variation", "variation", "openehr", "149"), + + MINIMUM("minimum", "minimum", "openehr", "145"), + + CHANGE("change", "change", "openehr", "147"), + + MEAN("mean", "mean", "openehr", "146"), + + MEDIAN("median", "median", "openehr", "268"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + MathFunctionDefiningcode(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/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/SettingDefiningcode.java b/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/SettingDefiningcode.java new file mode 100644 index 000000000..7c3dee8b7 --- /dev/null +++ b/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/SettingDefiningcode.java @@ -0,0 +1,62 @@ +package org.ehrbase.client.classgenerator.shareddefinition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum SettingDefiningcode implements EnumValueSet { + COMPLEMENTARY_HEALTH_CARE("complementary health care", "complementary health care", "openehr", "235"), + + HOME("home", "home", "openehr", "225"), + + SECONDARY_NURSING_CARE("secondary nursing care", "secondary nursing care", "openehr", "233"), + + DENTAL_CARE("dental care", "dental care", "openehr", "236"), + + OTHER_CARE("other care", "other care", "openehr", "238"), + + NURSING_HOME_CARE("nursing home care", "nursing home care", "openehr", "237"), + + SECONDARY_ALLIED_HEALTH_CARE("secondary allied health care", "secondary allied health care", "openehr", "234"), + + EMERGENCY_CARE("emergency care", "emergency care", "openehr", "227"), + + PRIMARY_NURSING_CARE("primary nursing care", "primary nursing care", "openehr", "229"), + + PRIMARY_MEDICAL_CARE("primary medical care", "primary medical care", "openehr", "228"), + + PRIMARY_ALLIED_HEALTH_CARE("primary allied health care", "primary allied health care", "openehr", "230"), + + SECONDARY_MEDICAL_CARE("secondary medical care", "secondary medical care", "openehr", "232"), + + MIDWIFERY_CARE("midwifery care", "midwifery care", "openehr", "231"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + SettingDefiningcode(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/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/Territory.java b/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/Territory.java new file mode 100644 index 000000000..fce931cd4 --- /dev/null +++ b/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/Territory.java @@ -0,0 +1,528 @@ +package org.ehrbase.client.classgenerator.shareddefinition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum Territory implements EnumValueSet { + AD("AD", "AD", "ISO_3166-1", "AD"), + + BF("BF", "BF", "ISO_3166-1", "BF"), + + DJ("DJ", "DJ", "ISO_3166-1", "DJ"), + + CH("CH", "CH", "ISO_3166-1", "CH"), + + PR("PR", "PR", "ISO_3166-1", "PR"), + + HR("HR", "HR", "ISO_3166-1", "HR"), + + GP("GP", "GP", "ISO_3166-1", "GP"), + + TZ("TZ", "TZ", "ISO_3166-1", "TZ"), + + IT("IT", "IT", "ISO_3166-1", "IT"), + + AT("AT", "AT", "ISO_3166-1", "AT"), + + BV("BV", "BV", "ISO_3166-1", "BV"), + + DZ("DZ", "DZ", "ISO_3166-1", "DZ"), + + CX("CX", "CX", "ISO_3166-1", "CX"), + + PA("PA", "PA", "ISO_3166-1", "PA"), + + MK("MK", "MK", "ISO_3166-1", "MK"), + + LI("LI", "LI", "ISO_3166-1", "LI"), + + RE("RE", "RE", "ISO_3166-1", "RE"), + + SG("SG", "SG", "ISO_3166-1", "SG"), + + JE("JE", "JE", "ISO_3166-1", "JE"), + + KG("KG", "KG", "ISO_3166-1", "KG"), + + AE("AE", "AE", "ISO_3166-1", "AE"), + + BG("BG", "BG", "ISO_3166-1", "BG"), + + CI("CI", "CI", "ISO_3166-1", "CI"), + + PS("PS", "PS", "ISO_3166-1", "PS"), + + NO("NO", "NO", "ISO_3166-1", "NO"), + + DK("DK", "DK", "ISO_3166-1", "DK"), + + KY("KY", "KY", "ISO_3166-1", "KY"), + + GQ("GQ", "GQ", "ISO_3166-1", "GQ"), + + FO("FO", "FO", "ISO_3166-1", "FO"), + + RW("RW", "RW", "ISO_3166-1", "RW"), + + SY("SY", "SY", "ISO_3166-1", "SY"), + + YT("YT", "YT", "ISO_3166-1", "YT"), + + AU("AU", "AU", "ISO_3166-1", "AU"), + + BW("BW", "BW", "ISO_3166-1", "BW"), + + CY("CY", "CY", "ISO_3166-1", "CY"), + + KH("KH", "KH", "ISO_3166-1", "KH"), + + ID("ID", "ID", "ISO_3166-1", "ID"), + + ML("ML", "ML", "ISO_3166-1", "ML"), + + SH("SH", "SH", "ISO_3166-1", "SH"), + + TJ("TJ", "TJ", "ISO_3166-1", "TJ"), + + VN("VN", "VN", "ISO_3166-1", "VN"), + + BD("BD", "BD", "ISO_3166-1", "BD"), + + CF("CF", "CF", "ISO_3166-1", "CF"), + + GN("GN", "GN", "ISO_3166-1", "GN"), + + QA("QA", "QA", "ISO_3166-1", "QA"), + + MZ("MZ", "MZ", "ISO_3166-1", "MZ"), + + SV("SV", "SV", "ISO_3166-1", "SV"), + + IR("IR", "IR", "ISO_3166-1", "IR"), + + UZ("UZ", "UZ", "ISO_3166-1", "UZ"), + + AR("AR", "AR", "ISO_3166-1", "AR"), + + BT("BT", "BT", "ISO_3166-1", "BT"), + + CV("CV", "CV", "ISO_3166-1", "CV"), + + SE("SE", "SE", "ISO_3166-1", "SE"), + + TG("TG", "TG", "ISO_3166-1", "TG"), + + OM("OM", "OM", "ISO_3166-1", "OM"), + + KE("KE", "KE", "ISO_3166-1", "KE"), + + BE("BE", "BE", "ISO_3166-1", "BE"), + + CG("CG", "CG", "ISO_3166-1", "CG"), + + FM("FM", "FM", "ISO_3166-1", "FM"), + + LY("LY", "LY", "ISO_3166-1", "LY"), + + RU("RU", "RU", "ISO_3166-1", "RU"), + + IS("IS", "IS", "ISO_3166-1", "IS"), + + KW("KW", "KW", "ISO_3166-1", "KW"), + + AS("AS", "AS", "ISO_3166-1", "AS"), + + TH("TH", "TH", "ISO_3166-1", "TH"), + + NL("NL", "NL", "ISO_3166-1", "NL"), + + CD("CD", "CD", "ISO_3166-1", "CD"), + + FJ("FJ", "FJ", "ISO_3166-1", "FJ"), + + EH("EH", "EH", "ISO_3166-1", "EH"), + + GL("GL", "GL", "ISO_3166-1", "GL"), + + HN("HN", "HN", "ISO_3166-1", "HN"), + + SC("SC", "SC", "ISO_3166-1", "SC"), + + ST("ST", "ST", "ISO_3166-1", "ST"), + + TV("TV", "TV", "ISO_3166-1", "TV"), + + LV("LV", "LV", "ISO_3166-1", "LV"), + + ZA("ZA", "ZA", "ISO_3166-1", "ZA"), + + NZ("NZ", "NZ", "ISO_3166-1", "NZ"), + + MX("MX", "MX", "ISO_3166-1", "MX"), + + BR("BR", "BR", "ISO_3166-1", "BR"), + + UG("UG", "UG", "ISO_3166-1", "UG"), + + PM("PM", "PM", "ISO_3166-1", "PM"), + + VI("VI", "VI", "ISO_3166-1", "VI"), + + MG("MG", "MG", "ISO_3166-1", "MG"), + + NI("NI", "NI", "ISO_3166-1", "NI"), + + BA("BA", "BA", "ISO_3166-1", "BA"), + + CC("CC", "CC", "ISO_3166-1", "CC"), + + IQ("IQ", "IQ", "ISO_3166-1", "IQ"), + + FK("FK", "FK", "ISO_3166-1", "FK"), + + GM("GM", "GM", "ISO_3166-1", "GM"), + + RS("RS", "RS", "ISO_3166-1", "RS"), + + UY("UY", "UY", "ISO_3166-1", "UY"), + + TW("TW", "TW", "ISO_3166-1", "TW"), + + MY("MY", "MY", "ISO_3166-1", "MY"), + + AQ("AQ", "AQ", "ISO_3166-1", "AQ"), + + BS("BS", "BS", "ISO_3166-1", "BS"), + + CU("CU", "CU", "ISO_3166-1", "CU"), + + SD("SD", "SD", "ISO_3166-1", "SD"), + + TF("TF", "TF", "ISO_3166-1", "TF"), + + PN("PN", "PN", "ISO_3166-1", "PN"), + + MH("MH", "MH", "ISO_3166-1", "MH"), + + BB("BB", "BB", "ISO_3166-1", "BB"), + + JP("JP", "JP", "ISO_3166-1", "JP"), + + KR("KR", "KR", "ISO_3166-1", "KR"), + + LT("LT", "LT", "ISO_3166-1", "LT"), + + SA("SA", "SA", "ISO_3166-1", "SA"), + + TC("TC", "TC", "ISO_3166-1", "TC"), + + IN("IN", "IN", "ISO_3166-1", "IN"), + + AN("AN", "AN", "ISO_3166-1", "AN"), + + MV("MV", "MV", "ISO_3166-1", "MV"), + + CR("CR", "CR", "ISO_3166-1", "CR"), + + ME("ME", "ME", "ISO_3166-1", "ME"), + + LC("LC", "LC", "ISO_3166-1", "LC"), + + RO("RO", "RO", "ISO_3166-1", "RO"), + + VG("VG", "VG", "ISO_3166-1", "VG"), + + PK("PK", "PK", "ISO_3166-1", "PK"), + + CA("CA", "CA", "ISO_3166-1", "CA"), + + NG("NG", "NG", "ISO_3166-1", "NG"), + + EE("EE", "EE", "ISO_3166-1", "EE"), + + EG("EG", "EG", "ISO_3166-1", "EG"), + + FI("FI", "FI", "ISO_3166-1", "FI"), + + DE("DE", "DE", "ISO_3166-1", "DE"), + + IO("IO", "IO", "ISO_3166-1", "IO"), + + SB("SB", "SB", "ISO_3166-1", "SB"), + + HM("HM", "HM", "ISO_3166-1", "HM"), + + TD("TD", "TD", "ISO_3166-1", "TD"), + + MW("MW", "MW", "ISO_3166-1", "MW"), + + LU("LU", "LU", "ISO_3166-1", "LU"), + + AO("AO", "AO", "ISO_3166-1", "AO"), + + SR("SR", "SR", "ISO_3166-1", "SR"), + + TT("TT", "TT", "ISO_3166-1", "TT"), + + PL("PL", "PL", "ISO_3166-1", "PL"), + + MF("MF", "MF", "ISO_3166-1", "MF"), + + KP("KP", "KP", "ISO_3166-1", "KP"), + + LR("LR", "LR", "ISO_3166-1", "LR"), + + IL("IL", "IL", "ISO_3166-1", "IL"), + + GH("GH", "GH", "ISO_3166-1", "GH"), + + MT("MT", "MT", "ISO_3166-1", "MT"), + + VE("VE", "VE", "ISO_3166-1", "VE"), + + AL("AL", "AL", "ISO_3166-1", "AL"), + + BN("BN", "BN", "ISO_3166-1", "BN"), + + ET("ET", "ET", "ISO_3166-1", "ET"), + + NE("NE", "NE", "ISO_3166-1", "NE"), + + MC("MC", "MC", "ISO_3166-1", "MC"), + + LA("LA", "LA", "ISO_3166-1", "LA"), + + SO("SO", "SO", "ISO_3166-1", "SO"), + + US("US", "US", "ISO_3166-1", "US"), + + VU("VU", "VU", "ISO_3166-1", "VU"), + + ZM("ZM", "ZM", "ISO_3166-1", "ZM"), + + EC("EC", "EC", "ISO_3166-1", "EC"), + + GG("GG", "GG", "ISO_3166-1", "GG"), + + IM("IM", "IM", "ISO_3166-1", "IM"), + + JO("JO", "JO", "ISO_3166-1", "JO"), + + HK("HK", "HK", "ISO_3166-1", "HK"), + + MU("MU", "MU", "ISO_3166-1", "MU"), + + GI("GI", "GI", "ISO_3166-1", "GI"), + + LS("LS", "LS", "ISO_3166-1", "LS"), + + AM("AM", "AM", "ISO_3166-1", "AM"), + + BO("BO", "BO", "ISO_3166-1", "BO"), + + LB("LB", "LB", "ISO_3166-1", "LB"), + + NF("NF", "NF", "ISO_3166-1", "NF"), + + GY("GY", "GY", "ISO_3166-1", "GY"), + + MD("MD", "MD", "ISO_3166-1", "MD"), + + TR("TR", "TR", "ISO_3166-1", "TR"), + + MR("MR", "MR", "ISO_3166-1", "MR"), + + UA("UA", "UA", "ISO_3166-1", "UA"), + + VC("VC", "VC", "ISO_3166-1", "VC"), + + KN("KN", "KN", "ISO_3166-1", "KN"), + + BL("BL", "BL", "ISO_3166-1", "BL"), + + CN("CN", "CN", "ISO_3166-1", "CN"), + + ER("ER", "ER", "ISO_3166-1", "ER"), + + PG("PG", "PG", "ISO_3166-1", "PG"), + + SM("SM", "SM", "ISO_3166-1", "SM"), + + NC("NC", "NC", "ISO_3166-1", "NC"), + + TO("TO", "TO", "ISO_3166-1", "TO"), + + MA("MA", "MA", "ISO_3166-1", "MA"), + + AZ("AZ", "AZ", "ISO_3166-1", "AZ"), + + GE("GE", "GE", "ISO_3166-1", "GE"), + + MS("MS", "MS", "ISO_3166-1", "MS"), + + NU("NU", "NU", "ISO_3166-1", "NU"), + + WF("WF", "WF", "ISO_3166-1", "WF"), + + JM("JM", "JM", "ISO_3166-1", "JM"), + + BM("BM", "BM", "ISO_3166-1", "BM"), + + CO("CO", "CO", "ISO_3166-1", "CO"), + + GW("GW", "GW", "ISO_3166-1", "GW"), + + PY("PY", "PY", "ISO_3166-1", "PY"), + + ES("ES", "ES", "ISO_3166-1", "ES"), + + PH("PH", "PH", "ISO_3166-1", "PH"), + + SN("SN", "SN", "ISO_3166-1", "SN"), + + GF("GF", "GF", "ISO_3166-1", "GF"), + + VA("VA", "VA", "ISO_3166-1", "VA"), + + NR("NR", "NR", "ISO_3166-1", "NR"), + + MP("MP", "MP", "ISO_3166-1", "MP"), + + BJ("BJ", "BJ", "ISO_3166-1", "BJ"), + + FR("FR", "FR", "ISO_3166-1", "FR"), + + CL("CL", "CL", "ISO_3166-1", "CL"), + + GT("GT", "GT", "ISO_3166-1", "GT"), + + WS("WS", "WS", "ISO_3166-1", "WS"), + + TM("TM", "TM", "ISO_3166-1", "TM"), + + PE("PE", "PE", "ISO_3166-1", "PE"), + + NA("NA", "NA", "ISO_3166-1", "NA"), + + AX("AX", "AX", "ISO_3166-1", "AX"), + + BZ("BZ", "BZ", "ISO_3166-1", "BZ"), + + SK("SK", "SK", "ISO_3166-1", "SK"), + + PW("PW", "PW", "ISO_3166-1", "PW"), + + KM("KM", "KM", "ISO_3166-1", "KM"), + + MQ("MQ", "MQ", "ISO_3166-1", "MQ"), + + AI("AI", "AI", "ISO_3166-1", "AI"), + + CM("CM", "CM", "ISO_3166-1", "CM"), + + DO("DO", "DO", "ISO_3166-1", "DO"), + + GU("GU", "GU", "ISO_3166-1", "GU"), + + SL("SL", "SL", "ISO_3166-1", "SL"), + + TN("TN", "TN", "ISO_3166-1", "TN"), + + PF("PF", "PF", "ISO_3166-1", "PF"), + + GD("GD", "GD", "ISO_3166-1", "GD"), + + YE("YE", "YE", "ISO_3166-1", "YE"), + + AF("AF", "AF", "ISO_3166-1", "AF"), + + PT("PT", "PT", "ISO_3166-1", "PT"), + + MN("MN", "MN", "ISO_3166-1", "MN"), + + BH("BH", "BH", "ISO_3166-1", "BH"), + + NP("NP", "NP", "ISO_3166-1", "NP"), + + HT("HT", "HT", "ISO_3166-1", "HT"), + + GR("GR", "GR", "ISO_3166-1", "GR"), + + KZ("KZ", "KZ", "ISO_3166-1", "KZ"), + + SZ("SZ", "SZ", "ISO_3166-1", "SZ"), + + ZW("ZW", "ZW", "ISO_3166-1", "ZW"), + + CZ("CZ", "CZ", "ISO_3166-1", "CZ"), + + IE("IE", "IE", "ISO_3166-1", "IE"), + + KI("KI", "KI", "ISO_3166-1", "KI"), + + MM("MM", "MM", "ISO_3166-1", "MM"), + + GA("GA", "GA", "ISO_3166-1", "GA"), + + LK("LK", "LK", "ISO_3166-1", "LK"), + + SI("SI", "SI", "ISO_3166-1", "SI"), + + UM("UM", "UM", "ISO_3166-1", "UM"), + + TK("TK", "TK", "ISO_3166-1", "TK"), + + MO("MO", "MO", "ISO_3166-1", "MO"), + + AG("AG", "AG", "ISO_3166-1", "AG"), + + BI("BI", "BI", "ISO_3166-1", "BI"), + + CK("CK", "CK", "ISO_3166-1", "CK"), + + GS("GS", "GS", "ISO_3166-1", "GS"), + + DM("DM", "DM", "ISO_3166-1", "DM"), + + HU("HU", "HU", "ISO_3166-1", "HU"), + + AW("AW", "AW", "ISO_3166-1", "AW"), + + BY("BY", "BY", "ISO_3166-1", "BY"), + + GB("GB", "GB", "ISO_3166-1", "GB"), + + SJ("SJ", "SJ", "ISO_3166-1", "SJ"), + + TL("TL", "TL", "ISO_3166-1", "TL"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + Territory(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/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsComposition.java new file mode 100644 index 000000000..60563b156 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsComposition.java @@ -0,0 +1,202 @@ +package org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.Participation; +import com.nedap.archie.rm.generic.PartyIdentified; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Id; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.annotations.Template; +import org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition.KorpergewichtObservation; +import org.ehrbase.client.classgenerator.shareddefinition.CategoryDefiningcode; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.SettingDefiningcode; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; +import org.ehrbase.client.openehrclient.VersionUid; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-COMPOSITION.report.v1") +@Template("AlternativeEvents") +public class AlternativeEventsComposition { + @Path("/context/other_context[at0001]/items[at0002]/value|value") + private String berichtIdValue; + + @Path("/context/other_context[at0001]/items[at0005]/value|value") + private String statusValue; + + @Path("/context/other_context[at0001]/items[at0006]") + private List erweiterung; + + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; + + @Path("/context/participations") + private List participations; + + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + @Path("/context/location") + private String location; + + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; + + @Path("/context/setting|defining_code") + private SettingDefiningcode settingDefiningcode; + + @Path("/content[openEHR-EHR-OBSERVATION.body_weight.v2]") + private List korpergewicht; + + @Path("/composer") + private PartyProxy composer; + + @Path("/language") + private Language language; + + @Path("/feeder_audit") + private FeederAudit feederAudit; + + @Path("/category|defining_code") + private CategoryDefiningcode categoryDefiningcode; + + @Path("/territory") + private Territory territory; + + @Id + private VersionUid versionUid; + + public void setBerichtIdValue(String berichtIdValue) { + this.berichtIdValue = berichtIdValue; + } + + public String getBerichtIdValue() { + return this.berichtIdValue ; + } + + public void setStatusValue(String statusValue) { + this.statusValue = statusValue; + } + + public String getStatusValue() { + return this.statusValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + 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(SettingDefiningcode settingDefiningcode) { + this.settingDefiningcode = settingDefiningcode; + } + + public SettingDefiningcode getSettingDefiningcode() { + return this.settingDefiningcode ; + } + + public void setKorpergewicht(List korpergewicht) { + this.korpergewicht = korpergewicht; + } + + public List getKorpergewicht() { + return this.korpergewicht ; + } + + 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 setCategoryDefiningcode(CategoryDefiningcode categoryDefiningcode) { + this.categoryDefiningcode = categoryDefiningcode; + } + + public CategoryDefiningcode getCategoryDefiningcode() { + return this.categoryDefiningcode ; + } + + 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/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsCompositionContainment.java new file mode 100644 index 000000000..1b592ded3 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsCompositionContainment.java @@ -0,0 +1,61 @@ +package org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.Participation; +import com.nedap.archie.rm.generic.PartyIdentified; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition.KorpergewichtObservation; +import org.ehrbase.client.classgenerator.shareddefinition.CategoryDefiningcode; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.SettingDefiningcode; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; + +import java.time.temporal.TemporalAccessor; + +public class AlternativeEventsCompositionContainment extends Containment { + public SelectAqlField ALTERNATIVE_EVENTS_COMPOSITION = new AqlFieldImp(AlternativeEventsComposition.class, "", "AlternativeEventsComposition", AlternativeEventsComposition.class, this); + + public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); + + public SelectAqlField STATUS_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "statusValue", String.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(AlternativeEventsComposition.class, "/context/other_context[at0001]/items[at0006]", "erweiterung", Cluster.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(AlternativeEventsComposition.class, "/context/participations", "participations", Participation.class, this); + + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + + public SelectAqlField LOCATION = new AqlFieldImp(AlternativeEventsComposition.class, "/context/location", "location", String.class, this); + + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(AlternativeEventsComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + + public SelectAqlField SETTING_DEFININGCODE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/setting|defining_code", "settingDefiningcode", SettingDefiningcode.class, this); + + public ListSelectAqlField KORPERGEWICHT = new ListAqlFieldImp(AlternativeEventsComposition.class, "/content[openEHR-EHR-OBSERVATION.body_weight.v2]", "korpergewicht", KorpergewichtObservation.class, this); + + public SelectAqlField COMPOSER = new AqlFieldImp(AlternativeEventsComposition.class, "/composer", "composer", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(AlternativeEventsComposition.class, "/language", "language", Language.class, this); + + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AlternativeEventsComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + + public SelectAqlField CATEGORY_DEFININGCODE = new AqlFieldImp(AlternativeEventsComposition.class, "/category|defining_code", "categoryDefiningcode", CategoryDefiningcode.class, this); + + public SelectAqlField TERRITORY = new AqlFieldImp(AlternativeEventsComposition.class, "/territory", "territory", Territory.class, this); + + private AlternativeEventsCompositionContainment() { + super("openEHR-EHR-COMPOSITION.report.v1"); + } + + public static AlternativeEventsCompositionContainment getInstance() { + return new AlternativeEventsCompositionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/AnyEventEnIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/AnyEventEnIntervalEvent.java new file mode 100644 index 000000000..0e3a70a61 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/AnyEventEnIntervalEvent.java @@ -0,0 +1,102 @@ +package org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition; + +import com.nedap.archie.rm.datatypes.CodePhrase; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.util.List; + +@Entity +@OptionFor("INTERVAL_EVENT") +public class AnyEventEnIntervalEvent implements KorpergewichtAnyEventEnChoice { + @Path("/data[at0001]/items[at0004]/value|magnitude") + private Double gewichtMagnitude; + + @Path("/data[at0001]/items[at0004]/value|units") + private String gewichtUnits; + + @Path("/data[at0001]/items[at0024]/value|value") + private String commentEnValue; + + @Path("/state[at0008]/items[at0009]/value|defining_code") + private StateOfDressEnDefiningcode stateOfDressEnDefiningcode; + + @Path("/state[at0008]/items[at0025]") + private List confoundingFactorsEn; + + @Path("/time|value") + private TemporalAccessor timeValue; + + @Path("/width|value") + private TemporalAmount nullValue; + + @Path("/math_function|defining_code") + private CodePhrase nullDefiningcode; + + public void setGewichtMagnitude(Double gewichtMagnitude) { + this.gewichtMagnitude = gewichtMagnitude; + } + + public Double getGewichtMagnitude() { + return this.gewichtMagnitude ; + } + + public void setGewichtUnits(String gewichtUnits) { + this.gewichtUnits = gewichtUnits; + } + + public String getGewichtUnits() { + return this.gewichtUnits ; + } + + public void setCommentEnValue(String commentEnValue) { + this.commentEnValue = commentEnValue; + } + + public String getCommentEnValue() { + return this.commentEnValue ; + } + + public void setStateOfDressEnDefiningcode(StateOfDressEnDefiningcode stateOfDressEnDefiningcode) { + this.stateOfDressEnDefiningcode = stateOfDressEnDefiningcode; + } + + public StateOfDressEnDefiningcode getStateOfDressEnDefiningcode() { + return this.stateOfDressEnDefiningcode ; + } + + public void setConfoundingFactorsEn(List confoundingFactorsEn) { + this.confoundingFactorsEn = confoundingFactorsEn; + } + + public List getConfoundingFactorsEn() { + return this.confoundingFactorsEn ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setNullValue(TemporalAmount nullValue) { + this.nullValue = nullValue; + } + + public TemporalAmount getNullValue() { + return this.nullValue ; + } + + public void setNullDefiningcode(CodePhrase nullDefiningcode) { + this.nullDefiningcode = nullDefiningcode; + } + + public CodePhrase getNullDefiningcode() { + return this.nullDefiningcode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/AnyEventEnPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/AnyEventEnPointEvent.java new file mode 100644 index 000000000..3292a0278 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/AnyEventEnPointEvent.java @@ -0,0 +1,78 @@ +package org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@OptionFor("POINT_EVENT") +public class AnyEventEnPointEvent implements KorpergewichtAnyEventEnChoice { + @Path("/data[at0001]/items[at0004]/value|magnitude") + private Double gewichtMagnitude; + + @Path("/data[at0001]/items[at0004]/value|units") + private String gewichtUnits; + + @Path("/data[at0001]/items[at0024]/value|value") + private String commentEnValue; + + @Path("/state[at0008]/items[at0009]/value|defining_code") + private StateOfDressEnDefiningcode stateOfDressEnDefiningcode; + + @Path("/state[at0008]/items[at0025]") + private List confoundingFactorsEn; + + @Path("/time|value") + private TemporalAccessor timeValue; + + public void setGewichtMagnitude(Double gewichtMagnitude) { + this.gewichtMagnitude = gewichtMagnitude; + } + + public Double getGewichtMagnitude() { + return this.gewichtMagnitude ; + } + + public void setGewichtUnits(String gewichtUnits) { + this.gewichtUnits = gewichtUnits; + } + + public String getGewichtUnits() { + return this.gewichtUnits ; + } + + public void setCommentEnValue(String commentEnValue) { + this.commentEnValue = commentEnValue; + } + + public String getCommentEnValue() { + return this.commentEnValue ; + } + + public void setStateOfDressEnDefiningcode(StateOfDressEnDefiningcode stateOfDressEnDefiningcode) { + this.stateOfDressEnDefiningcode = stateOfDressEnDefiningcode; + } + + public StateOfDressEnDefiningcode getStateOfDressEnDefiningcode() { + return this.stateOfDressEnDefiningcode ; + } + + public void setConfoundingFactorsEn(List confoundingFactorsEn) { + this.confoundingFactorsEn = confoundingFactorsEn; + } + + public List getConfoundingFactorsEn() { + return this.confoundingFactorsEn ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/BirthEnPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/BirthEnPointEvent.java new file mode 100644 index 000000000..4079f12e2 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/BirthEnPointEvent.java @@ -0,0 +1,76 @@ +package org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +public class BirthEnPointEvent { + @Path("/data[at0001]/items[at0004]/value|magnitude") + private Double gewichtMagnitude; + + @Path("/data[at0001]/items[at0004]/value|units") + private String gewichtUnits; + + @Path("/data[at0001]/items[at0024]/value|value") + private String commentEnValue; + + @Path("/state[at0008]/items[at0009]/value|defining_code") + private StateOfDressEnDefiningcode stateOfDressEnDefiningcode; + + @Path("/state[at0008]/items[at0025]") + private List confoundingFactorsEn; + + @Path("/time|value") + private TemporalAccessor timeValue; + + public void setGewichtMagnitude(Double gewichtMagnitude) { + this.gewichtMagnitude = gewichtMagnitude; + } + + public Double getGewichtMagnitude() { + return this.gewichtMagnitude ; + } + + public void setGewichtUnits(String gewichtUnits) { + this.gewichtUnits = gewichtUnits; + } + + public String getGewichtUnits() { + return this.gewichtUnits ; + } + + public void setCommentEnValue(String commentEnValue) { + this.commentEnValue = commentEnValue; + } + + public String getCommentEnValue() { + return this.commentEnValue ; + } + + public void setStateOfDressEnDefiningcode(StateOfDressEnDefiningcode stateOfDressEnDefiningcode) { + this.stateOfDressEnDefiningcode = stateOfDressEnDefiningcode; + } + + public StateOfDressEnDefiningcode getStateOfDressEnDefiningcode() { + return this.stateOfDressEnDefiningcode ; + } + + public void setConfoundingFactorsEn(List confoundingFactorsEn) { + this.confoundingFactorsEn = confoundingFactorsEn; + } + + public List getConfoundingFactorsEn() { + return this.confoundingFactorsEn ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/ConfoundingFactorsEnElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/ConfoundingFactorsEnElement.java new file mode 100644 index 000000000..5b03a1280 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/ConfoundingFactorsEnElement.java @@ -0,0 +1,18 @@ +package org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class ConfoundingFactorsEnElement { + @Path("/value|value") + private String confoundingFactorsEnValue; + + public void setConfoundingFactorsEnValue(String confoundingFactorsEnValue) { + this.confoundingFactorsEnValue = confoundingFactorsEnValue; + } + + public String getConfoundingFactorsEnValue() { + return this.confoundingFactorsEnValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java new file mode 100644 index 000000000..5edcfe9d4 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition; + +public interface KorpergewichtAnyEventEnChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservation.java new file mode 100644 index 000000000..07a960e8b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservation.java @@ -0,0 +1,94 @@ +package org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +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.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.body_weight.v2") +public class KorpergewichtObservation { + @Path("/data[at0002]/events[at0026]") + private BirthEnPointEvent birthEn; + + @Path("/data[at0002]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0015]/items[at0020]") + private Cluster gerat; + + @Path("/protocol[at0015]/items[at0027]") + private List extensionEn; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + @Path("/data[at0002]/events[at0003]") + @Choice + private List anyEventEn; + + public void setBirthEn(BirthEnPointEvent birthEn) { + this.birthEn = birthEn; + } + + public BirthEnPointEvent getBirthEn() { + return this.birthEn ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setGerat(Cluster gerat) { + this.gerat = gerat; + } + + public Cluster getGerat() { + return this.gerat ; + } + + public void setExtensionEn(List extensionEn) { + this.extensionEn = extensionEn; + } + + public List getExtensionEn() { + return this.extensionEn ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setAnyEventEn(List anyEventEn) { + this.anyEventEn = anyEventEn; + } + + public List getAnyEventEn() { + return this.anyEventEn ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java new file mode 100644 index 000000000..6ef8ddea1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java @@ -0,0 +1,38 @@ +package org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; + +public class KorpergewichtObservationContainment extends Containment { + public SelectAqlField KORPERGEWICHT_OBSERVATION = new AqlFieldImp(KorpergewichtObservation.class, "", "KorpergewichtObservation", KorpergewichtObservation.class, this); + + public SelectAqlField BIRTH_EN = new AqlFieldImp(KorpergewichtObservation.class, "/data[at0002]/events[at0026]", "birthEn", BirthEnPointEvent.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(KorpergewichtObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); + + public SelectAqlField GERAT = new AqlFieldImp(KorpergewichtObservation.class, "/protocol[at0015]/items[at0020]", "gerat", Cluster.class, this); + + public ListSelectAqlField EXTENSION_EN = new ListAqlFieldImp(KorpergewichtObservation.class, "/protocol[at0015]/items[at0027]", "extensionEn", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(KorpergewichtObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(KorpergewichtObservation.class, "/language", "language", Language.class, this); + + public ListSelectAqlField ANY_EVENT_EN = new ListAqlFieldImp(KorpergewichtObservation.class, "/data[at0002]/events[at0003]", "anyEventEn", KorpergewichtAnyEventEnChoice.class, this); + + private KorpergewichtObservationContainment() { + super("openEHR-EHR-OBSERVATION.body_weight.v2"); + } + + public static KorpergewichtObservationContainment getInstance() { + return new KorpergewichtObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/StateOfDressEnDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/StateOfDressEnDefiningcode.java new file mode 100644 index 000000000..74d32fa45 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/StateOfDressEnDefiningcode.java @@ -0,0 +1,46 @@ +package org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum StateOfDressEnDefiningcode implements EnumValueSet { + N_UNTERWASCHE("Leicht bekleidet / Unterwäsche", "Bekleidung, die nicht signifikant zum Gewicht beiträgt.", "local", "at0011"), + + UNBEKLEIDET("Unbekleidet", "Ohne Kleidung.", "local", "at0013"), + + N_FULLY_CLOTHED_WITHOUT_SHOES_EN("*Fully clothed, without shoes (en)", "*Clothing which may add significantly to weight. (en)", "local", "at0028"), + + WINDEL("Windel", "Trägt Windel; kann signifikant zum Gewicht beitragen.", "local", "at0017"), + + VOLL_BEKLEIDET_MIT_SCHUHEN("Voll bekleidet, mit Schuhen", "Bekleidung, die signifikant zum Gewicht beiträgt, mit Schuhen.", "local", "at0010"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + StateOfDressEnDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java new file mode 100644 index 000000000..35fc16fec --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java @@ -0,0 +1,182 @@ +package org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.generic.Participation; +import com.nedap.archie.rm.generic.PartyIdentified; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Id; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.annotations.Template; +import org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.BloodPressureTrainingSampleObservation; +import org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.DeviceDetailsTrainingSampleCluster; +import org.ehrbase.client.classgenerator.shareddefinition.CategoryDefiningcode; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.SettingDefiningcode; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; +import org.ehrbase.client.openehrclient.VersionUid; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-COMPOSITION.sample_encounter.v1") +@Template("ehrbase_blood_pressure_simple.de.v0") +public class EhrbaseBloodPressureSimpleDeV0Composition { + @Path("/context/other_context[at0001]/items[at0006]/items[openEHR-EHR-CLUSTER.sample_device.v1]") + private List deviceDetailsTrainingSample; + + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; + + @Path("/context/participations") + private List participations; + + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + @Path("/context/location") + private String location; + + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; + + @Path("/context/setting|defining_code") + private SettingDefiningcode settingDefiningcode; + + @Path("/content[openEHR-EHR-OBSERVATION.sample_blood_pressure.v1]") + private List bloodPressureTrainingSample; + + @Path("/composer") + private PartyProxy composer; + + @Path("/language") + private Language language; + + @Path("/feeder_audit") + private FeederAudit feederAudit; + + @Path("/category|defining_code") + private CategoryDefiningcode categoryDefiningcode; + + @Path("/territory") + private Territory territory; + + @Id + private VersionUid versionUid; + + public void setDeviceDetailsTrainingSample( + List deviceDetailsTrainingSample) { + this.deviceDetailsTrainingSample = deviceDetailsTrainingSample; + } + + public List getDeviceDetailsTrainingSample() { + return this.deviceDetailsTrainingSample ; + } + + 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(SettingDefiningcode settingDefiningcode) { + this.settingDefiningcode = settingDefiningcode; + } + + public SettingDefiningcode getSettingDefiningcode() { + return this.settingDefiningcode ; + } + + public void setBloodPressureTrainingSample( + List bloodPressureTrainingSample) { + this.bloodPressureTrainingSample = bloodPressureTrainingSample; + } + + public List getBloodPressureTrainingSample() { + return this.bloodPressureTrainingSample ; + } + + 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 setCategoryDefiningcode(CategoryDefiningcode categoryDefiningcode) { + this.categoryDefiningcode = categoryDefiningcode; + } + + public CategoryDefiningcode getCategoryDefiningcode() { + return this.categoryDefiningcode ; + } + + 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/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java new file mode 100644 index 000000000..d944808b6 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java @@ -0,0 +1,57 @@ +package org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.generic.Participation; +import com.nedap.archie.rm.generic.PartyIdentified; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.BloodPressureTrainingSampleObservation; +import org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.DeviceDetailsTrainingSampleCluster; +import org.ehrbase.client.classgenerator.shareddefinition.CategoryDefiningcode; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.SettingDefiningcode; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; + +import java.time.temporal.TemporalAccessor; + +public class EhrbaseBloodPressureSimpleDeV0CompositionContainment extends Containment { + public SelectAqlField EHRBASE_BLOOD_PRESSURE_SIMPLE_DE_V0_COMPOSITION = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "", "EhrbaseBloodPressureSimpleDeV0Composition", EhrbaseBloodPressureSimpleDeV0Composition.class, this); + + public ListSelectAqlField DEVICE_DETAILS_TRAINING_SAMPLE = new ListAqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/other_context[at0001]/items[at0006]/items[openEHR-EHR-CLUSTER.sample_device.v1]", "deviceDetailsTrainingSample", DeviceDetailsTrainingSampleCluster.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/participations", "participations", Participation.class, this); + + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + + public SelectAqlField LOCATION = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/location", "location", String.class, this); + + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + + public SelectAqlField SETTING_DEFININGCODE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/setting|defining_code", "settingDefiningcode", SettingDefiningcode.class, this); + + public ListSelectAqlField BLOOD_PRESSURE_TRAINING_SAMPLE = new ListAqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/content[openEHR-EHR-OBSERVATION.sample_blood_pressure.v1]", "bloodPressureTrainingSample", BloodPressureTrainingSampleObservation.class, this); + + public SelectAqlField COMPOSER = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/composer", "composer", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/language", "language", Language.class, this); + + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + + public SelectAqlField CATEGORY_DEFININGCODE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/category|defining_code", "categoryDefiningcode", CategoryDefiningcode.class, this); + + public SelectAqlField TERRITORY = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/territory", "territory", Territory.class, this); + + private EhrbaseBloodPressureSimpleDeV0CompositionContainment() { + super("openEHR-EHR-COMPOSITION.sample_encounter.v1"); + } + + public static EhrbaseBloodPressureSimpleDeV0CompositionContainment getInstance() { + return new EhrbaseBloodPressureSimpleDeV0CompositionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java new file mode 100644 index 000000000..ba5dcc38c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java @@ -0,0 +1,248 @@ +package org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.sample_blood_pressure.v1") +public class BloodPressureTrainingSampleObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude") + private Double systolicMagnitude; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units") + private String systolicUnits; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|magnitude") + private Double diastolicMagnitude; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|units") + private String diastolicUnits; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|magnitude") + private Double meanArterialPressureMagnitude; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|units") + private String meanArterialPressureUnits; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|magnitude") + private Double pulsePressureMagnitude; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|units") + private String pulsePressureUnits; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0033]/value|value") + private String commentValue; + + @Path("/data[at0001]/events[at0002]/state[at0007]/items[at0008]/value|defining_code") + private PositionDefiningcode positionDefiningcode; + + @Path("/data[at0001]/events[at0002]/state[at0007]/items[at1030]") + private List levelOfExertion; + + @Path("/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|magnitude") + private Double tiltMagnitude; + + @Path("/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|units") + private String tiltUnits; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0011]/items[at0013]/value|defining_code") + private CuffSizeDefiningcode cuffSizeDefiningcode; + + @Path("/protocol[at0011]/items[at0014]/value|defining_code") + private LocationOfMeasurementDefiningcode locationOfMeasurementDefiningcode; + + @Path("/protocol[at0011]/items[at1010]/value|defining_code") + private KorotkoffSoundsDefiningcode korotkoffSoundsDefiningcode; + + @Path("/protocol[at0011]/items[at1025]") + private List device; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setSystolicMagnitude(Double systolicMagnitude) { + this.systolicMagnitude = systolicMagnitude; + } + + public Double getSystolicMagnitude() { + return this.systolicMagnitude ; + } + + public void setSystolicUnits(String systolicUnits) { + this.systolicUnits = systolicUnits; + } + + public String getSystolicUnits() { + return this.systolicUnits ; + } + + public void setDiastolicMagnitude(Double diastolicMagnitude) { + this.diastolicMagnitude = diastolicMagnitude; + } + + public Double getDiastolicMagnitude() { + return this.diastolicMagnitude ; + } + + public void setDiastolicUnits(String diastolicUnits) { + this.diastolicUnits = diastolicUnits; + } + + public String getDiastolicUnits() { + return this.diastolicUnits ; + } + + public void setMeanArterialPressureMagnitude(Double meanArterialPressureMagnitude) { + this.meanArterialPressureMagnitude = meanArterialPressureMagnitude; + } + + public Double getMeanArterialPressureMagnitude() { + return this.meanArterialPressureMagnitude ; + } + + public void setMeanArterialPressureUnits(String meanArterialPressureUnits) { + this.meanArterialPressureUnits = meanArterialPressureUnits; + } + + public String getMeanArterialPressureUnits() { + return this.meanArterialPressureUnits ; + } + + public void setPulsePressureMagnitude(Double pulsePressureMagnitude) { + this.pulsePressureMagnitude = pulsePressureMagnitude; + } + + public Double getPulsePressureMagnitude() { + return this.pulsePressureMagnitude ; + } + + public void setPulsePressureUnits(String pulsePressureUnits) { + this.pulsePressureUnits = pulsePressureUnits; + } + + public String getPulsePressureUnits() { + return this.pulsePressureUnits ; + } + + public void setCommentValue(String commentValue) { + this.commentValue = commentValue; + } + + public String getCommentValue() { + return this.commentValue ; + } + + public void setPositionDefiningcode(PositionDefiningcode positionDefiningcode) { + this.positionDefiningcode = positionDefiningcode; + } + + public PositionDefiningcode getPositionDefiningcode() { + return this.positionDefiningcode ; + } + + public void setLevelOfExertion(List levelOfExertion) { + this.levelOfExertion = levelOfExertion; + } + + public List getLevelOfExertion() { + return this.levelOfExertion ; + } + + public void setTiltMagnitude(Double tiltMagnitude) { + this.tiltMagnitude = tiltMagnitude; + } + + public Double getTiltMagnitude() { + return this.tiltMagnitude ; + } + + public void setTiltUnits(String tiltUnits) { + this.tiltUnits = tiltUnits; + } + + public String getTiltUnits() { + return this.tiltUnits ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setCuffSizeDefiningcode(CuffSizeDefiningcode cuffSizeDefiningcode) { + this.cuffSizeDefiningcode = cuffSizeDefiningcode; + } + + public CuffSizeDefiningcode getCuffSizeDefiningcode() { + return this.cuffSizeDefiningcode ; + } + + public void setLocationOfMeasurementDefiningcode( + LocationOfMeasurementDefiningcode locationOfMeasurementDefiningcode) { + this.locationOfMeasurementDefiningcode = locationOfMeasurementDefiningcode; + } + + public LocationOfMeasurementDefiningcode getLocationOfMeasurementDefiningcode() { + return this.locationOfMeasurementDefiningcode ; + } + + public void setKorotkoffSoundsDefiningcode( + KorotkoffSoundsDefiningcode korotkoffSoundsDefiningcode) { + this.korotkoffSoundsDefiningcode = korotkoffSoundsDefiningcode; + } + + public KorotkoffSoundsDefiningcode getKorotkoffSoundsDefiningcode() { + return this.korotkoffSoundsDefiningcode ; + } + + public void setDevice(List device) { + this.device = device; + } + + public List getDevice() { + return this.device ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java new file mode 100644 index 000000000..17bb5619e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java @@ -0,0 +1,66 @@ +package org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; + +public class BloodPressureTrainingSampleObservationContainment extends Containment { + public SelectAqlField BLOOD_PRESSURE_TRAINING_SAMPLE_OBSERVATION = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "", "BloodPressureTrainingSampleObservation", BloodPressureTrainingSampleObservation.class, this); + + public SelectAqlField SYSTOLIC_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude", "systolicMagnitude", Double.class, this); + + public SelectAqlField SYSTOLIC_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units", "systolicUnits", String.class, this); + + public SelectAqlField DIASTOLIC_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|magnitude", "diastolicMagnitude", Double.class, this); + + public SelectAqlField DIASTOLIC_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|units", "diastolicUnits", String.class, this); + + public SelectAqlField MEAN_ARTERIAL_PRESSURE_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|magnitude", "meanArterialPressureMagnitude", Double.class, this); + + public SelectAqlField MEAN_ARTERIAL_PRESSURE_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|units", "meanArterialPressureUnits", String.class, this); + + public SelectAqlField PULSE_PRESSURE_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|magnitude", "pulsePressureMagnitude", Double.class, this); + + public SelectAqlField PULSE_PRESSURE_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|units", "pulsePressureUnits", String.class, this); + + public SelectAqlField COMMENT_VALUE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0033]/value|value", "commentValue", String.class, this); + + public SelectAqlField POSITION_DEFININGCODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/state[at0007]/items[at0008]/value|defining_code", "positionDefiningcode", PositionDefiningcode.class, this); + + public ListSelectAqlField LEVEL_OF_EXERTION = new ListAqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/state[at0007]/items[at1030]", "levelOfExertion", Cluster.class, this); + + public SelectAqlField TILT_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|magnitude", "tiltMagnitude", Double.class, this); + + public SelectAqlField TILT_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|units", "tiltUnits", String.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public SelectAqlField CUFF_SIZE_DEFININGCODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at0013]/value|defining_code", "cuffSizeDefiningcode", CuffSizeDefiningcode.class, this); + + public SelectAqlField LOCATION_OF_MEASUREMENT_DEFININGCODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at0014]/value|defining_code", "locationOfMeasurementDefiningcode", LocationOfMeasurementDefiningcode.class, this); + + public SelectAqlField KOROTKOFF_SOUNDS_DEFININGCODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at1010]/value|defining_code", "korotkoffSoundsDefiningcode", KorotkoffSoundsDefiningcode.class, this); + + public ListSelectAqlField DEVICE = new ListAqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at1025]", "device", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/language", "language", Language.class, this); + + private BloodPressureTrainingSampleObservationContainment() { + super("openEHR-EHR-OBSERVATION.sample_blood_pressure.v1"); + } + + public static BloodPressureTrainingSampleObservationContainment getInstance() { + return new BloodPressureTrainingSampleObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningcode.java new file mode 100644 index 000000000..23118e779 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningcode.java @@ -0,0 +1,52 @@ +package org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum CuffSizeDefiningcode implements EnumValueSet { + CHILD("Paediatric/Child", "A cuff that is appropriate for a child or thin arm - bladder approx 8cm x 21\n" + + " cm\n" + + " ", "local", "at0017"), + + ADULT_THIGH("Adult Thigh", "A cuff used for an adult thigh - bladder approx 20cm x 42 cm", "local", "at1008"), + + LARGE_ADULT("Large Adult", "A cuff for adults with larger arms - bladder approx 16cm x 38cm", "local", "at0016"), + + ADULT("Adult", "A cuff that is standard for an adult - bladder approx 13cm x 30cm", "local", "at0015"), + + INFANT("Infant", "A cuff used for infants - bladder approx 5cm x 15cm", "local", "at1018"), + + NEONATAL("Neonatal", "A cuff used for a new born - bladder approx 3cm x 6cm", "local", "at1009"), + + SMALL_ADULT("Small Adult", "A cuff used for a small adult - bladder approx 10cm x 24 cm", "local", "at1019"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + CuffSizeDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java new file mode 100644 index 000000000..a5f459ab7 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java @@ -0,0 +1,111 @@ +package org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +import java.time.temporal.TemporalAccessor; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.sample_device.v1") +public class DeviceDetailsTrainingSampleCluster { + @Path("/items[at0001]/value|value") + private String nameValue; + + @Path("/items[at0002]/value|value") + private String descriptionValue; + + @Path("/items[at0004]/items[at0003]/value|value") + private String manufacturerValue; + + @Path("/items[at0004]/items[at0005]/value|value") + private String modelValue; + + @Path("/items[at0004]/items[at0006]/value|value") + private String serialNumberValue; + + @Path("/items[at0007]") + private Cluster components; + + @Path("/items[at0008]/items[at0009]/value|value") + private TemporalAccessor dateLastServicedValue; + + @Path("/items[at0008]/items[at0010]/value|value") + private TemporalAccessor dateLastCalibrationValue; + + @Path("/items[at0008]/items[at0011]/value|value") + private String servicedByValue; + + public void setNameValue(String nameValue) { + this.nameValue = nameValue; + } + + public String getNameValue() { + return this.nameValue ; + } + + public void setDescriptionValue(String descriptionValue) { + this.descriptionValue = descriptionValue; + } + + public String getDescriptionValue() { + return this.descriptionValue ; + } + + public void setManufacturerValue(String manufacturerValue) { + this.manufacturerValue = manufacturerValue; + } + + public String getManufacturerValue() { + return this.manufacturerValue ; + } + + public void setModelValue(String modelValue) { + this.modelValue = modelValue; + } + + public String getModelValue() { + return this.modelValue ; + } + + public void setSerialNumberValue(String serialNumberValue) { + this.serialNumberValue = serialNumberValue; + } + + public String getSerialNumberValue() { + return this.serialNumberValue ; + } + + public void setComponents(Cluster components) { + this.components = components; + } + + public Cluster getComponents() { + return this.components ; + } + + public void setDateLastServicedValue(TemporalAccessor dateLastServicedValue) { + this.dateLastServicedValue = dateLastServicedValue; + } + + public TemporalAccessor getDateLastServicedValue() { + return this.dateLastServicedValue ; + } + + public void setDateLastCalibrationValue(TemporalAccessor dateLastCalibrationValue) { + this.dateLastCalibrationValue = dateLastCalibrationValue; + } + + public TemporalAccessor getDateLastCalibrationValue() { + return this.dateLastCalibrationValue ; + } + + public void setServicedByValue(String servicedByValue) { + this.servicedByValue = servicedByValue; + } + + public String getServicedByValue() { + return this.servicedByValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java new file mode 100644 index 000000000..4f20d1668 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java @@ -0,0 +1,38 @@ +package org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +import java.time.temporal.TemporalAccessor; + +public class DeviceDetailsTrainingSampleClusterContainment extends Containment { + public SelectAqlField DEVICE_DETAILS_TRAINING_SAMPLE_CLUSTER = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "", "DeviceDetailsTrainingSampleCluster", DeviceDetailsTrainingSampleCluster.class, this); + + public SelectAqlField NAME_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0001]/value|value", "nameValue", String.class, this); + + public SelectAqlField DESCRIPTION_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0002]/value|value", "descriptionValue", String.class, this); + + public SelectAqlField MANUFACTURER_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0004]/items[at0003]/value|value", "manufacturerValue", String.class, this); + + public SelectAqlField MODEL_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0004]/items[at0005]/value|value", "modelValue", String.class, this); + + public SelectAqlField SERIAL_NUMBER_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0004]/items[at0006]/value|value", "serialNumberValue", String.class, this); + + public SelectAqlField COMPONENTS = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0007]", "components", Cluster.class, this); + + public SelectAqlField DATE_LAST_SERVICED_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0008]/items[at0009]/value|value", "dateLastServicedValue", TemporalAccessor.class, this); + + public SelectAqlField DATE_LAST_CALIBRATION_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0008]/items[at0010]/value|value", "dateLastCalibrationValue", TemporalAccessor.class, this); + + public SelectAqlField SERVICED_BY_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0008]/items[at0011]/value|value", "servicedByValue", String.class, this); + + private DeviceDetailsTrainingSampleClusterContainment() { + super("openEHR-EHR-CLUSTER.sample_device.v1"); + } + + public static DeviceDetailsTrainingSampleClusterContainment getInstance() { + return new DeviceDetailsTrainingSampleClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningcode.java new file mode 100644 index 000000000..5fc9437e5 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningcode.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum KorotkoffSoundsDefiningcode implements EnumValueSet { + FIFTH_SOUND("Fifth sound", "The fifth Korotkoff sound is identified by absence of sounds as the cuff\n" + + " pressure drops below the diastolic blood pressure\n" + + " ", "local", "at1012"), + + FOURTH_SOUND("Fourth sound", "The fourth Korotkoff sound is identified as an abrupt muffling of sounds\n" + + " ", "local", "at1011"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + KorotkoffSoundsDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningcode.java new file mode 100644 index 000000000..2f2d4e830 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningcode.java @@ -0,0 +1,57 @@ +package org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum LocationOfMeasurementDefiningcode implements EnumValueSet { + LEFT_THIGH("Left thigh", "The left thigh of the person", "local", "at0028"), + + INTRA_ARTERIAL("Intra-arterial", "Blood pressure monitored via an intra-arterial line", "local", "at0032"), + + FINGER("Finger", "A finger of the person", "local", "at1026"), + + RIGHT_ANKLE("Right ankle", "The right ankle of the person", "local", "at1031"), + + LEFT_WRIST("Left wrist", "The left wrist of the person", "local", "at1021"), + + RIGHT_WRIST("Right wrist", "The right wrist of the person", "local", "at1020"), + + LEFT_ARM("Left arm", "The left arm of the person", "local", "at0026"), + + LEFT_ANKLE("Left ankle", "The left ankle of the person", "local", "at1032"), + + RIGHT_THIGH("Right thigh", "The right thigh of the person", "local", "at0027"), + + RIGHT_ARM("Right arm", "The right arm of the person", "local", "at0025"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + LocationOfMeasurementDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningcode.java new file mode 100644 index 000000000..439270489 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningcode.java @@ -0,0 +1,52 @@ +package org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum PositionDefiningcode implements EnumValueSet { + STANDING("Standing", "Standing at the time of blood pressure measurement", "local", "at1000"), + + LYING("Lying", "Lying flat at the time of blood pressure measurement", "local", "at1003"), + + RECLINING("Reclining", "Reclining at the time of blood pressure measurement", "local", "at1002"), + + TRENDELENBURG("Trendelenburg", "Lying flat on the back (supine position) with the feet higher than the head\n" + + " at the time of blood pressure measurement\n" + + " ", "local", "at1013"), + + LEFT_LATERAL("Left Lateral", "Lying on the left side at the time of blood pressure measurement", "local", "at1014"), + + SITTING("Sitting", "Sitting (for example on bed or chair) at the time of blood pressure\n" + + " measurement\n" + + " ", "local", "at1001"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + PositionDefiningcode(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/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java index 8adeef2b9..8580b8140 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java @@ -38,11 +38,19 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Id; +import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.annotations.Template; import org.ehrbase.client.classgenerator.config.RmClassGeneratorConfig; +import org.ehrbase.client.classgenerator.shareddefinition.CategoryDefiningcode; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.MathFunctionDefiningcode; +import org.ehrbase.client.classgenerator.shareddefinition.SettingDefiningcode; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.flattener.PathExtractor; import org.ehrbase.client.introspect.TemplateIntrospect; +import org.ehrbase.client.openehrclient.VersionUid; import org.ehrbase.serialisation.util.SnakeCase; import org.ehrbase.terminology.client.terminology.TermDefinition; import org.ehrbase.terminology.client.terminology.ValueSet; @@ -80,6 +88,7 @@ public class ClassGeneratorNew { private static class Context { final MultiValuedMap classes = new ArrayListValuedHashMap<>(); final Deque nodeDeque = new ArrayDeque<>(); + final Map currentTypeSpec = new HashMap<>(); String currentMainClass; final Deque currentArchetypeName = new ArrayDeque<>(); final Map currentClassNameMap = new HashMap<>(); @@ -103,6 +112,7 @@ public ClassGeneratorResult generate(String packageName, WebTemplate webTemplate .addMember(Template.VALUE, "$S", webTemplate.getTemplateId()) .build(); builder.addAnnotation(templateAnnotation); + addVersionUid(builder); context.classes.put( packageName + "." + context.currentMainClass.toLowerCase(), builder.build()); @@ -112,6 +122,16 @@ public ClassGeneratorResult generate(String packageName, WebTemplate webTemplate return generatorResult; } + private void addVersionUid(TypeSpec.Builder classBuilder) { + FieldSpec versionUid = + FieldSpec.builder(VersionUid.class, "versionUid", Modifier.PRIVATE) + .addAnnotation(Id.class) + .build(); + classBuilder.addField(versionUid); + classBuilder.addMethod(buildGetter(versionUid)); + classBuilder.addMethod(buildSetter(versionUid)); + } + private TypeSpec.Builder build(Context context, WebTemplateNode next) { String name; @@ -128,7 +148,7 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { } context.currentFieldNameMap.push(new HashMap<>()); - + context.nodeDeque.push(next); TypeSpec.Builder classBuilder = TypeSpec.classBuilder(className); if (StringUtils.isBlank(context.currentMainClass)) { @@ -146,7 +166,39 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { } Map> choices = next.getChoicesInChildren(); - for (WebTemplateNode child : next.getChildren()) { + List children = + next.getChildren().stream() + .filter(c -> !choices.containsValue(c)) + .collect(Collectors.toList()); + + if (children.stream().anyMatch(n -> n.getRmType().equals("EVENT"))) { + WebTemplateNode event = + children.stream().filter(n -> n.getRmType().equals("EVENT")).findAny().get(); + WebTemplateNode pointEvent = new WebTemplateNode(event); + WebTemplateNode intervalEvent = new WebTemplateNode(event); + pointEvent.setRmType("POINT_EVENT"); + intervalEvent.setRmType("INTERVAL_EVENT"); + WebTemplateNode width = new WebTemplateNode(); + width.setId("width"); + width.setName("width"); + width.setRmType("DV_DURATION"); + width.setMax(1); + width.setAqlPath(event.getAqlPath() + "/width"); + intervalEvent.getChildren().add(width); + WebTemplateNode math = new WebTemplateNode(); + math.setId("math_function"); + math.setName("math_function"); + math.setRmType("DV_CODED_TEXT"); + math.setMax(1); + math.setAqlPath(event.getAqlPath() + "/math_function"); + intervalEvent.getChildren().add(math); + choices.put(intervalEvent.getAqlPath(), List.of(intervalEvent, pointEvent)); + children.add(intervalEvent); + children.add(pointEvent); + children.remove(event); + } + + for (WebTemplateNode child : children) { String relativPath = FlatPath.removeStart(new FlatPath(child.getAqlPath()), new FlatPath(next.getAqlPath())) .toString(); @@ -157,6 +209,46 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { addComplexField(context, classBuilder, relativPath, child); } } + + for (List choice : choices.values()) { + TypeSpec interfaceSpec = + TypeSpec.interfaceBuilder( + buildClassName(context, choice.get(0).getName() + "_choice", true)) + .addModifiers(Modifier.PUBLIC) + .build(); + + String interfacePackage = + context.currentPackageName + "." + context.currentMainClass.toLowerCase() + ".definition"; + context.classes.put(interfacePackage, interfaceSpec); + TypeName interfaceClassName = ClassName.get(interfacePackage, interfaceSpec.name); + + for (WebTemplateNode child : choice) { + TypeSpec.Builder build = build(context, child); + build + .addSuperinterface(interfaceClassName) + .addAnnotation( + AnnotationSpec.builder(OptionFor.class) + .addMember(OptionFor.VALUE, "$S", child.getRmType()) + .build()); + context.classes.put(interfacePackage, build.build()); + } + if (choice.stream().anyMatch(WebTemplateNode::isMulti)) { + interfaceClassName = + ParameterizedTypeName.get(ClassName.get(List.class), interfaceClassName); + } + String relativPath = + FlatPath.removeStart( + new FlatPath(choice.get(0).getAqlPath()), new FlatPath(next.getAqlPath())) + .toString(); + addField( + context, + classBuilder, + relativPath, + choice.get(0).getName(), + interfaceClassName, + new ValueSet(ValueSet.LOCAL, ValueSet.LOCAL, Collections.emptySet()), + true); + } if (next.isArchetype()) { context.currentArchetypeName.poll(); } @@ -220,7 +312,25 @@ private String sanitizeNumber(String fieldName) { private void addComplexField( Context context, TypeSpec.Builder classBuilder, String path, WebTemplateNode node) { - TypeSpec subSpec = build(context, node).build(); + final TypeSpec subSpec; + + WebTemplateNode relativeNode = new WebTemplateNode(node); + + List matching = relativeNode.findMatching(n -> true); + matching.add(relativeNode); + matching.forEach(n -> { + String relativPath = + FlatPath.removeStart(new FlatPath(n.getAqlPath()), new FlatPath(context.nodeDeque.peek().getAqlPath())) + .toString(); + n.setAqlPath(relativPath); + }); + + if (context.currentTypeSpec.containsKey(relativeNode)) { + subSpec = context.currentTypeSpec.get(relativeNode); + } else { + subSpec = build(context,node).build(); + context.currentTypeSpec.put(relativeNode, subSpec); + } String subSpecPackage = context.currentPackageName + "." + context.currentMainClass.toLowerCase() + ".definition"; @@ -242,7 +352,7 @@ private void addComplexField( private void addSimpleField( Context context, TypeSpec.Builder classBuilder, String path, WebTemplateNode endNode) { - Class clazz = RM_INFO_LOOKUP.getClass(endNode.getRmType()); + Class clazz = extractClass(endNode); if (clazz == null) { logger.warn("No class for path {} ", path); return; @@ -281,6 +391,13 @@ private void addSimpleField( } } + private Class extractClass(WebTemplateNode endNode) { + if ("STRING".equals(endNode.getRmType())) { + return String.class; + } + return RM_INFO_LOOKUP.getClass(endNode.getRmType()); + } + private ValueSet buildValueSet(WebTemplateNode endNode) { Optional input = @@ -314,26 +431,40 @@ private void addField( ValueSet valueSet, boolean addChoiceAnnotation) { - if (CodePhrase.class.getName().equals(className.toString()) - && CollectionUtils.isNotEmpty(valueSet.getTherms())) { - - final TypeSpec enumValueSet = - context.currentEnums.computeIfAbsent( - valueSet, vs -> buildEnumValueSet(context, name, vs)); - - String enumPackage; - if (valueSet.getId().equals("local") || valueSet.getTerminologyId().equals("local")) { - enumPackage = - context.currentPackageName - + "." - + context.currentMainClass.toLowerCase() - + ".definition"; - } else { - enumPackage = context.currentPackageName + ".shareddefinition"; + if (CodePhrase.class.getName().equals(className.toString())) + switch (name) { + case "language": + className = ClassName.get(Language.class); + break; + case "setting_definingCode": + className = ClassName.get(SettingDefiningcode.class); + break; + case "category_definingCode": + className = ClassName.get(CategoryDefiningcode.class); + break; + case "territory": + className = ClassName.get(Territory.class); + break; + case "math_function_definingCode": + className = ClassName.get(MathFunctionDefiningcode.class); + break; + default: + if (CollectionUtils.isNotEmpty(valueSet.getTherms())) { + + final TypeSpec enumValueSet = + context.currentEnums.computeIfAbsent( + valueSet, vs -> buildEnumValueSet(context, name, vs)); + + String enumPackage = + context.currentPackageName + + "." + + context.currentMainClass.toLowerCase() + + ".definition"; + + context.classes.put(enumPackage, enumValueSet); + className = ClassName.get(enumPackage, enumValueSet.name); + } } - context.classes.put(enumPackage, enumValueSet); - className = ClassName.get(enumPackage, enumValueSet.name); - } PathExtractor pathExtractor = new PathExtractor(path); String parentPath = pathExtractor.getParentPath(); diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java b/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java index 2f5717a6f..26605286d 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java @@ -19,6 +19,7 @@ package org.ehrbase.client.classgenerator; +import com.nedap.archie.rm.datastructures.Event; import com.nedap.archie.rminfo.RMTypeInfo; import org.apache.commons.collections4.SetUtils; import org.ehrbase.serialisation.util.SnakeCase; @@ -39,19 +40,19 @@ public class FlattFilter extends Filter { @Override protected boolean skip(WebTemplateNode node, WebTemplate context, WebTemplateNode parent) { - if (!node.getChildren().isEmpty() && node.getMax() == 1 && !node.isArchetype()) { + if (!node.getChildren().isEmpty() && node.getMax() == 1 && !node.isArchetype() && ( !isEvent(node) || parent.getChildren().stream().filter(this::isEvent).count() == 1)){ return true; } else { if (parent != null) { RMTypeInfo typeInfo = ARCHIE_RM_INFO_LOOKUP.getTypeInfo(parent.getRmType()); Set attributeNames = Optional.ofNullable(configMap.get(typeInfo.getJavaClass())).map(RmIntrospectConfig::getNonTemplateFields).orElse(Collections.emptySet()).stream().map(s -> new SnakeCase(s).camelToSnake()).collect(Collectors.toSet()); attributeNames.add("context"); - attributeNames.add("encoding"); attributeNames.add("timing"); attributeNames.add("expiry_time"); attributeNames.add("lower"); attributeNames.add("upper"); attributeNames.add("ism_transition"); + attributeNames.add("location"); SetUtils.SetView difference = SetUtils.difference(typeInfo.getAttributes().keySet(), attributeNames); if (difference.contains(node.getName())) { return true; @@ -60,4 +61,9 @@ protected boolean skip(WebTemplateNode node, WebTemplate context, WebTemplateNod return false; } } + + private boolean isEvent(WebTemplateNode node){ + RMTypeInfo typeInfo = ARCHIE_RM_INFO_LOOKUP.getTypeInfo(node.getRmType()); + return typeInfo != null && Event.class.isAssignableFrom(typeInfo.getJavaClass()); + } } diff --git a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java index d4ea334c6..447c62ee4 100644 --- a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java +++ b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java @@ -47,446 +47,561 @@ @Ignore public class ClassGeneratorNewTest { - public static final String PACKAGE_NAME = "org.ehrbase.client.classgenerator.examples2"; - - private static final boolean WRITE_FILES = true; - - @Test - public void testGenerate() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.BLOOD_PRESSURE_SIMPLE.getStream()).getTemplate(); - WebTemplate webTemplate = new FlattFilter().filter( new OPTParser(template).parse()); - ClassGeneratorNew cut = new ClassGeneratorNew(); - ClassGeneratorResult generate = null; - - - generate = cut.generate(PACKAGE_NAME, webTemplate); - - - - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); - - - assertThat(fieldSpecs) - .extracting(f -> f.name, f -> f.type.toString()) - .containsExactlyInAnyOrder( - new Tuple("versionUid", "org.ehrbase.client.openehrclient.VersionUid"), - new Tuple("device", "java.util.List"), - new Tuple("language", "org.ehrbase.client.classgenerator.examples2.shareddefinition.Language"), - new Tuple("levelOfExertion", "java.util.List"), - new Tuple("commentValue", "java.lang.String"), - new Tuple("cuffSizeDefiningcode", "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.CuffSizeDefiningcode"), - new Tuple("korotkoffSoundsDefiningcode", "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.KorotkoffSoundsDefiningcode"), - new Tuple("systolicMagnitude", "java.lang.Double"), - new Tuple("systolicUnits", "java.lang.String"), - new Tuple("diastolicMagnitude", "java.lang.Double"), - new Tuple("diastolicUnits", "java.lang.String"), - new Tuple("positionDefiningcode", "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.PositionDefiningcode"), - new Tuple("tiltMagnitude", "java.lang.Double"), - new Tuple("tiltUnits", "java.lang.String"), - new Tuple("meanArterialPressureMagnitude", "java.lang.Double"), - new Tuple("meanArterialPressureUnits", "java.lang.String"), - new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("subject", "com.nedap.archie.rm.generic.PartyProxy"), - new Tuple("originValue", "java.time.temporal.TemporalAccessor"), - new Tuple("pulsePressureMagnitude", "java.lang.Double"), - new Tuple("pulsePressureUnits", "java.lang.String"), - new Tuple("locationOfMeasurementDefiningcode", "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.LocationOfMeasurementDefiningcode"), - new Tuple("modelValue", "java.lang.String"), - new Tuple("serialNumberValue", "java.lang.String"), - new Tuple("dateLastServicedValue", "java.time.temporal.TemporalAccessor"), - new Tuple("dateLastCalibrationValue", "java.time.temporal.TemporalAccessor"), - new Tuple("nameValue", "java.lang.String"), - new Tuple("descriptionValue", "java.lang.String"), - new Tuple("components", "java.util.List"), - new Tuple("servicedByValue", "java.lang.String"), - new Tuple("manufacturerValue", "java.lang.String"), - new Tuple("endTimeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("language", "org.ehrbase.client.classgenerator.examples2.shareddefinition.Language"), - new Tuple("healthCareFacility", "com.nedap.archie.rm.generic.PartyIdentified"), - new Tuple("composer", "com.nedap.archie.rm.generic.PartyProxy"), - new Tuple("settingDefiningcode", "org.ehrbase.client.classgenerator.examples2.shareddefinition.SettingDefiningcode"), - new Tuple("territory", "org.ehrbase.client.classgenerator.examples2.shareddefinition.Territory"), - new Tuple("bloodPressureTrainingSample", "java.util.List"), - new Tuple("location", "java.lang.String"), - new Tuple("deviceDetailsTrainingSample", "java.util.List"), - new Tuple("categoryDefiningcode", "org.ehrbase.client.classgenerator.examples2.shareddefinition.CategoryDefiningcode"), - new Tuple("startTimeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("participations", "java.util.List"), - new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit") - ); - - - writeFiles(generate); - - - } - - private void writeFiles(ClassGeneratorResult generate) throws IOException { - if (WRITE_FILES) { - Path path = Paths.get("..", "client/src/test/java/"); - generate.getClasses().keySet().stream().filter(s -> !s.contains("definition")).findFirst().ifPresent( - s -> - { - try { - FileUtils.cleanDirectory(Paths.get(String.valueOf(path), s.replace(".", "/")).toFile()); - } catch (Exception e) { - //NOP - } - } - ); - List generateFiles = generate.writeFiles(path); - - FieldGenerator fieldGenerator = new FieldGenerator(); - fieldGenerator.generate(generateFiles).writeFiles(path); - } - } - - - @Test - public void testGenerateAltEvents() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.ALT_EVENTS.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - - - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); - - - assertThat(fieldSpecs) - .extracting(f -> f.name, f -> f.type.toString()) - .containsExactlyInAnyOrder( - new Tuple("value", "java.lang.String"), - new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("gewichtMagnitude", "java.lang.Double"), - new Tuple("gewichtUnits", "java.lang.String"), - new Tuple("confoundingFactorsEn", "java.util.List"), - new Tuple("commentEnValue", "java.lang.String"), - new Tuple("stateOfDressEnDefiningcode", "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.StateOfDressEnDefiningcode"), - new Tuple("value", "java.lang.String"), - new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("gewichtMagnitude", "java.lang.Double"), - new Tuple("gewichtUnits", "java.lang.String"), - new Tuple("confoundingFactorsEn", "java.util.List"), - new Tuple("commentEnValue", "java.lang.String"), - new Tuple("stateOfDressEnDefiningcode", "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.StateOfDressEnDefiningcode"), - new Tuple("value", "java.lang.String"), - new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("gewichtMagnitude", "java.lang.Double"), - new Tuple("gewichtUnits", "java.lang.String"), - new Tuple("confoundingFactorsEn", "java.util.List"), - new Tuple("widthValue", "java.time.temporal.TemporalAmount"), - new Tuple("commentEnValue", "java.lang.String"), - new Tuple("stateOfDressEnDefiningcode", "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.StateOfDressEnDefiningcode"), - new Tuple("mathFunctionDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.MathFunctionDefiningcode"), - new Tuple("birthEn", "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.KorpergewichtBirthEnEvent"), - new Tuple("anyEventEn", "java.util.List"), - new Tuple("extensionEn", "java.util.List"), - new Tuple("language", "org.ehrbase.client.classgenerator.examples.shareddefinition.Language"), - new Tuple("originValue", "java.time.temporal.TemporalAccessor"), - new Tuple("gerat", "com.nedap.archie.rm.datastructures.Cluster"), - new Tuple("subject", "com.nedap.archie.rm.generic.PartyProxy"), - new Tuple("versionUid", "org.ehrbase.client.openehrclient.VersionUid"), - new Tuple("endTimeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("language", "org.ehrbase.client.classgenerator.examples.shareddefinition.Language"), - new Tuple("healthCareFacility", "com.nedap.archie.rm.generic.PartyIdentified"), - new Tuple("statusValue", "java.lang.String"), - new Tuple("berichtIdValue", "java.lang.String"), - new Tuple("territory", "org.ehrbase.client.classgenerator.examples.shareddefinition.Territory"), - new Tuple("startTimeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("composer", "com.nedap.archie.rm.generic.PartyProxy"), - new Tuple("settingDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode"), - new Tuple("korpergewicht", "java.util.List"), - new Tuple("erweiterung", "java.util.List"), - new Tuple("location", "java.lang.String"), - new Tuple("categoryDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode"), - new Tuple("participations", "java.util.List"), - new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit") - ); - - writeFiles(generate); - - - } - - @Test - public void testGenerateDiagnose() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.DIAGNOSE.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - - Set derDiagnoseDefiningcode = generate.getClasses() - .get("org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition") - .stream() - .filter(t -> t.name.equals("NameDesProblemsDerDiagnoseDefiningcode")) - .findAny() - .get() - .enumConstants - .keySet(); - - assertThat(derDiagnoseDefiningcode).containsExactlyInAnyOrder( - "KORONAVIREN_ALS_URSACHE_VON_KRANKHEITEN_DIE_IN_ANDEREN_KAPITELN_KLASSIFIZIERT_SIND", - "COVID19_VIRUS_NICHT_NACHGEWIESEN", - "COVID19_VIRUS_NACHGEWIESEN", - "INFEKTION_DURCH_KORONAVIREN_NICHT_NAHER_BEZEICHNETER_LOKALISATION" - ); - writeFiles(generate); - } - - - @Test - public void testGenerateEpisode() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.EPISODE_OF_CARE.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); - - assertThat(fieldSpecs).size().isEqualTo(28); - - writeFiles(generate); - - + public static final String PACKAGE_NAME = "org.ehrbase.client.classgenerator.examples2"; + + private static final boolean WRITE_FILES = true; + + @Test + public void testGenerate() throws IOException, XmlException { + OPERATIONALTEMPLATE template = + TemplateDocument.Factory.parse( + OperationalTemplateTestData.BLOOD_PRESSURE_SIMPLE.getStream()) + .getTemplate(); + WebTemplate webTemplate = new FlattFilter().filter(new OPTParser(template).parse()); + ClassGeneratorNew cut = new ClassGeneratorNew(); + ClassGeneratorResult generate = null; + + generate = cut.generate(PACKAGE_NAME, webTemplate); + + List fieldSpecs = + generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs) + .flatMap(List::stream) + .collect(Collectors.toList()); + + assertThat(fieldSpecs) + .extracting(f -> f.name, f -> f.type.toString()) + .containsExactlyInAnyOrder( + new Tuple("versionUid", "org.ehrbase.client.openehrclient.VersionUid"), + new Tuple("device", "java.util.List"), + new Tuple("language", "org.ehrbase.client.classgenerator.shareddefinition.Language"), + new Tuple( + "levelOfExertion", "java.util.List"), + new Tuple("commentValue", "java.lang.String"), + new Tuple( + "cuffSizeDefiningcode", + "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.CuffSizeDefiningcode"), + new Tuple( + "korotkoffSoundsDefiningcode", + "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.KorotkoffSoundsDefiningcode"), + new Tuple("systolicMagnitude", "java.lang.Double"), + new Tuple("systolicUnits", "java.lang.String"), + new Tuple("diastolicMagnitude", "java.lang.Double"), + new Tuple("diastolicUnits", "java.lang.String"), + new Tuple( + "positionDefiningcode", + "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.PositionDefiningcode"), + new Tuple("tiltMagnitude", "java.lang.Double"), + new Tuple("tiltUnits", "java.lang.String"), + new Tuple("meanArterialPressureMagnitude", "java.lang.Double"), + new Tuple("meanArterialPressureUnits", "java.lang.String"), + new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), + new Tuple("subject", "com.nedap.archie.rm.generic.PartyProxy"), + new Tuple("originValue", "java.time.temporal.TemporalAccessor"), + new Tuple("pulsePressureMagnitude", "java.lang.Double"), + new Tuple("pulsePressureUnits", "java.lang.String"), + new Tuple( + "locationOfMeasurementDefiningcode", + "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.LocationOfMeasurementDefiningcode"), + new Tuple("modelValue", "java.lang.String"), + new Tuple("serialNumberValue", "java.lang.String"), + new Tuple("dateLastServicedValue", "java.time.temporal.TemporalAccessor"), + new Tuple("dateLastCalibrationValue", "java.time.temporal.TemporalAccessor"), + new Tuple("nameValue", "java.lang.String"), + new Tuple("descriptionValue", "java.lang.String"), + new Tuple("components", "com.nedap.archie.rm.datastructures.Cluster"), + new Tuple("servicedByValue", "java.lang.String"), + new Tuple("manufacturerValue", "java.lang.String"), + new Tuple("endTimeValue", "java.time.temporal.TemporalAccessor"), + new Tuple("language", "org.ehrbase.client.classgenerator.shareddefinition.Language"), + new Tuple("healthCareFacility", "com.nedap.archie.rm.generic.PartyIdentified"), + new Tuple("composer", "com.nedap.archie.rm.generic.PartyProxy"), + new Tuple( + "settingDefiningcode", + "org.ehrbase.client.classgenerator.shareddefinition.SettingDefiningcode"), + new Tuple("territory", "org.ehrbase.client.classgenerator.shareddefinition.Territory"), + new Tuple( + "bloodPressureTrainingSample", + "java.util.List"), + // new Tuple("location", "java.lang.String"), + new Tuple( + "deviceDetailsTrainingSample", + "java.util.List"), + new Tuple( + "categoryDefiningcode", + "org.ehrbase.client.classgenerator.shareddefinition.CategoryDefiningcode"), + new Tuple("startTimeValue", "java.time.temporal.TemporalAccessor"), + new Tuple( + "participations", "java.util.List"), + new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), + new Tuple("location", "java.lang.String")); + + writeFiles(generate); + } + + private void writeFiles(ClassGeneratorResult generate) throws IOException { + if (WRITE_FILES) { + Path path = Paths.get("..", "client/src/test/java/"); + generate.getClasses().keySet().stream() + .filter(s -> !s.contains("definition")) + .findFirst() + .ifPresent( + s -> { + try { + FileUtils.cleanDirectory( + Paths.get(String.valueOf(path), s.replace(".", "/")).toFile()); + } catch (Exception e) { + // NOP + } + }); + List generateFiles = generate.writeFiles(path); + + FieldGenerator fieldGenerator = new FieldGenerator(); + fieldGenerator.generate(generateFiles).writeFiles(path); } - - @Test - public void testGenerateSmICS() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.SM_I_C_S_BEFUND.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); - - assertThat(fieldSpecs).size().isEqualTo(80); - - writeFiles(generate); - - - } - - @Test - public void testGenerateD4LQuestionnaire() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.D4L_QUESTIONNAIRE.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); - - assertThat(fieldSpecs).size().isEqualTo(348); - - } - - @Test - public void testGenerateBefundDerBlutgasanalyse() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.BEFUND_DER_BLUTGASANALYSE.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); - - assertThat(fieldSpecs).size().isEqualTo(52); - - writeFiles(generate); - - - } - - @Test - public void testGenerateMultiOccurrence() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.MULTI_OCCURRENCE.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - - - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); - - - assertThat(fieldSpecs) - .extracting(f -> f.name, f -> f.type.toString()) - .containsExactlyInAnyOrder( - new Tuple("versionUid", "org.ehrbase.client.openehrclient.VersionUid"), - new Tuple("extension", "java.util.List"), - new Tuple("language", "org.ehrbase.client.classgenerator.examples.shareddefinition.Language"), - new Tuple("settingDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode"), - new Tuple("structuredMeasurementLocation", "java.util.List"), - new Tuple("originValue", "java.time.temporal.TemporalAccessor"), - new Tuple("device", "com.nedap.archie.rm.datastructures.Cluster"), - new Tuple("subject", "com.nedap.archie.rm.generic.PartyProxy"), - new Tuple("locationOfMeasurementDefiningcode", "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.LocationOfMeasurementDefiningcode"), - new Tuple("locationOfMeasurementValue", "java.lang.String"), - new Tuple("bodyExposureDefiningcode", "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyExposureDefiningcode"), - new Tuple("bodyExposureValue", "java.lang.String"), - new Tuple("temperatureMagnitude", "java.lang.Double"), - new Tuple("temperatureUnits", "java.lang.String"), - new Tuple("descriptionOfThermalStressValue", "java.lang.String"), - new Tuple("exertion", "com.nedap.archie.rm.datastructures.Cluster"), - new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("endTimeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("language", "org.ehrbase.client.classgenerator.examples.shareddefinition.Language"), - new Tuple("healthCareFacility", "com.nedap.archie.rm.generic.PartyIdentified"), - new Tuple("composer", "com.nedap.archie.rm.generic.PartyProxy"), - new Tuple("territory", "org.ehrbase.client.classgenerator.examples.shareddefinition.Territory"), - new Tuple("bodyTemperature", "java.util.List"), - new Tuple("location", "java.lang.String"), - new Tuple("startTimeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("currentDayOfMenstrualCycleMagnitude", "java.lang.Long"), - new Tuple("environmentalConditions", "java.util.List"), - new Tuple("bodyExposure", "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureBodyExposureChoice"), - new Tuple("locationOfMeasurement", "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementChoice"), - new Tuple("categoryDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode"), - new Tuple("extension", "java.util.List"), - new Tuple("bodyExposureDefiningcode", "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyExposureDefiningcode"), - new Tuple("bodyExposureValue", "java.lang.String"), - new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("temperatureMagnitude", "java.lang.Double"), - new Tuple("temperatureUnits", "java.lang.String"), - new Tuple("descriptionOfThermalStressValue", "java.lang.String"), - new Tuple("exertion", "com.nedap.archie.rm.datastructures.Cluster"), - new Tuple("currentDayOfMenstrualCycleMagnitude", "java.lang.Long"), - new Tuple("environmentalConditions", "java.util.List"), - new Tuple("widthValue", "java.time.temporal.TemporalAmount"), - new Tuple("bodyExposure", "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureBodyExposureChoice2"), - new Tuple("mathFunctionDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.MathFunctionDefiningcode"), - new Tuple("anyEvent", "java.util.List"), - new Tuple("participations", "java.util.List"), - new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit") - ); - - - writeFiles(generate); - - } - - @Test - public void testGenerateAllTypes() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.ALL_TYPES.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - - - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); - - assertThat(fieldSpecs).size().isEqualTo(75L); - - writeFiles(generate); - - } - - @Test - public void testGenerateVirologyFinding() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.VIROLOGY_FINDING.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - - - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); - - assertThat(fieldSpecs).size().isEqualTo(75L); - - writeFiles(generate); - - } - - @Test - public void testGenerateCorona() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.CORONA_ANAMNESE.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - - - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); - - assertThat(fieldSpecs).size().isEqualTo(305); - - writeFiles(generate); - - } - - @Test - public void testGenerateSchwangerschaftsstatus() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.SCHWANGERSCHAFTSSTATUS.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - - - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); - - assertThat(fieldSpecs).size().isEqualTo(22); - - - Optional status1 = generate.getClasses().values().stream() - .flatMap(Collection::stream).filter(s -> s.name.equals("StatusDefiningcode")).findAny(); - assertThat(status1).isPresent(); - assertThat(status1.get().enumConstants.keySet()).containsExactlyInAnyOrder( - "VORLAUFIG", - "FINAL", - "REGISTRIERT", - "GEANDERT" - ); - - Optional status2 = generate.getClasses().values().stream() - .flatMap(Collection::stream).filter(s -> s.name.equals("StatusDefiningcode2")).findAny(); - assertThat(status2).isPresent(); - assertThat(status2.get().enumConstants.keySet()).containsExactlyInAnyOrder( - "SCHWANGER", - "NICHT_SCHWANGER", - "UNBEKANNT" - ); - - writeFiles(generate); - - } - - @Test - public void testCreateName() { - ClassGenerator cut = new ClassGenerator(); - String className = cut.buildClassName("/_state structure/*_confounding factors(en)_ELEMENT", true); - - assertThat(className).isEqualTo("ConfoundingFactorsEnElement"); - } - - @Test - public void testGenerateReactCare() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.OPEN_E_REACT_CARE.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); - - assertThat(fieldSpecs).size().isEqualTo(352); - - writeFiles(generate); - } - -} \ No newline at end of file + } + + @Test + public void testGenerateAltEvents() throws IOException, XmlException { + OPERATIONALTEMPLATE template = + TemplateDocument.Factory.parse(OperationalTemplateTestData.ALT_EVENTS.getStream()) + .getTemplate(); + WebTemplate webTemplate = new FlattFilter().filter(new OPTParser(template).parse()); + ClassGeneratorNew cut = new ClassGeneratorNew(); + + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, webTemplate); + + List fieldSpecs = + generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs) + .flatMap(List::stream) + .collect(Collectors.toList()); + + assertThat(fieldSpecs) + .extracting(f -> f.name, f -> f.type.toString()) + .containsExactlyInAnyOrder( + new Tuple("value", "java.lang.String"), + new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), + new Tuple("gewichtMagnitude", "java.lang.Double"), + new Tuple("gewichtUnits", "java.lang.String"), + new Tuple( + "confoundingFactorsEn", + "java.util.List"), + new Tuple("commentEnValue", "java.lang.String"), + new Tuple( + "stateOfDressEnDefiningcode", + "org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition.StateOfDressEnDefiningcode"), + new Tuple("value", "java.lang.String"), + new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), + new Tuple("gewichtMagnitude", "java.lang.Double"), + new Tuple("gewichtUnits", "java.lang.String"), + new Tuple( + "confoundingFactorsEn", + "java.util.List"), + new Tuple("commentEnValue", "java.lang.String"), + new Tuple( + "stateOfDressEnDefiningcode", + "org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition.StateOfDressEnDefiningcode"), + new Tuple("value", "java.lang.String"), + new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), + new Tuple("gewichtMagnitude", "java.lang.Double"), + new Tuple("gewichtUnits", "java.lang.String"), + new Tuple( + "confoundingFactorsEn", + "java.util.List"), + new Tuple("widthValue", "java.time.temporal.TemporalAmount"), + new Tuple("commentEnValue", "java.lang.String"), + new Tuple( + "stateOfDressEnDefiningcode", + "org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition.StateOfDressEnDefiningcode"), + new Tuple( + "mathFunctionDefiningcode", + "org.ehrbase.client.classgenerator.shareddefinition.MathFunctionDefiningcode"), + new Tuple( + "birthEn", + "org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition.KorpergewichtBirthEnEvent"), + new Tuple( + "anyEventEn", + "java.util.List"), + new Tuple("extensionEn", "java.util.List"), + new Tuple( + "language", "org.ehrbase.client.classgenerator.shareddefinition.Language"), + new Tuple("originValue", "java.time.temporal.TemporalAccessor"), + new Tuple("gerat", "com.nedap.archie.rm.datastructures.Cluster"), + new Tuple("subject", "com.nedap.archie.rm.generic.PartyProxy"), + new Tuple("versionUid", "org.ehrbase.client.openehrclient.VersionUid"), + new Tuple("endTimeValue", "java.time.temporal.TemporalAccessor"), + new Tuple( + "language", "org.ehrbase.client.classgenerator.shareddefinition.Language"), + new Tuple("healthCareFacility", "com.nedap.archie.rm.generic.PartyIdentified"), + new Tuple("statusValue", "java.lang.String"), + new Tuple("berichtIdValue", "java.lang.String"), + new Tuple( + "territory", + "org.ehrbase.client.classgenerator.shareddefinition.Territory"), + new Tuple("startTimeValue", "java.time.temporal.TemporalAccessor"), + new Tuple("composer", "com.nedap.archie.rm.generic.PartyProxy"), + new Tuple( + "settingDefiningcode", + "org.ehrbase.client.classgenerator.shareddefinition.SettingDefiningcode"), + new Tuple( + "korpergewicht", + "java.util.List"), + new Tuple("erweiterung", "java.util.List"), + new Tuple("location", "java.lang.String"), + new Tuple( + "categoryDefiningcode", + "org.ehrbase.client.classgenerator.shareddefinition.CategoryDefiningcode"), + new Tuple( + "participations", "java.util.List"), + new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit")); + + writeFiles(generate); + } + + @Test + public void testGenerateDiagnose() throws IOException, XmlException { + OPERATIONALTEMPLATE template = + TemplateDocument.Factory.parse(OperationalTemplateTestData.DIAGNOSE.getStream()) + .getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + + Set derDiagnoseDefiningcode = + generate + .getClasses() + .get("org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition") + .stream() + .filter(t -> t.name.equals("NameDesProblemsDerDiagnoseDefiningcode")) + .findAny() + .get() + .enumConstants + .keySet(); + + assertThat(derDiagnoseDefiningcode) + .containsExactlyInAnyOrder( + "KORONAVIREN_ALS_URSACHE_VON_KRANKHEITEN_DIE_IN_ANDEREN_KAPITELN_KLASSIFIZIERT_SIND", + "COVID19_VIRUS_NICHT_NACHGEWIESEN", + "COVID19_VIRUS_NACHGEWIESEN", + "INFEKTION_DURCH_KORONAVIREN_NICHT_NAHER_BEZEICHNETER_LOKALISATION"); + writeFiles(generate); + } + + @Test + public void testGenerateEpisode() throws IOException, XmlException { + OPERATIONALTEMPLATE template = + TemplateDocument.Factory.parse(OperationalTemplateTestData.EPISODE_OF_CARE.getStream()) + .getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + List fieldSpecs = + generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs) + .flatMap(List::stream) + .collect(Collectors.toList()); + + assertThat(fieldSpecs).size().isEqualTo(28); + + writeFiles(generate); + } + + @Test + public void testGenerateSmICS() throws IOException, XmlException { + OPERATIONALTEMPLATE template = + TemplateDocument.Factory.parse(OperationalTemplateTestData.SM_I_C_S_BEFUND.getStream()) + .getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + List fieldSpecs = + generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs) + .flatMap(List::stream) + .collect(Collectors.toList()); + + assertThat(fieldSpecs).size().isEqualTo(80); + + writeFiles(generate); + } + + @Test + public void testGenerateD4LQuestionnaire() throws IOException, XmlException { + OPERATIONALTEMPLATE template = + TemplateDocument.Factory.parse(OperationalTemplateTestData.D4L_QUESTIONNAIRE.getStream()) + .getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + List fieldSpecs = + generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs) + .flatMap(List::stream) + .collect(Collectors.toList()); + + assertThat(fieldSpecs).size().isEqualTo(348); + } + + @Test + public void testGenerateBefundDerBlutgasanalyse() throws IOException, XmlException { + OPERATIONALTEMPLATE template = + TemplateDocument.Factory.parse( + OperationalTemplateTestData.BEFUND_DER_BLUTGASANALYSE.getStream()) + .getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + List fieldSpecs = + generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs) + .flatMap(List::stream) + .collect(Collectors.toList()); + + assertThat(fieldSpecs).size().isEqualTo(52); + + writeFiles(generate); + } + + @Test + public void testGenerateMultiOccurrence() throws IOException, XmlException { + OPERATIONALTEMPLATE template = + TemplateDocument.Factory.parse(OperationalTemplateTestData.MULTI_OCCURRENCE.getStream()) + .getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + + List fieldSpecs = + generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs) + .flatMap(List::stream) + .collect(Collectors.toList()); + + assertThat(fieldSpecs) + .extracting(f -> f.name, f -> f.type.toString()) + .containsExactlyInAnyOrder( + new Tuple("versionUid", "org.ehrbase.client.openehrclient.VersionUid"), + new Tuple("extension", "java.util.List"), + new Tuple( + "language", "org.ehrbase.client.classgenerator.examples.shareddefinition.Language"), + new Tuple( + "settingDefiningcode", + "org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode"), + new Tuple( + "structuredMeasurementLocation", + "java.util.List"), + new Tuple("originValue", "java.time.temporal.TemporalAccessor"), + new Tuple("device", "com.nedap.archie.rm.datastructures.Cluster"), + new Tuple("subject", "com.nedap.archie.rm.generic.PartyProxy"), + new Tuple( + "locationOfMeasurementDefiningcode", + "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.LocationOfMeasurementDefiningcode"), + new Tuple("locationOfMeasurementValue", "java.lang.String"), + new Tuple( + "bodyExposureDefiningcode", + "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyExposureDefiningcode"), + new Tuple("bodyExposureValue", "java.lang.String"), + new Tuple("temperatureMagnitude", "java.lang.Double"), + new Tuple("temperatureUnits", "java.lang.String"), + new Tuple("descriptionOfThermalStressValue", "java.lang.String"), + new Tuple("exertion", "com.nedap.archie.rm.datastructures.Cluster"), + new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), + new Tuple("endTimeValue", "java.time.temporal.TemporalAccessor"), + new Tuple( + "language", "org.ehrbase.client.classgenerator.examples.shareddefinition.Language"), + new Tuple("healthCareFacility", "com.nedap.archie.rm.generic.PartyIdentified"), + new Tuple("composer", "com.nedap.archie.rm.generic.PartyProxy"), + new Tuple( + "territory", + "org.ehrbase.client.classgenerator.examples.shareddefinition.Territory"), + new Tuple( + "bodyTemperature", + "java.util.List"), + new Tuple("location", "java.lang.String"), + new Tuple("startTimeValue", "java.time.temporal.TemporalAccessor"), + new Tuple("currentDayOfMenstrualCycleMagnitude", "java.lang.Long"), + new Tuple( + "environmentalConditions", + "java.util.List"), + new Tuple( + "bodyExposure", + "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureBodyExposureChoice"), + new Tuple( + "locationOfMeasurement", + "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementChoice"), + new Tuple( + "categoryDefiningcode", + "org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode"), + new Tuple("extension", "java.util.List"), + new Tuple( + "bodyExposureDefiningcode", + "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyExposureDefiningcode"), + new Tuple("bodyExposureValue", "java.lang.String"), + new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), + new Tuple("temperatureMagnitude", "java.lang.Double"), + new Tuple("temperatureUnits", "java.lang.String"), + new Tuple("descriptionOfThermalStressValue", "java.lang.String"), + new Tuple("exertion", "com.nedap.archie.rm.datastructures.Cluster"), + new Tuple("currentDayOfMenstrualCycleMagnitude", "java.lang.Long"), + new Tuple( + "environmentalConditions", + "java.util.List"), + new Tuple("widthValue", "java.time.temporal.TemporalAmount"), + new Tuple( + "bodyExposure", + "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureBodyExposureChoice2"), + new Tuple( + "mathFunctionDefiningcode", + "org.ehrbase.client.classgenerator.shareddefinition.MathFunctionDefiningcode"), + new Tuple( + "anyEvent", + "java.util.List"), + new Tuple( + "participations", "java.util.List"), + new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit")); + + writeFiles(generate); + } + + @Test + public void testGenerateAllTypes() throws IOException, XmlException { + OPERATIONALTEMPLATE template = + TemplateDocument.Factory.parse(OperationalTemplateTestData.ALL_TYPES.getStream()) + .getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + + List fieldSpecs = + generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs) + .flatMap(List::stream) + .collect(Collectors.toList()); + + assertThat(fieldSpecs).size().isEqualTo(75L); + + writeFiles(generate); + } + + @Test + public void testGenerateVirologyFinding() throws IOException, XmlException { + OPERATIONALTEMPLATE template = + TemplateDocument.Factory.parse(OperationalTemplateTestData.VIROLOGY_FINDING.getStream()) + .getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + + List fieldSpecs = + generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs) + .flatMap(List::stream) + .collect(Collectors.toList()); + + assertThat(fieldSpecs).size().isEqualTo(75L); + + writeFiles(generate); + } + + @Test + public void testGenerateCorona() throws IOException, XmlException { + OPERATIONALTEMPLATE template = + TemplateDocument.Factory.parse(OperationalTemplateTestData.CORONA_ANAMNESE.getStream()) + .getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + + List fieldSpecs = + generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs) + .flatMap(List::stream) + .collect(Collectors.toList()); + + assertThat(fieldSpecs).size().isEqualTo(305); + + writeFiles(generate); + } + + @Test + public void testGenerateSchwangerschaftsstatus() throws IOException, XmlException { + OPERATIONALTEMPLATE template = + TemplateDocument.Factory.parse( + OperationalTemplateTestData.SCHWANGERSCHAFTSSTATUS.getStream()) + .getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + + List fieldSpecs = + generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs) + .flatMap(List::stream) + .collect(Collectors.toList()); + + assertThat(fieldSpecs).size().isEqualTo(22); + + Optional status1 = + generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(s -> s.name.equals("StatusDefiningcode")) + .findAny(); + assertThat(status1).isPresent(); + assertThat(status1.get().enumConstants.keySet()) + .containsExactlyInAnyOrder("VORLAUFIG", "FINAL", "REGISTRIERT", "GEANDERT"); + + Optional status2 = + generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(s -> s.name.equals("StatusDefiningcode2")) + .findAny(); + assertThat(status2).isPresent(); + assertThat(status2.get().enumConstants.keySet()) + .containsExactlyInAnyOrder("SCHWANGER", "NICHT_SCHWANGER", "UNBEKANNT"); + + writeFiles(generate); + } + + @Test + public void testCreateName() { + ClassGenerator cut = new ClassGenerator(); + String className = + cut.buildClassName("/_state structure/*_confounding factors(en)_ELEMENT", true); + + assertThat(className).isEqualTo("ConfoundingFactorsEnElement"); + } + + @Test + public void testGenerateReactCare() throws IOException, XmlException { + OPERATIONALTEMPLATE template = + TemplateDocument.Factory.parse(OperationalTemplateTestData.OPEN_E_REACT_CARE.getStream()) + .getTemplate(); + ClassGenerator cut = new ClassGenerator(); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + + List fieldSpecs = + generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs) + .flatMap(List::stream) + .collect(Collectors.toList()); + + assertThat(fieldSpecs).size().isEqualTo(352); + + writeFiles(generate); + } +} From fed0e59895afd1484a1fd75e3406ddedc8717efd Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Tue, 24 Nov 2020 15:54:04 +0100 Subject: [PATCH 11/54] handle choices duplicates in new dto generator see https://github.com/ehrbase/project_management/issues/424 --- .../AlternativeEventsComposition.java | 6 +- ...ternativeEventsCompositionContainment.java | 4 +- .../definition/AnyEventEnIntervalEvent.java | 102 -- .../definition/AnyEventEnPointEvent.java | 78 -- .../definition/BirthEnPointEvent.java | 76 -- .../ConfoundingFactorsEnElement.java | 18 - .../definition/KorpergewichtObservation.java | 11 +- .../KorpergewichtObservationContainment.java | 5 +- .../StateOfDressEnDefiningcode.java | 1 + .../classgenerator/ClassGeneratorConfig.java | 23 + .../classgenerator/ClassGeneratorNew.java | 133 ++- .../client/classgenerator/FlattFilter.java | 21 + .../classgenerator/ClassGeneratorNewTest.java | 202 +++- .../classgenerator/ClassGeneratorTest.java | 126 ++- .../ehrbase/webtemplate/filter/Filter.java | 34 +- .../webtemplate/filter/WebtemplateFilter.java | 26 + .../ehrbase/webtemplate/parser/OPTParser.java | 942 ++++++++++-------- 17 files changed, 983 insertions(+), 825 deletions(-) delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/AnyEventEnIntervalEvent.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/AnyEventEnPointEvent.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/BirthEnPointEvent.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/ConfoundingFactorsEnElement.java create mode 100644 generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorConfig.java create mode 100644 web-template/src/main/java/org/ehrbase/webtemplate/filter/WebtemplateFilter.java diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsComposition.java index 60563b156..34b245b35 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsComposition.java @@ -5,6 +5,9 @@ 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 org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Id; @@ -17,9 +20,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-COMPOSITION.report.v1") @Template("AlternativeEvents") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsCompositionContainment.java index 1b592ded3..7168a823a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsCompositionContainment.java @@ -5,6 +5,8 @@ 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 org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -16,8 +18,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.SettingDefiningcode; import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import java.time.temporal.TemporalAccessor; - public class AlternativeEventsCompositionContainment extends Containment { public SelectAqlField ALTERNATIVE_EVENTS_COMPOSITION = new AqlFieldImp(AlternativeEventsComposition.class, "", "AlternativeEventsComposition", AlternativeEventsComposition.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/AnyEventEnIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/AnyEventEnIntervalEvent.java deleted file mode 100644 index 0e3a70a61..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/AnyEventEnIntervalEvent.java +++ /dev/null @@ -1,102 +0,0 @@ -package org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition; - -import com.nedap.archie.rm.datatypes.CodePhrase; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalAmount; -import java.util.List; - -@Entity -@OptionFor("INTERVAL_EVENT") -public class AnyEventEnIntervalEvent implements KorpergewichtAnyEventEnChoice { - @Path("/data[at0001]/items[at0004]/value|magnitude") - private Double gewichtMagnitude; - - @Path("/data[at0001]/items[at0004]/value|units") - private String gewichtUnits; - - @Path("/data[at0001]/items[at0024]/value|value") - private String commentEnValue; - - @Path("/state[at0008]/items[at0009]/value|defining_code") - private StateOfDressEnDefiningcode stateOfDressEnDefiningcode; - - @Path("/state[at0008]/items[at0025]") - private List confoundingFactorsEn; - - @Path("/time|value") - private TemporalAccessor timeValue; - - @Path("/width|value") - private TemporalAmount nullValue; - - @Path("/math_function|defining_code") - private CodePhrase nullDefiningcode; - - public void setGewichtMagnitude(Double gewichtMagnitude) { - this.gewichtMagnitude = gewichtMagnitude; - } - - public Double getGewichtMagnitude() { - return this.gewichtMagnitude ; - } - - public void setGewichtUnits(String gewichtUnits) { - this.gewichtUnits = gewichtUnits; - } - - public String getGewichtUnits() { - return this.gewichtUnits ; - } - - public void setCommentEnValue(String commentEnValue) { - this.commentEnValue = commentEnValue; - } - - public String getCommentEnValue() { - return this.commentEnValue ; - } - - public void setStateOfDressEnDefiningcode(StateOfDressEnDefiningcode stateOfDressEnDefiningcode) { - this.stateOfDressEnDefiningcode = stateOfDressEnDefiningcode; - } - - public StateOfDressEnDefiningcode getStateOfDressEnDefiningcode() { - return this.stateOfDressEnDefiningcode ; - } - - public void setConfoundingFactorsEn(List confoundingFactorsEn) { - this.confoundingFactorsEn = confoundingFactorsEn; - } - - public List getConfoundingFactorsEn() { - return this.confoundingFactorsEn ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setNullValue(TemporalAmount nullValue) { - this.nullValue = nullValue; - } - - public TemporalAmount getNullValue() { - return this.nullValue ; - } - - public void setNullDefiningcode(CodePhrase nullDefiningcode) { - this.nullDefiningcode = nullDefiningcode; - } - - public CodePhrase getNullDefiningcode() { - return this.nullDefiningcode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/AnyEventEnPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/AnyEventEnPointEvent.java deleted file mode 100644 index 3292a0278..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/AnyEventEnPointEvent.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -import java.time.temporal.TemporalAccessor; -import java.util.List; - -@Entity -@OptionFor("POINT_EVENT") -public class AnyEventEnPointEvent implements KorpergewichtAnyEventEnChoice { - @Path("/data[at0001]/items[at0004]/value|magnitude") - private Double gewichtMagnitude; - - @Path("/data[at0001]/items[at0004]/value|units") - private String gewichtUnits; - - @Path("/data[at0001]/items[at0024]/value|value") - private String commentEnValue; - - @Path("/state[at0008]/items[at0009]/value|defining_code") - private StateOfDressEnDefiningcode stateOfDressEnDefiningcode; - - @Path("/state[at0008]/items[at0025]") - private List confoundingFactorsEn; - - @Path("/time|value") - private TemporalAccessor timeValue; - - public void setGewichtMagnitude(Double gewichtMagnitude) { - this.gewichtMagnitude = gewichtMagnitude; - } - - public Double getGewichtMagnitude() { - return this.gewichtMagnitude ; - } - - public void setGewichtUnits(String gewichtUnits) { - this.gewichtUnits = gewichtUnits; - } - - public String getGewichtUnits() { - return this.gewichtUnits ; - } - - public void setCommentEnValue(String commentEnValue) { - this.commentEnValue = commentEnValue; - } - - public String getCommentEnValue() { - return this.commentEnValue ; - } - - public void setStateOfDressEnDefiningcode(StateOfDressEnDefiningcode stateOfDressEnDefiningcode) { - this.stateOfDressEnDefiningcode = stateOfDressEnDefiningcode; - } - - public StateOfDressEnDefiningcode getStateOfDressEnDefiningcode() { - return this.stateOfDressEnDefiningcode ; - } - - public void setConfoundingFactorsEn(List confoundingFactorsEn) { - this.confoundingFactorsEn = confoundingFactorsEn; - } - - public List getConfoundingFactorsEn() { - return this.confoundingFactorsEn ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/BirthEnPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/BirthEnPointEvent.java deleted file mode 100644 index 4079f12e2..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/BirthEnPointEvent.java +++ /dev/null @@ -1,76 +0,0 @@ -package org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -import java.time.temporal.TemporalAccessor; -import java.util.List; - -@Entity -public class BirthEnPointEvent { - @Path("/data[at0001]/items[at0004]/value|magnitude") - private Double gewichtMagnitude; - - @Path("/data[at0001]/items[at0004]/value|units") - private String gewichtUnits; - - @Path("/data[at0001]/items[at0024]/value|value") - private String commentEnValue; - - @Path("/state[at0008]/items[at0009]/value|defining_code") - private StateOfDressEnDefiningcode stateOfDressEnDefiningcode; - - @Path("/state[at0008]/items[at0025]") - private List confoundingFactorsEn; - - @Path("/time|value") - private TemporalAccessor timeValue; - - public void setGewichtMagnitude(Double gewichtMagnitude) { - this.gewichtMagnitude = gewichtMagnitude; - } - - public Double getGewichtMagnitude() { - return this.gewichtMagnitude ; - } - - public void setGewichtUnits(String gewichtUnits) { - this.gewichtUnits = gewichtUnits; - } - - public String getGewichtUnits() { - return this.gewichtUnits ; - } - - public void setCommentEnValue(String commentEnValue) { - this.commentEnValue = commentEnValue; - } - - public String getCommentEnValue() { - return this.commentEnValue ; - } - - public void setStateOfDressEnDefiningcode(StateOfDressEnDefiningcode stateOfDressEnDefiningcode) { - this.stateOfDressEnDefiningcode = stateOfDressEnDefiningcode; - } - - public StateOfDressEnDefiningcode getStateOfDressEnDefiningcode() { - return this.stateOfDressEnDefiningcode ; - } - - public void setConfoundingFactorsEn(List confoundingFactorsEn) { - this.confoundingFactorsEn = confoundingFactorsEn; - } - - public List getConfoundingFactorsEn() { - return this.confoundingFactorsEn ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/ConfoundingFactorsEnElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/ConfoundingFactorsEnElement.java deleted file mode 100644 index 5b03a1280..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/ConfoundingFactorsEnElement.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class ConfoundingFactorsEnElement { - @Path("/value|value") - private String confoundingFactorsEnValue; - - public void setConfoundingFactorsEnValue(String confoundingFactorsEnValue) { - this.confoundingFactorsEnValue = confoundingFactorsEnValue; - } - - public String getConfoundingFactorsEnValue() { - return this.confoundingFactorsEnValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservation.java index 07a960e8b..00e0dca97 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservation.java @@ -2,20 +2,19 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; 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.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.body_weight.v2") public class KorpergewichtObservation { @Path("/data[at0002]/events[at0026]") - private BirthEnPointEvent birthEn; + private KorpergewichtBirthEnPointEvent birthEn; @Path("/data[at0002]/origin|value") private TemporalAccessor originValue; @@ -36,11 +35,11 @@ public class KorpergewichtObservation { @Choice private List anyEventEn; - public void setBirthEn(BirthEnPointEvent birthEn) { + public void setBirthEn(KorpergewichtBirthEnPointEvent birthEn) { this.birthEn = birthEn; } - public BirthEnPointEvent getBirthEn() { + public KorpergewichtBirthEnPointEvent getBirthEn() { return this.birthEn ; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java index 6ef8ddea1..b9d980db6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,12 +10,10 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class KorpergewichtObservationContainment extends Containment { public SelectAqlField KORPERGEWICHT_OBSERVATION = new AqlFieldImp(KorpergewichtObservation.class, "", "KorpergewichtObservation", KorpergewichtObservation.class, this); - public SelectAqlField BIRTH_EN = new AqlFieldImp(KorpergewichtObservation.class, "/data[at0002]/events[at0026]", "birthEn", BirthEnPointEvent.class, this); + public SelectAqlField BIRTH_EN = new AqlFieldImp(KorpergewichtObservation.class, "/data[at0002]/events[at0026]", "birthEn", KorpergewichtBirthEnPointEvent.class, this); public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(KorpergewichtObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/StateOfDressEnDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/StateOfDressEnDefiningcode.java index 74d32fa45..2c2565f55 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/StateOfDressEnDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/StateOfDressEnDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum StateOfDressEnDefiningcode implements EnumValueSet { diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorConfig.java b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorConfig.java new file mode 100644 index 000000000..30928c6cd --- /dev/null +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorConfig.java @@ -0,0 +1,23 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.client.classgenerator; + +public class ClassGeneratorConfig { +} diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java index 8580b8140..fc69d6b6b 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java @@ -55,6 +55,7 @@ import org.ehrbase.terminology.client.terminology.TermDefinition; import org.ehrbase.terminology.client.terminology.ValueSet; import org.ehrbase.util.reflection.ReflectionHelper; +import org.ehrbase.webtemplate.filter.WebtemplateFilter; import org.ehrbase.webtemplate.model.WebTemplate; import org.ehrbase.webtemplate.model.WebTemplateInput; import org.ehrbase.webtemplate.model.WebTemplateInputValue; @@ -100,13 +101,20 @@ private static class Context { private Logger logger = LoggerFactory.getLogger(this.getClass()); + private final WebtemplateFilter filter; + + public ClassGeneratorNew(ClassGeneratorConfig config) { + + filter = new FlattFilter(); + } + public ClassGeneratorResult generate(String packageName, WebTemplate webTemplate) { Context context = new Context(); context.templateId = webTemplate.getTemplateId(); context.currentPackageName = packageName; - TypeSpec.Builder builder = build(context, webTemplate.getTree()); + TypeSpec.Builder builder = build(context, filter.filter(webTemplate).getTree()); AnnotationSpec templateAnnotation = AnnotationSpec.builder(Template.class) .addMember(Template.VALUE, "$S", webTemplate.getTemplateId()) @@ -141,7 +149,7 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { className = buildClassName(context, name, false); } else { name = new SnakeCase(next.getName()).camelToSnake() + "_" + next.getRmType(); - className = buildClassName(context, name, false); + className = buildClassName(context, name, context.nodeDeque.size() > 1); } if (next.isArchetype()) { context.currentArchetypeName.push(next.getName()); @@ -173,7 +181,7 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { if (children.stream().anyMatch(n -> n.getRmType().equals("EVENT"))) { WebTemplateNode event = - children.stream().filter(n -> n.getRmType().equals("EVENT")).findAny().get(); + children.stream().filter(n -> n.getRmType().equals("EVENT")).findAny().get(); WebTemplateNode pointEvent = new WebTemplateNode(event); WebTemplateNode intervalEvent = new WebTemplateNode(event); pointEvent.setRmType("POINT_EVENT"); @@ -209,28 +217,54 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { addComplexField(context, classBuilder, relativPath, child); } } + if (children.isEmpty()){ + addSimpleField(context, classBuilder, "", next); + } for (List choice : choices.values()) { - TypeSpec interfaceSpec = - TypeSpec.interfaceBuilder( - buildClassName(context, choice.get(0).getName() + "_choice", true)) - .addModifiers(Modifier.PUBLIC) - .build(); - String interfacePackage = - context.currentPackageName + "." + context.currentMainClass.toLowerCase() + ".definition"; - context.classes.put(interfacePackage, interfaceSpec); - TypeName interfaceClassName = ClassName.get(interfacePackage, interfaceSpec.name); - for (WebTemplateNode child : choice) { - TypeSpec.Builder build = build(context, child); - build - .addSuperinterface(interfaceClassName) - .addAnnotation( - AnnotationSpec.builder(OptionFor.class) - .addMember(OptionFor.VALUE, "$S", child.getRmType()) - .build()); - context.classes.put(interfacePackage, build.build()); + + WebTemplateNode node = choice.get(0); + WebTemplateNode relativeNode = buildRelativeNode(context, node); + + TypeSpec interfaceSpec; + TypeName interfaceClassName; + if (context.currentTypeSpec.containsKey(relativeNode)) { + interfaceSpec = context.currentTypeSpec.get(relativeNode); + String interfacePackage = + context.currentPackageName + + "." + + context.currentMainClass.toLowerCase() + + ".definition"; + context.classes.put(interfacePackage, interfaceSpec); + + interfaceClassName = ClassName.get(interfacePackage, interfaceSpec.name); + } else { + interfaceSpec = + TypeSpec.interfaceBuilder(buildClassName(context, node.getName() + "_choice", true)) + .addModifiers(Modifier.PUBLIC) + .build(); + context.currentTypeSpec.put(relativeNode, interfaceSpec); + + String interfacePackage = + context.currentPackageName + + "." + + context.currentMainClass.toLowerCase() + + ".definition"; + context.classes.put(interfacePackage, interfaceSpec); + interfaceClassName = ClassName.get(interfacePackage, interfaceSpec.name); + + for (WebTemplateNode child : choice) { + TypeSpec.Builder build = build(context, child); + build + .addSuperinterface(interfaceClassName) + .addAnnotation( + AnnotationSpec.builder(OptionFor.class) + .addMember(OptionFor.VALUE, "$S", child.getRmType()) + .build()); + context.classes.put(interfacePackage, build.build()); + } } if (choice.stream().anyMatch(WebTemplateNode::isMulti)) { interfaceClassName = @@ -238,13 +272,13 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { } String relativPath = FlatPath.removeStart( - new FlatPath(choice.get(0).getAqlPath()), new FlatPath(next.getAqlPath())) + new FlatPath(node.getAqlPath()), new FlatPath(next.getAqlPath())) .toString(); addField( context, classBuilder, relativPath, - choice.get(0).getName(), + node.getName(), interfaceClassName, new ValueSet(ValueSet.LOCAL, ValueSet.LOCAL, Collections.emptySet()), true); @@ -314,21 +348,12 @@ private void addComplexField( final TypeSpec subSpec; - WebTemplateNode relativeNode = new WebTemplateNode(node); - - List matching = relativeNode.findMatching(n -> true); - matching.add(relativeNode); - matching.forEach(n -> { - String relativPath = - FlatPath.removeStart(new FlatPath(n.getAqlPath()), new FlatPath(context.nodeDeque.peek().getAqlPath())) - .toString(); - n.setAqlPath(relativPath); - }); + WebTemplateNode relativeNode = buildRelativeNode(context, node); if (context.currentTypeSpec.containsKey(relativeNode)) { subSpec = context.currentTypeSpec.get(relativeNode); } else { - subSpec = build(context,node).build(); + subSpec = build(context, node).build(); context.currentTypeSpec.put(relativeNode, subSpec); } String subSpecPackage = @@ -349,6 +374,23 @@ private void addComplexField( false); } + private WebTemplateNode buildRelativeNode(Context context, WebTemplateNode node) { + WebTemplateNode relativeNode = new WebTemplateNode(node); + + List matching = relativeNode.findMatching(n -> true); + matching.add(relativeNode); + matching.forEach( + n -> { + String relativPath = + FlatPath.removeStart( + new FlatPath(n.getAqlPath()), + new FlatPath(context.nodeDeque.peek().getAqlPath())) + .toString(); + n.setAqlPath(relativPath); + }); + return relativeNode; + } + private void addSimpleField( Context context, TypeSpec.Builder classBuilder, String path, WebTemplateNode endNode) { @@ -391,11 +433,17 @@ private void addSimpleField( } } - private Class extractClass(WebTemplateNode endNode) { - if ("STRING".equals(endNode.getRmType())) { - return String.class; + private Class extractClass(WebTemplateNode endNode) { + switch (endNode.getRmType()) { + case "STRING": + return String.class; + case "BOOLEAN": + return Boolean.class; + case "INTEGER": + return Long.class; + default: + return RM_INFO_LOOKUP.getClass(endNode.getRmType()); } - return RM_INFO_LOOKUP.getClass(endNode.getRmType()); } private ValueSet buildValueSet(WebTemplateNode endNode) { @@ -572,6 +620,14 @@ private String toEnumName(String fieldName) { } private String buildFieldName(Context context, String name) { + if(name.equals( "value")){ + name = context.nodeDeque.peek().getName(); + } + if (context.nodeDeque.peek().getRmType().equals("ELEMENT")) { + name = "value"; + } + + String[] strings = Arrays.stream(name.split(TemplateIntrospect.TERM_DIVIDER)) .filter(StringUtils::isNotBlank) @@ -579,6 +635,7 @@ private String buildFieldName(Context context, String name) { String fieldName = ""; String nonNormalized = ""; + for (int i = 0; i < strings.length; i++) { nonNormalized = nonNormalized + "_" + strings[strings.length - (i + 1)]; fieldName = normalise(nonNormalized, false); diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java b/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java index 26605286d..bdcee0d60 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java @@ -30,6 +30,7 @@ import org.ehrbase.webtemplate.parser.config.RmIntrospectConfig; import java.util.Collections; +import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; @@ -53,6 +54,9 @@ protected boolean skip(WebTemplateNode node, WebTemplate context, WebTemplateNod attributeNames.add("upper"); attributeNames.add("ism_transition"); attributeNames.add("location"); + attributeNames.add("lower_included"); + attributeNames.add("upper_included"); + SetUtils.SetView difference = SetUtils.difference(typeInfo.getAttributes().keySet(), attributeNames); if (difference.contains(node.getName())) { return true; @@ -66,4 +70,21 @@ private boolean isEvent(WebTemplateNode node){ RMTypeInfo typeInfo = ARCHIE_RM_INFO_LOOKUP.getTypeInfo(node.getRmType()); return typeInfo != null && Event.class.isAssignableFrom(typeInfo.getJavaClass()); } + + protected void preHandle(WebTemplateNode node) { + + List ismTransitionList = node.getChildren().stream() + .filter(n -> "ISM_TRANSITION".equals(n.getRmType())) + .collect(Collectors.toList()); + if (!ismTransitionList.isEmpty()) { + node.getChildren().removeAll(ismTransitionList); + node.getChildren().add(ismTransitionList.get(0)); + } + + if (node.getRmType().equals("ELEMENT") && node.getChildren().size() == 3 && node.getChildren().stream().map(WebTemplateNode::getRmType).collect(Collectors.toList()).containsAll(List.of("DV_TEXT", "DV_CODED_TEXT"))) { + WebTemplateNode merged = node.findChildById(node.getId(false)).orElseThrow(); + + node.getChildren().remove(merged); + } + } } diff --git a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java index 447c62ee4..b08a76b32 100644 --- a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java +++ b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java @@ -57,8 +57,8 @@ public void testGenerate() throws IOException, XmlException { TemplateDocument.Factory.parse( OperationalTemplateTestData.BLOOD_PRESSURE_SIMPLE.getStream()) .getTemplate(); - WebTemplate webTemplate = new FlattFilter().filter(new OPTParser(template).parse()); - ClassGeneratorNew cut = new ClassGeneratorNew(); + WebTemplate webTemplate =new OPTParser(template).parse(); + ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); ClassGeneratorResult generate = null; generate = cut.generate(PACKAGE_NAME, webTemplate); @@ -168,8 +168,8 @@ public void testGenerateAltEvents() throws IOException, XmlException { OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.ALT_EVENTS.getStream()) .getTemplate(); - WebTemplate webTemplate = new FlattFilter().filter(new OPTParser(template).parse()); - ClassGeneratorNew cut = new ClassGeneratorNew(); + WebTemplate webTemplate = new OPTParser(template).parse(); + ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, webTemplate); @@ -223,7 +223,7 @@ public void testGenerateAltEvents() throws IOException, XmlException { "org.ehrbase.client.classgenerator.shareddefinition.MathFunctionDefiningcode"), new Tuple( "birthEn", - "org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition.KorpergewichtBirthEnEvent"), + "org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition.KorpergewichtBirthEnPointEvent"), new Tuple( "anyEventEn", "java.util.List"), @@ -268,15 +268,16 @@ public void testGenerateDiagnose() throws IOException, XmlException { OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.DIAGNOSE.getStream()) .getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser( template).parse()); + Set derDiagnoseDefiningcode = generate .getClasses() - .get("org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition") + .get("org.ehrbase.client.classgenerator.examples2.diagnosecomposition.definition") .stream() - .filter(t -> t.name.equals("NameDesProblemsDerDiagnoseDefiningcode")) + .filter(t -> t.name.equals("DerDiagnoseDefiningcode")) .findAny() .get() .enumConstants @@ -288,6 +289,8 @@ public void testGenerateDiagnose() throws IOException, XmlException { "COVID19_VIRUS_NICHT_NACHGEWIESEN", "COVID19_VIRUS_NACHGEWIESEN", "INFEKTION_DURCH_KORONAVIREN_NICHT_NAHER_BEZEICHNETER_LOKALISATION"); + + writeFiles(generate); } @@ -296,17 +299,47 @@ public void testGenerateEpisode() throws IOException, XmlException { OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.EPISODE_OF_CARE.getStream()) .getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - List fieldSpecs = - generate.getClasses().values().stream() + ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser( template).parse()); + List fieldSpecs = generate.getClasses().values().stream() .flatMap(Collection::stream) .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs) - .flatMap(List::stream) - .collect(Collectors.toList()); - - assertThat(fieldSpecs).size().isEqualTo(28); + .map(t -> t.fieldSpecs).flatMap(List::stream).map(f -> f.name).collect(Collectors.toList()); + + + assertThat(fieldSpecs).containsExactlyInAnyOrder( + "value", + "value", + "rankMagnitude", + "roleValue", + "diagnosisEntry", + "identifier", + "team", + "statusDefiningcode", + "language", + "diagnosis", + "subject", + "managingOrganizationValue", + "typeValue", + "careManagerValue", + "versionUid", + "episodeofcare", + "endTimeValue", + "participations", + "language", + "composer", + "settingDefiningcode", + "territory", + "feederAudit", + "location", + "categoryDefiningcode", + "startTimeValue", + "upperValue", + "lowerValue", + "lowerIncluded", + "upperIncluded", + "healthCareFacility" + ); writeFiles(generate); } @@ -316,17 +349,94 @@ public void testGenerateSmICS() throws IOException, XmlException { OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.SM_I_C_S_BEFUND.getStream()) .getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - List fieldSpecs = - generate.getClasses().values().stream() + ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser( template).parse()); + List fieldSpecs = generate.getClasses().values().stream() .flatMap(Collection::stream) .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs) - .flatMap(List::stream) - .collect(Collectors.toList()); - - assertThat(fieldSpecs).size().isEqualTo(80); + .map(t -> t.fieldSpecs).flatMap(List::stream).map(f -> f.name).collect(Collectors.toList()); + + assertThat(fieldSpecs).containsExactlyInAnyOrder( + "value", + "valueValue", + "value", + "idDerPerson", + "artDerPersonValue", + "kommentarValue", + "fallKategorieValue", + "fallidentifikationValue", + "fallArtValue", + "beteiligtePersonen", + "zimmerValue", + "stationValue", + "details", + "standorttypValue", + "standortbeschreibungValue", + "standortschlusselValue", + "antibiotikumDefiningcode", + "resistenzValue", + "kommentarValue", + "minimaleHemmkonzentrationMagnitude", + "minimaleHemmkonzentrationUnits", + "analyseergebnisDetails", + "laboranalytResultat", + "resistenzmechanismusBezeichnungValue", + "value", + "antibiogramm", + "haufigkeit", + "kommentarValue", + "resistenzmechanismus", + "valueMagnitude", + "valueUnits", + "weitereErganzungen", + "keimSubtyp", + "virulenzfaktorValue", + "mreKlasseDefiningcode", + "value", + "value", + "value", + "bewertungValue", + "kommentarValue", + "artDerTypisierung", + "ergebnis", + "erregernameDefiningcode", + "language", + "standort", + "zeitpunktDesErstenErregernachweisesValue", + "zeitpunktDesLetztenErregernachweisesValue", + "transmissionswegValue", + "ubertragungswegValue", + "erregerdetails", + "smicsErgebniskategorieDefiningcode", + "multispeziesValue", + "anzahlDerErregernachweise", + "timeValue", + "beginnValue", + "beginnDerUntersuchungValue", + "endeValue", + "dauerValue", + "subject", + "originValue", + "erregertypisierung", + "kommentarValue", + "kommentarValueValue", + "versionUid", + "endTimeValue", + "participations", + "language", + "healthCareFacility", + "statusValue", + "berichtIdValue", + "territory", + "eventsummary", + "startTimeValue", + "smicsErgebnis", + "composer", + "settingDefiningcode", + "feederAudit", + "location", + "categoryDefiningcode" + ); writeFiles(generate); } @@ -355,8 +465,8 @@ public void testGenerateBefundDerBlutgasanalyse() throws IOException, XmlExcepti TemplateDocument.Factory.parse( OperationalTemplateTestData.BEFUND_DER_BLUTGASANALYSE.getStream()) .getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser( template).parse()); List fieldSpecs = generate.getClasses().values().stream() .flatMap(Collection::stream) @@ -375,8 +485,8 @@ public void testGenerateMultiOccurrence() throws IOException, XmlException { OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.MULTI_OCCURRENCE.getStream()) .getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser( template).parse()); List fieldSpecs = generate.getClasses().values().stream() @@ -385,17 +495,17 @@ public void testGenerateMultiOccurrence() throws IOException, XmlException { .map(t -> t.fieldSpecs) .flatMap(List::stream) .collect(Collectors.toList()); - +/* assertThat(fieldSpecs) .extracting(f -> f.name, f -> f.type.toString()) .containsExactlyInAnyOrder( new Tuple("versionUid", "org.ehrbase.client.openehrclient.VersionUid"), new Tuple("extension", "java.util.List"), new Tuple( - "language", "org.ehrbase.client.classgenerator.examples.shareddefinition.Language"), + "language", "org.ehrbase.client.classgenerator.shareddefinition.Language"), new Tuple( "settingDefiningcode", - "org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode"), + "org.ehrbase.client.classgenerator.shareddefinition.SettingDefiningcode"), new Tuple( "structuredMeasurementLocation", "java.util.List"), @@ -404,11 +514,11 @@ public void testGenerateMultiOccurrence() throws IOException, XmlException { new Tuple("subject", "com.nedap.archie.rm.generic.PartyProxy"), new Tuple( "locationOfMeasurementDefiningcode", - "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.LocationOfMeasurementDefiningcode"), + "org.ehrbase.client.classgenerator.examples2.ehrbasemultioccurrencedev1composition.definition.LocationOfMeasurementDefiningcode"), new Tuple("locationOfMeasurementValue", "java.lang.String"), new Tuple( "bodyExposureDefiningcode", - "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyExposureDefiningcode"), + "org.ehrbase.client.classgenerator.examples2.ehrbasemultioccurrencedev1composition.definition.BodyExposureDefiningcode"), new Tuple("bodyExposureValue", "java.lang.String"), new Tuple("temperatureMagnitude", "java.lang.Double"), new Tuple("temperatureUnits", "java.lang.String"), @@ -417,15 +527,15 @@ public void testGenerateMultiOccurrence() throws IOException, XmlException { new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), new Tuple("endTimeValue", "java.time.temporal.TemporalAccessor"), new Tuple( - "language", "org.ehrbase.client.classgenerator.examples.shareddefinition.Language"), + "language", "org.ehrbase.client.classgenerator.shareddefinition.Language"), new Tuple("healthCareFacility", "com.nedap.archie.rm.generic.PartyIdentified"), new Tuple("composer", "com.nedap.archie.rm.generic.PartyProxy"), new Tuple( "territory", - "org.ehrbase.client.classgenerator.examples.shareddefinition.Territory"), + "org.ehrbase.client.classgenerator.shareddefinition.Territory"), new Tuple( "bodyTemperature", - "java.util.List"), + "java.util.List"), new Tuple("location", "java.lang.String"), new Tuple("startTimeValue", "java.time.temporal.TemporalAccessor"), new Tuple("currentDayOfMenstrualCycleMagnitude", "java.lang.Long"), @@ -434,17 +544,17 @@ public void testGenerateMultiOccurrence() throws IOException, XmlException { "java.util.List"), new Tuple( "bodyExposure", - "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureBodyExposureChoice"), + "org.ehrbase.client.classgenerator.examples2.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureBodyExposureChoice"), new Tuple( "locationOfMeasurement", - "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementChoice"), + "org.ehrbase.client.classgenerator.examples2.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementChoice"), new Tuple( "categoryDefiningcode", - "org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode"), + "org.ehrbase.client.classgenerator.shareddefinition.CategoryDefiningcode"), new Tuple("extension", "java.util.List"), new Tuple( "bodyExposureDefiningcode", - "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyExposureDefiningcode"), + "org.ehrbase.client.classgenerator.examples2.ehrbasemultioccurrencedev1composition.definition.BodyExposureDefiningcode"), new Tuple("bodyExposureValue", "java.lang.String"), new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), new Tuple("temperatureMagnitude", "java.lang.Double"), @@ -458,17 +568,17 @@ public void testGenerateMultiOccurrence() throws IOException, XmlException { new Tuple("widthValue", "java.time.temporal.TemporalAmount"), new Tuple( "bodyExposure", - "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureBodyExposureChoice2"), + "org.ehrbase.client.classgenerator.examples2.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureBodyExposureChoice2"), new Tuple( "mathFunctionDefiningcode", "org.ehrbase.client.classgenerator.shareddefinition.MathFunctionDefiningcode"), new Tuple( "anyEvent", - "java.util.List"), + "java.util.List"), new Tuple( "participations", "java.util.List"), new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit")); - +*/ writeFiles(generate); } diff --git a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java index f55352e18..c73b5e5ef 100644 --- a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java +++ b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java @@ -242,12 +242,41 @@ public void testGenerateEpisode() throws IOException, XmlException { OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.EPISODE_OF_CARE.getStream()).getTemplate(); ClassGenerator cut = new ClassGenerator(); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - List fieldSpecs = generate.getClasses().values().stream() + List fieldSpecs = generate.getClasses().values().stream() .flatMap(Collection::stream) .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); - - assertThat(fieldSpecs).size().isEqualTo(28); + .map(t -> t.fieldSpecs).flatMap(List::stream).map(f -> f.name).collect(Collectors.toList()); + + assertThat(fieldSpecs).containsExactlyInAnyOrder( + "value", + "value", + "rankMagnitude", + "roleValue", + "diagnosisEntry", + "identifier", + "team", + "statusDefiningcode", + "language", + "diagnosis", + "subject", + "managingOrganizationValue", + "typeValue", + "period", + "careManagerValue", + "versionUid", + "episodeofcare", + "endTimeValue", + "participations", + "language", + "healthcarefacility", + "composer", + "settingDefiningcode", + "territory", + "feederAudit", + "location", + "categoryDefiningcode", + "startTimeValue" + ); writeFiles(generate); @@ -259,12 +288,93 @@ public void testGenerateSmICS() throws IOException, XmlException { OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.SM_I_C_S_BEFUND.getStream()).getTemplate(); ClassGenerator cut = new ClassGenerator(); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - List fieldSpecs = generate.getClasses().values().stream() + List fieldSpecs = generate.getClasses().values().stream() .flatMap(Collection::stream) .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); - - assertThat(fieldSpecs).size().isEqualTo(80); + .map(t -> t.fieldSpecs).flatMap(List::stream).map(f -> f.name).collect(Collectors.toList()); + + assertThat(fieldSpecs).containsExactlyInAnyOrder( + "value", + "valueValue", + "value", + "idDerPerson", + "artDerPersonValue", + "kommentarValue", + "fallKategorieValue", + "fallidentifikationValue", + "fallArtValue", + "beteiligtePersonen", + "zimmerValue", + "stationValue", + "details", + "standorttypValue", + "standortbeschreibungValue", + "standortschlusselValue", + "antibiotikumDefiningcode", + "resistenzValue", + "kommentarValue", + "minimaleHemmkonzentrationMagnitude", + "minimaleHemmkonzentrationUnits", + "analyseergebnisDetails", + "laboranalytResultat", + "resistenzmechanismusBezeichnungValue", + "value", + "antibiogramm", + "haufigkeit", + "kommentarValue", + "resistenzmechanismus", + "keimzahlMagnitude", + "keimzahlUnits", + "weitereErganzungen", + "keimSubtyp", + "keimzahlDefiningcode", + "virulenzfaktorValue", + "mreKlasseDefiningcode", + "magnitude", + "definingcode", + "value", + "bewertungValue", + "kommentarValue", + "artDerTypisierung", + "ergebnis", + "erregernameDefiningcode", + "language", + "standort", + "zeitpunktDesErstenErregernachweisesValue", + "zeitpunktDesLetztenErregernachweisesValue", + "transmissionswegValue", + "ubertragungswegValue", + "erregerdetails", + "smicsErgebniskategorieDefiningcode", + "multispeziesValue", + "anzahlDerErregernachweise", + "timeValue", + "beginnValue", + "beginnDerUntersuchungValue", + "endeValue", + "dauerValue", + "subject", + "originValue", + "erregertypisierung", + "kommentarValue", + "kommentarValueArtDerUbertragung", + "versionUid", + "endTimeValue", + "participations", + "language", + "healthCareFacility", + "statusValue", + "berichtIdValue", + "territory", + "eventsummary", + "startTimeValue", + "smicsErgebnis", + "composer", + "settingDefiningcode", + "feederAudit", + "location", + "categoryDefiningcode" + ); writeFiles(generate); diff --git a/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java b/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java index 1fe4e719b..c2a12d288 100644 --- a/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java +++ b/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java @@ -36,11 +36,12 @@ import java.util.Set; import java.util.stream.Collectors; -public class Filter { +public class Filter implements WebtemplateFilter { private static final Map, RmIntrospectConfig> configMap = ReflectionHelper.buildMap(RmIntrospectConfig.class); public static final ArchieRMInfoLookup ARCHIE_RM_INFO_LOOKUP = ArchieRMInfoLookup.getInstance(); + @Override public WebTemplate filter(WebTemplate webTemplate) { WebTemplate clone = new WebTemplate(webTemplate); List filteredChildren = filter(clone.getTree(), webTemplate, null); @@ -50,6 +51,23 @@ public WebTemplate filter(WebTemplate webTemplate) { } protected List filter(WebTemplateNode node, WebTemplate context, WebTemplateNode parent) { + preHandle(node); + List nodes; + List filteredChildren = node.getChildren().stream().map(n -> filter(n, context, node)).flatMap(List::stream).collect(Collectors.toList()); + node.getChildren().clear(); + node.getChildren().addAll(filteredChildren); + if (skip(node, context, parent)) { + nodes = filteredChildren; + + } else { + nodes = Collections.singletonList(node); + + } + OPTParser.makeIdUnique(node); + return nodes; + } + + protected void preHandle(WebTemplateNode node) { List nodes; List ismTransitionList = node.getChildren().stream() .filter(n -> "ISM_TRANSITION".equals(n.getRmType())) @@ -64,18 +82,6 @@ protected List filter(WebTemplateNode node, WebTemplate context node.getChildren().clear(); node.getChildren().add(merged); } - List filteredChildren = node.getChildren().stream().map(n -> filter(n, context, node)).flatMap(List::stream).collect(Collectors.toList()); - node.getChildren().clear(); - node.getChildren().addAll(filteredChildren); - if (skip(node, context, parent)) { - nodes = filteredChildren; - - } else { - nodes = Collections.singletonList(node); - - } - OPTParser.makeIdUnique(node); - return nodes; } protected boolean skip(WebTemplateNode node, WebTemplate context, WebTemplateNode parent) { @@ -95,6 +101,8 @@ protected boolean skip(WebTemplateNode node, WebTemplate context, WebTemplateNod attributeNames.add("lower"); attributeNames.add("upper"); attributeNames.add("ism_transition"); + + SetUtils.SetView difference = SetUtils.difference(typeInfo.getAttributes().keySet(), attributeNames); if (difference.contains(node.getName())) { return true; diff --git a/web-template/src/main/java/org/ehrbase/webtemplate/filter/WebtemplateFilter.java b/web-template/src/main/java/org/ehrbase/webtemplate/filter/WebtemplateFilter.java new file mode 100644 index 000000000..fd010151c --- /dev/null +++ b/web-template/src/main/java/org/ehrbase/webtemplate/filter/WebtemplateFilter.java @@ -0,0 +1,26 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.webtemplate.filter; + +import org.ehrbase.webtemplate.model.WebTemplate; + +public interface WebtemplateFilter { + WebTemplate filter(WebTemplate webTemplate); +} diff --git a/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java b/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java index 0a9e54065..f4a40ac48 100644 --- a/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java +++ b/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java @@ -23,6 +23,7 @@ import com.nedap.archie.rm.composition.EventContext; import com.nedap.archie.rm.composition.IsmTransition; import com.nedap.archie.rm.datastructures.Element; +import com.nedap.archie.rm.datavalues.quantity.DvInterval; import com.nedap.archie.rminfo.ArchieRMInfoLookup; import com.nedap.archie.rminfo.RMAttributeInfo; import com.nedap.archie.rminfo.RMTypeInfo; @@ -61,455 +62,532 @@ import java.util.stream.Collectors; public class OPTParser { - public static final String PATH_DIVIDER = "/"; - public static final ArchieRMInfoLookup ARCHIE_RM_INFO_LOOKUP = ArchieRMInfoLookup.getInstance(); - private static final TerminologyProvider TERMINOLOGY_PROVIDER = new TerminologyProvider(); - - private final OPERATIONALTEMPLATE operationaltemplate; - private final String defaultLanguage; - - public OPTParser(OPERATIONALTEMPLATE operationaltemplate) { - this.operationaltemplate = operationaltemplate; - defaultLanguage = operationaltemplate.getLanguage().getCodeString(); - } - - public WebTemplate parse() { - WebTemplate webTemplate = new WebTemplate(); - - webTemplate.setTemplateId(operationaltemplate.getTemplateId().getValue()); - webTemplate.setDefaultLanguage(defaultLanguage); - webTemplate.setVersion("2.3"); - webTemplate.setTree(parseCARCHETYPEROO(operationaltemplate.getDefinition(), "")); - return webTemplate; - } - - private WebTemplateNode parseCARCHETYPEROO(CARCHETYPEROOT carchetyperoot, String aqlPath) { - - // extract local Terminologies - Map> termDefinitionMap = new HashMap<>(); - for (ARCHETYPETERM term : carchetyperoot.getTermDefinitionsArray()) { - String code = term.getCode(); - String value = null; - String description = null; - for (StringDictionaryItem item : term.getItemsArray()) { - if ("text".equals(item.getId())) { - value = item.getStringValue(); - } - if ("description".equals(item.getId())) - description = item.getStringValue(); - } - termDefinitionMap.computeIfAbsent(code, c -> new HashMap<>()).put(defaultLanguage, new TermDefinition(code, value, description)); - + public static final String PATH_DIVIDER = "/"; + public static final ArchieRMInfoLookup ARCHIE_RM_INFO_LOOKUP = ArchieRMInfoLookup.getInstance(); + private static final TerminologyProvider TERMINOLOGY_PROVIDER = new TerminologyProvider(); + + private final OPERATIONALTEMPLATE operationaltemplate; + private final String defaultLanguage; + + public OPTParser(OPERATIONALTEMPLATE operationaltemplate) { + this.operationaltemplate = operationaltemplate; + defaultLanguage = operationaltemplate.getLanguage().getCodeString(); + } + + public WebTemplate parse() { + WebTemplate webTemplate = new WebTemplate(); + + webTemplate.setTemplateId(operationaltemplate.getTemplateId().getValue()); + webTemplate.setDefaultLanguage(defaultLanguage); + webTemplate.setVersion("2.3"); + webTemplate.setTree(parseCARCHETYPEROO(operationaltemplate.getDefinition(), "")); + return webTemplate; + } + + private WebTemplateNode parseCARCHETYPEROO(CARCHETYPEROOT carchetyperoot, String aqlPath) { + + // extract local Terminologies + Map> termDefinitionMap = new HashMap<>(); + for (ARCHETYPETERM term : carchetyperoot.getTermDefinitionsArray()) { + String code = term.getCode(); + String value = null; + String description = null; + for (StringDictionaryItem item : term.getItemsArray()) { + if ("text".equals(item.getId())) { + value = item.getStringValue(); } - WebTemplateNode node = parseCCOMPLEXOBJECT(carchetyperoot, aqlPath, termDefinitionMap, null); - node.setNodeId(carchetyperoot.getArchetypeId().getValue()); - addRMAttributes(node, aqlPath, termDefinitionMap); - return node; + if ("description".equals(item.getId())) description = item.getStringValue(); + } + termDefinitionMap + .computeIfAbsent(code, c -> new HashMap<>()) + .put(defaultLanguage, new TermDefinition(code, value, description)); } - - private WebTemplateNode parseCCOMPLEXOBJECT(CCOMPLEXOBJECT ccomplexobject, String aqlPath, Map> termDefinitionMap, String rmAttributeName) { - - Optional expliziteName = OptNameHelper.extractName(ccomplexobject); - WebTemplateNode node = buildNode(ccomplexobject, rmAttributeName, termDefinitionMap); - node.setAqlPath(aqlPath); - - if (StringUtils.isNotBlank(ccomplexobject.getNodeId()) && expliziteName.isPresent()) { - FlatPath path = new FlatPath(node.getAqlPath()); - FlatPath lastSegment = path; - while (lastSegment.getChild() != null) { - lastSegment = lastSegment.getChild(); - } - lastSegment.addOtherPredicate("name/value", expliziteName.get()); - node.setAqlPath(path.format(true)); - aqlPath = path.format(true); - } - - CATTRIBUTE[] cattributes = ccomplexobject.getAttributesArray(); - - for (CATTRIBUTE cattribute : cattributes) { - String pathLoop = aqlPath + PATH_DIVIDER + cattribute.getRmAttributeName(); - if ( - //Will be set via Attributes - pathLoop.equals("/category") - || pathLoop.endsWith("/name")) { - continue; - } - List newChildren = new ArrayList<>(); - for (COBJECT cobject : cattribute.getChildrenArray()) { - WebTemplateNode childNode = parseCOBJECT(cobject, pathLoop, termDefinitionMap, cattribute.getRmAttributeName()); - if (childNode != null) { - newChildren.add(childNode); - } - } - - List ismTransitionList = newChildren.stream() - .filter(n -> "ISM_TRANSITION".equals(n.getRmType())) - .collect(Collectors.toList()); - if (!ismTransitionList.isEmpty()) { - - WebTemplateNode ismTransition = new WebTemplateNode(); - ismTransition.setName(cattribute.getRmAttributeName()); - ismTransition.setId(buildId(cattribute.getRmAttributeName())); - ismTransition.setMin(ismTransitionList.get(0).getMin()); - ismTransition.setMax(ismTransitionList.get(0).getMax()); - ismTransition.setRmType("ISM_TRANSITION"); - ismTransition.setAqlPath(aqlPath + "/" + cattribute.getRmAttributeName()); - - WebTemplateNode careflowStep = new WebTemplateNode(); - WebTemplateNode careflowStepProto = ismTransitionList.get(0).findMatching(n -> n.getId().equals("careflow_step")).get(0); - careflowStep.setMin(careflowStepProto.getMin()); - careflowStep.setMax(careflowStepProto.getMin()); - careflowStep.setName("Careflow_step"); - careflowStep.setId("careflow_step"); - careflowStep.setRmType("DV_CODED_TEXT"); - careflowStep.setAqlPath(aqlPath + "/" + cattribute.getRmAttributeName() + "/" + "careflow_step"); - WebTemplateInput code = new WebTemplateInput(); - code.setSuffix("code"); - code.setType("CODED_TEXT"); - - ismTransitionList.forEach( - i -> { - WebTemplateInputValue value = i.findChildById("careflow_step").get().getInputs().get(0).getList().get(0); - value.getCurrentStates().addAll(i.findChildById("current_state").get().getInputs().get(0).getList().stream().map(WebTemplateInputValue::getValue).collect(Collectors.toList())); - code.getList().add(value); - } - ); - careflowStep.getInputs().add(code); - ismTransition.getChildren().add(careflowStep); - - - WebTemplateNode currentState = new WebTemplateNode(); - WebTemplateNode currentStateProto = ismTransitionList.get(0).findMatching(n -> n.getId().equals("current_state")).get(0); - currentState.setMin(currentStateProto.getMin()); - currentState.setMax(currentStateProto.getMin()); - currentState.setRmType("DV_CODED_TEXT"); - currentState.setName("Current_state"); - currentState.setId("current_state"); - currentState.setAqlPath(aqlPath + "/" + cattribute.getRmAttributeName() + "/" + "current_state"); - WebTemplateInput code2 = new WebTemplateInput(); - code2.setSuffix("code"); - code2.setType("CODED_TEXT"); - code2.getList().addAll( - ismTransitionList.stream() - .map(n -> n.findMatching(k -> k.getId().equals("current_state"))) - .flatMap(List::stream) - .map(WebTemplateNode::getInputs) - .flatMap(List::stream) - .map(WebTemplateInput::getList) - .flatMap(List::stream) - .collect(Collectors.toList()) - ); - currentState.getInputs().add(code2); - ismTransition.getChildren().add(currentState); - WebTemplateNode transition = ismTransitionList.get(0).findChildById("transition").get(); - transition.setAqlPath(aqlPath + "/" + cattribute.getRmAttributeName() + "/" + "transition"); - ismTransition.getChildren().add(transition); - node.getChildren().add(ismTransition); - } - - node.getChildren().addAll(newChildren); - } - - // Handle choice children - node.getChoicesInChildren() - .values() - .stream() - .flatMap(List::stream) - .filter(n -> n.getRmType().startsWith("DV_")) - .forEach(n -> n.setId(n.getRmType().replace("DV_", "").toLowerCase() + "_value")); - - //Inherit name for Element values - if (node.getRmType().equals("ELEMENT")) { - if (node.getChildren().size() == 1) { - WebTemplateNode value = node.getChildren().get(0); - value.setId(node.getId(false)); - value.setName(node.getName()); - value.setMax(node.getMax()); - value.setMin(node.getMin()); - value.getLocalizedDescriptions().putAll(node.getLocalizedDescriptions()); - value.getLocalizedNames().putAll(node.getLocalizedNames()); - value.setLocalizedName(node.getLocalizedName()); - // If contains a choice of DV_TEXT and DV_CODED_TEXT add a merged node - } else if (node.getChildren().size() == 2 && node.getChildren().stream().map(WebTemplateNode::getRmType).collect(Collectors.toList()).containsAll(List.of("DV_TEXT", "DV_CODED_TEXT"))) { - WebTemplateNode merged = new WebTemplateNode(); - merged.setId(node.getId(false)); - merged.setName(node.getName()); - merged.setMax(node.getMax()); - merged.setMin(node.getMin()); - merged.setRmType("DV_CODED_TEXT"); - WebTemplateNode codedTextValue = node.findChildById("coded_text_value").orElseThrow(); - merged.getInputs().addAll(codedTextValue.getInputs()); - merged.setAqlPath(codedTextValue.getAqlPath()); - merged.getLocalizedDescriptions().putAll(node.getLocalizedDescriptions()); - merged.getLocalizedNames().putAll(node.getLocalizedNames()); - merged.setLocalizedName(node.getLocalizedName()); - WebTemplateInput other = new WebTemplateInput(); - other.setType("TEXT"); - other.setSuffix("other"); - merged.getInputs().add(other); - node.getChildren().add(merged); - } - } - - - //Push inputs for DV_CODED_TEXT up - if (node.getRmType().equals("DV_CODED_TEXT")) { - List matching = node.findMatching(n -> n.getRmType().equals("CODE_PHRASE")); - if (!matching.isEmpty()) { - node.getInputs().addAll(matching.get(0).getInputs()); - WebTemplateInput code = node.getInputs().get(0); - if (code.getList().isEmpty()) { - WebTemplateInput value = new WebTemplateInput(); - value.setType("TEXT"); - value.setSuffix("value"); - value.setTerminology(code.getTerminology()); - } - } - } - - - addRMAttributes(node, aqlPath, termDefinitionMap); - - makeIdUnique(node); - - - return node; - } - - public static void makeIdUnique(WebTemplateNode node) { - //Make ids unique in for a children - node.getChildren().stream() - .collect(Collectors.groupingBy(node1 -> node1.getId(false))) - .values() - .forEach(l -> { - if (l.size() > 1) { - for (int i = 0; i < l.size(); i++) { - if (i > 0) { - WebTemplateNode n = l.get(i); - n.setOptionalIdNumber((i + 1)); - } - } - } else { - l.get(0).setOptionalIdNumber(null); - } - } - ); + WebTemplateNode node = parseCCOMPLEXOBJECT(carchetyperoot, aqlPath, termDefinitionMap, null); + node.setNodeId(carchetyperoot.getArchetypeId().getValue()); + addRMAttributes(node, aqlPath, termDefinitionMap); + return node; + } + + private WebTemplateNode parseCCOMPLEXOBJECT( + CCOMPLEXOBJECT ccomplexobject, + String aqlPath, + Map> termDefinitionMap, + String rmAttributeName) { + + Optional expliziteName = OptNameHelper.extractName(ccomplexobject); + WebTemplateNode node = buildNode(ccomplexobject, rmAttributeName, termDefinitionMap); + node.setAqlPath(aqlPath); + + if (StringUtils.isNotBlank(ccomplexobject.getNodeId()) && expliziteName.isPresent()) { + FlatPath path = new FlatPath(node.getAqlPath()); + FlatPath lastSegment = path; + while (lastSegment.getChild() != null) { + lastSegment = lastSegment.getChild(); + } + lastSegment.addOtherPredicate("name/value", expliziteName.get()); + node.setAqlPath(path.format(true)); + aqlPath = path.format(true); } - private void addRMAttributes(WebTemplateNode node, String aqlPath, Map> termDefinitionMap) { - //Add RM Attributes - RMTypeInfo typeInfo = ARCHIE_RM_INFO_LOOKUP.getTypeInfo(node.getRmType()); - if (typeInfo != null && (Locatable.class.isAssignableFrom(typeInfo.getJavaClass()) || EventContext.class.isAssignableFrom(typeInfo.getJavaClass()) || IsmTransition.class.isAssignableFrom(typeInfo.getJavaClass())) && !Element.class.isAssignableFrom(typeInfo.getJavaClass())) { - - node.getChildren().addAll(typeInfo.getAttributes() - .values() - .stream() - .filter(s -> !s.isComputed()) - .filter(s -> !List.of("value").contains(s.getRmName())) - .filter(s -> !Locatable.class.isAssignableFrom(s.getTypeInCollection())) - .map(i -> buildNodeForAttribute(i, aqlPath, termDefinitionMap)) - //only add if not already there - .filter(n -> node.getChildren().stream().map(WebTemplateNode::getId).noneMatch(s -> s.equals(n.getId()))) - .collect(Collectors.toList())); + CATTRIBUTE[] cattributes = ccomplexobject.getAttributesArray(); + + for (CATTRIBUTE cattribute : cattributes) { + String pathLoop = aqlPath + PATH_DIVIDER + cattribute.getRmAttributeName(); + if ( + // Will be set via Attributes + pathLoop.equals("/category") || pathLoop.endsWith("/name")) { + continue; + } + List newChildren = new ArrayList<>(); + for (COBJECT cobject : cattribute.getChildrenArray()) { + WebTemplateNode childNode = + parseCOBJECT(cobject, pathLoop, termDefinitionMap, cattribute.getRmAttributeName()); + if (childNode != null) { + newChildren.add(childNode); } + } + + List ismTransitionList = + newChildren.stream() + .filter(n -> "ISM_TRANSITION".equals(n.getRmType())) + .collect(Collectors.toList()); + if (!ismTransitionList.isEmpty()) { + + WebTemplateNode ismTransition = new WebTemplateNode(); + ismTransition.setName(cattribute.getRmAttributeName()); + ismTransition.setId(buildId(cattribute.getRmAttributeName())); + ismTransition.setMin(ismTransitionList.get(0).getMin()); + ismTransition.setMax(ismTransitionList.get(0).getMax()); + ismTransition.setRmType("ISM_TRANSITION"); + ismTransition.setAqlPath(aqlPath + "/" + cattribute.getRmAttributeName()); + + WebTemplateNode careflowStep = new WebTemplateNode(); + WebTemplateNode careflowStepProto = + ismTransitionList.get(0).findMatching(n -> n.getId().equals("careflow_step")).get(0); + careflowStep.setMin(careflowStepProto.getMin()); + careflowStep.setMax(careflowStepProto.getMin()); + careflowStep.setName("Careflow_step"); + careflowStep.setId("careflow_step"); + careflowStep.setRmType("DV_CODED_TEXT"); + careflowStep.setAqlPath( + aqlPath + "/" + cattribute.getRmAttributeName() + "/" + "careflow_step"); + WebTemplateInput code = new WebTemplateInput(); + code.setSuffix("code"); + code.setType("CODED_TEXT"); + + ismTransitionList.forEach( + i -> { + WebTemplateInputValue value = + i.findChildById("careflow_step").get().getInputs().get(0).getList().get(0); + value + .getCurrentStates() + .addAll( + i.findChildById("current_state").get().getInputs().get(0).getList().stream() + .map(WebTemplateInputValue::getValue) + .collect(Collectors.toList())); + code.getList().add(value); + }); + careflowStep.getInputs().add(code); + ismTransition.getChildren().add(careflowStep); + + WebTemplateNode currentState = new WebTemplateNode(); + WebTemplateNode currentStateProto = + ismTransitionList.get(0).findMatching(n -> n.getId().equals("current_state")).get(0); + currentState.setMin(currentStateProto.getMin()); + currentState.setMax(currentStateProto.getMin()); + currentState.setRmType("DV_CODED_TEXT"); + currentState.setName("Current_state"); + currentState.setId("current_state"); + currentState.setAqlPath( + aqlPath + "/" + cattribute.getRmAttributeName() + "/" + "current_state"); + WebTemplateInput code2 = new WebTemplateInput(); + code2.setSuffix("code"); + code2.setType("CODED_TEXT"); + code2 + .getList() + .addAll( + ismTransitionList.stream() + .map(n -> n.findMatching(k -> k.getId().equals("current_state"))) + .flatMap(List::stream) + .map(WebTemplateNode::getInputs) + .flatMap(List::stream) + .map(WebTemplateInput::getList) + .flatMap(List::stream) + .collect(Collectors.toList())); + currentState.getInputs().add(code2); + ismTransition.getChildren().add(currentState); + WebTemplateNode transition = ismTransitionList.get(0).findChildById("transition").get(); + transition.setAqlPath(aqlPath + "/" + cattribute.getRmAttributeName() + "/" + "transition"); + ismTransition.getChildren().add(transition); + node.getChildren().add(ismTransition); + } + + node.getChildren().addAll(newChildren); } - private WebTemplateNode buildNodeForAttribute(RMAttributeInfo attributeInfo, String aqlPath, Map> termDefinitionMap) { - WebTemplateNode node = new WebTemplateNode(); - node.setAqlPath(aqlPath + PATH_DIVIDER + attributeInfo.getRmName()); - node.setName(attributeInfo.getRmName()); - node.setId(buildId(attributeInfo.getRmName())); - node.setRmType(attributeInfo.getTypeNameInCollection()); - node.setMax(attributeInfo.isMultipleValued() ? -1:1); - node.setMin(0); - return node; + // Handle choice children + node.getChoicesInChildren().values().stream() + .flatMap(List::stream) + .filter(n -> n.getRmType().startsWith("DV_")) + .forEach(n -> n.setId(n.getRmType().replace("DV_", "").toLowerCase() + "_value")); + + // Inherit name for Element values + if (node.getRmType().equals("ELEMENT")) { + if (node.getChildren().size() == 1) { + WebTemplateNode value = node.getChildren().get(0); + value.setId(node.getId(false)); + value.setName(node.getName()); + value.setMax(node.getMax()); + value.setMin(node.getMin()); + value.getLocalizedDescriptions().putAll(node.getLocalizedDescriptions()); + value.getLocalizedNames().putAll(node.getLocalizedNames()); + value.setLocalizedName(node.getLocalizedName()); + // If contains a choice of DV_TEXT and DV_CODED_TEXT add a merged node + } else if (node.getChildren().size() == 2 + && node.getChildren().stream() + .map(WebTemplateNode::getRmType) + .collect(Collectors.toList()) + .containsAll(List.of("DV_TEXT", "DV_CODED_TEXT"))) { + WebTemplateNode merged = new WebTemplateNode(); + merged.setId(node.getId(false)); + merged.setName(node.getName()); + merged.setMax(node.getMax()); + merged.setMin(node.getMin()); + merged.setRmType("DV_CODED_TEXT"); + WebTemplateNode codedTextValue = node.findChildById("coded_text_value").orElseThrow(); + merged.getInputs().addAll(codedTextValue.getInputs()); + merged.setAqlPath(codedTextValue.getAqlPath()); + merged.getLocalizedDescriptions().putAll(node.getLocalizedDescriptions()); + merged.getLocalizedNames().putAll(node.getLocalizedNames()); + merged.setLocalizedName(node.getLocalizedName()); + WebTemplateInput other = new WebTemplateInput(); + other.setType("TEXT"); + other.setSuffix("other"); + merged.getInputs().add(other); + node.getChildren().add(merged); + } } - private WebTemplateNode parseCOBJECT(COBJECT cobject, String aqlPath, Map> termDefinitionMap, String rmAttributeName) { - - - if (cobject instanceof CARCHETYPEROOT) { - String nodeId = ((CARCHETYPEROOT) cobject).getArchetypeId().getValue(); - final String pathLoop; - if (StringUtils.isNotBlank(nodeId)) { - pathLoop = aqlPath + "[" + nodeId + "]"; - } else { - pathLoop = aqlPath; - } - return parseCARCHETYPEROO((CARCHETYPEROOT) cobject, pathLoop); - - } else if (cobject instanceof CCOMPLEXOBJECT) { - String nodeId = cobject.getNodeId(); - final String pathLoop; - if (StringUtils.isNotBlank(nodeId)) { - pathLoop = aqlPath + "[" + nodeId + "]"; - } else { - pathLoop = aqlPath; - } - return parseCCOMPLEXOBJECT((CCOMPLEXOBJECT) cobject, pathLoop, termDefinitionMap, rmAttributeName); - - } else if (cobject instanceof CDOMAINTYPE) { - String nodeId = cobject.getNodeId(); - final String pathLoop; - if (StringUtils.isNotBlank(nodeId)) { - pathLoop = aqlPath + "[" + nodeId + "]"; - } else { - pathLoop = aqlPath; - } - return parseCDOMAINTYPE((CDOMAINTYPE) cobject, pathLoop, termDefinitionMap, rmAttributeName); - }else if (cobject instanceof ARCHETYPESLOT){ - String nodeId = cobject.getNodeId(); - final String pathLoop; - if (StringUtils.isNotBlank(nodeId)) { - pathLoop = aqlPath + "[" + nodeId + "]"; - } else { - pathLoop = aqlPath; - } - return parseARCHETYPESLOT((ARCHETYPESLOT) cobject, pathLoop, termDefinitionMap, rmAttributeName); + // Push inputs for DV_CODED_TEXT up + if (node.getRmType().equals("DV_CODED_TEXT")) { + List matching = node.findMatching(n -> n.getRmType().equals("CODE_PHRASE")); + if (!matching.isEmpty()) { + node.getInputs().addAll(matching.get(0).getInputs()); + WebTemplateInput code = node.getInputs().get(0); + if (code.getList().isEmpty()) { + WebTemplateInput value = new WebTemplateInput(); + value.setType("TEXT"); + value.setSuffix("value"); + value.setTerminology(code.getTerminology()); } - return null; + } } - private WebTemplateNode parseARCHETYPESLOT(ARCHETYPESLOT cobject, String pathLoop, Map> termDefinitionMap, String rmAttributeName) { - WebTemplateNode node = buildNode(cobject, rmAttributeName, termDefinitionMap); - node.setAqlPath(pathLoop); - return node; - + addRMAttributes(node, aqlPath, termDefinitionMap); + + makeIdUnique(node); + + return node; + } + + public static void makeIdUnique(WebTemplateNode node) { + // Make ids unique in for a children + node.getChildren().stream() + .collect(Collectors.groupingBy(node1 -> node1.getId(false))) + .values() + .forEach( + l -> { + if (l.size() > 1) { + for (int i = 0; i < l.size(); i++) { + if (i > 0) { + WebTemplateNode n = l.get(i); + n.setOptionalIdNumber((i + 1)); + } + } + } else { + l.get(0).setOptionalIdNumber(null); + } + }); + } + + private void addRMAttributes( + WebTemplateNode node, + String aqlPath, + Map> termDefinitionMap) { + // Add RM Attributes + RMTypeInfo typeInfo = ARCHIE_RM_INFO_LOOKUP.getTypeInfo(node.getRmType()); + if (typeInfo != null + && (Locatable.class.isAssignableFrom(typeInfo.getJavaClass()) + || EventContext.class.isAssignableFrom(typeInfo.getJavaClass()) + || DvInterval.class.isAssignableFrom(typeInfo.getJavaClass()) + || IsmTransition.class.isAssignableFrom(typeInfo.getJavaClass())) + && !Element.class.isAssignableFrom(typeInfo.getJavaClass())) { + + node.getChildren() + .addAll( + typeInfo.getAttributes().values().stream() + .filter(s -> !s.isComputed()) + .filter(s -> !List.of("value").contains(s.getRmName())) + .filter(s -> !Locatable.class.isAssignableFrom(s.getTypeInCollection())) + .map(i -> buildNodeForAttribute(i, aqlPath, termDefinitionMap)) + // only add if not already there + .filter( + n -> + node.getChildren().stream() + .map(WebTemplateNode::getId) + .noneMatch(s -> s.equals(n.getId()))) + .collect(Collectors.toList())); } - - private WebTemplateNode parseCDOMAINTYPE(CDOMAINTYPE cdomaintype, String aqlPath, Map> termDefinitionMap, String rmAttributeName) { - - WebTemplateNode node = buildNode(cdomaintype, rmAttributeName, termDefinitionMap); - node.setAqlPath(aqlPath); - if (cdomaintype instanceof CDVSTATE) { - - } else if (cdomaintype instanceof CDVQUANTITY) { - - WebTemplateInput magnitude = new WebTemplateInput(); - magnitude.setSuffix("magnitude"); - magnitude.setType("DECIMAL"); - node.getInputs().add(magnitude); - - WebTemplateInput unit = new WebTemplateInput(); - unit.setSuffix("unit"); - unit.setType("CODED_TEXT"); - node.getInputs().add(unit); - - Arrays.stream(((CDVQUANTITY) cdomaintype).getListArray()).forEach( - o -> { - WebTemplateInputValue value = new WebTemplateInputValue(); - value.setLabel(o.getUnits()); - value.setValue(o.getUnits()); - unit.getList().add(value); - } - ); - - } else if (cdomaintype instanceof CDVORDINAL) { - WebTemplateInput code = new WebTemplateInput(); - code.setType("CODED_TEXT"); - node.getInputs().add(code); - Arrays.stream(((CDVORDINAL) cdomaintype).getListArray()).forEach( - o -> { - WebTemplateInputValue value = new WebTemplateInputValue(); - value.setOrdinal(o.getValue()); - value.setValue(o.getSymbol().getDefiningCode().getCodeString()); - value.getLocalizedLabels().putAll( - Optional.ofNullable(termDefinitionMap.get(value.getValue())) - .map(Map::entrySet) - .stream() - .flatMap(Set::stream) - .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().getValue())) - ); - value.setLabel(value.getLocalizedLabels().get(defaultLanguage)); - code.getList().add(value); + } + + private WebTemplateNode buildNodeForAttribute( + RMAttributeInfo attributeInfo, + String aqlPath, + Map> termDefinitionMap) { + WebTemplateNode node = new WebTemplateNode(); + node.setAqlPath(aqlPath + PATH_DIVIDER + attributeInfo.getRmName()); + node.setName(attributeInfo.getRmName()); + node.setId(buildId(attributeInfo.getRmName())); + node.setRmType(attributeInfo.getTypeNameInCollection()); + node.setMax(attributeInfo.isMultipleValued() ? -1 : 1); + node.setMin(0); + addRMAttributes(node, node.getAqlPath(), termDefinitionMap); + return node; + } + + private WebTemplateNode parseCOBJECT( + COBJECT cobject, + String aqlPath, + Map> termDefinitionMap, + String rmAttributeName) { + + if (cobject instanceof CARCHETYPEROOT) { + String nodeId = ((CARCHETYPEROOT) cobject).getArchetypeId().getValue(); + final String pathLoop; + if (StringUtils.isNotBlank(nodeId)) { + pathLoop = aqlPath + "[" + nodeId + "]"; + } else { + pathLoop = aqlPath; + } + return parseCARCHETYPEROO((CARCHETYPEROOT) cobject, pathLoop); + + } else if (cobject instanceof CCOMPLEXOBJECT) { + String nodeId = cobject.getNodeId(); + final String pathLoop; + if (StringUtils.isNotBlank(nodeId)) { + pathLoop = aqlPath + "[" + nodeId + "]"; + } else { + pathLoop = aqlPath; + } + return parseCCOMPLEXOBJECT( + (CCOMPLEXOBJECT) cobject, pathLoop, termDefinitionMap, rmAttributeName); + + } else if (cobject instanceof CDOMAINTYPE) { + String nodeId = cobject.getNodeId(); + final String pathLoop; + if (StringUtils.isNotBlank(nodeId)) { + pathLoop = aqlPath + "[" + nodeId + "]"; + } else { + pathLoop = aqlPath; + } + return parseCDOMAINTYPE((CDOMAINTYPE) cobject, pathLoop, termDefinitionMap, rmAttributeName); + } else if (cobject instanceof ARCHETYPESLOT) { + String nodeId = cobject.getNodeId(); + final String pathLoop; + if (StringUtils.isNotBlank(nodeId)) { + pathLoop = aqlPath + "[" + nodeId + "]"; + } else { + pathLoop = aqlPath; + } + return parseARCHETYPESLOT( + (ARCHETYPESLOT) cobject, pathLoop, termDefinitionMap, rmAttributeName); + } + return null; + } + + private WebTemplateNode parseARCHETYPESLOT( + ARCHETYPESLOT cobject, + String pathLoop, + Map> termDefinitionMap, + String rmAttributeName) { + WebTemplateNode node = buildNode(cobject, rmAttributeName, termDefinitionMap); + node.setAqlPath(pathLoop); + return node; + } + + private WebTemplateNode parseCDOMAINTYPE( + CDOMAINTYPE cdomaintype, + String aqlPath, + Map> termDefinitionMap, + String rmAttributeName) { + + WebTemplateNode node = buildNode(cdomaintype, rmAttributeName, termDefinitionMap); + node.setAqlPath(aqlPath); + if (cdomaintype instanceof CDVSTATE) { + + } else if (cdomaintype instanceof CDVQUANTITY) { + + WebTemplateInput magnitude = new WebTemplateInput(); + magnitude.setSuffix("magnitude"); + magnitude.setType("DECIMAL"); + node.getInputs().add(magnitude); + + WebTemplateInput unit = new WebTemplateInput(); + unit.setSuffix("unit"); + unit.setType("CODED_TEXT"); + node.getInputs().add(unit); + + Arrays.stream(((CDVQUANTITY) cdomaintype).getListArray()) + .forEach( + o -> { + WebTemplateInputValue value = new WebTemplateInputValue(); + value.setLabel(o.getUnits()); + value.setValue(o.getUnits()); + unit.getList().add(value); + }); + + } else if (cdomaintype instanceof CDVORDINAL) { + WebTemplateInput code = new WebTemplateInput(); + code.setType("CODED_TEXT"); + node.getInputs().add(code); + Arrays.stream(((CDVORDINAL) cdomaintype).getListArray()) + .forEach( + o -> { + WebTemplateInputValue value = new WebTemplateInputValue(); + value.setOrdinal(o.getValue()); + value.setValue(o.getSymbol().getDefiningCode().getCodeString()); + value + .getLocalizedLabels() + .putAll( + Optional.ofNullable(termDefinitionMap.get(value.getValue())) + .map(Map::entrySet) + .stream() + .flatMap(Set::stream) + .collect( + Collectors.toMap(Map.Entry::getKey, e -> e.getValue().getValue()))); + value.setLabel(value.getLocalizedLabels().get(defaultLanguage)); + code.getList().add(value); + }); + + } else if (cdomaintype instanceof CCODEPHRASE) { + WebTemplateInput code = new WebTemplateInput(); + code.setType("CODED_TEXT"); + node.getInputs().add(code); + if (cdomaintype instanceof CCODEREFERENCE) { + code.setTerminology( + Optional.of((CCODEREFERENCE) cdomaintype) + .map(CCODEREFERENCE::getReferenceSetUri) + .map(s -> StringUtils.removeStart(s, "terminology:")) + .orElse(null)); + } else { + code.setTerminology( + Optional.of((CCODEPHRASE) cdomaintype) + .map(CCODEPHRASE::getTerminologyId) + .map(OBJECTID::getValue) + .orElse(null)); + } + if (code.getTerminology().equals("openehr")) { + ValueSet valueSet = + TerminologyProvider.findOpenEhrValueSet( + code.getTerminology(), ((CCODEPHRASE) cdomaintype).getCodeListArray()); + valueSet + .getTherms() + .forEach( + t -> { + WebTemplateInputValue value = new WebTemplateInputValue(); + value.setValue(t.getCode()); + value.setLabel(t.getValue()); + code.getList().add(value); + }); + } else { + Arrays.stream(((CCODEPHRASE) cdomaintype).getCodeListArray()) + .forEach( + o -> { + WebTemplateInputValue value = new WebTemplateInputValue(); + Optional termDefinition = + Optional.ofNullable(termDefinitionMap.get(o)) + .map(e -> e.get(defaultLanguage)); + if (termDefinition.isPresent()) { + value.setValue(termDefinition.get().getCode()); + value.setLabel(termDefinition.get().getValue()); + if (StringUtils.isNotBlank(termDefinition.get().getDescription())) { + value + .getLocalizedDescriptions() + .put(defaultLanguage, termDefinition.get().getDescription()); } - ); - - - } else if (cdomaintype instanceof CCODEPHRASE) { - WebTemplateInput code = new WebTemplateInput(); - code.setType("CODED_TEXT"); - node.getInputs().add(code); - if (cdomaintype instanceof CCODEREFERENCE) { - code.setTerminology(Optional.of((CCODEREFERENCE) cdomaintype).map(CCODEREFERENCE::getReferenceSetUri).map(s -> StringUtils.removeStart(s, "terminology:")).orElse(null)); - } else { - code.setTerminology(Optional.of((CCODEPHRASE) cdomaintype).map(CCODEPHRASE::getTerminologyId).map(OBJECTID::getValue).orElse(null)); - } - if (code.getTerminology().equals("local")) { - Arrays.stream(((CCODEPHRASE) cdomaintype).getCodeListArray()).forEach( - o -> { - WebTemplateInputValue value = new WebTemplateInputValue(); - TermDefinition termDefinition = termDefinitionMap.get(o).get(defaultLanguage); - value.setValue(termDefinition.getCode()); - value.setLabel(termDefinition.getValue()); - value.getLocalizedDescriptions().put(defaultLanguage,termDefinition.getDescription()); - value.getLocalizedLabels().put(defaultLanguage,termDefinition.getValue()); - code.getList().add(value); - } - - ); - } else if (code.getTerminology().equals("openehr")) { - ValueSet valueSet = TerminologyProvider.findOpenEhrValueSet(code.getTerminology(), ((CCODEPHRASE) cdomaintype).getCodeListArray()); - valueSet.getTherms().forEach( - t -> { - WebTemplateInputValue value = new WebTemplateInputValue(); - value.setValue(t.getCode()); - value.setLabel(t.getValue()); - code.getList().add(value); - } - ); - } - - if (code.getList().isEmpty() && StringUtils.isBlank(code.getTerminology())) { - code.setType("TEXT"); - } else { - code.setType("CODED_TEXT"); - } - } else { - throw new RuntimeException(String.format("Unexpected class: %s", cdomaintype.getClass().getSimpleName())); - } - return node; + value + .getLocalizedLabels() + .put(defaultLanguage, termDefinition.get().getValue()); + code.getList().add(value); + } + }); + } + + if (code.getList().isEmpty() && StringUtils.isBlank(code.getTerminology())) { + code.setType("TEXT"); + } else { + code.setType("CODED_TEXT"); + } + } else { + throw new RuntimeException( + String.format("Unexpected class: %s", cdomaintype.getClass().getSimpleName())); } - - private WebTemplateNode buildNode(COBJECT cobject, String rmAttributeName, Map> termDefinitionMap) { - WebTemplateNode node = new WebTemplateNode(); - node.setRmType(cobject.getRmTypeName()); - IntervalOfInteger occurrences = cobject.getOccurrences(); - node.setMin(occurrences.getLowerUnbounded() ? -1 : occurrences.getLower()); - node.setMax(occurrences.getUpperUnbounded() ? -1 : occurrences.getUpper()); - String nodeId = cobject.getNodeId(); - if (StringUtils.isNotBlank(nodeId)) { - - Optional expliziteName; - if (cobject instanceof CCOMPLEXOBJECT) { - expliziteName = OptNameHelper.extractName((CCOMPLEXOBJECT) cobject); - } else { - expliziteName = Optional.empty(); - } - - String name = expliziteName.orElse(termDefinitionMap.get(nodeId).get(defaultLanguage).getValue()); - node.setName(name); - node.setId(buildId(name)); - node.setNodeId(nodeId); - node.setLocalizedName(name); - node.getLocalizedNames().putAll(termDefinitionMap.get(nodeId).entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().getValue()))); - node.getLocalizedDescriptions().putAll(termDefinitionMap.get(nodeId).entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().getDescription()))); - } else { - String name = StringUtils.isNotBlank(rmAttributeName) ? rmAttributeName : cobject.getRmTypeName(); - node.setId(buildId(name)); - node.setName(name); - node.setLocalizedName(name); - } - return node; + return node; + } + + private WebTemplateNode buildNode( + COBJECT cobject, + String rmAttributeName, + Map> termDefinitionMap) { + WebTemplateNode node = new WebTemplateNode(); + node.setRmType(cobject.getRmTypeName()); + IntervalOfInteger occurrences = cobject.getOccurrences(); + node.setMin(occurrences.getLowerUnbounded() ? -1 : occurrences.getLower()); + node.setMax(occurrences.getUpperUnbounded() ? -1 : occurrences.getUpper()); + String nodeId = cobject.getNodeId(); + if (StringUtils.isNotBlank(nodeId)) { + + Optional expliziteName; + if (cobject instanceof CCOMPLEXOBJECT) { + expliziteName = OptNameHelper.extractName((CCOMPLEXOBJECT) cobject); + } else { + expliziteName = Optional.empty(); + } + + String name = + expliziteName.orElse(termDefinitionMap.get(nodeId).get(defaultLanguage).getValue()); + node.setName(name); + node.setId(buildId(name)); + node.setNodeId(nodeId); + node.setLocalizedName(name); + node.getLocalizedNames() + .putAll( + termDefinitionMap.get(nodeId).entrySet().stream() + .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().getValue()))); + node.getLocalizedDescriptions() + .putAll( + termDefinitionMap.get(nodeId).entrySet().stream() + .collect( + Collectors.toMap(Map.Entry::getKey, e -> e.getValue().getDescription()))); + } else { + String name = + StringUtils.isNotBlank(rmAttributeName) ? rmAttributeName : cobject.getRmTypeName(); + node.setId(buildId(name)); + node.setName(name); + node.setLocalizedName(name); } + return node; + } - private String buildId(String term) { + private String buildId(String term) { - String normalTerm = StringUtils.normalizeSpace(term.toLowerCase().replaceAll("[^a-z0-9äüöß._\\-]", " ").trim()).replace(" ", "_"); - if (StringUtils.isNumeric(normalTerm.substring(0, 1))) { - normalTerm = "a" + normalTerm; - } - - return normalTerm; + String normalTerm = + StringUtils.normalizeSpace(term.toLowerCase().replaceAll("[^a-z0-9äüöß._\\-]", " ").trim()) + .replace(" ", "_"); + if (StringUtils.isNumeric(normalTerm.substring(0, 1))) { + normalTerm = "a" + normalTerm; } + + return normalTerm; + } } From 2b637a8b4a361b0c21d80c705e079dc8e9c1a537 Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Tue, 24 Nov 2020 16:09:43 +0100 Subject: [PATCH 12/54] fix test see https://github.com/ehrbase/project_management/issues/424 --- .../AlternativeEventsComposition.java | 202 -------------- ...ternativeEventsCompositionContainment.java | 61 ----- .../KorpergewichtAnyEventEnChoice.java | 4 - .../definition/KorpergewichtObservation.java | 93 ------- .../KorpergewichtObservationContainment.java | 37 --- .../StateOfDressEnDefiningcode.java | 47 ---- ...aseBloodPressureSimpleDeV0Composition.java | 182 ------------- ...ssureSimpleDeV0CompositionContainment.java | 57 ---- ...loodPressureTrainingSampleObservation.java | 248 ------------------ ...eTrainingSampleObservationContainment.java | 66 ----- .../definition/CuffSizeDefiningcode.java | 52 ---- .../DeviceDetailsTrainingSampleCluster.java | 111 -------- ...tailsTrainingSampleClusterContainment.java | 38 --- .../KorotkoffSoundsDefiningcode.java | 43 --- .../LocationOfMeasurementDefiningcode.java | 57 ---- .../definition/PositionDefiningcode.java | 52 ---- 16 files changed, 1350 deletions(-) delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsComposition.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsCompositionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/StateOfDressEnDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningcode.java diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsComposition.java deleted file mode 100644 index 34b245b35..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsComposition.java +++ /dev/null @@ -1,202 +0,0 @@ -package org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -import com.nedap.archie.rm.datastructures.Cluster; -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 org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Id; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition.KorpergewichtObservation; -import org.ehrbase.client.classgenerator.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import org.ehrbase.client.openehrclient.VersionUid; - -@Entity -@Archetype("openEHR-EHR-COMPOSITION.report.v1") -@Template("AlternativeEvents") -public class AlternativeEventsComposition { - @Path("/context/other_context[at0001]/items[at0002]/value|value") - private String berichtIdValue; - - @Path("/context/other_context[at0001]/items[at0005]/value|value") - private String statusValue; - - @Path("/context/other_context[at0001]/items[at0006]") - private List erweiterung; - - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; - - @Path("/context/participations") - private List participations; - - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; - - @Path("/context/location") - private String location; - - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; - - @Path("/context/setting|defining_code") - private SettingDefiningcode settingDefiningcode; - - @Path("/content[openEHR-EHR-OBSERVATION.body_weight.v2]") - private List korpergewicht; - - @Path("/composer") - private PartyProxy composer; - - @Path("/language") - private Language language; - - @Path("/feeder_audit") - private FeederAudit feederAudit; - - @Path("/category|defining_code") - private CategoryDefiningcode categoryDefiningcode; - - @Path("/territory") - private Territory territory; - - @Id - private VersionUid versionUid; - - public void setBerichtIdValue(String berichtIdValue) { - this.berichtIdValue = berichtIdValue; - } - - public String getBerichtIdValue() { - return this.berichtIdValue ; - } - - public void setStatusValue(String statusValue) { - this.statusValue = statusValue; - } - - public String getStatusValue() { - return this.statusValue ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - 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(SettingDefiningcode settingDefiningcode) { - this.settingDefiningcode = settingDefiningcode; - } - - public SettingDefiningcode getSettingDefiningcode() { - return this.settingDefiningcode ; - } - - public void setKorpergewicht(List korpergewicht) { - this.korpergewicht = korpergewicht; - } - - public List getKorpergewicht() { - return this.korpergewicht ; - } - - 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 setCategoryDefiningcode(CategoryDefiningcode categoryDefiningcode) { - this.categoryDefiningcode = categoryDefiningcode; - } - - public CategoryDefiningcode getCategoryDefiningcode() { - return this.categoryDefiningcode ; - } - - 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/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsCompositionContainment.java deleted file mode 100644 index 7168a823a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/AlternativeEventsCompositionContainment.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -import com.nedap.archie.rm.datastructures.Cluster; -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 org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition.KorpergewichtObservation; -import org.ehrbase.client.classgenerator.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; - -public class AlternativeEventsCompositionContainment extends Containment { - public SelectAqlField ALTERNATIVE_EVENTS_COMPOSITION = new AqlFieldImp(AlternativeEventsComposition.class, "", "AlternativeEventsComposition", AlternativeEventsComposition.class, this); - - public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); - - public SelectAqlField STATUS_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "statusValue", String.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(AlternativeEventsComposition.class, "/context/other_context[at0001]/items[at0006]", "erweiterung", Cluster.class, this); - - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(AlternativeEventsComposition.class, "/context/participations", "participations", Participation.class, this); - - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - - public SelectAqlField LOCATION = new AqlFieldImp(AlternativeEventsComposition.class, "/context/location", "location", String.class, this); - - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(AlternativeEventsComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - - public SelectAqlField SETTING_DEFININGCODE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/setting|defining_code", "settingDefiningcode", SettingDefiningcode.class, this); - - public ListSelectAqlField KORPERGEWICHT = new ListAqlFieldImp(AlternativeEventsComposition.class, "/content[openEHR-EHR-OBSERVATION.body_weight.v2]", "korpergewicht", KorpergewichtObservation.class, this); - - public SelectAqlField COMPOSER = new AqlFieldImp(AlternativeEventsComposition.class, "/composer", "composer", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(AlternativeEventsComposition.class, "/language", "language", Language.class, this); - - public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AlternativeEventsComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - - public SelectAqlField CATEGORY_DEFININGCODE = new AqlFieldImp(AlternativeEventsComposition.class, "/category|defining_code", "categoryDefiningcode", CategoryDefiningcode.class, this); - - public SelectAqlField TERRITORY = new AqlFieldImp(AlternativeEventsComposition.class, "/territory", "territory", Territory.class, this); - - private AlternativeEventsCompositionContainment() { - super("openEHR-EHR-COMPOSITION.report.v1"); - } - - public static AlternativeEventsCompositionContainment getInstance() { - return new AlternativeEventsCompositionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java deleted file mode 100644 index 5edcfe9d4..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition; - -public interface KorpergewichtAnyEventEnChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservation.java deleted file mode 100644 index 00e0dca97..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservation.java +++ /dev/null @@ -1,93 +0,0 @@ -package org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import java.util.List; -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.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.body_weight.v2") -public class KorpergewichtObservation { - @Path("/data[at0002]/events[at0026]") - private KorpergewichtBirthEnPointEvent birthEn; - - @Path("/data[at0002]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0015]/items[at0020]") - private Cluster gerat; - - @Path("/protocol[at0015]/items[at0027]") - private List extensionEn; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - @Path("/data[at0002]/events[at0003]") - @Choice - private List anyEventEn; - - public void setBirthEn(KorpergewichtBirthEnPointEvent birthEn) { - this.birthEn = birthEn; - } - - public KorpergewichtBirthEnPointEvent getBirthEn() { - return this.birthEn ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setGerat(Cluster gerat) { - this.gerat = gerat; - } - - public Cluster getGerat() { - return this.gerat ; - } - - public void setExtensionEn(List extensionEn) { - this.extensionEn = extensionEn; - } - - public List getExtensionEn() { - return this.extensionEn ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } - - public void setAnyEventEn(List anyEventEn) { - this.anyEventEn = anyEventEn; - } - - public List getAnyEventEn() { - return this.anyEventEn ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java deleted file mode 100644 index b9d980db6..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class KorpergewichtObservationContainment extends Containment { - public SelectAqlField KORPERGEWICHT_OBSERVATION = new AqlFieldImp(KorpergewichtObservation.class, "", "KorpergewichtObservation", KorpergewichtObservation.class, this); - - public SelectAqlField BIRTH_EN = new AqlFieldImp(KorpergewichtObservation.class, "/data[at0002]/events[at0026]", "birthEn", KorpergewichtBirthEnPointEvent.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(KorpergewichtObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); - - public SelectAqlField GERAT = new AqlFieldImp(KorpergewichtObservation.class, "/protocol[at0015]/items[at0020]", "gerat", Cluster.class, this); - - public ListSelectAqlField EXTENSION_EN = new ListAqlFieldImp(KorpergewichtObservation.class, "/protocol[at0015]/items[at0027]", "extensionEn", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(KorpergewichtObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(KorpergewichtObservation.class, "/language", "language", Language.class, this); - - public ListSelectAqlField ANY_EVENT_EN = new ListAqlFieldImp(KorpergewichtObservation.class, "/data[at0002]/events[at0003]", "anyEventEn", KorpergewichtAnyEventEnChoice.class, this); - - private KorpergewichtObservationContainment() { - super("openEHR-EHR-OBSERVATION.body_weight.v2"); - } - - public static KorpergewichtObservationContainment getInstance() { - return new KorpergewichtObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/StateOfDressEnDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/StateOfDressEnDefiningcode.java deleted file mode 100644 index 2c2565f55..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/alternativeeventscomposition/definition/StateOfDressEnDefiningcode.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum StateOfDressEnDefiningcode implements EnumValueSet { - N_UNTERWASCHE("Leicht bekleidet / Unterwäsche", "Bekleidung, die nicht signifikant zum Gewicht beiträgt.", "local", "at0011"), - - UNBEKLEIDET("Unbekleidet", "Ohne Kleidung.", "local", "at0013"), - - N_FULLY_CLOTHED_WITHOUT_SHOES_EN("*Fully clothed, without shoes (en)", "*Clothing which may add significantly to weight. (en)", "local", "at0028"), - - WINDEL("Windel", "Trägt Windel; kann signifikant zum Gewicht beitragen.", "local", "at0017"), - - VOLL_BEKLEIDET_MIT_SCHUHEN("Voll bekleidet, mit Schuhen", "Bekleidung, die signifikant zum Gewicht beiträgt, mit Schuhen.", "local", "at0010"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - StateOfDressEnDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java deleted file mode 100644 index 35fc16fec..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java +++ /dev/null @@ -1,182 +0,0 @@ -package org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -import com.nedap.archie.rm.generic.Participation; -import com.nedap.archie.rm.generic.PartyIdentified; -import com.nedap.archie.rm.generic.PartyProxy; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Id; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.BloodPressureTrainingSampleObservation; -import org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.DeviceDetailsTrainingSampleCluster; -import org.ehrbase.client.classgenerator.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import org.ehrbase.client.openehrclient.VersionUid; - -import java.time.temporal.TemporalAccessor; -import java.util.List; - -@Entity -@Archetype("openEHR-EHR-COMPOSITION.sample_encounter.v1") -@Template("ehrbase_blood_pressure_simple.de.v0") -public class EhrbaseBloodPressureSimpleDeV0Composition { - @Path("/context/other_context[at0001]/items[at0006]/items[openEHR-EHR-CLUSTER.sample_device.v1]") - private List deviceDetailsTrainingSample; - - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; - - @Path("/context/participations") - private List participations; - - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; - - @Path("/context/location") - private String location; - - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; - - @Path("/context/setting|defining_code") - private SettingDefiningcode settingDefiningcode; - - @Path("/content[openEHR-EHR-OBSERVATION.sample_blood_pressure.v1]") - private List bloodPressureTrainingSample; - - @Path("/composer") - private PartyProxy composer; - - @Path("/language") - private Language language; - - @Path("/feeder_audit") - private FeederAudit feederAudit; - - @Path("/category|defining_code") - private CategoryDefiningcode categoryDefiningcode; - - @Path("/territory") - private Territory territory; - - @Id - private VersionUid versionUid; - - public void setDeviceDetailsTrainingSample( - List deviceDetailsTrainingSample) { - this.deviceDetailsTrainingSample = deviceDetailsTrainingSample; - } - - public List getDeviceDetailsTrainingSample() { - return this.deviceDetailsTrainingSample ; - } - - 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(SettingDefiningcode settingDefiningcode) { - this.settingDefiningcode = settingDefiningcode; - } - - public SettingDefiningcode getSettingDefiningcode() { - return this.settingDefiningcode ; - } - - public void setBloodPressureTrainingSample( - List bloodPressureTrainingSample) { - this.bloodPressureTrainingSample = bloodPressureTrainingSample; - } - - public List getBloodPressureTrainingSample() { - return this.bloodPressureTrainingSample ; - } - - 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 setCategoryDefiningcode(CategoryDefiningcode categoryDefiningcode) { - this.categoryDefiningcode = categoryDefiningcode; - } - - public CategoryDefiningcode getCategoryDefiningcode() { - return this.categoryDefiningcode ; - } - - 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/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java deleted file mode 100644 index d944808b6..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -import com.nedap.archie.rm.generic.Participation; -import com.nedap.archie.rm.generic.PartyIdentified; -import com.nedap.archie.rm.generic.PartyProxy; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.BloodPressureTrainingSampleObservation; -import org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.DeviceDetailsTrainingSampleCluster; -import org.ehrbase.client.classgenerator.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; - -import java.time.temporal.TemporalAccessor; - -public class EhrbaseBloodPressureSimpleDeV0CompositionContainment extends Containment { - public SelectAqlField EHRBASE_BLOOD_PRESSURE_SIMPLE_DE_V0_COMPOSITION = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "", "EhrbaseBloodPressureSimpleDeV0Composition", EhrbaseBloodPressureSimpleDeV0Composition.class, this); - - public ListSelectAqlField DEVICE_DETAILS_TRAINING_SAMPLE = new ListAqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/other_context[at0001]/items[at0006]/items[openEHR-EHR-CLUSTER.sample_device.v1]", "deviceDetailsTrainingSample", DeviceDetailsTrainingSampleCluster.class, this); - - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/participations", "participations", Participation.class, this); - - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - - public SelectAqlField LOCATION = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/location", "location", String.class, this); - - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - - public SelectAqlField SETTING_DEFININGCODE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/setting|defining_code", "settingDefiningcode", SettingDefiningcode.class, this); - - public ListSelectAqlField BLOOD_PRESSURE_TRAINING_SAMPLE = new ListAqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/content[openEHR-EHR-OBSERVATION.sample_blood_pressure.v1]", "bloodPressureTrainingSample", BloodPressureTrainingSampleObservation.class, this); - - public SelectAqlField COMPOSER = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/composer", "composer", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/language", "language", Language.class, this); - - public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - - public SelectAqlField CATEGORY_DEFININGCODE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/category|defining_code", "categoryDefiningcode", CategoryDefiningcode.class, this); - - public SelectAqlField TERRITORY = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/territory", "territory", Territory.class, this); - - private EhrbaseBloodPressureSimpleDeV0CompositionContainment() { - super("openEHR-EHR-COMPOSITION.sample_encounter.v1"); - } - - public static EhrbaseBloodPressureSimpleDeV0CompositionContainment getInstance() { - return new EhrbaseBloodPressureSimpleDeV0CompositionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java deleted file mode 100644 index ba5dcc38c..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java +++ /dev/null @@ -1,248 +0,0 @@ -package org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -import java.time.temporal.TemporalAccessor; -import java.util.List; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.sample_blood_pressure.v1") -public class BloodPressureTrainingSampleObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude") - private Double systolicMagnitude; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units") - private String systolicUnits; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|magnitude") - private Double diastolicMagnitude; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|units") - private String diastolicUnits; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|magnitude") - private Double meanArterialPressureMagnitude; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|units") - private String meanArterialPressureUnits; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|magnitude") - private Double pulsePressureMagnitude; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|units") - private String pulsePressureUnits; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0033]/value|value") - private String commentValue; - - @Path("/data[at0001]/events[at0002]/state[at0007]/items[at0008]/value|defining_code") - private PositionDefiningcode positionDefiningcode; - - @Path("/data[at0001]/events[at0002]/state[at0007]/items[at1030]") - private List levelOfExertion; - - @Path("/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|magnitude") - private Double tiltMagnitude; - - @Path("/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|units") - private String tiltUnits; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0011]/items[at0013]/value|defining_code") - private CuffSizeDefiningcode cuffSizeDefiningcode; - - @Path("/protocol[at0011]/items[at0014]/value|defining_code") - private LocationOfMeasurementDefiningcode locationOfMeasurementDefiningcode; - - @Path("/protocol[at0011]/items[at1010]/value|defining_code") - private KorotkoffSoundsDefiningcode korotkoffSoundsDefiningcode; - - @Path("/protocol[at0011]/items[at1025]") - private List device; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setSystolicMagnitude(Double systolicMagnitude) { - this.systolicMagnitude = systolicMagnitude; - } - - public Double getSystolicMagnitude() { - return this.systolicMagnitude ; - } - - public void setSystolicUnits(String systolicUnits) { - this.systolicUnits = systolicUnits; - } - - public String getSystolicUnits() { - return this.systolicUnits ; - } - - public void setDiastolicMagnitude(Double diastolicMagnitude) { - this.diastolicMagnitude = diastolicMagnitude; - } - - public Double getDiastolicMagnitude() { - return this.diastolicMagnitude ; - } - - public void setDiastolicUnits(String diastolicUnits) { - this.diastolicUnits = diastolicUnits; - } - - public String getDiastolicUnits() { - return this.diastolicUnits ; - } - - public void setMeanArterialPressureMagnitude(Double meanArterialPressureMagnitude) { - this.meanArterialPressureMagnitude = meanArterialPressureMagnitude; - } - - public Double getMeanArterialPressureMagnitude() { - return this.meanArterialPressureMagnitude ; - } - - public void setMeanArterialPressureUnits(String meanArterialPressureUnits) { - this.meanArterialPressureUnits = meanArterialPressureUnits; - } - - public String getMeanArterialPressureUnits() { - return this.meanArterialPressureUnits ; - } - - public void setPulsePressureMagnitude(Double pulsePressureMagnitude) { - this.pulsePressureMagnitude = pulsePressureMagnitude; - } - - public Double getPulsePressureMagnitude() { - return this.pulsePressureMagnitude ; - } - - public void setPulsePressureUnits(String pulsePressureUnits) { - this.pulsePressureUnits = pulsePressureUnits; - } - - public String getPulsePressureUnits() { - return this.pulsePressureUnits ; - } - - public void setCommentValue(String commentValue) { - this.commentValue = commentValue; - } - - public String getCommentValue() { - return this.commentValue ; - } - - public void setPositionDefiningcode(PositionDefiningcode positionDefiningcode) { - this.positionDefiningcode = positionDefiningcode; - } - - public PositionDefiningcode getPositionDefiningcode() { - return this.positionDefiningcode ; - } - - public void setLevelOfExertion(List levelOfExertion) { - this.levelOfExertion = levelOfExertion; - } - - public List getLevelOfExertion() { - return this.levelOfExertion ; - } - - public void setTiltMagnitude(Double tiltMagnitude) { - this.tiltMagnitude = tiltMagnitude; - } - - public Double getTiltMagnitude() { - return this.tiltMagnitude ; - } - - public void setTiltUnits(String tiltUnits) { - this.tiltUnits = tiltUnits; - } - - public String getTiltUnits() { - return this.tiltUnits ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setCuffSizeDefiningcode(CuffSizeDefiningcode cuffSizeDefiningcode) { - this.cuffSizeDefiningcode = cuffSizeDefiningcode; - } - - public CuffSizeDefiningcode getCuffSizeDefiningcode() { - return this.cuffSizeDefiningcode ; - } - - public void setLocationOfMeasurementDefiningcode( - LocationOfMeasurementDefiningcode locationOfMeasurementDefiningcode) { - this.locationOfMeasurementDefiningcode = locationOfMeasurementDefiningcode; - } - - public LocationOfMeasurementDefiningcode getLocationOfMeasurementDefiningcode() { - return this.locationOfMeasurementDefiningcode ; - } - - public void setKorotkoffSoundsDefiningcode( - KorotkoffSoundsDefiningcode korotkoffSoundsDefiningcode) { - this.korotkoffSoundsDefiningcode = korotkoffSoundsDefiningcode; - } - - public KorotkoffSoundsDefiningcode getKorotkoffSoundsDefiningcode() { - return this.korotkoffSoundsDefiningcode ; - } - - public void setDevice(List device) { - this.device = device; - } - - public List getDevice() { - return this.device ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java deleted file mode 100644 index 17bb5619e..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -import java.time.temporal.TemporalAccessor; - -public class BloodPressureTrainingSampleObservationContainment extends Containment { - public SelectAqlField BLOOD_PRESSURE_TRAINING_SAMPLE_OBSERVATION = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "", "BloodPressureTrainingSampleObservation", BloodPressureTrainingSampleObservation.class, this); - - public SelectAqlField SYSTOLIC_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude", "systolicMagnitude", Double.class, this); - - public SelectAqlField SYSTOLIC_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units", "systolicUnits", String.class, this); - - public SelectAqlField DIASTOLIC_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|magnitude", "diastolicMagnitude", Double.class, this); - - public SelectAqlField DIASTOLIC_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|units", "diastolicUnits", String.class, this); - - public SelectAqlField MEAN_ARTERIAL_PRESSURE_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|magnitude", "meanArterialPressureMagnitude", Double.class, this); - - public SelectAqlField MEAN_ARTERIAL_PRESSURE_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|units", "meanArterialPressureUnits", String.class, this); - - public SelectAqlField PULSE_PRESSURE_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|magnitude", "pulsePressureMagnitude", Double.class, this); - - public SelectAqlField PULSE_PRESSURE_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|units", "pulsePressureUnits", String.class, this); - - public SelectAqlField COMMENT_VALUE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0033]/value|value", "commentValue", String.class, this); - - public SelectAqlField POSITION_DEFININGCODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/state[at0007]/items[at0008]/value|defining_code", "positionDefiningcode", PositionDefiningcode.class, this); - - public ListSelectAqlField LEVEL_OF_EXERTION = new ListAqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/state[at0007]/items[at1030]", "levelOfExertion", Cluster.class, this); - - public SelectAqlField TILT_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|magnitude", "tiltMagnitude", Double.class, this); - - public SelectAqlField TILT_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|units", "tiltUnits", String.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public SelectAqlField CUFF_SIZE_DEFININGCODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at0013]/value|defining_code", "cuffSizeDefiningcode", CuffSizeDefiningcode.class, this); - - public SelectAqlField LOCATION_OF_MEASUREMENT_DEFININGCODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at0014]/value|defining_code", "locationOfMeasurementDefiningcode", LocationOfMeasurementDefiningcode.class, this); - - public SelectAqlField KOROTKOFF_SOUNDS_DEFININGCODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at1010]/value|defining_code", "korotkoffSoundsDefiningcode", KorotkoffSoundsDefiningcode.class, this); - - public ListSelectAqlField DEVICE = new ListAqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at1025]", "device", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/language", "language", Language.class, this); - - private BloodPressureTrainingSampleObservationContainment() { - super("openEHR-EHR-OBSERVATION.sample_blood_pressure.v1"); - } - - public static BloodPressureTrainingSampleObservationContainment getInstance() { - return new BloodPressureTrainingSampleObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningcode.java deleted file mode 100644 index 23118e779..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningcode.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum CuffSizeDefiningcode implements EnumValueSet { - CHILD("Paediatric/Child", "A cuff that is appropriate for a child or thin arm - bladder approx 8cm x 21\n" - + " cm\n" - + " ", "local", "at0017"), - - ADULT_THIGH("Adult Thigh", "A cuff used for an adult thigh - bladder approx 20cm x 42 cm", "local", "at1008"), - - LARGE_ADULT("Large Adult", "A cuff for adults with larger arms - bladder approx 16cm x 38cm", "local", "at0016"), - - ADULT("Adult", "A cuff that is standard for an adult - bladder approx 13cm x 30cm", "local", "at0015"), - - INFANT("Infant", "A cuff used for infants - bladder approx 5cm x 15cm", "local", "at1018"), - - NEONATAL("Neonatal", "A cuff used for a new born - bladder approx 3cm x 6cm", "local", "at1009"), - - SMALL_ADULT("Small Adult", "A cuff used for a small adult - bladder approx 10cm x 24 cm", "local", "at1019"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - CuffSizeDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java deleted file mode 100644 index a5f459ab7..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java +++ /dev/null @@ -1,111 +0,0 @@ -package org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -import java.time.temporal.TemporalAccessor; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.sample_device.v1") -public class DeviceDetailsTrainingSampleCluster { - @Path("/items[at0001]/value|value") - private String nameValue; - - @Path("/items[at0002]/value|value") - private String descriptionValue; - - @Path("/items[at0004]/items[at0003]/value|value") - private String manufacturerValue; - - @Path("/items[at0004]/items[at0005]/value|value") - private String modelValue; - - @Path("/items[at0004]/items[at0006]/value|value") - private String serialNumberValue; - - @Path("/items[at0007]") - private Cluster components; - - @Path("/items[at0008]/items[at0009]/value|value") - private TemporalAccessor dateLastServicedValue; - - @Path("/items[at0008]/items[at0010]/value|value") - private TemporalAccessor dateLastCalibrationValue; - - @Path("/items[at0008]/items[at0011]/value|value") - private String servicedByValue; - - public void setNameValue(String nameValue) { - this.nameValue = nameValue; - } - - public String getNameValue() { - return this.nameValue ; - } - - public void setDescriptionValue(String descriptionValue) { - this.descriptionValue = descriptionValue; - } - - public String getDescriptionValue() { - return this.descriptionValue ; - } - - public void setManufacturerValue(String manufacturerValue) { - this.manufacturerValue = manufacturerValue; - } - - public String getManufacturerValue() { - return this.manufacturerValue ; - } - - public void setModelValue(String modelValue) { - this.modelValue = modelValue; - } - - public String getModelValue() { - return this.modelValue ; - } - - public void setSerialNumberValue(String serialNumberValue) { - this.serialNumberValue = serialNumberValue; - } - - public String getSerialNumberValue() { - return this.serialNumberValue ; - } - - public void setComponents(Cluster components) { - this.components = components; - } - - public Cluster getComponents() { - return this.components ; - } - - public void setDateLastServicedValue(TemporalAccessor dateLastServicedValue) { - this.dateLastServicedValue = dateLastServicedValue; - } - - public TemporalAccessor getDateLastServicedValue() { - return this.dateLastServicedValue ; - } - - public void setDateLastCalibrationValue(TemporalAccessor dateLastCalibrationValue) { - this.dateLastCalibrationValue = dateLastCalibrationValue; - } - - public TemporalAccessor getDateLastCalibrationValue() { - return this.dateLastCalibrationValue ; - } - - public void setServicedByValue(String servicedByValue) { - this.servicedByValue = servicedByValue; - } - - public String getServicedByValue() { - return this.servicedByValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java deleted file mode 100644 index 4f20d1668..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; - -import java.time.temporal.TemporalAccessor; - -public class DeviceDetailsTrainingSampleClusterContainment extends Containment { - public SelectAqlField DEVICE_DETAILS_TRAINING_SAMPLE_CLUSTER = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "", "DeviceDetailsTrainingSampleCluster", DeviceDetailsTrainingSampleCluster.class, this); - - public SelectAqlField NAME_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0001]/value|value", "nameValue", String.class, this); - - public SelectAqlField DESCRIPTION_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0002]/value|value", "descriptionValue", String.class, this); - - public SelectAqlField MANUFACTURER_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0004]/items[at0003]/value|value", "manufacturerValue", String.class, this); - - public SelectAqlField MODEL_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0004]/items[at0005]/value|value", "modelValue", String.class, this); - - public SelectAqlField SERIAL_NUMBER_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0004]/items[at0006]/value|value", "serialNumberValue", String.class, this); - - public SelectAqlField COMPONENTS = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0007]", "components", Cluster.class, this); - - public SelectAqlField DATE_LAST_SERVICED_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0008]/items[at0009]/value|value", "dateLastServicedValue", TemporalAccessor.class, this); - - public SelectAqlField DATE_LAST_CALIBRATION_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0008]/items[at0010]/value|value", "dateLastCalibrationValue", TemporalAccessor.class, this); - - public SelectAqlField SERVICED_BY_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0008]/items[at0011]/value|value", "servicedByValue", String.class, this); - - private DeviceDetailsTrainingSampleClusterContainment() { - super("openEHR-EHR-CLUSTER.sample_device.v1"); - } - - public static DeviceDetailsTrainingSampleClusterContainment getInstance() { - return new DeviceDetailsTrainingSampleClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningcode.java deleted file mode 100644 index 5fc9437e5..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningcode.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum KorotkoffSoundsDefiningcode implements EnumValueSet { - FIFTH_SOUND("Fifth sound", "The fifth Korotkoff sound is identified by absence of sounds as the cuff\n" - + " pressure drops below the diastolic blood pressure\n" - + " ", "local", "at1012"), - - FOURTH_SOUND("Fourth sound", "The fourth Korotkoff sound is identified as an abrupt muffling of sounds\n" - + " ", "local", "at1011"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - KorotkoffSoundsDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningcode.java deleted file mode 100644 index 2f2d4e830..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningcode.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum LocationOfMeasurementDefiningcode implements EnumValueSet { - LEFT_THIGH("Left thigh", "The left thigh of the person", "local", "at0028"), - - INTRA_ARTERIAL("Intra-arterial", "Blood pressure monitored via an intra-arterial line", "local", "at0032"), - - FINGER("Finger", "A finger of the person", "local", "at1026"), - - RIGHT_ANKLE("Right ankle", "The right ankle of the person", "local", "at1031"), - - LEFT_WRIST("Left wrist", "The left wrist of the person", "local", "at1021"), - - RIGHT_WRIST("Right wrist", "The right wrist of the person", "local", "at1020"), - - LEFT_ARM("Left arm", "The left arm of the person", "local", "at0026"), - - LEFT_ANKLE("Left ankle", "The left ankle of the person", "local", "at1032"), - - RIGHT_THIGH("Right thigh", "The right thigh of the person", "local", "at0027"), - - RIGHT_ARM("Right arm", "The right arm of the person", "local", "at0025"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - LocationOfMeasurementDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningcode.java deleted file mode 100644 index 439270489..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples2/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningcode.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum PositionDefiningcode implements EnumValueSet { - STANDING("Standing", "Standing at the time of blood pressure measurement", "local", "at1000"), - - LYING("Lying", "Lying flat at the time of blood pressure measurement", "local", "at1003"), - - RECLINING("Reclining", "Reclining at the time of blood pressure measurement", "local", "at1002"), - - TRENDELENBURG("Trendelenburg", "Lying flat on the back (supine position) with the feet higher than the head\n" - + " at the time of blood pressure measurement\n" - + " ", "local", "at1013"), - - LEFT_LATERAL("Left Lateral", "Lying on the left side at the time of blood pressure measurement", "local", "at1014"), - - SITTING("Sitting", "Sitting (for example on bed or chair) at the time of blood pressure\n" - + " measurement\n" - + " ", "local", "at1001"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - PositionDefiningcode(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 ; - } -} From 29a2e1348092312f3eafaa5cbb525bc3ea6510fe Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Wed, 25 Nov 2020 16:59:33 +0100 Subject: [PATCH 13/54] extract naming strategy see https://github.com/ehrbase/project_management/issues/424 --- ...ategoryDefiningcode.java => Category.java} | 4 +- ...ionDefiningcode.java => MathFunction.java} | 4 +- ...{SettingDefiningcode.java => Setting.java} | 4 +- .../client/flattener/FlattenerTest.java | 2 +- .../classgenerator/ClassGeneratorNew.java | 198 ++++-------------- .../classgenerator/DefaultNamingStrategy.java | 154 ++++++++++++++ .../classgenerator/ClassGeneratorNewTest.java | 26 +-- .../classgenerator/ClassGeneratorTest.java | 12 +- 8 files changed, 217 insertions(+), 187 deletions(-) rename client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/{CategoryDefiningcode.java => Category.java} (83%) rename client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/{MathFunctionDefiningcode.java => MathFunction.java} (87%) rename client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/{SettingDefiningcode.java => Setting.java} (91%) create mode 100644 generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java diff --git a/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/CategoryDefiningcode.java b/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/Category.java similarity index 83% rename from client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/CategoryDefiningcode.java rename to client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/Category.java index 7fe5dd402..4363f8455 100644 --- a/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/CategoryDefiningcode.java +++ b/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/Category.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum CategoryDefiningcode implements EnumValueSet { +public enum Category implements EnumValueSet { EVENT("event", "event", "openehr", "433"), EPISODIC("episodic", "episodic", "openehr", "435"), @@ -17,7 +17,7 @@ public enum CategoryDefiningcode implements EnumValueSet { private String code; - CategoryDefiningcode(String value, String description, String terminologyId, String code) { + Category(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; diff --git a/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/MathFunctionDefiningcode.java b/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/MathFunction.java similarity index 87% rename from client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/MathFunctionDefiningcode.java rename to client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/MathFunction.java index e54355778..2b84e9aa3 100644 --- a/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/MathFunctionDefiningcode.java +++ b/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/MathFunction.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum MathFunctionDefiningcode implements EnumValueSet { +public enum MathFunction implements EnumValueSet { DECREASE("decrease", "decrease", "openehr", "521"), TOTAL("total", "total", "openehr", "148"), @@ -33,7 +33,7 @@ public enum MathFunctionDefiningcode implements EnumValueSet { private String code; - MathFunctionDefiningcode(String value, String description, String terminologyId, String code) { + MathFunction(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; diff --git a/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/SettingDefiningcode.java b/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/Setting.java similarity index 91% rename from client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/SettingDefiningcode.java rename to client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/Setting.java index 7c3dee8b7..939244fc8 100644 --- a/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/SettingDefiningcode.java +++ b/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/Setting.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum SettingDefiningcode implements EnumValueSet { +public enum Setting implements EnumValueSet { COMPLEMENTARY_HEALTH_CARE("complementary health care", "complementary health care", "openehr", "235"), HOME("home", "home", "openehr", "225"), @@ -37,7 +37,7 @@ public enum SettingDefiningcode implements EnumValueSet { private String code; - SettingDefiningcode(String value, String description, String terminologyId, String code) { + Setting(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; diff --git a/client/src/test/java/org/ehrbase/client/flattener/FlattenerTest.java b/client/src/test/java/org/ehrbase/client/flattener/FlattenerTest.java index 40182402a..212010de5 100644 --- a/client/src/test/java/org/ehrbase/client/flattener/FlattenerTest.java +++ b/client/src/test/java/org/ehrbase/client/flattener/FlattenerTest.java @@ -76,7 +76,7 @@ public void testFlatten() { RMObject rmObject = new Unflattener(new TestDataTemplateProvider()).unflatten(bloodpressureListDe); - BloodpressureListDe expected = cut.flatten((Locatable) rmObject, BloodpressureListDe.class); + BloodpressureListDe expected = cut.flatten(rmObject, BloodpressureListDe.class); assertThat(expected).isNotNull(); assertThat(expected.getStartTime()).isEqualTo(bloodpressureListDe.getStartTime()); diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java index fc69d6b6b..1616964c9 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java @@ -31,10 +31,8 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MultiValuedMap; import org.apache.commons.collections4.multimap.ArrayListValuedHashMap; -import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.reflect.FieldUtils; -import org.apache.commons.text.CaseUtils; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; @@ -43,13 +41,11 @@ import org.ehrbase.client.annotations.Path; import org.ehrbase.client.annotations.Template; import org.ehrbase.client.classgenerator.config.RmClassGeneratorConfig; -import org.ehrbase.client.classgenerator.shareddefinition.CategoryDefiningcode; +import org.ehrbase.client.classgenerator.shareddefinition.Category; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.MathFunctionDefiningcode; -import org.ehrbase.client.classgenerator.shareddefinition.SettingDefiningcode; +import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import org.ehrbase.client.flattener.PathExtractor; -import org.ehrbase.client.introspect.TemplateIntrospect; import org.ehrbase.client.openehrclient.VersionUid; import org.ehrbase.serialisation.util.SnakeCase; import org.ehrbase.terminology.client.terminology.TermDefinition; @@ -64,7 +60,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.lang.model.SourceVersion; import javax.lang.model.element.Modifier; import java.lang.reflect.Field; import java.util.ArrayDeque; @@ -85,8 +80,9 @@ public class ClassGeneratorNew { public static final int CLASS_NAME_MAX_WIDTH = 80; private static final Map, RmClassGeneratorConfig> configMap = ReflectionHelper.buildMap(RmClassGeneratorConfig.class); + private final DefaultNamingStrategy defaultNamingStrategy = new DefaultNamingStrategy(); - private static class Context { + static class Context { final MultiValuedMap classes = new ArrayListValuedHashMap<>(); final Deque nodeDeque = new ArrayDeque<>(); final Map currentTypeSpec = new HashMap<>(); @@ -142,18 +138,8 @@ private void addVersionUid(TypeSpec.Builder classBuilder) { private TypeSpec.Builder build(Context context, WebTemplateNode next) { - String name; - String className; - if (context.currentArchetypeName.isEmpty()) { - name = new SnakeCase(context.templateId).camelToSnake() + "_" + next.getRmType(); - className = buildClassName(context, name, false); - } else { - name = new SnakeCase(next.getName()).camelToSnake() + "_" + next.getRmType(); - className = buildClassName(context, name, context.nodeDeque.size() > 1); - } - if (next.isArchetype()) { - context.currentArchetypeName.push(next.getName()); - } + + String className = defaultNamingStrategy.buildClassName(context, next, false);; context.currentFieldNameMap.push(new HashMap<>()); context.nodeDeque.push(next); @@ -173,15 +159,11 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { classBuilder.addAnnotation(archetypeAnnotation); } - Map> choices = next.getChoicesInChildren(); - List children = - next.getChildren().stream() - .filter(c -> !choices.containsValue(c)) - .collect(Collectors.toList()); - if (children.stream().anyMatch(n -> n.getRmType().equals("EVENT"))) { + + if (next.getChildren().stream().anyMatch(n -> n.getRmType().equals("EVENT"))) { WebTemplateNode event = - children.stream().filter(n -> n.getRmType().equals("EVENT")).findAny().get(); + next.getChildren().stream().filter(n -> n.getRmType().equals("EVENT")).findAny().get(); WebTemplateNode pointEvent = new WebTemplateNode(event); WebTemplateNode intervalEvent = new WebTemplateNode(event); pointEvent.setRmType("POINT_EVENT"); @@ -200,12 +182,15 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { math.setMax(1); math.setAqlPath(event.getAqlPath() + "/math_function"); intervalEvent.getChildren().add(math); - choices.put(intervalEvent.getAqlPath(), List.of(intervalEvent, pointEvent)); - children.add(intervalEvent); - children.add(pointEvent); - children.remove(event); + next.getChildren().add(intervalEvent); + next.getChildren().add(pointEvent); + next.getChildren().remove(event); } - + Map> choices = next.getChoicesInChildren(); + List children = + next.getChildren().stream() + .filter(c -> choices.values().stream().flatMap(List::stream).noneMatch(l -> l.equals(c))) + .collect(Collectors.toList()); for (WebTemplateNode child : children) { String relativPath = FlatPath.removeStart(new FlatPath(child.getAqlPath()), new FlatPath(next.getAqlPath())) @@ -242,7 +227,7 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { interfaceClassName = ClassName.get(interfacePackage, interfaceSpec.name); } else { interfaceSpec = - TypeSpec.interfaceBuilder(buildClassName(context, node.getName() + "_choice", true)) + TypeSpec.interfaceBuilder(defaultNamingStrategy.buildClassName(context, choice.get(0), true)) .addModifiers(Modifier.PUBLIC) .build(); context.currentTypeSpec.put(relativeNode, interfaceSpec); @@ -278,7 +263,7 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { context, classBuilder, relativPath, - node.getName(), + node, interfaceClassName, new ValueSet(ValueSet.LOCAL, ValueSet.LOCAL, Collections.emptySet()), true); @@ -291,57 +276,9 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { return classBuilder; } - private static String normalise(String name, boolean capitalizeFirstLetter) { - if (StringUtils.isBlank(name) || name.equals("_")) { - return RandomStringUtils.randomAlphabetic(10); - } - String normalisedString = - StringUtils.strip( - StringUtils.stripAccents(name).replace("ß", "ss").replaceAll("[^A-Za-z0-9]", "_"), "_"); - return CaseUtils.toCamelCase(normalisedString, capitalizeFirstLetter, '_'); - } - String buildClassName(Context context, String name, boolean addArchetypeName) { - String[] strings = - Arrays.stream(name.split(TemplateIntrospect.TERM_DIVIDER)) - .filter(StringUtils::isNotBlank) - .toArray(String[]::new); - String fieldName = ""; - String nonNormalized = ""; - for (int i = 0; i < strings.length; i++) { - nonNormalized = nonNormalized + "_" + strings[strings.length - (i + 1)]; - if (addArchetypeName) { - nonNormalized = - new SnakeCase(context.currentArchetypeName.peek()).camelToSnake() + "_" + nonNormalized; - } - fieldName = - StringUtils.abbreviate( - normalise(nonNormalized, true), ABBREV_MARKER, CLASS_NAME_MAX_WIDTH); - if (!context.currentClassNameMap.containsKey(fieldName) && SourceVersion.isName(fieldName)) { - break; - } - } - if (context.currentClassNameMap.containsKey(fieldName)) { - context.currentClassNameMap.put(fieldName, context.currentClassNameMap.get(fieldName) + 1); - fieldName = fieldName + context.currentClassNameMap.get(fieldName); - } else { - context.currentClassNameMap.put(fieldName, 1); - } - fieldName = sanitizeNumber(fieldName); - return fieldName; - } - private String sanitizeNumber(String fieldName) { - if (!Character.isAlphabetic(fieldName.charAt(0))) { - if (Character.isLowerCase(fieldName.charAt(0))) { - fieldName = "n" + fieldName; - } else { - fieldName = "N" + fieldName; - } - } - return fieldName; - } private void addComplexField( Context context, TypeSpec.Builder classBuilder, String path, WebTemplateNode node) { @@ -368,7 +305,7 @@ private void addComplexField( context, classBuilder, path, - node.getName(), + node, className, new ValueSet(ValueSet.LOCAL, ValueSet.LOCAL, Collections.emptySet()), false); @@ -413,7 +350,7 @@ private void addSimpleField( className = ParameterizedTypeName.get(ClassName.get(List.class), className); } - addField(context, classBuilder, path, endNode.getName(), className, valueSet, false); + addField(context, classBuilder, path, endNode, className, valueSet, false); } else { Map fieldMap = Arrays.stream(FieldUtils.getAllFields(clazz)) @@ -426,7 +363,7 @@ private void addSimpleField( context, classBuilder, path + "|" + new SnakeCase(fieldName).camelToSnake(), - endNode.getName() + "_" + fieldName, + endNode, ClassName.get(fieldMap.get(fieldName).getType()), valueSet, false)); @@ -474,27 +411,27 @@ private void addField( Context context, TypeSpec.Builder classBuilder, String path, - String name, + WebTemplateNode name, TypeName className, ValueSet valueSet, boolean addChoiceAnnotation) { if (CodePhrase.class.getName().equals(className.toString())) - switch (name) { + switch (name.getName()) { case "language": className = ClassName.get(Language.class); break; - case "setting_definingCode": - className = ClassName.get(SettingDefiningcode.class); + case "setting": + className = ClassName.get(Setting.class); break; - case "category_definingCode": - className = ClassName.get(CategoryDefiningcode.class); + case "category": + className = ClassName.get(Category.class); break; case "territory": className = ClassName.get(Territory.class); break; - case "math_function_definingCode": - className = ClassName.get(MathFunctionDefiningcode.class); + case "math_function": + className = ClassName.get(MathFunction.class); break; default: if (CollectionUtils.isNotEmpty(valueSet.getTherms())) { @@ -514,17 +451,10 @@ private void addField( } } - PathExtractor pathExtractor = new PathExtractor(path); - String parentPath = pathExtractor.getParentPath(); - String childPath = pathExtractor.getChildPath(); String fieldName = - buildFieldName( - context, - parentPath - + TemplateIntrospect.TERM_DIVIDER - + childPath - + TemplateIntrospect.TERM_DIVIDER - + name); + defaultNamingStrategy.buildFieldName( + context, + path, name); FieldSpec.Builder builder = FieldSpec.builder(className, fieldName) .addAnnotation( @@ -542,9 +472,9 @@ private void addField( classBuilder.addMethod(buildGetter(fieldSpec)); } - private TypeSpec buildEnumValueSet(Context context, String name, ValueSet valueSet) { + private TypeSpec buildEnumValueSet(Context context, WebTemplateNode node, ValueSet valueSet) { TypeSpec.Builder enumBuilder = - TypeSpec.enumBuilder(buildClassName(context, name, false)) + TypeSpec.enumBuilder(defaultNamingStrategy.buildClassName(context, node, false)) .addSuperinterface(EnumValueSet.class) .addModifiers(Modifier.PUBLIC); FieldSpec fieldSpec1 = @@ -574,9 +504,8 @@ private TypeSpec buildEnumValueSet(Context context, String name, ValueSet valueS .getTherms() .forEach( t -> { - String fieldName = extractSubName(t.getValue()); enumBuilder.addEnumConstant( - toEnumName(fieldName), + defaultNamingStrategy.toEnumName(t.getValue()), TypeSpec.anonymousClassBuilder( "$S, $S, $S, $S", t.getValue(), @@ -603,61 +532,8 @@ private MethodSpec buildConstructor(FieldSpec... fieldSpecs) { return builder.build(); } - private String extractSubName(String name) { - String[] strings = name.split(TemplateIntrospect.TERM_DIVIDER); - return strings[strings.length - 1]; - } - - /** - * Manipulate the fieldName to remove or replace illegal characters - * - * @param fieldName - * @return normalized fieldName for Java naming convention - */ - private String toEnumName(String fieldName) { - fieldName = sanitizeNumber(fieldName); - return new SnakeCase(normalise(fieldName, false)).camelToUpperSnake(); - } - - private String buildFieldName(Context context, String name) { - if(name.equals( "value")){ - name = context.nodeDeque.peek().getName(); - } - if (context.nodeDeque.peek().getRmType().equals("ELEMENT")) { - name = "value"; - } - String[] strings = - Arrays.stream(name.split(TemplateIntrospect.TERM_DIVIDER)) - .filter(StringUtils::isNotBlank) - .toArray(String[]::new); - - String fieldName = ""; - String nonNormalized = ""; - - for (int i = 0; i < strings.length; i++) { - nonNormalized = nonNormalized + "_" + strings[strings.length - (i + 1)]; - fieldName = normalise(nonNormalized, false); - if (!context.currentFieldNameMap.peek().containsKey(fieldName) - && SourceVersion.isName(fieldName)) { - break; - } - } - - if (context.currentFieldNameMap.peek().containsKey(fieldName)) { - context - .currentFieldNameMap - .peek() - .put(fieldName, context.currentFieldNameMap.peek().get(fieldName) + 1); - fieldName = fieldName + context.currentFieldNameMap.peek().get(fieldName); - } else { - context.currentFieldNameMap.peek().put(fieldName, 1); - } - fieldName = sanitizeNumber(fieldName); - return fieldName; - } - private MethodSpec buildSetter(FieldSpec fieldSpec) { return MethodSpec.methodBuilder("set" + StringUtils.capitalize(fieldSpec.name)) diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java b/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java new file mode 100644 index 000000000..36f6be116 --- /dev/null +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java @@ -0,0 +1,154 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.client.classgenerator; + +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.text.CaseUtils; +import org.ehrbase.serialisation.util.SnakeCase; +import org.ehrbase.webtemplate.model.WebTemplateNode; +import org.ehrbase.webtemplate.parser.FlatPath; + +import java.util.Deque; +import java.util.Iterator; +import java.util.List; + +public class DefaultNamingStrategy { + + public static final String TERM_DIVIDER = "_"; + + public DefaultNamingStrategy() {} + + String buildClassName( + ClassGeneratorNew.Context context, WebTemplateNode node, boolean isChoice) { + + String name = node.getName(); + if (context.nodeDeque.isEmpty()) { + name = context.templateId; + } + if (!context.nodeDeque.isEmpty() && !node.isArchetype() && !node.getRmType().equals("DV_CODED_TEXT")) { + name = findLastArchetype(context.nodeDeque).getName() + TERM_DIVIDER + name; + } + + if (!context.nodeDeque.isEmpty() + && isChoice) { + name = name + TERM_DIVIDER + "choice"; + } else if(node.getRmType().equals("DV_CODED_TEXT")) { + name = name + TERM_DIVIDER + "defining_code"; + }else{ + name = name + TERM_DIVIDER + node.getRmType(); + } + + String fieldName = + StringUtils.abbreviate( + normalise(name, true), + ClassGeneratorNew.ABBREV_MARKER, + ClassGeneratorNew.CLASS_NAME_MAX_WIDTH); + + if (context.currentClassNameMap.containsKey(fieldName)) { + context.currentClassNameMap.put(fieldName, context.currentClassNameMap.get(fieldName) + 1); + fieldName = fieldName + context.currentClassNameMap.get(fieldName); + } else { + context.currentClassNameMap.put(fieldName, 1); + } + fieldName = sanitizeNumber(fieldName); + return fieldName; + } + + private boolean isInChoice(WebTemplateNode parent, WebTemplateNode node) { + return parent.getChoicesInChildren().values().stream() + .flatMap(List::stream) + .anyMatch(l -> l.equals(node)); + } + + String sanitizeNumber(String fieldName) { + if (!Character.isAlphabetic(fieldName.charAt(0))) { + if (Character.isLowerCase(fieldName.charAt(0))) { + fieldName = "n" + fieldName; + } else { + fieldName = "N" + fieldName; + } + } + return fieldName; + } + + WebTemplateNode findLastArchetype(Deque nodeDeque) { + for (Iterator it = nodeDeque.iterator(); it.hasNext(); ) { + WebTemplateNode node = it.next(); + if (node.isArchetype()) { + return node; + } + } + return null; + } + + /** + * Manipulate the fieldName to remove or replace illegal characters + * + * @param fieldName + * @return normalized fieldName for Java naming convention + */ + String toEnumName(String fieldName) { + fieldName = sanitizeNumber(fieldName); + return new SnakeCase(normalise(fieldName, false)).camelToUpperSnake(); + } + + String buildFieldName(ClassGeneratorNew.Context context, String path, WebTemplateNode node) { + String name = node.getName(); + String attributeName = new FlatPath(path).getLast().getAttributeName(); + if (StringUtils.isNotBlank(attributeName)) { + name = name + TERM_DIVIDER + attributeName; + } + if (name.equals("value")) { + name = context.nodeDeque.peek().getName(); + } + if (context.nodeDeque.peek().getRmType().equals("ELEMENT")) { + name = "value"; + } + + String fieldName = ""; + + fieldName = normalise(name, false); + + if (context.currentFieldNameMap.peek().containsKey(fieldName)) { + context + .currentFieldNameMap + .peek() + .put(fieldName, context.currentFieldNameMap.peek().get(fieldName) + 1); + fieldName = fieldName + context.currentFieldNameMap.peek().get(fieldName); + } else { + context.currentFieldNameMap.peek().put(fieldName, 1); + } + fieldName = sanitizeNumber(fieldName); + return fieldName; + } + + private static String normalise(String name, boolean capitalizeFirstLetter) { + if (StringUtils.isBlank(name) || name.equals("_")) { + return RandomStringUtils.randomAlphabetic(10); + } + + String normalisedString = + StringUtils.strip( + StringUtils.stripAccents(name).replace("ß", "ss").replaceAll("[^A-Za-z0-9_]", "_"), + "_"); + return CaseUtils.toCamelCase(normalisedString, capitalizeFirstLetter, '_'); + } +} diff --git a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java index b08a76b32..40838c45d 100644 --- a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java +++ b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java @@ -49,7 +49,7 @@ public class ClassGeneratorNewTest { public static final String PACKAGE_NAME = "org.ehrbase.client.classgenerator.examples2"; - private static final boolean WRITE_FILES = true; + private static final boolean WRITE_FILES = false; @Test public void testGenerate() throws IOException, XmlException { @@ -193,8 +193,8 @@ public void testGenerateAltEvents() throws IOException, XmlException { "java.util.List"), new Tuple("commentEnValue", "java.lang.String"), new Tuple( - "stateOfDressEnDefiningcode", - "org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition.StateOfDressEnDefiningcode"), + "stateOfDressEnDefiningCode", + "org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition.StateOfDressEnDefiningCode"), new Tuple("value", "java.lang.String"), new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), new Tuple("gewichtMagnitude", "java.lang.Double"), @@ -204,8 +204,8 @@ public void testGenerateAltEvents() throws IOException, XmlException { "java.util.List"), new Tuple("commentEnValue", "java.lang.String"), new Tuple( - "stateOfDressEnDefiningcode", - "org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition.StateOfDressEnDefiningcode"), + "stateOfDressEnDefiningCode", + "org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition.StateOfDressEnDefiningCode"), new Tuple("value", "java.lang.String"), new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), new Tuple("gewichtMagnitude", "java.lang.Double"), @@ -216,11 +216,11 @@ public void testGenerateAltEvents() throws IOException, XmlException { new Tuple("widthValue", "java.time.temporal.TemporalAmount"), new Tuple("commentEnValue", "java.lang.String"), new Tuple( - "stateOfDressEnDefiningcode", - "org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition.StateOfDressEnDefiningcode"), + "stateOfDressEnDefiningCode", + "org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition.StateOfDressEnDefiningCode"), new Tuple( - "mathFunctionDefiningcode", - "org.ehrbase.client.classgenerator.shareddefinition.MathFunctionDefiningcode"), + "mathFunctionDefiningCode", + "org.ehrbase.client.classgenerator.shareddefinition.MathFunction"), new Tuple( "birthEn", "org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition.KorpergewichtBirthEnPointEvent"), @@ -246,16 +246,16 @@ public void testGenerateAltEvents() throws IOException, XmlException { new Tuple("startTimeValue", "java.time.temporal.TemporalAccessor"), new Tuple("composer", "com.nedap.archie.rm.generic.PartyProxy"), new Tuple( - "settingDefiningcode", - "org.ehrbase.client.classgenerator.shareddefinition.SettingDefiningcode"), + "settingDefiningCode", + "org.ehrbase.client.classgenerator.shareddefinition.Setting"), new Tuple( "korpergewicht", "java.util.List"), new Tuple("erweiterung", "java.util.List"), new Tuple("location", "java.lang.String"), new Tuple( - "categoryDefiningcode", - "org.ehrbase.client.classgenerator.shareddefinition.CategoryDefiningcode"), + "categoryDefiningCode", + "org.ehrbase.client.classgenerator.shareddefinition.Category"), new Tuple( "participations", "java.util.List"), new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit")); diff --git a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java index c73b5e5ef..3361b0ba3 100644 --- a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java +++ b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java @@ -165,14 +165,14 @@ public void testGenerateAltEvents() throws IOException, XmlException { new Tuple("gewichtUnits", "java.lang.String"), new Tuple("confoundingFactorsEn", "java.util.List"), new Tuple("commentEnValue", "java.lang.String"), - new Tuple("stateOfDressEnDefiningcode", "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.StateOfDressEnDefiningcode"), + new Tuple("stateOfDressEnDefiningcode", "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.StateOfDressEnDefiningCode"), new Tuple("value", "java.lang.String"), new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), new Tuple("gewichtMagnitude", "java.lang.Double"), new Tuple("gewichtUnits", "java.lang.String"), new Tuple("confoundingFactorsEn", "java.util.List"), new Tuple("commentEnValue", "java.lang.String"), - new Tuple("stateOfDressEnDefiningcode", "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.StateOfDressEnDefiningcode"), + new Tuple("stateOfDressEnDefiningcode", "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.StateOfDressEnDefiningCode"), new Tuple("value", "java.lang.String"), new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), new Tuple("gewichtMagnitude", "java.lang.Double"), @@ -180,8 +180,8 @@ public void testGenerateAltEvents() throws IOException, XmlException { new Tuple("confoundingFactorsEn", "java.util.List"), new Tuple("widthValue", "java.time.temporal.TemporalAmount"), new Tuple("commentEnValue", "java.lang.String"), - new Tuple("stateOfDressEnDefiningcode", "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.StateOfDressEnDefiningcode"), - new Tuple("mathFunctionDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.MathFunctionDefiningcode"), + new Tuple("stateOfDressEnDefiningcode", "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.StateOfDressEnDefiningCode"), + new Tuple("mathFunctionDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.MathFunction"), new Tuple("birthEn", "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.KorpergewichtBirthEnEvent"), new Tuple("anyEventEn", "java.util.List"), new Tuple("extensionEn", "java.util.List"), @@ -198,11 +198,11 @@ public void testGenerateAltEvents() throws IOException, XmlException { new Tuple("territory", "org.ehrbase.client.classgenerator.examples.shareddefinition.Territory"), new Tuple("startTimeValue", "java.time.temporal.TemporalAccessor"), new Tuple("composer", "com.nedap.archie.rm.generic.PartyProxy"), - new Tuple("settingDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode"), + new Tuple("settingDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.Setting"), new Tuple("korpergewicht", "java.util.List"), new Tuple("erweiterung", "java.util.List"), new Tuple("location", "java.lang.String"), - new Tuple("categoryDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode"), + new Tuple("categoryDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.Category"), new Tuple("participations", "java.util.List"), new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit") ); From 77bf6276746c151580aa412586ce46b10e18796f Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Tue, 1 Dec 2020 10:14:13 +0100 Subject: [PATCH 14/54] handle non unique names better see https://github.com/ehrbase/project_management/issues/424 --- .../classgenerator/ClassGeneratorNew.java | 64 ++++-- .../classgenerator/DefaultNamingStrategy.java | 74 +++++-- .../client/classgenerator/FlattFilter.java | 31 ++- .../classgenerator/ClassGeneratorNewTest.java | 190 +++++++++--------- .../classgenerator/ClassGeneratorTest.java | 3 +- .../ehrbase/webtemplate/filter/Filter.java | 39 +++- ...lateFilter.java => WebTemplateFilter.java} | 5 +- .../model/FilteredWebTemplate.java | 43 ++++ 8 files changed, 297 insertions(+), 152 deletions(-) rename web-template/src/main/java/org/ehrbase/webtemplate/filter/{WebtemplateFilter.java => WebTemplateFilter.java} (84%) create mode 100644 web-template/src/main/java/org/ehrbase/webtemplate/model/FilteredWebTemplate.java diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java index 1616964c9..3511989ee 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java @@ -51,7 +51,8 @@ import org.ehrbase.terminology.client.terminology.TermDefinition; import org.ehrbase.terminology.client.terminology.ValueSet; import org.ehrbase.util.reflection.ReflectionHelper; -import org.ehrbase.webtemplate.filter.WebtemplateFilter; +import org.ehrbase.webtemplate.filter.WebTemplateFilter; +import org.ehrbase.webtemplate.model.FilteredWebTemplate; import org.ehrbase.webtemplate.model.WebTemplate; import org.ehrbase.webtemplate.model.WebTemplateInput; import org.ehrbase.webtemplate.model.WebTemplateInputValue; @@ -85,6 +86,7 @@ public class ClassGeneratorNew { static class Context { final MultiValuedMap classes = new ArrayListValuedHashMap<>(); final Deque nodeDeque = new ArrayDeque<>(); + final Deque unFilteredNodeDeque = new ArrayDeque<>(); final Map currentTypeSpec = new HashMap<>(); String currentMainClass; final Deque currentArchetypeName = new ArrayDeque<>(); @@ -92,12 +94,12 @@ static class Context { String currentPackageName; final Map currentEnums = new HashMap<>(); final Deque> currentFieldNameMap = new ArrayDeque<>(); - String templateId; + FilteredWebTemplate webTemplate; } private Logger logger = LoggerFactory.getLogger(this.getClass()); - private final WebtemplateFilter filter; + private final WebTemplateFilter filter; public ClassGeneratorNew(ClassGeneratorConfig config) { @@ -107,10 +109,12 @@ public ClassGeneratorNew(ClassGeneratorConfig config) { public ClassGeneratorResult generate(String packageName, WebTemplate webTemplate) { Context context = new Context(); - context.templateId = webTemplate.getTemplateId(); + context.currentPackageName = packageName; - TypeSpec.Builder builder = build(context, filter.filter(webTemplate).getTree()); + FilteredWebTemplate filteredWebTemplate = this.filter.filter(webTemplate); + context.webTemplate = filteredWebTemplate; + TypeSpec.Builder builder = build(context, filteredWebTemplate.getTree()); AnnotationSpec templateAnnotation = AnnotationSpec.builder(Template.class) .addMember(Template.VALUE, "$S", webTemplate.getTemplateId()) @@ -139,10 +143,12 @@ private void addVersionUid(TypeSpec.Builder classBuilder) { private TypeSpec.Builder build(Context context, WebTemplateNode next) { - String className = defaultNamingStrategy.buildClassName(context, next, false);; + String className = defaultNamingStrategy.buildClassName(context, next, false, false); context.currentFieldNameMap.push(new HashMap<>()); + context.nodeDeque.push(next); + context.unFilteredNodeDeque.push(next); TypeSpec.Builder classBuilder = TypeSpec.classBuilder(className); if (StringUtils.isBlank(context.currentMainClass)) { @@ -192,6 +198,9 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { .filter(c -> choices.values().stream().flatMap(List::stream).noneMatch(l -> l.equals(c))) .collect(Collectors.toList()); for (WebTemplateNode child : children) { + + Deque filtersNodes = pushToUnfiltered(context, child); + String relativPath = FlatPath.removeStart(new FlatPath(child.getAqlPath()), new FlatPath(next.getAqlPath())) .toString(); @@ -201,9 +210,9 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { } else if (!choices.containsKey(child.getAqlPath())) { addComplexField(context, classBuilder, relativPath, child); } - } - if (children.isEmpty()){ - addSimpleField(context, classBuilder, "", next); + if (!CollectionUtils.isEmpty(filtersNodes)){ + filtersNodes.forEach(n -> context.unFilteredNodeDeque.poll()); + } } for (List choice : choices.values()) { @@ -212,7 +221,7 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { WebTemplateNode node = choice.get(0); WebTemplateNode relativeNode = buildRelativeNode(context, node); - + Deque filtersNodes = pushToUnfiltered(context, node); TypeSpec interfaceSpec; TypeName interfaceClassName; if (context.currentTypeSpec.containsKey(relativeNode)) { @@ -227,7 +236,7 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { interfaceClassName = ClassName.get(interfacePackage, interfaceSpec.name); } else { interfaceSpec = - TypeSpec.interfaceBuilder(defaultNamingStrategy.buildClassName(context, choice.get(0), true)) + TypeSpec.interfaceBuilder(defaultNamingStrategy.buildClassName(context, choice.get(0), true, false)) .addModifiers(Modifier.PUBLIC) .build(); context.currentTypeSpec.put(relativeNode, interfaceSpec); @@ -267,17 +276,34 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { interfaceClassName, new ValueSet(ValueSet.LOCAL, ValueSet.LOCAL, Collections.emptySet()), true); + + if (!CollectionUtils.isEmpty(filtersNodes)){ + filtersNodes.forEach(n -> context.unFilteredNodeDeque.poll()); + } } if (next.isArchetype()) { context.currentArchetypeName.poll(); } + + if (children.isEmpty() && choices.isEmpty()){ + addSimpleField(context, classBuilder, "", next); + } + + context.currentFieldNameMap.poll(); context.nodeDeque.poll(); + + context.unFilteredNodeDeque.poll(); return classBuilder; } - - + private Deque pushToUnfiltered(Context context, WebTemplateNode node) { + Deque filtersNodes = context.webTemplate.findFiltersNodes(node); + if (!CollectionUtils.isEmpty(filtersNodes)) { + filtersNodes.descendingIterator().forEachRemaining(context.unFilteredNodeDeque::push); + } + return filtersNodes; + } private void addComplexField( @@ -411,13 +437,13 @@ private void addField( Context context, TypeSpec.Builder classBuilder, String path, - WebTemplateNode name, + WebTemplateNode node, TypeName className, ValueSet valueSet, boolean addChoiceAnnotation) { if (CodePhrase.class.getName().equals(className.toString())) - switch (name.getName()) { + switch (node.getName()) { case "language": className = ClassName.get(Language.class); break; @@ -438,7 +464,7 @@ private void addField( final TypeSpec enumValueSet = context.currentEnums.computeIfAbsent( - valueSet, vs -> buildEnumValueSet(context, name, vs)); + valueSet, vs -> buildEnumValueSet(context, node, vs)); String enumPackage = context.currentPackageName @@ -451,10 +477,10 @@ private void addField( } } - String fieldName = + String fieldName = defaultNamingStrategy.buildFieldName( context, - path, name); + path, node); FieldSpec.Builder builder = FieldSpec.builder(className, fieldName) .addAnnotation( @@ -474,7 +500,7 @@ private void addField( private TypeSpec buildEnumValueSet(Context context, WebTemplateNode node, ValueSet valueSet) { TypeSpec.Builder enumBuilder = - TypeSpec.enumBuilder(defaultNamingStrategy.buildClassName(context, node, false)) + TypeSpec.enumBuilder(defaultNamingStrategy.buildClassName(context, node, false, true)) .addSuperinterface(EnumValueSet.class) .addModifiers(Modifier.PUBLIC); FieldSpec fieldSpec1 = diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java b/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java index 36f6be116..db7123068 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java @@ -29,6 +29,8 @@ import java.util.Deque; import java.util.Iterator; import java.util.List; +import java.util.Objects; +import java.util.Optional; public class DefaultNamingStrategy { @@ -37,22 +39,22 @@ public class DefaultNamingStrategy { public DefaultNamingStrategy() {} String buildClassName( - ClassGeneratorNew.Context context, WebTemplateNode node, boolean isChoice) { + ClassGeneratorNew.Context context, WebTemplateNode node, boolean isChoice, boolean isEnum) { - String name = node.getName(); + String name = replaceElementName(context, node); if (context.nodeDeque.isEmpty()) { - name = context.templateId; - } - if (!context.nodeDeque.isEmpty() && !node.isArchetype() && !node.getRmType().equals("DV_CODED_TEXT")) { - name = findLastArchetype(context.nodeDeque).getName() + TERM_DIVIDER + name; - } + name = context.webTemplate.getTemplateId(); + } else { - if (!context.nodeDeque.isEmpty() - && isChoice) { + if (!node.isArchetype() && !isEnum) { + name = findLastArchetype(context.nodeDeque).getName() + TERM_DIVIDER + name; + } + } + if (isChoice) { name = name + TERM_DIVIDER + "choice"; - } else if(node.getRmType().equals("DV_CODED_TEXT")) { + } else if (node.getRmType().equals("DV_CODED_TEXT") && isEnum) { name = name + TERM_DIVIDER + "defining_code"; - }else{ + } else { name = name + TERM_DIVIDER + node.getRmType(); } @@ -72,10 +74,47 @@ String buildClassName( return fieldName; } + private String makeNameUnique(ClassGeneratorNew.Context context, WebTemplateNode node) { + + WebTemplateNode parent = context.nodeDeque.peek(); + String name = replaceElementName(context, node); + String finalName = name; + if (parent.getChildren().stream() + .filter( + n -> + replaceElementName(context, n).equals(finalName) + && !Objects.equals(node.getAqlPath(), n.getAqlPath())) + .count() + > 0) { + if (!Objects.equals(context.unFilteredNodeDeque.peek().getRmType(), "ELEMENT")) { + name = context.unFilteredNodeDeque.peek().getName() + TERM_DIVIDER + name; + } else { + WebTemplateNode poll = context.unFilteredNodeDeque.poll(); + name = context.unFilteredNodeDeque.peek().getName() + TERM_DIVIDER + name; + context.unFilteredNodeDeque.push(poll); + } + } + + return name; + } + + private String replaceElementName(ClassGeneratorNew.Context context, WebTemplateNode node) { + String name = node.getName(); + WebTemplateNode trueParent = + Optional.ofNullable(context.webTemplate.findFiltersNodes(node)) + .map(Deque::peek) + .orElse(null); + if (Objects.equals( + Optional.ofNullable(trueParent).map(WebTemplateNode::getRmType).orElse(null), "ELEMENT")) { + name = trueParent.getName(); + } + return name; + } + private boolean isInChoice(WebTemplateNode parent, WebTemplateNode node) { return parent.getChoicesInChildren().values().stream() - .flatMap(List::stream) - .anyMatch(l -> l.equals(node)); + .flatMap(List::stream) + .anyMatch(l -> l.equals(node)); } String sanitizeNumber(String fieldName) { @@ -113,6 +152,15 @@ String toEnumName(String fieldName) { String buildFieldName(ClassGeneratorNew.Context context, String path, WebTemplateNode node) { String name = node.getName(); String attributeName = new FlatPath(path).getLast().getAttributeName(); + + if (!context.nodeDeque.isEmpty()) { + if (StringUtils.isBlank(attributeName) || attributeName.equals("value")) { + name = makeNameUnique(context, node); + } else { + name = replaceElementName(context, node); + } + } + if (StringUtils.isNotBlank(attributeName)) { name = name + TERM_DIVIDER + attributeName; } diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java b/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java index bdcee0d60..bfdf5df13 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java @@ -37,16 +37,26 @@ import java.util.stream.Collectors; public class FlattFilter extends Filter { - private static final Map, RmIntrospectConfig> configMap = ReflectionHelper.buildMap(RmIntrospectConfig.class); + private static final Map, RmIntrospectConfig> configMap = + ReflectionHelper.buildMap(RmIntrospectConfig.class); @Override protected boolean skip(WebTemplateNode node, WebTemplate context, WebTemplateNode parent) { - if (!node.getChildren().isEmpty() && node.getMax() == 1 && !node.isArchetype() && ( !isEvent(node) || parent.getChildren().stream().filter(this::isEvent).count() == 1)){ + if (!node.getChildren().isEmpty() + && node.getMax() == 1 + && !node.isArchetype() + && (!isEvent(node) || parent.getChildren().stream().filter(this::isEvent).count() == 1)) { return true; } else { if (parent != null) { RMTypeInfo typeInfo = ARCHIE_RM_INFO_LOOKUP.getTypeInfo(parent.getRmType()); - Set attributeNames = Optional.ofNullable(configMap.get(typeInfo.getJavaClass())).map(RmIntrospectConfig::getNonTemplateFields).orElse(Collections.emptySet()).stream().map(s -> new SnakeCase(s).camelToSnake()).collect(Collectors.toSet()); + Set attributeNames = + Optional.ofNullable(configMap.get(typeInfo.getJavaClass())) + .map(RmIntrospectConfig::getNonTemplateFields) + .orElse(Collections.emptySet()) + .stream() + .map(s -> new SnakeCase(s).camelToSnake()) + .collect(Collectors.toSet()); attributeNames.add("context"); attributeNames.add("timing"); attributeNames.add("expiry_time"); @@ -57,7 +67,8 @@ protected boolean skip(WebTemplateNode node, WebTemplate context, WebTemplateNod attributeNames.add("lower_included"); attributeNames.add("upper_included"); - SetUtils.SetView difference = SetUtils.difference(typeInfo.getAttributes().keySet(), attributeNames); + SetUtils.SetView difference = + SetUtils.difference(typeInfo.getAttributes().keySet(), attributeNames); if (difference.contains(node.getName())) { return true; } @@ -66,14 +77,15 @@ protected boolean skip(WebTemplateNode node, WebTemplate context, WebTemplateNod } } - private boolean isEvent(WebTemplateNode node){ + private boolean isEvent(WebTemplateNode node) { RMTypeInfo typeInfo = ARCHIE_RM_INFO_LOOKUP.getTypeInfo(node.getRmType()); return typeInfo != null && Event.class.isAssignableFrom(typeInfo.getJavaClass()); } protected void preHandle(WebTemplateNode node) { - List ismTransitionList = node.getChildren().stream() + List ismTransitionList = + node.getChildren().stream() .filter(n -> "ISM_TRANSITION".equals(n.getRmType())) .collect(Collectors.toList()); if (!ismTransitionList.isEmpty()) { @@ -81,7 +93,12 @@ protected void preHandle(WebTemplateNode node) { node.getChildren().add(ismTransitionList.get(0)); } - if (node.getRmType().equals("ELEMENT") && node.getChildren().size() == 3 && node.getChildren().stream().map(WebTemplateNode::getRmType).collect(Collectors.toList()).containsAll(List.of("DV_TEXT", "DV_CODED_TEXT"))) { + if (node.getRmType().equals("ELEMENT") + && node.getChildren().size() == 3 + && node.getChildren().stream() + .map(WebTemplateNode::getRmType) + .collect(Collectors.toList()) + .containsAll(List.of("DV_TEXT", "DV_CODED_TEXT"))) { WebTemplateNode merged = node.findChildById(node.getId(false)).orElseThrow(); node.getChildren().remove(merged); diff --git a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java index 40838c45d..27548730f 100644 --- a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java +++ b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java @@ -28,7 +28,6 @@ import org.ehrbase.test_data.operationaltemplate.OperationalTemplateTestData; import org.ehrbase.webtemplate.model.WebTemplate; import org.ehrbase.webtemplate.parser.OPTParser; -import org.junit.Ignore; import org.junit.Test; import org.openehr.schemas.v1.OPERATIONALTEMPLATE; import org.openehr.schemas.v1.TemplateDocument; @@ -44,7 +43,6 @@ import static org.assertj.core.api.Assertions.assertThat; -@Ignore public class ClassGeneratorNewTest { public static final String PACKAGE_NAME = "org.ehrbase.client.classgenerator.examples2"; @@ -57,7 +55,7 @@ public void testGenerate() throws IOException, XmlException { TemplateDocument.Factory.parse( OperationalTemplateTestData.BLOOD_PRESSURE_SIMPLE.getStream()) .getTemplate(); - WebTemplate webTemplate =new OPTParser(template).parse(); + WebTemplate webTemplate = new OPTParser(template).parse(); ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); ClassGeneratorResult generate = null; @@ -81,18 +79,18 @@ public void testGenerate() throws IOException, XmlException { "levelOfExertion", "java.util.List"), new Tuple("commentValue", "java.lang.String"), new Tuple( - "cuffSizeDefiningcode", - "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.CuffSizeDefiningcode"), + "cuffSizeDefiningCode", + "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.CuffSizeDefiningCode"), new Tuple( - "korotkoffSoundsDefiningcode", - "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.KorotkoffSoundsDefiningcode"), + "korotkoffSoundsDefiningCode", + "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.KorotkoffSoundsDefiningCode"), new Tuple("systolicMagnitude", "java.lang.Double"), new Tuple("systolicUnits", "java.lang.String"), new Tuple("diastolicMagnitude", "java.lang.Double"), new Tuple("diastolicUnits", "java.lang.String"), new Tuple( - "positionDefiningcode", - "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.PositionDefiningcode"), + "positionDefiningCode", + "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.PositionDefiningCode"), new Tuple("tiltMagnitude", "java.lang.Double"), new Tuple("tiltUnits", "java.lang.String"), new Tuple("meanArterialPressureMagnitude", "java.lang.Double"), @@ -103,8 +101,8 @@ public void testGenerate() throws IOException, XmlException { new Tuple("pulsePressureMagnitude", "java.lang.Double"), new Tuple("pulsePressureUnits", "java.lang.String"), new Tuple( - "locationOfMeasurementDefiningcode", - "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.LocationOfMeasurementDefiningcode"), + "locationOfMeasurementDefiningCode", + "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.LocationOfMeasurementDefiningCode"), new Tuple("modelValue", "java.lang.String"), new Tuple("serialNumberValue", "java.lang.String"), new Tuple("dateLastServicedValue", "java.time.temporal.TemporalAccessor"), @@ -119,8 +117,8 @@ public void testGenerate() throws IOException, XmlException { new Tuple("healthCareFacility", "com.nedap.archie.rm.generic.PartyIdentified"), new Tuple("composer", "com.nedap.archie.rm.generic.PartyProxy"), new Tuple( - "settingDefiningcode", - "org.ehrbase.client.classgenerator.shareddefinition.SettingDefiningcode"), + "settingDefiningCode", + "org.ehrbase.client.classgenerator.shareddefinition.Setting"), new Tuple("territory", "org.ehrbase.client.classgenerator.shareddefinition.Territory"), new Tuple( "bloodPressureTrainingSample", @@ -130,8 +128,8 @@ public void testGenerate() throws IOException, XmlException { "deviceDetailsTrainingSample", "java.util.List"), new Tuple( - "categoryDefiningcode", - "org.ehrbase.client.classgenerator.shareddefinition.CategoryDefiningcode"), + "categoryDefiningCode", + "org.ehrbase.client.classgenerator.shareddefinition.Category"), new Tuple("startTimeValue", "java.time.temporal.TemporalAccessor"), new Tuple( "participations", "java.util.List"), @@ -228,21 +226,17 @@ public void testGenerateAltEvents() throws IOException, XmlException { "anyEventEn", "java.util.List"), new Tuple("extensionEn", "java.util.List"), - new Tuple( - "language", "org.ehrbase.client.classgenerator.shareddefinition.Language"), + new Tuple("language", "org.ehrbase.client.classgenerator.shareddefinition.Language"), new Tuple("originValue", "java.time.temporal.TemporalAccessor"), new Tuple("gerat", "com.nedap.archie.rm.datastructures.Cluster"), new Tuple("subject", "com.nedap.archie.rm.generic.PartyProxy"), new Tuple("versionUid", "org.ehrbase.client.openehrclient.VersionUid"), new Tuple("endTimeValue", "java.time.temporal.TemporalAccessor"), - new Tuple( - "language", "org.ehrbase.client.classgenerator.shareddefinition.Language"), + new Tuple("language", "org.ehrbase.client.classgenerator.shareddefinition.Language"), new Tuple("healthCareFacility", "com.nedap.archie.rm.generic.PartyIdentified"), new Tuple("statusValue", "java.lang.String"), new Tuple("berichtIdValue", "java.lang.String"), - new Tuple( - "territory", - "org.ehrbase.client.classgenerator.shareddefinition.Territory"), + new Tuple("territory", "org.ehrbase.client.classgenerator.shareddefinition.Territory"), new Tuple("startTimeValue", "java.time.temporal.TemporalAccessor"), new Tuple("composer", "com.nedap.archie.rm.generic.PartyProxy"), new Tuple( @@ -269,28 +263,26 @@ public void testGenerateDiagnose() throws IOException, XmlException { TemplateDocument.Factory.parse(OperationalTemplateTestData.DIAGNOSE.getStream()) .getTemplate(); ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser( template).parse()); - + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); - Set derDiagnoseDefiningcode = + Set derDiagnoseDefiningCode = generate .getClasses() .get("org.ehrbase.client.classgenerator.examples2.diagnosecomposition.definition") .stream() - .filter(t -> t.name.equals("DerDiagnoseDefiningcode")) + .filter(t -> t.name.equals("NameDesProblemsDerDiagnoseDefiningCode")) .findAny() .get() .enumConstants .keySet(); - assertThat(derDiagnoseDefiningcode) + assertThat(derDiagnoseDefiningCode) .containsExactlyInAnyOrder( "KORONAVIREN_ALS_URSACHE_VON_KRANKHEITEN_DIE_IN_ANDEREN_KAPITELN_KLASSIFIZIERT_SIND", "COVID19_VIRUS_NICHT_NACHGEWIESEN", "COVID19_VIRUS_NACHGEWIESEN", "INFEKTION_DURCH_KORONAVIREN_NICHT_NAHER_BEZEICHNETER_LOKALISATION"); - writeFiles(generate); } @@ -300,14 +292,18 @@ public void testGenerateEpisode() throws IOException, XmlException { TemplateDocument.Factory.parse(OperationalTemplateTestData.EPISODE_OF_CARE.getStream()) .getTemplate(); ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser( template).parse()); - List fieldSpecs = generate.getClasses().values().stream() + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); + List fieldSpecs = + generate.getClasses().values().stream() .flatMap(Collection::stream) .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).map(f -> f.name).collect(Collectors.toList()); - + .map(t -> t.fieldSpecs) + .flatMap(List::stream) + .map(f -> f.name) + .collect(Collectors.toList()); - assertThat(fieldSpecs).containsExactlyInAnyOrder( + assertThat(fieldSpecs) + .containsExactlyInAnyOrder( "value", "value", "rankMagnitude", @@ -315,7 +311,7 @@ public void testGenerateEpisode() throws IOException, XmlException { "diagnosisEntry", "identifier", "team", - "statusDefiningcode", + "statusDefiningCode", "language", "diagnosis", "subject", @@ -328,18 +324,17 @@ public void testGenerateEpisode() throws IOException, XmlException { "participations", "language", "composer", - "settingDefiningcode", + "settingDefiningCode", "territory", "feederAudit", "location", - "categoryDefiningcode", + "categoryDefiningCode", "startTimeValue", "upperValue", "lowerValue", "lowerIncluded", "upperIncluded", - "healthCareFacility" - ); + "healthCareFacility"); writeFiles(generate); } @@ -350,13 +345,18 @@ public void testGenerateSmICS() throws IOException, XmlException { TemplateDocument.Factory.parse(OperationalTemplateTestData.SM_I_C_S_BEFUND.getStream()) .getTemplate(); ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser( template).parse()); - List fieldSpecs = generate.getClasses().values().stream() + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); + List fieldSpecs = + generate.getClasses().values().stream() .flatMap(Collection::stream) .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).map(f -> f.name).collect(Collectors.toList()); + .map(t -> t.fieldSpecs) + .flatMap(List::stream) + .map(f -> f.name) + .collect(Collectors.toList()); - assertThat(fieldSpecs).containsExactlyInAnyOrder( + assertThat(fieldSpecs) + .containsExactlyInAnyOrder( "value", "valueValue", "value", @@ -373,7 +373,7 @@ public void testGenerateSmICS() throws IOException, XmlException { "standorttypValue", "standortbeschreibungValue", "standortschlusselValue", - "antibiotikumDefiningcode", + "antibiotikumDefiningCode", "resistenzValue", "kommentarValue", "minimaleHemmkonzentrationMagnitude", @@ -386,12 +386,12 @@ public void testGenerateSmICS() throws IOException, XmlException { "haufigkeit", "kommentarValue", "resistenzmechanismus", - "valueMagnitude", - "valueUnits", + "keimzahlMagnitude", + "keimzahlUnits", "weitereErganzungen", "keimSubtyp", "virulenzfaktorValue", - "mreKlasseDefiningcode", + "mreKlasseDefiningCode", "value", "value", "value", @@ -399,7 +399,7 @@ public void testGenerateSmICS() throws IOException, XmlException { "kommentarValue", "artDerTypisierung", "ergebnis", - "erregernameDefiningcode", + "erregernameDefiningCode", "language", "standort", "zeitpunktDesErstenErregernachweisesValue", @@ -407,7 +407,7 @@ public void testGenerateSmICS() throws IOException, XmlException { "transmissionswegValue", "ubertragungswegValue", "erregerdetails", - "smicsErgebniskategorieDefiningcode", + "smicsErgebniskategorieDefiningCode", "multispeziesValue", "anzahlDerErregernachweise", "timeValue", @@ -418,8 +418,8 @@ public void testGenerateSmICS() throws IOException, XmlException { "subject", "originValue", "erregertypisierung", - "kommentarValue", - "kommentarValueValue", + "baumKommentarValue", + "artDerUbertragungKommentarValue", "versionUid", "endTimeValue", "participations", @@ -432,11 +432,10 @@ public void testGenerateSmICS() throws IOException, XmlException { "startTimeValue", "smicsErgebnis", "composer", - "settingDefiningcode", + "settingDefiningCode", "feederAudit", "location", - "categoryDefiningcode" - ); + "categoryDefiningCode"); writeFiles(generate); } @@ -446,8 +445,9 @@ public void testGenerateD4LQuestionnaire() throws IOException, XmlException { OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.D4L_QUESTIONNAIRE.getStream()) .getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); + List fieldSpecs = generate.getClasses().values().stream() .flatMap(Collection::stream) @@ -456,7 +456,7 @@ public void testGenerateD4LQuestionnaire() throws IOException, XmlException { .flatMap(List::stream) .collect(Collectors.toList()); - assertThat(fieldSpecs).size().isEqualTo(348); + assertThat(fieldSpecs).size().isEqualTo(248); } @Test @@ -466,7 +466,7 @@ public void testGenerateBefundDerBlutgasanalyse() throws IOException, XmlExcepti OperationalTemplateTestData.BEFUND_DER_BLUTGASANALYSE.getStream()) .getTemplate(); ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser( template).parse()); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); List fieldSpecs = generate.getClasses().values().stream() .flatMap(Collection::stream) @@ -486,7 +486,7 @@ public void testGenerateMultiOccurrence() throws IOException, XmlException { TemplateDocument.Factory.parse(OperationalTemplateTestData.MULTI_OCCURRENCE.getStream()) .getTemplate(); ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser( template).parse()); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); List fieldSpecs = generate.getClasses().values().stream() @@ -495,17 +495,16 @@ public void testGenerateMultiOccurrence() throws IOException, XmlException { .map(t -> t.fieldSpecs) .flatMap(List::stream) .collect(Collectors.toList()); -/* + assertThat(fieldSpecs) .extracting(f -> f.name, f -> f.type.toString()) .containsExactlyInAnyOrder( new Tuple("versionUid", "org.ehrbase.client.openehrclient.VersionUid"), new Tuple("extension", "java.util.List"), + new Tuple("language", "org.ehrbase.client.classgenerator.shareddefinition.Language"), new Tuple( - "language", "org.ehrbase.client.classgenerator.shareddefinition.Language"), - new Tuple( - "settingDefiningcode", - "org.ehrbase.client.classgenerator.shareddefinition.SettingDefiningcode"), + "settingDefiningCode", + "org.ehrbase.client.classgenerator.shareddefinition.Setting"), new Tuple( "structuredMeasurementLocation", "java.util.List"), @@ -513,12 +512,12 @@ public void testGenerateMultiOccurrence() throws IOException, XmlException { new Tuple("device", "com.nedap.archie.rm.datastructures.Cluster"), new Tuple("subject", "com.nedap.archie.rm.generic.PartyProxy"), new Tuple( - "locationOfMeasurementDefiningcode", - "org.ehrbase.client.classgenerator.examples2.ehrbasemultioccurrencedev1composition.definition.LocationOfMeasurementDefiningcode"), + "locationOfMeasurementDefiningCode", + "org.ehrbase.client.classgenerator.examples2.ehrbasemultioccurrencedev1composition.definition.LocationOfMeasurementDefiningCode"), new Tuple("locationOfMeasurementValue", "java.lang.String"), new Tuple( - "bodyExposureDefiningcode", - "org.ehrbase.client.classgenerator.examples2.ehrbasemultioccurrencedev1composition.definition.BodyExposureDefiningcode"), + "bodyExposureDefiningCode", + "org.ehrbase.client.classgenerator.examples2.ehrbasemultioccurrencedev1composition.definition.BodyExposureDefiningCode"), new Tuple("bodyExposureValue", "java.lang.String"), new Tuple("temperatureMagnitude", "java.lang.Double"), new Tuple("temperatureUnits", "java.lang.String"), @@ -526,13 +525,10 @@ public void testGenerateMultiOccurrence() throws IOException, XmlException { new Tuple("exertion", "com.nedap.archie.rm.datastructures.Cluster"), new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), new Tuple("endTimeValue", "java.time.temporal.TemporalAccessor"), - new Tuple( - "language", "org.ehrbase.client.classgenerator.shareddefinition.Language"), + new Tuple("language", "org.ehrbase.client.classgenerator.shareddefinition.Language"), new Tuple("healthCareFacility", "com.nedap.archie.rm.generic.PartyIdentified"), new Tuple("composer", "com.nedap.archie.rm.generic.PartyProxy"), - new Tuple( - "territory", - "org.ehrbase.client.classgenerator.shareddefinition.Territory"), + new Tuple("territory", "org.ehrbase.client.classgenerator.shareddefinition.Territory"), new Tuple( "bodyTemperature", "java.util.List"), @@ -545,17 +541,16 @@ public void testGenerateMultiOccurrence() throws IOException, XmlException { new Tuple( "bodyExposure", "org.ehrbase.client.classgenerator.examples2.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureBodyExposureChoice"), + new Tuple( + "bodyExposure", + "org.ehrbase.client.classgenerator.examples2.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureBodyExposureChoice"), new Tuple( "locationOfMeasurement", "org.ehrbase.client.classgenerator.examples2.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementChoice"), new Tuple( - "categoryDefiningcode", - "org.ehrbase.client.classgenerator.shareddefinition.CategoryDefiningcode"), + "categoryDefiningCode", + "org.ehrbase.client.classgenerator.shareddefinition.Category"), new Tuple("extension", "java.util.List"), - new Tuple( - "bodyExposureDefiningcode", - "org.ehrbase.client.classgenerator.examples2.ehrbasemultioccurrencedev1composition.definition.BodyExposureDefiningcode"), - new Tuple("bodyExposureValue", "java.lang.String"), new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), new Tuple("temperatureMagnitude", "java.lang.Double"), new Tuple("temperatureUnits", "java.lang.String"), @@ -567,18 +562,15 @@ public void testGenerateMultiOccurrence() throws IOException, XmlException { "java.util.List"), new Tuple("widthValue", "java.time.temporal.TemporalAmount"), new Tuple( - "bodyExposure", - "org.ehrbase.client.classgenerator.examples2.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureBodyExposureChoice2"), - new Tuple( - "mathFunctionDefiningcode", - "org.ehrbase.client.classgenerator.shareddefinition.MathFunctionDefiningcode"), + "mathFunctionDefiningCode", + "org.ehrbase.client.classgenerator.shareddefinition.MathFunction"), new Tuple( "anyEvent", "java.util.List"), new Tuple( "participations", "java.util.List"), new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit")); -*/ + writeFiles(generate); } @@ -587,8 +579,8 @@ public void testGenerateAllTypes() throws IOException, XmlException { OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.ALL_TYPES.getStream()) .getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); List fieldSpecs = generate.getClasses().values().stream() @@ -598,7 +590,7 @@ public void testGenerateAllTypes() throws IOException, XmlException { .flatMap(List::stream) .collect(Collectors.toList()); - assertThat(fieldSpecs).size().isEqualTo(75L); + assertThat(fieldSpecs).size().isEqualTo(80L); writeFiles(generate); } @@ -608,8 +600,8 @@ public void testGenerateVirologyFinding() throws IOException, XmlException { OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.VIROLOGY_FINDING.getStream()) .getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); List fieldSpecs = generate.getClasses().values().stream() @@ -619,7 +611,7 @@ public void testGenerateVirologyFinding() throws IOException, XmlException { .flatMap(List::stream) .collect(Collectors.toList()); - assertThat(fieldSpecs).size().isEqualTo(75L); + assertThat(fieldSpecs).size().isEqualTo(74L); writeFiles(generate); } @@ -629,8 +621,8 @@ public void testGenerateCorona() throws IOException, XmlException { OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.CORONA_ANAMNESE.getStream()) .getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); List fieldSpecs = generate.getClasses().values().stream() @@ -640,7 +632,7 @@ public void testGenerateCorona() throws IOException, XmlException { .flatMap(List::stream) .collect(Collectors.toList()); - assertThat(fieldSpecs).size().isEqualTo(305); + assertThat(fieldSpecs).size().isEqualTo(296); writeFiles(generate); } @@ -651,8 +643,8 @@ public void testGenerateSchwangerschaftsstatus() throws IOException, XmlExceptio TemplateDocument.Factory.parse( OperationalTemplateTestData.SCHWANGERSCHAFTSSTATUS.getStream()) .getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); List fieldSpecs = generate.getClasses().values().stream() @@ -667,7 +659,7 @@ public void testGenerateSchwangerschaftsstatus() throws IOException, XmlExceptio Optional status1 = generate.getClasses().values().stream() .flatMap(Collection::stream) - .filter(s -> s.name.equals("StatusDefiningcode")) + .filter(s -> s.name.equals("StatusDefiningCode")) .findAny(); assertThat(status1).isPresent(); assertThat(status1.get().enumConstants.keySet()) @@ -676,7 +668,7 @@ public void testGenerateSchwangerschaftsstatus() throws IOException, XmlExceptio Optional status2 = generate.getClasses().values().stream() .flatMap(Collection::stream) - .filter(s -> s.name.equals("StatusDefiningcode2")) + .filter(s -> s.name.equals("StatusDefiningCode2")) .findAny(); assertThat(status2).isPresent(); assertThat(status2.get().enumConstants.keySet()) @@ -699,8 +691,8 @@ public void testGenerateReactCare() throws IOException, XmlException { OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.OPEN_E_REACT_CARE.getStream()) .getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); + ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); List fieldSpecs = generate.getClasses().values().stream() diff --git a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java index 3361b0ba3..3237a9441 100644 --- a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java +++ b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java @@ -26,6 +26,7 @@ import org.apache.xmlbeans.XmlException; import org.assertj.core.groups.Tuple; import org.ehrbase.test_data.operationaltemplate.OperationalTemplateTestData; +import org.junit.Ignore; import org.junit.Test; import org.openehr.schemas.v1.OPERATIONALTEMPLATE; import org.openehr.schemas.v1.TemplateDocument; @@ -41,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat; - +@Ignore public class ClassGeneratorTest { public static final String PACKAGE_NAME = "org.ehrbase.client.classgenerator.examples"; diff --git a/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java b/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java index c2a12d288..78920b642 100644 --- a/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java +++ b/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java @@ -22,53 +22,70 @@ import com.nedap.archie.rminfo.ArchieRMInfoLookup; import com.nedap.archie.rminfo.RMTypeInfo; import org.apache.commons.collections4.SetUtils; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; import org.ehrbase.serialisation.util.SnakeCase; import org.ehrbase.util.reflection.ReflectionHelper; +import org.ehrbase.webtemplate.model.FilteredWebTemplate; import org.ehrbase.webtemplate.model.WebTemplate; import org.ehrbase.webtemplate.model.WebTemplateNode; import org.ehrbase.webtemplate.parser.OPTParser; import org.ehrbase.webtemplate.parser.config.RmIntrospectConfig; +import java.util.ArrayDeque; +import java.util.ArrayList; import java.util.Collections; +import java.util.Deque; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -public class Filter implements WebtemplateFilter { +public class Filter implements WebTemplateFilter { private static final Map, RmIntrospectConfig> configMap = ReflectionHelper.buildMap(RmIntrospectConfig.class); public static final ArchieRMInfoLookup ARCHIE_RM_INFO_LOOKUP = ArchieRMInfoLookup.getInstance(); @Override - public WebTemplate filter(WebTemplate webTemplate) { - WebTemplate clone = new WebTemplate(webTemplate); - List filteredChildren = filter(clone.getTree(), webTemplate, null); - clone.setTree(filteredChildren.get(0)); + public FilteredWebTemplate filter(WebTemplate webTemplate) { + FilteredWebTemplate clone = new FilteredWebTemplate(webTemplate); + Pair, Map>> filter = filter(clone.getTree(), webTemplate, null); + clone.setTree(filter.getLeft().get(0)); + clone.setFilteredNodeMap(filter.getRight()); return clone; } - protected List filter(WebTemplateNode node, WebTemplate context, WebTemplateNode parent) { - preHandle(node); + protected Pair< List, Map> > filter(WebTemplateNode node, WebTemplate context, WebTemplateNode parent) { + WebTemplateNode oldNode = new WebTemplateNode(node); + preHandle(node); List nodes; - List filteredChildren = node.getChildren().stream().map(n -> filter(n, context, node)).flatMap(List::stream).collect(Collectors.toList()); + List filteredChildren = new ArrayList<>(); + Map > nodeMap = new HashMap<>(); + node.getChildren().stream().map(n -> filter(n, context, node)).forEach(p -> { + filteredChildren.addAll(p.getLeft()); + nodeMap.putAll(p.getRight()); + }); node.getChildren().clear(); node.getChildren().addAll(filteredChildren); if (skip(node, context, parent)) { nodes = filteredChildren; - + for( WebTemplateNode child: filteredChildren){ + nodeMap.get(child).addLast(oldNode); + } } else { nodes = Collections.singletonList(node); + nodeMap.put(node,new ArrayDeque<>()); } OPTParser.makeIdUnique(node); - return nodes; + return new ImmutablePair<>(nodes, nodeMap); } protected void preHandle(WebTemplateNode node) { - List nodes; + List ismTransitionList = node.getChildren().stream() .filter(n -> "ISM_TRANSITION".equals(n.getRmType())) .collect(Collectors.toList()); diff --git a/web-template/src/main/java/org/ehrbase/webtemplate/filter/WebtemplateFilter.java b/web-template/src/main/java/org/ehrbase/webtemplate/filter/WebTemplateFilter.java similarity index 84% rename from web-template/src/main/java/org/ehrbase/webtemplate/filter/WebtemplateFilter.java rename to web-template/src/main/java/org/ehrbase/webtemplate/filter/WebTemplateFilter.java index fd010151c..67ba2527d 100644 --- a/web-template/src/main/java/org/ehrbase/webtemplate/filter/WebtemplateFilter.java +++ b/web-template/src/main/java/org/ehrbase/webtemplate/filter/WebTemplateFilter.java @@ -19,8 +19,9 @@ package org.ehrbase.webtemplate.filter; +import org.ehrbase.webtemplate.model.FilteredWebTemplate; import org.ehrbase.webtemplate.model.WebTemplate; -public interface WebtemplateFilter { - WebTemplate filter(WebTemplate webTemplate); +public interface WebTemplateFilter { + FilteredWebTemplate filter(WebTemplate webTemplate); } diff --git a/web-template/src/main/java/org/ehrbase/webtemplate/model/FilteredWebTemplate.java b/web-template/src/main/java/org/ehrbase/webtemplate/model/FilteredWebTemplate.java new file mode 100644 index 000000000..001630561 --- /dev/null +++ b/web-template/src/main/java/org/ehrbase/webtemplate/model/FilteredWebTemplate.java @@ -0,0 +1,43 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.webtemplate.model; + +import net.minidev.json.annotate.JsonIgnore; + +import java.util.Deque; +import java.util.Map; + +public class FilteredWebTemplate extends WebTemplate{ + + public FilteredWebTemplate(WebTemplate other) { + super(other); + } + + @JsonIgnore + private Map> filteredNodeMap; + + public void setFilteredNodeMap(Map> filteredNodeMap) { + this.filteredNodeMap = filteredNodeMap; + } + + public Deque findFiltersNodes(WebTemplateNode node){ + return filteredNodeMap.get(node); + } +} From fed0fd262703b28eb51002ce32f047bd862731f4 Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Tue, 1 Dec 2020 12:08:10 +0100 Subject: [PATCH 15/54] added more Test see https://github.com/ehrbase/project_management/issues/424 --- .../classgenerator/ClassGeneratorNewTest.java | 179 ++++++++++++++++-- .../classgenerator/ClassGeneratorTest.java | 170 ++++++++++++++++- 2 files changed, 321 insertions(+), 28 deletions(-) diff --git a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java index 27548730f..93d0449bb 100644 --- a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java +++ b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java @@ -467,15 +467,65 @@ public void testGenerateBefundDerBlutgasanalyse() throws IOException, XmlExcepti .getTemplate(); ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); - List fieldSpecs = - generate.getClasses().values().stream() + List fieldSpecs = generate.getClasses().values().stream() .flatMap(Collection::stream) .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs) - .flatMap(List::stream) - .collect(Collectors.toList()); + .map(t -> t.fieldSpecs).flatMap(List::stream).map(f -> f.name).collect(Collectors.toList()); - assertThat(fieldSpecs).size().isEqualTo(52); + assertThat(fieldSpecs).containsExactlyInAnyOrder( + "versionUid", + "endTimeValue", + "participations", + "language", + "healthCareFacility", + "statusDefiningCode", + "kategorieValue", + "territory", + "startTimeValue", + "composer", + "settingDefiningCode", + "feederAudit", + "location", + "categoryDefiningCode", + "erweiterung", + "laborergebnis", + "ergebnisStatusValue", + "untersuchterAnalytDefiningCode", + "analytResultatMagnitude", + "analytResultatUnits", + "analyseergebnisDetails", + "ergebnisStatusValue", + "untersuchterAnalytDefiningCode", + "analytResultatMagnitude", + "analytResultatUnits", + "analyseergebnisDetails", + "ergebnisStatusValue", + "untersuchterAnalytDefiningCode", + "analytResultatMagnitude", + "analytResultatUnits", + "analyseergebnisDetails", + "ergebnisStatusValue", + "untersuchterAnalytDefiningCode", + "analytResultatMagnitude", + "analytResultatUnits", + "analyseergebnisDetails", + "testDetails", + "phWert", + "language", + "sauerstoffpartialdruck", + "multimediaDarstellung", + "labortestBezeichnungDefiningCode", + "strukturierteErfassungDerStorfaktoren", + "strukturierteTestdiagnostik", + "kohlendioxidpartialdruck", + "sauerstoffsattigung", + "erweiterung", + "timeValue", + "probendetail", + "subject", + "originValue", + "laborWelchesDenUntersuchungsauftragAnnimmt" + ); writeFiles(generate); } @@ -603,15 +653,85 @@ public void testGenerateVirologyFinding() throws IOException, XmlException { ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); - List fieldSpecs = - generate.getClasses().values().stream() + List fieldSpecs = generate.getClasses().values().stream() .flatMap(Collection::stream) .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs) - .flatMap(List::stream) - .collect(Collectors.toList()); - - assertThat(fieldSpecs).size().isEqualTo(74L); + .map(t -> t.fieldSpecs).flatMap(List::stream).map(f -> f.name).collect(Collectors.toList()); + + assertThat(fieldSpecs).containsExactlyInAnyOrder("alternativeStruktur", + "nameDerKorperstelleValue", + "multimedialeDarstellung", + "kommentarDesProbennehmersValue", + "angabenZumProbennehmer", + "angabenZumTransport", + "externerIdentifikator", + "probenentnahmestelleValue", + "zusatzlicheAngabenZurProbennahme", + "behalterDetails", + "digitaleDarstellung", + "identifikatorDerUbergeordnetenProbe", + "zeitpunktDesProbeneingangsValue", + "kommentarValue", + "probenartValue", + "anatomischeLokalisation", + "laborprobenidentifikator", + "angabenZurVerarbeitung", + "identifikatorDesProbennehmers", + "physischeEigenschaften", + "zeitpunktDerProbenentnahmeValue", + "details", + "standorttypValue", + "standortbeschreibungValue", + "standortschlusselValue", + "nachweisValue", + "viruslastCtWertMagnitude", + "viruslastCtWertUnits", + "virusValue", + "kommentarValue", + "zugehorigeLaborprobe", + "analyseergebnisReihenfolgeMagnitude", + "analyseergebnisDetails", + "proVirus", + "details", + "standorttypValue", + "standortbeschreibungValue", + "standortschlusselValue", + "value", + "testDetails", + "probe", + "language", + "einsenderstandort", + "kultur", + "multimediaDarstellung", + "auftragsIdDesAnforderndenEinsendendenSystems", + "auftragsIdEmpfanger", + "labortestBezeichnungValue", + "strukturierteErfassungDerStorfaktoren", + "strukturierteTestdiagnostik", + "empfangerstandort", + "erweiterung", + "timeValue", + "anforderung", + "subject", + "originValue", + "verteilerliste", + "fallKennungValue", + "versionUid", + "endTimeValue", + "befund", + "participations", + "language", + "healthCareFacility", + "statusValue", + "berichtIdValue", + "territory", + "startTimeValue", + "fallidentifikation", + "composer", + "settingDefiningCode", + "feederAudit", + "location", + "categoryDefiningCode"); writeFiles(generate); } @@ -646,15 +766,36 @@ public void testGenerateSchwangerschaftsstatus() throws IOException, XmlExceptio ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); - List fieldSpecs = - generate.getClasses().values().stream() + List fieldSpecs = generate.getClasses().values().stream() .flatMap(Collection::stream) .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs) - .flatMap(List::stream) - .collect(Collectors.toList()); + .map(t -> t.fieldSpecs).flatMap(List::stream).map(f -> f.name).collect(Collectors.toList()); + + assertThat(fieldSpecs).containsExactlyInAnyOrder( + "versionUid", + "endTimeValue", + "participations", + "language", + "healthCareFacility", + "statusDefiningCode", + "kategorieValue", + "territory", + "startTimeValue", + "composer", + "settingDefiningCode", + "schwangerschaftsstatus", + "feederAudit", + "location", + "categoryDefiningCode", + "erweiterung", + "timeValue", + "subject", + "originValue", + "language", + "erweiterungen", + "statusDefiningCode" + ); - assertThat(fieldSpecs).size().isEqualTo(22); Optional status1 = generate.getClasses().values().stream() diff --git a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java index 3237a9441..dc860fc8e 100644 --- a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java +++ b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java @@ -401,12 +401,65 @@ public void testGenerateBefundDerBlutgasanalyse() throws IOException, XmlExcepti OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.BEFUND_DER_BLUTGASANALYSE.getStream()).getTemplate(); ClassGenerator cut = new ClassGenerator(); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - List fieldSpecs = generate.getClasses().values().stream() + List fieldSpecs = generate.getClasses().values().stream() .flatMap(Collection::stream) .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); + .map(t -> t.fieldSpecs).flatMap(List::stream).map(f -> f.name).collect(Collectors.toList()); - assertThat(fieldSpecs).size().isEqualTo(52); + assertThat(fieldSpecs).containsExactlyInAnyOrder( + "versionUid", + "endTimeValue", + "participations", + "language", + "healthCareFacility", + "statusDefiningcode", + "kategorieValue", + "territory", + "startTimeValue", + "composer", + "settingDefiningcode", + "feederAudit", + "location", + "categoryDefiningcode", + "erweiterung", + "laborergebnis", + "ergebnisStatusValue", + "untersuchterAnalytDefiningcode", + "analytResultatMagnitude", + "analytResultatUnits", + "analyseergebnisDetails", + "ergebnisStatusValue", + "untersuchterAnalytDefiningcode", + "analytResultatMagnitude", + "analytResultatUnits", + "analyseergebnisDetails", + "ergebnisStatusValue", + "untersuchterAnalytDefiningcode", + "analytResultatMagnitude", + "analytResultatUnits", + "analyseergebnisDetails", + "ergebnisStatusValue", + "untersuchterAnalytDefiningcode", + "analytResultatMagnitude", + "analytResultatUnits", + "analyseergebnisDetails", + "testDetails", + "phWert", + "language", + "sauerstoffpartialdruck", + "multimediaDarstellung", + "labortestBezeichnungDefiningcode", + "strukturierteErfassungDerStorfaktoren", + "strukturierteTestdiagnostik", + "kohlendioxidpartialdruck", + "sauerstoffsattigung", + "erweiterung", + "timeValue", + "probendetail", + "subject", + "originValue", + "laborWelchesDenUntersuchungsauftragAnnimmt" + ); writeFiles(generate); @@ -507,12 +560,87 @@ public void testGenerateVirologyFinding() throws IOException, XmlException { ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - List fieldSpecs = generate.getClasses().values().stream() + List fieldSpecs = generate.getClasses().values().stream() .flatMap(Collection::stream) .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); + .map(t -> t.fieldSpecs).flatMap(List::stream).map(f -> f.name).collect(Collectors.toList()); - assertThat(fieldSpecs).size().isEqualTo(75L); + assertThat(fieldSpecs).containsExactlyInAnyOrder( + "alternativeStruktur", + "nameDerKorperstelleValue", + "multimedialeDarstellung", + "kommentarDesProbennehmersValue", + "angabenZumProbennehmer", + "angabenZumTransport", + "externerIdentifikator", + "probenentnahmestelleValue", + "zusatzlicheAngabenZurProbennahme", + "behalterDetails", + "digitaleDarstellung", + "identifikatorDerUbergeordnetenProbe", + "zeitpunktDesProbeneingangsValue", + "kommentarValue", + "probenartValue", + "anatomischeLokalisation", + "laborprobenidentifikator", + "angabenZurVerarbeitung", + "identifikatorDesProbennehmers", + "physischeEigenschaften", + "zeitpunktDerProbenentnahmeValue", + "details", + "standorttypValue", + "standortbeschreibungValue", + "standortschlusselValue", + "nachweisValue", + "viruslastCtWertMagnitude", + "viruslastCtWertUnits", + "virusValue", + "kommentarValue", + "nachweis", + "zugehorigeLaborprobe", + "analyseergebnisReihenfolgeMagnitude", + "analyseergebnisDetails", + "proVirus", + "details", + "standorttypValue", + "standortbeschreibungValue", + "standortschlusselValue", + "value", + "testDetails", + "probe", + "language", + "einsenderstandort", + "kultur", + "multimediaDarstellung", + "auftragsIdDesAnforderndenEinsendendenSystems", + "auftragsIdEmpfanger", + "labortestBezeichnungValue", + "strukturierteErfassungDerStorfaktoren", + "strukturierteTestdiagnostik", + "empfangerstandort", + "erweiterung", + "timeValue", + "anforderung", + "subject", + "originValue", + "verteilerliste", + "fallKennungValue", + "versionUid", + "endTimeValue", + "befund", + "participations", + "language", + "healthCareFacility", + "statusValue", + "berichtIdValue", + "territory", + "startTimeValue", + "fallidentifikation", + "composer", + "settingDefiningcode", + "feederAudit", + "location", + "categoryDefiningcode"); writeFiles(generate); @@ -543,12 +671,36 @@ public void testGenerateSchwangerschaftsstatus() throws IOException, XmlExceptio ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - List fieldSpecs = generate.getClasses().values().stream() + List fieldSpecs = generate.getClasses().values().stream() .flatMap(Collection::stream) .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); + .map(t -> t.fieldSpecs).flatMap(List::stream).map(f -> f.name).collect(Collectors.toList()); - assertThat(fieldSpecs).size().isEqualTo(22); + assertThat(fieldSpecs).containsExactlyInAnyOrder( + "versionUid", + "endTimeValue", + "participations", + "language", + "healthCareFacility", + "statusDefiningcode", + "kategorieValue", + "territory", + "startTimeValue", + "composer", + "settingDefiningcode", + "schwangerschaftsstatus", + "feederAudit", + "location", + "categoryDefiningcode", + "erweiterung", + "timeValue", + "subject", + "originValue", + "language", + "erweiterungen", + "statusDefiningcode" + + ); Optional status1 = generate.getClasses().values().stream() From 882152429810e3f002ed89e33cf1493c42b88912 Mon Sep 17 00:00:00 2001 From: Wlad Wagner <64201310+wlad@users.noreply.github.com> Date: Tue, 1 Dec 2020 13:53:35 +0100 Subject: [PATCH 16/54] force generation of test-data and expected result set + cache --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c7dac0a88..adfe2c120 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -428,7 +428,7 @@ jobs: keys: - ehrbasedb-dump-v7 # COMMENT: USE THE NEXT LINE ONLY TO FORCE TEST-DATA REGENERATION! Otherwise comment it out! - # - run: echo "FORCE GENERATION OF TEST-DATA AND EXPECTED RESULTS!" > /tmp/DATA_CHANGED_NOTICE + - run: echo "FORCE GENERATION OF TEST-DATA AND EXPECTED RESULTS!" > /tmp/DATA_CHANGED_NOTICE - run: name: CHECK IF EXPECTED-RESULT TEMPLATES HAVE CHANGED AND REGENERATE TEST-DATA IF NEEDED command: | From 585f18e291a4532fe997c827d84cadbf02f8ec4d Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Tue, 1 Dec 2020 14:09:16 +0100 Subject: [PATCH 17/54] added old dto test see https://github.com/ehrbase/project_management/issues/424 --- .../classgenerator/OldDtoModelTest.java | 209 +++++++ .../CoronaAnamneseComposition.java | 250 +++++++++ .../CoronaAnamneseCompositionContainment.java | 73 +++ .../definition/AdresseCluster.java | 31 + .../definition/AdresseClusterContainment.java | 21 + .../definition/AllgemeineAngabenSection.java | 115 ++++ .../AllgemeineAngabenSectionContainment.java | 37 ++ ...AndereAktuelleErkrankungenObservation.java | 104 ++++ ...lleErkrankungenObservationContainment.java | 40 ++ ...ogebieteFurCoronainfektionOderKontak_.java | 41 ++ ...ltInGesundheitseinrichtungObservation.java | 127 +++++ ...eitseinrichtungObservationContainment.java | 44 ++ .../definition/BeschaftigungCluster.java | 45 ++ .../BeschaftigungClusterContainment.java | 26 + ...esundheitsrisikosDetailsClusterSpezi_.java | 23 + ...esundheitsrisikosRisikofaktorDvtextS_.java | 20 + ...esundheitsrisikosVorhandenseinDvcode_.java | 20 + ...ungDesGesundheitsrisikosDetailsChoice.java | 4 + ...ngDesGesundheitsrisikosDetailsCluster.java | 23 + ...ertungDesGesundheitsrisikosEvaluation.java | 129 +++++ ...sundheitsrisikosEvaluationContainment.java | 44 ++ ...sGesundheitsrisikosRisikofaktorChoice.java | 4 + ...sGesundheitsrisikosRisikofaktorDvtext.java | 20 + ...GesundheitsrisikosVorhandenseinChoice.java | 4 + ...dheitsrisikosVorhandenseinDvcodedtext.java | 20 + .../ChronischeErkrankungenObservation.java | 104 ++++ ...cheErkrankungenObservationContainment.java | 40 ++ .../DiagnosestatusDefiningcode.java | 38 ++ .../DiagnostischeSicherheitDefiningcode.java | 43 ++ ...enstleistungAktuelleAktivitatActivity.java | 89 +++ ...leistungGrundFurDieAnforderungElement.java | 18 + .../definition/DienstleistungInstruction.java | 103 ++++ .../DienstleistungInstructionContainment.java | 38 ++ .../definition/DurchfallObservation.java | 104 ++++ .../DurchfallObservationContainment.java | 40 ++ ...derErhohteKorpertemperaturObservation.java | 104 ++++ ...orpertemperaturObservationContainment.java | 40 ++ ...genZumMedikationsScreeningObservation.java | 120 ++++ ...ationsScreeningObservationContainment.java | 43 ++ ...creeningSpezifischeMedikamenteCluster.java | 30 + ...ichteHistorieBeliebigesEreignisChoice.java | 4 + ...storieBeliebigesEreignisIntervalEvent.java | 70 +++ ...eHistorieBeliebigesEreignisPointEvent.java | 46 ++ .../GeschichteHistorieGeschichteElement.java | 18 + .../GeschichteHistorieObservation.java | 73 +++ ...chichteHistorieObservationContainment.java | 34 ++ .../GestorterGeruchssinnObservation.java | 104 ++++ ...rterGeruchssinnObservationContainment.java | 40 ++ .../GestorterGeschmackssinnObservation.java | 104 ++++ ...rGeschmackssinnObservationContainment.java | 40 ++ .../GesundheitsbezogenerBerufEvaluation.java | 80 +++ ...tsbezogenerBerufEvaluationContainment.java | 34 ++ .../definition/HeiserkeitObservation.java | 104 ++++ .../HeiserkeitObservationContainment.java | 40 ++ .../HistorieDerReiseObservation.java | 105 ++++ ...istorieDerReiseObservationContainment.java | 40 ++ .../definition/HustenObservation.java | 104 ++++ .../HustenObservationContainment.java | 40 ++ .../definition/InlandAuslandDefiningcode.java | 42 ++ .../definition/KontaktSection.java | 32 ++ .../definition/KontaktSectionContainment.java | 21 + .../KorpertemperaturObservation.java | 148 +++++ ...orpertemperaturObservationContainment.java | 48 ++ .../KorpertemperaturStorfaktorenElement.java | 18 + .../definition/LetzteReiseDefiningcode.java | 42 ++ .../MedikamentInVerwendungDefiningcode.java | 43 ++ ...amentenklasseInVerwendungDefiningcode.java | 43 ++ .../definition/OrganisationCluster.java | 78 +++ .../OrganisationClusterContainment.java | 32 ++ .../PersonenkontaktObservation.java | 127 +++++ ...PersonenkontaktObservationContainment.java | 44 ++ .../PresenceOfAnyExposureEnDefiningcode.java | 43 ++ .../definition/ProblemDiagnoseEvaluation.java | 91 +++ .../ProblemDiagnoseEvaluationContainment.java | 36 ++ .../ProblemDiganoseCoronovirusEvaluation.java | 128 +++++ ...anoseCoronovirusEvaluationContainment.java | 44 ++ ...fallBeliebigesIntervallereignisChoice.java | 4 + ...iebigesIntervallereignisIntervalEvent.java | 80 +++ ...BeliebigesIntervallereignisPointEvent.java | 56 ++ .../ReisefallBestimmteReiseCluster.java | 45 ++ .../ReisefallBestimmtesReisezielCluster.java | 65 +++ .../definition/ReisefallObservation.java | 73 +++ .../ReisefallObservationContainment.java | 34 ++ .../definition/RisikogebietSection.java | 33 ++ .../RisikogebietSectionContainment.java | 23 + .../definition/SchnupfenObservation.java | 104 ++++ .../SchnupfenObservationContainment.java | 40 ++ .../definition/StandortCluster.java | 34 ++ .../StandortClusterContainment.java | 24 + .../definition/StatusCluster.java | 20 + .../definition/StatusClusterContainment.java | 19 + .../StatusDiagnostischeSicherheitChoice.java | 4 + ...tusDiagnostischeSicherheitDvcodedtext.java | 21 + .../StatusDiagnostischeSicherheitDvtext.java | 20 + .../definition/SymptomeSection.java | 110 ++++ .../SymptomeSectionContainment.java | 35 ++ .../definition/VorhandenDefiningcode.java | 40 ++ .../definition/VorhandenDefiningcode2.java | 42 ++ .../definition/VorhandenseinDefiningcode.java | 42 ++ ...denseinDefiningcodeSpecificExposureEn.java | 41 ++ ...itereSymptomeBeliebigesEreignisChoice.java | 4 + ...mptomeBeliebigesEreignisIntervalEvent.java | 60 ++ ...eSymptomeBeliebigesEreignisPointEvent.java | 36 ++ .../WeitereSymptomeObservation.java | 73 +++ ...WeitereSymptomeObservationContainment.java | 34 ++ ...meSpezifischesSymptomAnzeichenCluster.java | 55 ++ .../definition/WohnsituationEvaluation.java | 80 +++ .../WohnsituationEvaluationContainment.java | 34 ++ .../definition/WohnstatteCluster.java | 34 ++ .../WohnstatteClusterContainment.java | 24 + .../CategoryDefiningcode.java | 42 ++ .../shareddefinition/Definingcode.java | 42 ++ .../shareddefinition/Language.java | 296 ++++++++++ .../MathFunctionDefiningcode.java | 58 ++ .../ServiceNameDefiningcode.java | 40 ++ .../ServicePlannedDefiningcode.java | 38 ++ .../shareddefinition/SettingDefiningcode.java | 62 ++ .../SymptomSignNameDefiningcode.java | 38 ++ .../shareddefinition/Territory.java | 528 ++++++++++++++++++ .../TransitionDefiningcode.java | 76 +++ .../TestAllTypesEnV1Composition.java | 207 +++++++ ...estAllTypesEnV1CompositionContainment.java | 63 +++ .../definition/ActiveDefiningcode.java | 38 ++ .../definition/ActiveDefiningcode2.java | 38 ++ .../definition/CompletedDefiningcode.java | 38 ++ .../definition/CompletedDefiningcode2.java | 38 ++ .../ContextCodedTextDefiningcode.java | 43 ++ .../definition/PlannedDefiningcode.java | 38 ++ .../definition/PlannedDefiningcode2.java | 38 ++ .../definition/TestAllTypesAction.java | 163 ++++++ .../TestAllTypesActionContainment.java | 50 ++ .../definition/TestAllTypesAdminEntry.java | 44 ++ .../TestAllTypesAdminEntryContainment.java | 25 + .../definition/TestAllTypesChoiceChoice.java | 4 + .../definition/TestAllTypesChoiceDvcount.java | 20 + .../TestAllTypesChoiceDvquantity.java | 31 + .../definition/TestAllTypesCluster.java | 32 ++ .../TestAllTypesClusterContainment.java | 22 + .../definition/TestAllTypesEvaluation.java | 104 ++++ .../TestAllTypesEvaluationContainment.java | 38 ++ .../definition/TestAllTypesInstruction.java | 92 +++ .../TestAllTypesInstructionContainment.java | 37 ++ .../definition/TestAllTypesObservation.java | 252 +++++++++ .../TestAllTypesObservationContainment.java | 71 +++ .../definition/TestAllTypesSection.java | 44 ++ .../TestAllTypesSectionContainment.java | 25 + .../classgenerator/ClassGeneratorNewTest.java | 2 +- 147 files changed, 8827 insertions(+), 1 deletion(-) create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/OldDtoModelTest.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/CoronaAnamneseComposition.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AdresseCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AdresseClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AllgemeineAngabenSectionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BeschaftigungCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosDetailsClusterSpezi_.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosRisikofaktorDvtextS_.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosVorhandenseinDvcode_.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosDetailsChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosDetailsCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosRisikofaktorChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosRisikofaktorDvtext.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosVorhandenseinChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosVorhandenseinDvcodedtext.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DiagnosestatusDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DienstleistungInstruction.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DurchfallObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HeiserkeitObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HustenObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HustenObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/InlandAuslandDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/KontaktSection.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/KontaktSectionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/LetzteReiseDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/OrganisationCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisPointEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/RisikogebietSection.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/RisikogebietSectionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/SchnupfenObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StandortCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StandortClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StatusCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StatusClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitDvcodedtext.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitDvtext.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/SymptomeSection.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/SymptomeSectionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/VorhandenDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/VorhandenDefiningcode2.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/VorhandenseinDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/VorhandenseinDefiningcodeSpecificExposureEn.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WohnstatteCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/CategoryDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/Definingcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/Language.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/MathFunctionDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/ServiceNameDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/ServicePlannedDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/SettingDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/SymptomSignNameDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/Territory.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/TransitionDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/TestAllTypesEnV1Composition.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/ActiveDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/ActiveDefiningcode2.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/CompletedDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/CompletedDefiningcode2.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/ContextCodedTextDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/PlannedDefiningcode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/PlannedDefiningcode2.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesAction.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesChoiceChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesChoiceDvcount.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesChoiceDvquantity.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesInstruction.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesSection.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesSectionContainment.java diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/OldDtoModelTest.java b/client/src/test/java/org/ehrbase/client/classgenerator/OldDtoModelTest.java new file mode 100644 index 000000000..b3f45d305 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/OldDtoModelTest.java @@ -0,0 +1,209 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.client.classgenerator; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.nedap.archie.rm.RMObject; +import com.nedap.archie.rm.archetyped.Locatable; +import com.nedap.archie.rm.composition.Composition; +import org.apache.commons.io.IOUtils; +import org.assertj.core.api.SoftAssertions; +import org.assertj.core.groups.Tuple; +import org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.CoronaAnamneseComposition; +import org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition.VorhandenDefiningcode; +import org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.TestAllTypesEnV1Composition; +import org.ehrbase.client.flattener.Flattener; +import org.ehrbase.client.flattener.Unflattener; +import org.ehrbase.client.templateprovider.TestDataTemplateProvider; +import org.ehrbase.serialisation.flatencoding.FlatFormat; +import org.ehrbase.serialisation.flatencoding.FlatJasonProvider; +import org.ehrbase.serialisation.flatencoding.FlatJson; +import org.ehrbase.serialisation.jsonencoding.CanonicalJson; +import org.ehrbase.serialisation.jsonencoding.JacksonUtil; +import org.ehrbase.test_data.composition.CompositionTestDataCanonicalJson; +import org.ehrbase.test_data.composition.CompositionTestDataSimSDTJson; +import org.junit.Test; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.assertj.core.api.Assertions.assertThat; + + +public class OldDtoModelTest { + + class TestCase { + long id; + CompositionTestDataSimSDTJson simSDTJson; + String templateId; + Class dtoClass; + String[] missing; + String[] extra; + + public TestCase( + long id, + CompositionTestDataSimSDTJson simSDTJson, + String templateId, + Class dtoClass, + String[] missing, + String[] extra) { + this.id = id; + this.simSDTJson = simSDTJson; + this.templateId = templateId; + this.dtoClass = dtoClass; + this.missing = missing; + this.extra = extra; + } + } + + @Test + public void testRoundTrip() throws IOException { + + List testCaseList = new ArrayList<>(); + + testCaseList.add( + new TestCase( + 1, + CompositionTestDataSimSDTJson.ALL_TYPES, + "test_all_types.en.v1", + TestAllTypesEnV1Composition.class, + new String[] { + "Missing path: test_all_types/test_all_types:0/identifier|id, value: 55175056", + "Missing path: test_all_types/test_all_types:0/proportion_any|type, value: 1" + }, + new String[] { + "Extra path: test_all_types/test_all_types:0/identifier, value: 55175056", + "Extra path: test_all_types/test_all_types:0/proportion_any|type, value: 1.0", + "Extra path: test_all_types/test_all_types:0/coded_text|value, value: value1", + "Extra path: test_all_types/test_all_types:0/coded_text_terminology|value, value: .HCXbqCyQtseLkDyKS,QLpOdDZxrEJ", + "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types:0/current_activity/timing, value: P1D", + "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types:0/current_activity/timing|formalism, value: ISO8601", + "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types2:0/ism_transition/current_state|code, value: 526", + "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types2:0/ism_transition/current_state|value, value: planned", + "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types2:0/ism_transition/current_state|terminology, value: openehr", + })); + + SoftAssertions softly = new SoftAssertions(); + + for (TestCase testCase : testCaseList) { + checkTestCase(testCase, softly); + } + + softly.assertAll(); + } + + @Test + public void testFlattenCorona() throws IOException { + Composition composition = new CanonicalJson().unmarshal(IOUtils.toString(CompositionTestDataCanonicalJson.CORONA.getStream(), StandardCharsets.UTF_8), Composition.class); + Flattener cut = new Flattener(new TestDataTemplateProvider()); + CoronaAnamneseComposition actual = cut.flatten(composition, CoronaAnamneseComposition.class); + assertThat(actual).isNotNull(); + assertThat(actual.getSymptome()).isNotNull(); + assertThat(actual.getSymptome().getHeiserkeit()).isNotNull(); + assertThat(actual.getSymptome().getHeiserkeit().getVorhandenDefiningcode()).isEqualTo(VorhandenDefiningcode.NICHT_VORHANDEN); + } + + + @Test + public void testUnflattenCorona() throws IOException { + Composition expected = new CanonicalJson().unmarshal(IOUtils.toString(CompositionTestDataCanonicalJson.CORONA.getStream(), StandardCharsets.UTF_8), Composition.class); + Flattener flattener = new Flattener(new TestDataTemplateProvider()); + CoronaAnamneseComposition coronaAnamneseComposition = flattener.flatten(expected, CoronaAnamneseComposition.class); + + Unflattener cut = new Unflattener(new TestDataTemplateProvider()); + Composition actual = (Composition) cut.unflatten(coronaAnamneseComposition); + assertThat(actual).isNotNull(); + assertThat(actual.getContent()) + .extracting( + Locatable::getNameAsString, + Locatable::getArchetypeNodeId + ) + .containsExactlyInAnyOrder( + actual.getContent().stream().map(c -> new Tuple( + c.getNameAsString(), + c.getArchetypeNodeId())).toArray(Tuple[]::new) + ); + } + + public void checkTestCase(TestCase testCase, SoftAssertions softly) throws IOException { + + String value = IOUtils.toString(testCase.simSDTJson.getStream(), UTF_8); + FlatJson flatJson = + new FlatJasonProvider(new TestDataTemplateProvider()) + .buildFlatJson(FlatFormat.SIM_SDT, testCase.templateId); + + Composition composition = flatJson.unmarshal(value); + + Flattener flattener = new Flattener(new TestDataTemplateProvider()); + Object flatten = flattener.flatten(composition, testCase.dtoClass); + + Unflattener unflattener = new Unflattener(new TestDataTemplateProvider()); + RMObject actual = unflattener.unflatten(flatten); + + String actualFlat = flatJson.marshal(actual); + + List errors = compere(actualFlat, value); + + softly.assertThat(errors) + .filteredOn(s -> s.startsWith("Missing")) + .as("Test Case %s", testCase.id) + .containsExactlyInAnyOrder( + testCase.missing + ); + + String[] extra = {"Extra path: test_all_types/test_all_types:0/identifier, value: 55175056", + "Extra path: test_all_types/test_all_types:0/proportion_any|type, value: 1.0"}; + softly.assertThat(errors) + .filteredOn(s -> s.startsWith("Extra")) + .as("Test Case %s", testCase.id) + .containsExactlyInAnyOrder( + testCase.extra + ); + + + } + + private static List compere(String actualJson, String expectedJson) throws JsonProcessingException { + List errors = new ArrayList<>(); + ObjectMapper objectMapper = JacksonUtil.getObjectMapper(); + + Map actual = objectMapper.readValue(actualJson, Map.class); + Map expected = objectMapper.readValue(expectedJson, Map.class); + + actual.forEach((key, value) -> { + if (!expected.containsKey(key) || !expected.get(key).equals(value)) { + errors.add(String.format("Missing path: %s, value: %s", key, value)); + } + }); + + expected.forEach((key, value) -> { + if (!actual.containsKey(key) || !actual.get(key).equals(value)) { + errors.add(String.format("Extra path: %s, value: %s", key, value)); + } + }); + + return errors; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/CoronaAnamneseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/CoronaAnamneseComposition.java new file mode 100644 index 000000000..03eda2311 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/CoronaAnamneseComposition.java @@ -0,0 +1,250 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.Participation; +import com.nedap.archie.rm.generic.PartyIdentified; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Id; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.annotations.Template; +import org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition.AllgemeineAngabenSection; +import org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition.GeschichteHistorieObservation; +import org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition.KontaktSection; +import org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition.RisikogebietSection; +import org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition.SymptomeSection; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.CategoryDefiningcode; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.SettingDefiningcode; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Territory; +import org.ehrbase.client.openehrclient.VersionUid; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-COMPOSITION.report.v1") +@Template("Corona_Anamnese") +public class CoronaAnamneseComposition { + @Id + private VersionUid versionUid; + + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Risikogebiet']") + private RisikogebietSection risikogebiet; + + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + @Path("/context/participations") + private List participations; + + @Path("/language") + private Language language; + + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; + + @Path("/context/other_context[at0001]/items[at0005]/value|value") + private String statusValue; + + @Path("/content[openEHR-EHR-OBSERVATION.story.v1]") + private List geschichteHistorie; + + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']") + private AllgemeineAngabenSection allgemeineAngaben; + + @Path("/context/other_context[at0001]/items[at0002]/value|value") + private String berichtIdValue; + + @Path("/territory") + private Territory territory; + + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; + + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']") + private SymptomeSection symptome; + + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']") + private KontaktSection kontakt; + + @Path("/composer") + private PartyProxy composer; + + @Path("/context/setting|defining_code") + private SettingDefiningcode settingDefiningcode; + + @Path("/feeder_audit") + private FeederAudit feederAudit; + + @Path("/context/other_context[at0001]/items[at0006]") + private List erweiterung; + + @Path("/context/location") + private String location; + + @Path("/category|defining_code") + private CategoryDefiningcode categoryDefiningcode; + + public VersionUid getVersionUid() { + return this.versionUid; + } + + public void setVersionUid(VersionUid versionUid) { + this.versionUid = versionUid; + } + + public void setRisikogebiet(RisikogebietSection risikogebiet) { + this.risikogebiet = risikogebiet; + } + + public RisikogebietSection getRisikogebiet() { + return this.risikogebiet; + } + + public void setEndTimeValue(TemporalAccessor endTimeValue) { + this.endTimeValue = endTimeValue; + } + + public TemporalAccessor getEndTimeValue() { + return this.endTimeValue; + } + + public void setParticipations(List participations) { + this.participations = participations; + } + + public List getParticipations() { + return this.participations; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setHealthCareFacility(PartyIdentified healthCareFacility) { + this.healthCareFacility = healthCareFacility; + } + + public PartyIdentified getHealthCareFacility() { + return this.healthCareFacility; + } + + public void setStatusValue(String statusValue) { + this.statusValue = statusValue; + } + + public String getStatusValue() { + return this.statusValue; + } + + public void setGeschichteHistorie(List geschichteHistorie) { + this.geschichteHistorie = geschichteHistorie; + } + + public List getGeschichteHistorie() { + return this.geschichteHistorie; + } + + public void setAllgemeineAngaben(AllgemeineAngabenSection allgemeineAngaben) { + this.allgemeineAngaben = allgemeineAngaben; + } + + public AllgemeineAngabenSection getAllgemeineAngaben() { + return this.allgemeineAngaben; + } + + public void setBerichtIdValue(String berichtIdValue) { + this.berichtIdValue = berichtIdValue; + } + + public String getBerichtIdValue() { + return this.berichtIdValue; + } + + public void setTerritory(Territory territory) { + this.territory = territory; + } + + public Territory getTerritory() { + return this.territory; + } + + public void setStartTimeValue(TemporalAccessor startTimeValue) { + this.startTimeValue = startTimeValue; + } + + public TemporalAccessor getStartTimeValue() { + return this.startTimeValue; + } + + public void setSymptome(SymptomeSection symptome) { + this.symptome = symptome; + } + + public SymptomeSection getSymptome() { + return this.symptome; + } + + public void setKontakt(KontaktSection kontakt) { + this.kontakt = kontakt; + } + + public KontaktSection getKontakt() { + return this.kontakt; + } + + public void setComposer(PartyProxy composer) { + this.composer = composer; + } + + public PartyProxy getComposer() { + return this.composer; + } + + public void setSettingDefiningcode(SettingDefiningcode settingDefiningcode) { + this.settingDefiningcode = settingDefiningcode; + } + + public SettingDefiningcode getSettingDefiningcode() { + return this.settingDefiningcode; + } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } + + public void setLocation(String location) { + this.location = location; + } + + public String getLocation() { + return this.location; + } + + public void setCategoryDefiningcode(CategoryDefiningcode categoryDefiningcode) { + this.categoryDefiningcode = categoryDefiningcode; + } + + public CategoryDefiningcode getCategoryDefiningcode() { + return this.categoryDefiningcode; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java new file mode 100644 index 000000000..90da683f8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java @@ -0,0 +1,73 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.Participation; +import com.nedap.archie.rm.generic.PartyIdentified; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition.AllgemeineAngabenSection; +import org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition.GeschichteHistorieObservation; +import org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition.KontaktSection; +import org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition.RisikogebietSection; +import org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition.SymptomeSection; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.CategoryDefiningcode; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.SettingDefiningcode; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Territory; + +import java.time.temporal.TemporalAccessor; + +public class CoronaAnamneseCompositionContainment extends Containment { + public SelectAqlField CORONA_ANAMNESE_COMPOSITION = new AqlFieldImp(CoronaAnamneseComposition.class, "", "CoronaAnamneseComposition", CoronaAnamneseComposition.class, this); + + public SelectAqlField RISIKOGEBIET = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Risikogebiet']", "risikogebiet", RisikogebietSection.class, this); + + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/context/participations", "participations", Participation.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/language", "language", Language.class, this); + + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + + public SelectAqlField STATUS_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "statusValue", String.class, this); + + public ListSelectAqlField GESCHICHTE_HISTORIE = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-OBSERVATION.story.v1]", "geschichteHistorie", GeschichteHistorieObservation.class, this); + + public SelectAqlField ALLGEMEINE_ANGABEN = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']", "allgemeineAngaben", AllgemeineAngabenSection.class, this); + + public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); + + public SelectAqlField TERRITORY = new AqlFieldImp(CoronaAnamneseComposition.class, "/territory", "territory", Territory.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + + public SelectAqlField SYMPTOME = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']", "symptome", SymptomeSection.class, this); + + public SelectAqlField KONTAKT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']", "kontakt", KontaktSection.class, this); + + public SelectAqlField COMPOSER = new AqlFieldImp(CoronaAnamneseComposition.class, "/composer", "composer", PartyProxy.class, this); + + public SelectAqlField SETTING_DEFININGCODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/setting|defining_code", "settingDefiningcode", SettingDefiningcode.class, this); + + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(CoronaAnamneseComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/context/other_context[at0001]/items[at0006]", "erweiterung", Cluster.class, this); + + public SelectAqlField LOCATION = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/location", "location", String.class, this); + + public SelectAqlField CATEGORY_DEFININGCODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/category|defining_code", "categoryDefiningcode", CategoryDefiningcode.class, this); + + private CoronaAnamneseCompositionContainment() { + super("openEHR-EHR-COMPOSITION.report.v1"); + } + + public static CoronaAnamneseCompositionContainment getInstance() { + return new CoronaAnamneseCompositionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AdresseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AdresseCluster.java new file mode 100644 index 000000000..6d72ec65e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AdresseCluster.java @@ -0,0 +1,31 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.address_cc.v0") +public class AdresseCluster { + @Path("/items[at0012]/value|value") + private String stadtValue; + + @Path("/items[at0015]/value|value") + private String landValue; + + public void setStadtValue(String stadtValue) { + this.stadtValue = stadtValue; + } + + public String getStadtValue() { + return this.stadtValue; + } + + public void setLandValue(String landValue) { + this.landValue = landValue; + } + + public String getLandValue() { + return this.landValue; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AdresseClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AdresseClusterContainment.java new file mode 100644 index 000000000..8a21308cd --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AdresseClusterContainment.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class AdresseClusterContainment extends Containment { + public SelectAqlField ADRESSE_CLUSTER = new AqlFieldImp(AdresseCluster.class, "", "AdresseCluster", AdresseCluster.class, this); + + public SelectAqlField STADT_VALUE = new AqlFieldImp(AdresseCluster.class, "/items[at0012]/value|value", "stadtValue", String.class, this); + + public SelectAqlField LAND_VALUE = new AqlFieldImp(AdresseCluster.class, "/items[at0015]/value|value", "landValue", String.class, this); + + private AdresseClusterContainment() { + super("openEHR-EHR-CLUSTER.address_cc.v0"); + } + + public static AdresseClusterContainment getInstance() { + return new AdresseClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java new file mode 100644 index 000000000..1ff3b100f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java @@ -0,0 +1,115 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-SECTION.adhoc.v1") +public class AllgemeineAngabenSection { + @Path("/items[openEHR-EHR-OBSERVATION.medication_use.v0]") + private FragebogenZumMedikationsScreeningObservation fragebogenZumMedikationsScreening; + + @Path("/items[openEHR-EHR-EVALUATION.occupation_summary.v1 and name/value='Gesundheitsbezogener Beruf']") + private GesundheitsbezogenerBerufEvaluation gesundheitsbezogenerBeruf; + + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Chronische Erkrankungen']") + private ChronischeErkrankungenObservation chronischeErkrankungen; + + @Path("/items[openEHR-EHR-EVALUATION.problem_diagnosis.v1]") + private List problemDiagnose; + + @Path("/items[openEHR-EHR-INSTRUCTION.service_request.v1]") + private List dienstleistung; + + @Path("/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1 and name/value='Problem/Diganose Coronovirus']") + private ProblemDiganoseCoronovirusEvaluation problemDiganoseCoronovirus; + + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Andere aktuelle Erkrankungen']") + private AndereAktuelleErkrankungenObservation andereAktuelleErkrankungen; + + @Path("/items[openEHR-EHR-EVALUATION.health_risk.v1]") + private List bewertungDesGesundheitsrisikos; + + @Path("/items[openEHR-EHR-EVALUATION.living_arrangement.v0]") + private List wohnsituation; + + public void setFragebogenZumMedikationsScreening( + FragebogenZumMedikationsScreeningObservation fragebogenZumMedikationsScreening) { + this.fragebogenZumMedikationsScreening = fragebogenZumMedikationsScreening; + } + + public FragebogenZumMedikationsScreeningObservation getFragebogenZumMedikationsScreening() { + return this.fragebogenZumMedikationsScreening; + } + + public void setGesundheitsbezogenerBeruf( + GesundheitsbezogenerBerufEvaluation gesundheitsbezogenerBeruf) { + this.gesundheitsbezogenerBeruf = gesundheitsbezogenerBeruf; + } + + public GesundheitsbezogenerBerufEvaluation getGesundheitsbezogenerBeruf() { + return this.gesundheitsbezogenerBeruf; + } + + public void setChronischeErkrankungen(ChronischeErkrankungenObservation chronischeErkrankungen) { + this.chronischeErkrankungen = chronischeErkrankungen; + } + + public ChronischeErkrankungenObservation getChronischeErkrankungen() { + return this.chronischeErkrankungen; + } + + public void setProblemDiagnose(List problemDiagnose) { + this.problemDiagnose = problemDiagnose; + } + + public List getProblemDiagnose() { + return this.problemDiagnose; + } + + public void setDienstleistung(List dienstleistung) { + this.dienstleistung = dienstleistung; + } + + public List getDienstleistung() { + return this.dienstleistung; + } + + public void setProblemDiganoseCoronovirus( + ProblemDiganoseCoronovirusEvaluation problemDiganoseCoronovirus) { + this.problemDiganoseCoronovirus = problemDiganoseCoronovirus; + } + + public ProblemDiganoseCoronovirusEvaluation getProblemDiganoseCoronovirus() { + return this.problemDiganoseCoronovirus; + } + + public void setAndereAktuelleErkrankungen( + AndereAktuelleErkrankungenObservation andereAktuelleErkrankungen) { + this.andereAktuelleErkrankungen = andereAktuelleErkrankungen; + } + + public AndereAktuelleErkrankungenObservation getAndereAktuelleErkrankungen() { + return this.andereAktuelleErkrankungen; + } + + public void setBewertungDesGesundheitsrisikos( + List bewertungDesGesundheitsrisikos) { + this.bewertungDesGesundheitsrisikos = bewertungDesGesundheitsrisikos; + } + + public List getBewertungDesGesundheitsrisikos() { + return this.bewertungDesGesundheitsrisikos; + } + + public void setWohnsituation(List wohnsituation) { + this.wohnsituation = wohnsituation; + } + + public List getWohnsituation() { + return this.wohnsituation; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AllgemeineAngabenSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AllgemeineAngabenSectionContainment.java new file mode 100644 index 000000000..f83558cc8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AllgemeineAngabenSectionContainment.java @@ -0,0 +1,37 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class AllgemeineAngabenSectionContainment extends Containment { + public SelectAqlField ALLGEMEINE_ANGABEN_SECTION = new AqlFieldImp(AllgemeineAngabenSection.class, "", "AllgemeineAngabenSection", AllgemeineAngabenSection.class, this); + + public SelectAqlField FRAGEBOGEN_ZUM_MEDIKATIONS_SCREENING = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-OBSERVATION.medication_use.v0]", "fragebogenZumMedikationsScreening", FragebogenZumMedikationsScreeningObservation.class, this); + + public SelectAqlField GESUNDHEITSBEZOGENER_BERUF = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.occupation_summary.v1 and name/value='Gesundheitsbezogener Beruf']", "gesundheitsbezogenerBeruf", GesundheitsbezogenerBerufEvaluation.class, this); + + public SelectAqlField CHRONISCHE_ERKRANKUNGEN = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Chronische Erkrankungen']", "chronischeErkrankungen", ChronischeErkrankungenObservation.class, this); + + public ListSelectAqlField PROBLEM_DIAGNOSE = new ListAqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.problem_diagnosis.v1]", "problemDiagnose", ProblemDiagnoseEvaluation.class, this); + + public ListSelectAqlField DIENSTLEISTUNG = new ListAqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-INSTRUCTION.service_request.v1]", "dienstleistung", DienstleistungInstruction.class, this); + + public SelectAqlField PROBLEM_DIGANOSE_CORONOVIRUS = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1 and name/value='Problem/Diganose Coronovirus']", "problemDiganoseCoronovirus", ProblemDiganoseCoronovirusEvaluation.class, this); + + public SelectAqlField ANDERE_AKTUELLE_ERKRANKUNGEN = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Andere aktuelle Erkrankungen']", "andereAktuelleErkrankungen", AndereAktuelleErkrankungenObservation.class, this); + + public ListSelectAqlField BEWERTUNG_DES_GESUNDHEITSRISIKOS = new ListAqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.health_risk.v1]", "bewertungDesGesundheitsrisikos", BewertungDesGesundheitsrisikosEvaluation.class, this); + + public ListSelectAqlField WOHNSITUATION = new ListAqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.living_arrangement.v0]", "wohnsituation", WohnsituationEvaluation.class, this); + + private AllgemeineAngabenSectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } + + public static AllgemeineAngabenSectionContainment getInstance() { + return new AllgemeineAngabenSectionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java new file mode 100644 index 000000000..2a42f557b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java @@ -0,0 +1,104 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class AndereAktuelleErkrankungenObservation { + @Path("/language") + private Language language; + + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningcode vorhandenDefiningcode; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/subject") + private PartyProxy subject; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List anzeichen; + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue; + } + + public void setVorhandenDefiningcode(VorhandenDefiningcode vorhandenDefiningcode) { + this.vorhandenDefiningcode = vorhandenDefiningcode; + } + + public VorhandenDefiningcode getVorhandenDefiningcode() { + return this.vorhandenDefiningcode; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue; + } + + public void setAnzeichen(List anzeichen) { + this.anzeichen = anzeichen; + } + + public List getAnzeichen() { + return this.anzeichen; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java new file mode 100644 index 000000000..a6e6e522b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; + +public class AndereAktuelleErkrankungenObservationContainment extends Containment { + public SelectAqlField ANDERE_AKTUELLE_ERKRANKUNGEN_OBSERVATION = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "", "AndereAktuelleErkrankungenObservation", AndereAktuelleErkrankungenObservation.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/language", "language", Language.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFININGCODE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningcode", VorhandenDefiningcode.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ANZEICHEN = new ListAqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "anzeichen", Cluster.class, this); + + private AndereAktuelleErkrankungenObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static AndereAktuelleErkrankungenObservationContainment getInstance() { + return new AndereAktuelleErkrankungenObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java new file mode 100644 index 000000000..5ff1b8693 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java @@ -0,0 +1,41 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ implements EnumValueSet { + JA("Ja", "Der Patient ist vor kurzem gereist.", "local", "at0112"), + + NEIN("Nein", "Der Patient ist in letzter Zeit nicht gereist.", "local", "at0113"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java new file mode 100644 index 000000000..39ec39032 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java @@ -0,0 +1,127 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.exposure_assessment.v0") +public class AufenthaltInGesundheitseinrichtungObservation { + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value") + private String kommentarValue; + + @Path("/protocol[at0004]/items[at0056]") + private List erweiterung; + + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value") + private String exposureEnValue; + + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code") + private VorhandenseinDefiningcodeSpecificExposureEn vorhandenseinDefiningcode; + + @Path("/language") + private Language language; + + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value") + private String agentEnValue; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/subject") + private PartyProxy subject; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code") + private PresenceOfAnyExposureEnDefiningcode presenceOfAnyExposureEnDefiningcode; + + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } + + public String getKommentarValue() { + return this.kommentarValue; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } + + public void setExposureEnValue(String exposureEnValue) { + this.exposureEnValue = exposureEnValue; + } + + public String getExposureEnValue() { + return this.exposureEnValue; + } + + public void setVorhandenseinDefiningcode( + VorhandenseinDefiningcodeSpecificExposureEn vorhandenseinDefiningcode) { + this.vorhandenseinDefiningcode = vorhandenseinDefiningcode; + } + + public VorhandenseinDefiningcodeSpecificExposureEn getVorhandenseinDefiningcode() { + return this.vorhandenseinDefiningcode; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setAgentEnValue(String agentEnValue) { + this.agentEnValue = agentEnValue; + } + + public String getAgentEnValue() { + return this.agentEnValue; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue; + } + + public void setPresenceOfAnyExposureEnDefiningcode( + PresenceOfAnyExposureEnDefiningcode presenceOfAnyExposureEnDefiningcode) { + this.presenceOfAnyExposureEnDefiningcode = presenceOfAnyExposureEnDefiningcode; + } + + public PresenceOfAnyExposureEnDefiningcode getPresenceOfAnyExposureEnDefiningcode() { + return this.presenceOfAnyExposureEnDefiningcode; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java new file mode 100644 index 000000000..3c947f42c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; + +public class AufenthaltInGesundheitseinrichtungObservationContainment extends Containment { + public SelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG_OBSERVATION = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "", "AufenthaltInGesundheitseinrichtungObservation", AufenthaltInGesundheitseinrichtungObservation.class, this); + + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value", "kommentarValue", String.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/protocol[at0004]/items[at0056]", "erweiterung", Cluster.class, this); + + public SelectAqlField EXPOSURE_EN_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value", "exposureEnValue", String.class, this); + + public SelectAqlField VORHANDENSEIN_DEFININGCODE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code", "vorhandenseinDefiningcode", VorhandenseinDefiningcodeSpecificExposureEn.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/language", "language", Language.class, this); + + public SelectAqlField AGENT_EN_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value", "agentEnValue", String.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public SelectAqlField PRESENCE_OF_ANY_EXPOSURE_EN_DEFININGCODE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code", "presenceOfAnyExposureEnDefiningcode", PresenceOfAnyExposureEnDefiningcode.class, this); + + private AufenthaltInGesundheitseinrichtungObservationContainment() { + super("openEHR-EHR-OBSERVATION.exposure_assessment.v0"); + } + + public static AufenthaltInGesundheitseinrichtungObservationContainment getInstance() { + return new AufenthaltInGesundheitseinrichtungObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BeschaftigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BeschaftigungCluster.java new file mode 100644 index 000000000..d3bfaa0d7 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BeschaftigungCluster.java @@ -0,0 +1,45 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.occupation_record.v1") +public class BeschaftigungCluster { + @Path("/items[at0005]/value|value") + private String berufsbezeichnungRolleValue; + + @Path("/items[openEHR-EHR-CLUSTER.organisation_cc.v0]") + private List organisation; + + @Path("/items[at0018]") + private List zusatzlicheAngaben; + + public void setBerufsbezeichnungRolleValue(String berufsbezeichnungRolleValue) { + this.berufsbezeichnungRolleValue = berufsbezeichnungRolleValue; + } + + public String getBerufsbezeichnungRolleValue() { + return this.berufsbezeichnungRolleValue; + } + + public void setOrganisation(List organisation) { + this.organisation = organisation; + } + + public List getOrganisation() { + return this.organisation; + } + + public void setZusatzlicheAngaben(List zusatzlicheAngaben) { + this.zusatzlicheAngaben = zusatzlicheAngaben; + } + + public List getZusatzlicheAngaben() { + return this.zusatzlicheAngaben; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java new file mode 100644 index 000000000..7ba599e75 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java @@ -0,0 +1,26 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class BeschaftigungClusterContainment extends Containment { + public SelectAqlField BESCHAFTIGUNG_CLUSTER = new AqlFieldImp(BeschaftigungCluster.class, "", "BeschaftigungCluster", BeschaftigungCluster.class, this); + + public SelectAqlField BERUFSBEZEICHNUNG_ROLLE_VALUE = new AqlFieldImp(BeschaftigungCluster.class, "/items[at0005]/value|value", "berufsbezeichnungRolleValue", String.class, this); + + public ListSelectAqlField ORGANISATION = new ListAqlFieldImp(BeschaftigungCluster.class, "/items[openEHR-EHR-CLUSTER.organisation_cc.v0]", "organisation", OrganisationCluster.class, this); + + public ListSelectAqlField ZUSATZLICHE_ANGABEN = new ListAqlFieldImp(BeschaftigungCluster.class, "/items[at0018]", "zusatzlicheAngaben", Cluster.class, this); + + private BeschaftigungClusterContainment() { + super("openEHR-EHR-CLUSTER.occupation_record.v1"); + } + + public static BeschaftigungClusterContainment getInstance() { + return new BeschaftigungClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosDetailsClusterSpezi_.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosDetailsClusterSpezi_.java new file mode 100644 index 000000000..cdf0b726d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosDetailsClusterSpezi_.java @@ -0,0 +1,23 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +import java.util.List; + +@Entity +@OptionFor("CLUSTER") +public class BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosDetailsClusterSpezi_ implements BewertungDesGesundheitsrisikosDetailsChoice { + @Path("") + private List details; + + public void setDetails(List details) { + this.details = details; + } + + public List getDetails() { + return this.details; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosRisikofaktorDvtextS_.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosRisikofaktorDvtextS_.java new file mode 100644 index 000000000..fae394dc1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosRisikofaktorDvtextS_.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosRisikofaktorDvtextS_ implements BewertungDesGesundheitsrisikosRisikofaktorChoice { + @Path("|value") + private String risikofaktorValue; + + public void setRisikofaktorValue(String risikofaktorValue) { + this.risikofaktorValue = risikofaktorValue; + } + + public String getRisikofaktorValue() { + return this.risikofaktorValue; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosVorhandenseinDvcode_.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosVorhandenseinDvcode_.java new file mode 100644 index 000000000..7d4d82be7 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosVorhandenseinDvcode_.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosVorhandenseinDvcode_ implements BewertungDesGesundheitsrisikosVorhandenseinChoice { + @Path("|defining_code") + private VorhandenseinDefiningcode vorhandenseinDefiningcode; + + public void setVorhandenseinDefiningcode(VorhandenseinDefiningcode vorhandenseinDefiningcode) { + this.vorhandenseinDefiningcode = vorhandenseinDefiningcode; + } + + public VorhandenseinDefiningcode getVorhandenseinDefiningcode() { + return this.vorhandenseinDefiningcode; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosDetailsChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosDetailsChoice.java new file mode 100644 index 000000000..021a75941 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosDetailsChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +public interface BewertungDesGesundheitsrisikosDetailsChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosDetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosDetailsCluster.java new file mode 100644 index 000000000..bfa5b2d4f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosDetailsCluster.java @@ -0,0 +1,23 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +import java.util.List; + +@Entity +@OptionFor("CLUSTER") +public class BewertungDesGesundheitsrisikosDetailsCluster implements BewertungDesGesundheitsrisikosDetailsChoice { + @Path("") + private List details; + + public void setDetails(List details) { + this.details = details; + } + + public List getDetails() { + return this.details; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java new file mode 100644 index 000000000..141882137 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java @@ -0,0 +1,129 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +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.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.health_risk.v1") +public class BewertungDesGesundheitsrisikosEvaluation { + @Path("/protocol[at0010]/items[at0024]/value|value") + private TemporalAccessor letzteAktualisierungValue; + + @Path("/data[at0001]/items[at0016]/items[at0013]/value") + @Choice + private BewertungDesGesundheitsrisikosRisikofaktorChoice risikofaktor; + + @Path("/data[at0001]/items[at0003]/value|value") + private String risikobewertungValue; + + @Path("/protocol[at0010]/items[at0011]") + private List erweiterung; + + @Path("/data[at0001]/items[at0002]/value|value") + private String gesundheitsrisikoValue; + + @Path("/language") + private Language language; + + @Path("/data[at0001]/items[at0016]/items[at0017]/value") + @Choice + private BewertungDesGesundheitsrisikosVorhandenseinChoice vorhandensein; + + @Path("/subject") + private PartyProxy subject; + + @Path("/protocol[at0010]/items[at0025]/value|value") + private String bewertungsmethodeValue; + + @Path("/data[at0001]/items[at0016]/items[at0027]") + @Choice + private BewertungDesGesundheitsrisikosDetailsChoice details; + + public void setLetzteAktualisierungValue(TemporalAccessor letzteAktualisierungValue) { + this.letzteAktualisierungValue = letzteAktualisierungValue; + } + + public TemporalAccessor getLetzteAktualisierungValue() { + return this.letzteAktualisierungValue; + } + + public void setRisikofaktor(BewertungDesGesundheitsrisikosRisikofaktorChoice risikofaktor) { + this.risikofaktor = risikofaktor; + } + + public BewertungDesGesundheitsrisikosRisikofaktorChoice getRisikofaktor() { + return this.risikofaktor; + } + + public void setRisikobewertungValue(String risikobewertungValue) { + this.risikobewertungValue = risikobewertungValue; + } + + public String getRisikobewertungValue() { + return this.risikobewertungValue; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } + + public void setGesundheitsrisikoValue(String gesundheitsrisikoValue) { + this.gesundheitsrisikoValue = gesundheitsrisikoValue; + } + + public String getGesundheitsrisikoValue() { + return this.gesundheitsrisikoValue; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setVorhandensein(BewertungDesGesundheitsrisikosVorhandenseinChoice vorhandensein) { + this.vorhandensein = vorhandensein; + } + + public BewertungDesGesundheitsrisikosVorhandenseinChoice getVorhandensein() { + return this.vorhandensein; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setBewertungsmethodeValue(String bewertungsmethodeValue) { + this.bewertungsmethodeValue = bewertungsmethodeValue; + } + + public String getBewertungsmethodeValue() { + return this.bewertungsmethodeValue; + } + + public void setDetails(BewertungDesGesundheitsrisikosDetailsChoice details) { + this.details = details; + } + + public BewertungDesGesundheitsrisikosDetailsChoice getDetails() { + return this.details; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java new file mode 100644 index 000000000..a40a10c91 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; + +public class BewertungDesGesundheitsrisikosEvaluationContainment extends Containment { + public SelectAqlField BEWERTUNG_DES_GESUNDHEITSRISIKOS_EVALUATION = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "", "BewertungDesGesundheitsrisikosEvaluation", BewertungDesGesundheitsrisikosEvaluation.class, this); + + public SelectAqlField LETZTE_AKTUALISIERUNG_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/protocol[at0010]/items[at0024]/value|value", "letzteAktualisierungValue", TemporalAccessor.class, this); + + public SelectAqlField RISIKOFAKTOR = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0013]/value", "risikofaktor", BewertungDesGesundheitsrisikosRisikofaktorChoice.class, this); + + public SelectAqlField RISIKOBEWERTUNG_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0003]/value|value", "risikobewertungValue", String.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/protocol[at0010]/items[at0011]", "erweiterung", Cluster.class, this); + + public SelectAqlField GESUNDHEITSRISIKO_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0002]/value|value", "gesundheitsrisikoValue", String.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/language", "language", Language.class, this); + + public SelectAqlField VORHANDENSEIN = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0017]/value", "vorhandensein", BewertungDesGesundheitsrisikosVorhandenseinChoice.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField BEWERTUNGSMETHODE_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/protocol[at0010]/items[at0025]/value|value", "bewertungsmethodeValue", String.class, this); + + public SelectAqlField DETAILS = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0027]", "details", BewertungDesGesundheitsrisikosDetailsChoice.class, this); + + private BewertungDesGesundheitsrisikosEvaluationContainment() { + super("openEHR-EHR-EVALUATION.health_risk.v1"); + } + + public static BewertungDesGesundheitsrisikosEvaluationContainment getInstance() { + return new BewertungDesGesundheitsrisikosEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosRisikofaktorChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosRisikofaktorChoice.java new file mode 100644 index 000000000..f4615b168 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosRisikofaktorChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +public interface BewertungDesGesundheitsrisikosRisikofaktorChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosRisikofaktorDvtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosRisikofaktorDvtext.java new file mode 100644 index 000000000..c306baadf --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosRisikofaktorDvtext.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class BewertungDesGesundheitsrisikosRisikofaktorDvtext implements BewertungDesGesundheitsrisikosRisikofaktorChoice { + @Path("|value") + private String risikofaktorValue; + + public void setRisikofaktorValue(String risikofaktorValue) { + this.risikofaktorValue = risikofaktorValue; + } + + public String getRisikofaktorValue() { + return this.risikofaktorValue; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosVorhandenseinChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosVorhandenseinChoice.java new file mode 100644 index 000000000..13796d18f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosVorhandenseinChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +public interface BewertungDesGesundheitsrisikosVorhandenseinChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosVorhandenseinDvcodedtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosVorhandenseinDvcodedtext.java new file mode 100644 index 000000000..d3911fb50 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosVorhandenseinDvcodedtext.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class BewertungDesGesundheitsrisikosVorhandenseinDvcodedtext implements BewertungDesGesundheitsrisikosVorhandenseinChoice { + @Path("|defining_code") + private VorhandenseinDefiningcode vorhandenseinDefiningcode; + + public void setVorhandenseinDefiningcode(VorhandenseinDefiningcode vorhandenseinDefiningcode) { + this.vorhandenseinDefiningcode = vorhandenseinDefiningcode; + } + + public VorhandenseinDefiningcode getVorhandenseinDefiningcode() { + return this.vorhandenseinDefiningcode; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java new file mode 100644 index 000000000..3c63bf0e8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java @@ -0,0 +1,104 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class ChronischeErkrankungenObservation { + @Path("/language") + private Language language; + + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningcode vorhandenDefiningcode; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/subject") + private PartyProxy subject; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List anzeichen; + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue; + } + + public void setVorhandenDefiningcode(VorhandenDefiningcode vorhandenDefiningcode) { + this.vorhandenDefiningcode = vorhandenDefiningcode; + } + + public VorhandenDefiningcode getVorhandenDefiningcode() { + return this.vorhandenDefiningcode; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue; + } + + public void setAnzeichen(List anzeichen) { + this.anzeichen = anzeichen; + } + + public List getAnzeichen() { + return this.anzeichen; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java new file mode 100644 index 000000000..9e0114a4f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; + +public class ChronischeErkrankungenObservationContainment extends Containment { + public SelectAqlField CHRONISCHE_ERKRANKUNGEN_OBSERVATION = new AqlFieldImp(ChronischeErkrankungenObservation.class, "", "ChronischeErkrankungenObservation", ChronischeErkrankungenObservation.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/language", "language", Language.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ChronischeErkrankungenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFININGCODE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningcode", VorhandenDefiningcode.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ANZEICHEN = new ListAqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "anzeichen", Cluster.class, this); + + private ChronischeErkrankungenObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static ChronischeErkrankungenObservationContainment getInstance() { + return new ChronischeErkrankungenObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DiagnosestatusDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DiagnosestatusDefiningcode.java new file mode 100644 index 000000000..5e5927f6c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DiagnosestatusDefiningcode.java @@ -0,0 +1,38 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum DiagnosestatusDefiningcode implements EnumValueSet { + IN_BEARBEITUNG("In Bearbeitung", "Eine vorübergehende Diagnose, bei welcher Testergebnisse und klinische Hinweise oder Empfehlungen noch ausstehen, welche aber bereits auf einer soliden klinischen Sicherheit beruht. Sobald weitere Testresultate und klinische Hinweise oder Empfehlungen zur Verfügung stehen, kann sich die Diagnose noch ändern.", "local", "at0017"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + DiagnosestatusDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningcode.java new file mode 100644 index 000000000..16811cca0 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningcode.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum DiagnostischeSicherheitDefiningcode implements EnumValueSet { + WAHRSCHEINLICH("Wahrscheinlich", "Die Diagnose wurde mit einem hohen Maß an Sicherheit gestellt.", "local", "at0075"), + + VERMUTET("Vermutet", "Die Diagnose wurde mit einem niedrigen Grad an Sicherheit gestellt.", "local", "at0074"), + + BESTATIGT("Bestätigt", "Die Diagnose wurde anhand anerkannter Kriterien bestätigt.", "local", "at0076"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + DiagnostischeSicherheitDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java new file mode 100644 index 000000000..744d95353 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java @@ -0,0 +1,89 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datastructures.ItemStructure; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +import java.util.List; + +@Entity +public class DienstleistungAktuelleAktivitatActivity { + @Path("/description[at0009]/items[at0149]") + private List unterstutzendeInformationen; + + @Path("/description[at0009]/items[at0116]") + private List anforderungenAnPatienten; + + @Path("/description[at0009]/items[at0121]/value|value") + private String nameDerDienstleistungValue; + + @Path("/description[at0009]/items[at0132]") + private List spezifischeDetails; + + @Path("/description[at0009]/items[at0151]") + private List komplexeZeitplanung; + + @Path("/description[at0009]/items[at0062]") + private List grundFurDieAnforderung; + + @Path("/description") + private ItemStructure description; + + public void setUnterstutzendeInformationen(List unterstutzendeInformationen) { + this.unterstutzendeInformationen = unterstutzendeInformationen; + } + + public List getUnterstutzendeInformationen() { + return this.unterstutzendeInformationen; + } + + public void setAnforderungenAnPatienten(List anforderungenAnPatienten) { + this.anforderungenAnPatienten = anforderungenAnPatienten; + } + + public List getAnforderungenAnPatienten() { + return this.anforderungenAnPatienten; + } + + public void setNameDerDienstleistungValue(String nameDerDienstleistungValue) { + this.nameDerDienstleistungValue = nameDerDienstleistungValue; + } + + public String getNameDerDienstleistungValue() { + return this.nameDerDienstleistungValue; + } + + public void setSpezifischeDetails(List spezifischeDetails) { + this.spezifischeDetails = spezifischeDetails; + } + + public List getSpezifischeDetails() { + return this.spezifischeDetails; + } + + public void setKomplexeZeitplanung(List komplexeZeitplanung) { + this.komplexeZeitplanung = komplexeZeitplanung; + } + + public List getKomplexeZeitplanung() { + return this.komplexeZeitplanung; + } + + public void setGrundFurDieAnforderung( + List grundFurDieAnforderung) { + this.grundFurDieAnforderung = grundFurDieAnforderung; + } + + public List getGrundFurDieAnforderung() { + return this.grundFurDieAnforderung; + } + + public void setDescription(ItemStructure description) { + this.description = description; + } + + public ItemStructure getDescription() { + return this.description; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java new file mode 100644 index 000000000..08c28d87d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java @@ -0,0 +1,18 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class DienstleistungGrundFurDieAnforderungElement { + @Path("/value|value") + private String value; + + public void setValue(String value) { + this.value = value; + } + + public String getValue() { + return this.value; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DienstleistungInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DienstleistungInstruction.java new file mode 100644 index 000000000..a202fd1d5 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DienstleistungInstruction.java @@ -0,0 +1,103 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-INSTRUCTION.service_request.v1") +public class DienstleistungInstruction { + @Path("/narrative|value") + private String narrativeValue; + + @Path("/language") + private Language language; + + @Path("/protocol[at0008]/items[at0142]") + private Cluster empfanger; + + @Path("/protocol[at0008]/items[at0112]") + private List erweiterung; + + @Path("/protocol[at0008]/items[at0141]") + private Cluster einsender; + + @Path("/subject") + private PartyProxy subject; + + @Path("/activities[at0001]") + private List aktuelleAktivitat; + + @Path("/protocol[at0008]/items[at0128]") + private List verteilerliste; + + public void setNarrativeValue(String narrativeValue) { + this.narrativeValue = narrativeValue; + } + + public String getNarrativeValue() { + return this.narrativeValue; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setEmpfanger(Cluster empfanger) { + this.empfanger = empfanger; + } + + public Cluster getEmpfanger() { + return this.empfanger; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } + + public void setEinsender(Cluster einsender) { + this.einsender = einsender; + } + + public Cluster getEinsender() { + return this.einsender; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setAktuelleAktivitat( + List aktuelleAktivitat) { + this.aktuelleAktivitat = aktuelleAktivitat; + } + + public List getAktuelleAktivitat() { + return this.aktuelleAktivitat; + } + + public void setVerteilerliste(List verteilerliste) { + this.verteilerliste = verteilerliste; + } + + public List getVerteilerliste() { + return this.verteilerliste; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java new file mode 100644 index 000000000..2b1929539 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java @@ -0,0 +1,38 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +public class DienstleistungInstructionContainment extends Containment { + public SelectAqlField DIENSTLEISTUNG_INSTRUCTION = new AqlFieldImp(DienstleistungInstruction.class, "", "DienstleistungInstruction", DienstleistungInstruction.class, this); + + public SelectAqlField NARRATIVE_VALUE = new AqlFieldImp(DienstleistungInstruction.class, "/narrative|value", "narrativeValue", String.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(DienstleistungInstruction.class, "/language", "language", Language.class, this); + + public SelectAqlField EMPFANGER = new AqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0142]", "empfanger", Cluster.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0112]", "erweiterung", Cluster.class, this); + + public SelectAqlField EINSENDER = new AqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0141]", "einsender", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(DienstleistungInstruction.class, "/subject", "subject", PartyProxy.class, this); + + public ListSelectAqlField AKTUELLE_AKTIVITAT = new ListAqlFieldImp(DienstleistungInstruction.class, "/activities[at0001]", "aktuelleAktivitat", DienstleistungAktuelleAktivitatActivity.class, this); + + public ListSelectAqlField VERTEILERLISTE = new ListAqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0128]", "verteilerliste", Cluster.class, this); + + private DienstleistungInstructionContainment() { + super("openEHR-EHR-INSTRUCTION.service_request.v1"); + } + + public static DienstleistungInstructionContainment getInstance() { + return new DienstleistungInstructionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DurchfallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DurchfallObservation.java new file mode 100644 index 000000000..a42ebcc97 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DurchfallObservation.java @@ -0,0 +1,104 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class DurchfallObservation { + @Path("/language") + private Language language; + + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningcode vorhandenDefiningcode; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/subject") + private PartyProxy subject; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List anzeichen; + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue; + } + + public void setVorhandenDefiningcode(VorhandenDefiningcode vorhandenDefiningcode) { + this.vorhandenDefiningcode = vorhandenDefiningcode; + } + + public VorhandenDefiningcode getVorhandenDefiningcode() { + return this.vorhandenDefiningcode; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue; + } + + public void setAnzeichen(List anzeichen) { + this.anzeichen = anzeichen; + } + + public List getAnzeichen() { + return this.anzeichen; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java new file mode 100644 index 000000000..a402ec55f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; + +public class DurchfallObservationContainment extends Containment { + public SelectAqlField DURCHFALL_OBSERVATION = new AqlFieldImp(DurchfallObservation.class, "", "DurchfallObservation", DurchfallObservation.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(DurchfallObservation.class, "/language", "language", Language.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(DurchfallObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFININGCODE = new AqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningcode", VorhandenDefiningcode.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(DurchfallObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(DurchfallObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ANZEICHEN = new ListAqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "anzeichen", Cluster.class, this); + + private DurchfallObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static DurchfallObservationContainment getInstance() { + return new DurchfallObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java new file mode 100644 index 000000000..aeb05bfab --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java @@ -0,0 +1,104 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class FieberOderErhohteKorpertemperaturObservation { + @Path("/language") + private Language language; + + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningcode vorhandenDefiningcode; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/subject") + private PartyProxy subject; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List anzeichen; + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue; + } + + public void setVorhandenDefiningcode(VorhandenDefiningcode vorhandenDefiningcode) { + this.vorhandenDefiningcode = vorhandenDefiningcode; + } + + public VorhandenDefiningcode getVorhandenDefiningcode() { + return this.vorhandenDefiningcode; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue; + } + + public void setAnzeichen(List anzeichen) { + this.anzeichen = anzeichen; + } + + public List getAnzeichen() { + return this.anzeichen; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java new file mode 100644 index 000000000..f283021f2 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; + +public class FieberOderErhohteKorpertemperaturObservationContainment extends Containment { + public SelectAqlField FIEBER_ODER_ERHOHTE_KORPERTEMPERATUR_OBSERVATION = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "", "FieberOderErhohteKorpertemperaturObservation", FieberOderErhohteKorpertemperaturObservation.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/language", "language", Language.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFININGCODE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningcode", VorhandenDefiningcode.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ANZEICHEN = new ListAqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "anzeichen", Cluster.class, this); + + private FieberOderErhohteKorpertemperaturObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static FieberOderErhohteKorpertemperaturObservationContainment getInstance() { + return new FieberOderErhohteKorpertemperaturObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java new file mode 100644 index 000000000..580a84cde --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java @@ -0,0 +1,120 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.medication_use.v0") +public class FragebogenZumMedikationsScreeningObservation { + @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0008]") + private List spezifischeMedikamente; + + @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0003]/value|defining_code") + private MedikamentenklasseInVerwendungDefiningcode medikamentenklasseInVerwendungDefiningcode; + + @Path("/language") + private Language language; + + @Path("/data[at0022]/origin|value") + private TemporalAccessor originValue; + + @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0027]/value|defining_code") + private CodePhrase medikamenteInVerwendungDefiningcode; + + @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0002]/value|value") + private String nameDerMedikamentenklasseValue; + + @Path("/data[at0022]/events[at0023]/time|value") + private TemporalAccessor timeValue; + + @Path("/subject") + private PartyProxy subject; + + @Path("/protocol[at0005]/items[at0019]") + private List erweiterung; + + public void setSpezifischeMedikamente( + List spezifischeMedikamente) { + this.spezifischeMedikamente = spezifischeMedikamente; + } + + public List getSpezifischeMedikamente( + ) { + return this.spezifischeMedikamente; + } + + public void setMedikamentenklasseInVerwendungDefiningcode( + MedikamentenklasseInVerwendungDefiningcode medikamentenklasseInVerwendungDefiningcode) { + this.medikamentenklasseInVerwendungDefiningcode = medikamentenklasseInVerwendungDefiningcode; + } + + public MedikamentenklasseInVerwendungDefiningcode getMedikamentenklasseInVerwendungDefiningcode( + ) { + return this.medikamentenklasseInVerwendungDefiningcode; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue; + } + + public void setMedikamenteInVerwendungDefiningcode( + CodePhrase medikamenteInVerwendungDefiningcode) { + this.medikamenteInVerwendungDefiningcode = medikamenteInVerwendungDefiningcode; + } + + public CodePhrase getMedikamenteInVerwendungDefiningcode() { + return this.medikamenteInVerwendungDefiningcode; + } + + public void setNameDerMedikamentenklasseValue(String nameDerMedikamentenklasseValue) { + this.nameDerMedikamentenklasseValue = nameDerMedikamentenklasseValue; + } + + public String getNameDerMedikamentenklasseValue() { + return this.nameDerMedikamentenklasseValue; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java new file mode 100644 index 000000000..2d03ecbed --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; + +public class FragebogenZumMedikationsScreeningObservationContainment extends Containment { + public SelectAqlField FRAGEBOGEN_ZUM_MEDIKATIONS_SCREENING_OBSERVATION = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "", "FragebogenZumMedikationsScreeningObservation", FragebogenZumMedikationsScreeningObservation.class, this); + + public ListSelectAqlField SPEZIFISCHE_MEDIKAMENTE = new ListAqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0008]", "spezifischeMedikamente", FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.class, this); + + public SelectAqlField MEDIKAMENTENKLASSE_IN_VERWENDUNG_DEFININGCODE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0003]/value|defining_code", "medikamentenklasseInVerwendungDefiningcode", MedikamentenklasseInVerwendungDefiningcode.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/language", "language", Language.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/origin|value", "originValue", TemporalAccessor.class, this); + + public SelectAqlField MEDIKAMENTE_IN_VERWENDUNG_DEFININGCODE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0027]/value|defining_code", "medikamenteInVerwendungDefiningcode", CodePhrase.class, this); + + public SelectAqlField NAME_DER_MEDIKAMENTENKLASSE_VALUE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0002]/value|value", "nameDerMedikamentenklasseValue", String.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/subject", "subject", PartyProxy.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/protocol[at0005]/items[at0019]", "erweiterung", Cluster.class, this); + + private FragebogenZumMedikationsScreeningObservationContainment() { + super("openEHR-EHR-OBSERVATION.medication_use.v0"); + } + + public static FragebogenZumMedikationsScreeningObservationContainment getInstance() { + return new FragebogenZumMedikationsScreeningObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java new file mode 100644 index 000000000..71b46b6dc --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java @@ -0,0 +1,30 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster { + @Path("/items[at0021]/value|value") + private String nameDesMedikamentsValue; + + @Path("/items[at0024]/value|defining_code") + private MedikamentInVerwendungDefiningcode medikamentInVerwendungDefiningcode; + + public void setNameDesMedikamentsValue(String nameDesMedikamentsValue) { + this.nameDesMedikamentsValue = nameDesMedikamentsValue; + } + + public String getNameDesMedikamentsValue() { + return this.nameDesMedikamentsValue; + } + + public void setMedikamentInVerwendungDefiningcode( + MedikamentInVerwendungDefiningcode medikamentInVerwendungDefiningcode) { + this.medikamentInVerwendungDefiningcode = medikamentInVerwendungDefiningcode; + } + + public MedikamentInVerwendungDefiningcode getMedikamentInVerwendungDefiningcode() { + return this.medikamentInVerwendungDefiningcode; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java new file mode 100644 index 000000000..28fe60e5d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +public interface GeschichteHistorieBeliebigesEreignisChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java new file mode 100644 index 000000000..2f328258c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java @@ -0,0 +1,70 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.MathFunctionDefiningcode; + +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.util.List; + +@Entity +@OptionFor("INTERVAL_EVENT") +public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements GeschichteHistorieBeliebigesEreignisChoice { + @Path("/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0003]/items[at0004]") + private List geschichte; + + @Path("/math_function|defining_code") + private MathFunctionDefiningcode mathFunctionDefiningcode; + + @Path("/width|value") + private TemporalAmount widthValue; + + @Path("/data[at0003]/items[at0006]") + private List strukturierteAngabe; + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue; + } + + public void setGeschichte(List geschichte) { + this.geschichte = geschichte; + } + + public List getGeschichte() { + return this.geschichte; + } + + public void setMathFunctionDefiningcode(MathFunctionDefiningcode mathFunctionDefiningcode) { + this.mathFunctionDefiningcode = mathFunctionDefiningcode; + } + + public MathFunctionDefiningcode getMathFunctionDefiningcode() { + return this.mathFunctionDefiningcode; + } + + public void setWidthValue(TemporalAmount widthValue) { + this.widthValue = widthValue; + } + + public TemporalAmount getWidthValue() { + return this.widthValue; + } + + public void setStrukturierteAngabe(List strukturierteAngabe) { + this.strukturierteAngabe = strukturierteAngabe; + } + + public List getStrukturierteAngabe() { + return this.strukturierteAngabe; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java new file mode 100644 index 000000000..02c0d58fa --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java @@ -0,0 +1,46 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@OptionFor("POINT_EVENT") +public class GeschichteHistorieBeliebigesEreignisPointEvent implements GeschichteHistorieBeliebigesEreignisChoice { + @Path("/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0003]/items[at0004]") + private List geschichte; + + @Path("/data[at0003]/items[at0006]") + private List strukturierteAngabe; + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue; + } + + public void setGeschichte(List geschichte) { + this.geschichte = geschichte; + } + + public List getGeschichte() { + return this.geschichte; + } + + public void setStrukturierteAngabe(List strukturierteAngabe) { + this.strukturierteAngabe = strukturierteAngabe; + } + + public List getStrukturierteAngabe() { + return this.strukturierteAngabe; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java new file mode 100644 index 000000000..7debb5b42 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java @@ -0,0 +1,18 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class GeschichteHistorieGeschichteElement { + @Path("/value|value") + private String value; + + public void setValue(String value) { + this.value = value; + } + + public String getValue() { + return this.value; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java new file mode 100644 index 000000000..fdde74db4 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java @@ -0,0 +1,73 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +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.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.story.v1") +public class GeschichteHistorieObservation { + @Path("/subject") + private PartyProxy subject; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/data[at0001]/events[at0002]") + @Choice + private List beliebigesEreignis; + + @Path("/language") + private Language language; + + @Path("/protocol[at0007]/items[at0008]") + private List erweiterung; + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue; + } + + public void setBeliebigesEreignis( + List beliebigesEreignis) { + this.beliebigesEreignis = beliebigesEreignis; + } + + public List getBeliebigesEreignis() { + return this.beliebigesEreignis; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java new file mode 100644 index 000000000..54a08152a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java @@ -0,0 +1,34 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; + +public class GeschichteHistorieObservationContainment extends Containment { + public SelectAqlField GESCHICHTE_HISTORIE_OBSERVATION = new AqlFieldImp(GeschichteHistorieObservation.class, "", "GeschichteHistorieObservation", GeschichteHistorieObservation.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(GeschichteHistorieObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(GeschichteHistorieObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField BELIEBIGES_EREIGNIS = new ListAqlFieldImp(GeschichteHistorieObservation.class, "/data[at0001]/events[at0002]", "beliebigesEreignis", GeschichteHistorieBeliebigesEreignisChoice.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(GeschichteHistorieObservation.class, "/language", "language", Language.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GeschichteHistorieObservation.class, "/protocol[at0007]/items[at0008]", "erweiterung", Cluster.class, this); + + private GeschichteHistorieObservationContainment() { + super("openEHR-EHR-OBSERVATION.story.v1"); + } + + public static GeschichteHistorieObservationContainment getInstance() { + return new GeschichteHistorieObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java new file mode 100644 index 000000000..6f21d5e05 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java @@ -0,0 +1,104 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class GestorterGeruchssinnObservation { + @Path("/language") + private Language language; + + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningcode vorhandenDefiningcode; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/subject") + private PartyProxy subject; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List anzeichen; + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue; + } + + public void setVorhandenDefiningcode(VorhandenDefiningcode vorhandenDefiningcode) { + this.vorhandenDefiningcode = vorhandenDefiningcode; + } + + public VorhandenDefiningcode getVorhandenDefiningcode() { + return this.vorhandenDefiningcode; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue; + } + + public void setAnzeichen(List anzeichen) { + this.anzeichen = anzeichen; + } + + public List getAnzeichen() { + return this.anzeichen; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java new file mode 100644 index 000000000..933b53d71 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; + +public class GestorterGeruchssinnObservationContainment extends Containment { + public SelectAqlField GESTORTER_GERUCHSSINN_OBSERVATION = new AqlFieldImp(GestorterGeruchssinnObservation.class, "", "GestorterGeruchssinnObservation", GestorterGeruchssinnObservation.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/language", "language", Language.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GestorterGeruchssinnObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFININGCODE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningcode", VorhandenDefiningcode.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ANZEICHEN = new ListAqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "anzeichen", Cluster.class, this); + + private GestorterGeruchssinnObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static GestorterGeruchssinnObservationContainment getInstance() { + return new GestorterGeruchssinnObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java new file mode 100644 index 000000000..8441cd26d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java @@ -0,0 +1,104 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class GestorterGeschmackssinnObservation { + @Path("/language") + private Language language; + + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningcode vorhandenDefiningcode; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/subject") + private PartyProxy subject; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List anzeichen; + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue; + } + + public void setVorhandenDefiningcode(VorhandenDefiningcode vorhandenDefiningcode) { + this.vorhandenDefiningcode = vorhandenDefiningcode; + } + + public VorhandenDefiningcode getVorhandenDefiningcode() { + return this.vorhandenDefiningcode; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue; + } + + public void setAnzeichen(List anzeichen) { + this.anzeichen = anzeichen; + } + + public List getAnzeichen() { + return this.anzeichen; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java new file mode 100644 index 000000000..1d09334fa --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; + +public class GestorterGeschmackssinnObservationContainment extends Containment { + public SelectAqlField GESTORTER_GESCHMACKSSINN_OBSERVATION = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "", "GestorterGeschmackssinnObservation", GestorterGeschmackssinnObservation.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/language", "language", Language.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GestorterGeschmackssinnObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFININGCODE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningcode", VorhandenDefiningcode.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ANZEICHEN = new ListAqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "anzeichen", Cluster.class, this); + + private GestorterGeschmackssinnObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static GestorterGeschmackssinnObservationContainment getInstance() { + return new GestorterGeschmackssinnObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java new file mode 100644 index 000000000..5a948fe29 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java @@ -0,0 +1,80 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.occupation_summary.v1") +public class GesundheitsbezogenerBerufEvaluation { + @Path("/data[at0001]/items[at0004]/value|value") + private String beschaftigungsstatusValue; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.occupation_record.v1]") + private List beschaftigung; + + @Path("/data[at0001]/items[at0005]") + private List zusatzlicheAngaben; + + @Path("/protocol[at0007]/items[at0008]") + private List erweiterung; + + public void setBeschaftigungsstatusValue(String beschaftigungsstatusValue) { + this.beschaftigungsstatusValue = beschaftigungsstatusValue; + } + + public String getBeschaftigungsstatusValue() { + return this.beschaftigungsstatusValue; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setBeschaftigung(List beschaftigung) { + this.beschaftigung = beschaftigung; + } + + public List getBeschaftigung() { + return this.beschaftigung; + } + + public void setZusatzlicheAngaben(List zusatzlicheAngaben) { + this.zusatzlicheAngaben = zusatzlicheAngaben; + } + + public List getZusatzlicheAngaben() { + return this.zusatzlicheAngaben; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java new file mode 100644 index 000000000..8797ccc65 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java @@ -0,0 +1,34 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +public class GesundheitsbezogenerBerufEvaluationContainment extends Containment { + public SelectAqlField GESUNDHEITSBEZOGENER_BERUF_EVALUATION = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "", "GesundheitsbezogenerBerufEvaluation", GesundheitsbezogenerBerufEvaluation.class, this); + + public SelectAqlField BESCHAFTIGUNGSSTATUS_VALUE = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/data[at0001]/items[at0004]/value|value", "beschaftigungsstatusValue", String.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/language", "language", Language.class, this); + + public ListSelectAqlField BESCHAFTIGUNG = new ListAqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.occupation_record.v1]", "beschaftigung", BeschaftigungCluster.class, this); + + public ListSelectAqlField ZUSATZLICHE_ANGABEN = new ListAqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/data[at0001]/items[at0005]", "zusatzlicheAngaben", Cluster.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/protocol[at0007]/items[at0008]", "erweiterung", Cluster.class, this); + + private GesundheitsbezogenerBerufEvaluationContainment() { + super("openEHR-EHR-EVALUATION.occupation_summary.v1"); + } + + public static GesundheitsbezogenerBerufEvaluationContainment getInstance() { + return new GesundheitsbezogenerBerufEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HeiserkeitObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HeiserkeitObservation.java new file mode 100644 index 000000000..27bd484ec --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HeiserkeitObservation.java @@ -0,0 +1,104 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class HeiserkeitObservation { + @Path("/language") + private Language language; + + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningcode vorhandenDefiningcode; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/subject") + private PartyProxy subject; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List anzeichen; + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue; + } + + public void setVorhandenDefiningcode(VorhandenDefiningcode vorhandenDefiningcode) { + this.vorhandenDefiningcode = vorhandenDefiningcode; + } + + public VorhandenDefiningcode getVorhandenDefiningcode() { + return this.vorhandenDefiningcode; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue; + } + + public void setAnzeichen(List anzeichen) { + this.anzeichen = anzeichen; + } + + public List getAnzeichen() { + return this.anzeichen; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java new file mode 100644 index 000000000..641381f74 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; + +public class HeiserkeitObservationContainment extends Containment { + public SelectAqlField HEISERKEIT_OBSERVATION = new AqlFieldImp(HeiserkeitObservation.class, "", "HeiserkeitObservation", HeiserkeitObservation.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(HeiserkeitObservation.class, "/language", "language", Language.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(HeiserkeitObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFININGCODE = new AqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningcode", VorhandenDefiningcode.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(HeiserkeitObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ANZEICHEN = new ListAqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "anzeichen", Cluster.class, this); + + private HeiserkeitObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static HeiserkeitObservationContainment getInstance() { + return new HeiserkeitObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java new file mode 100644 index 000000000..cffa8dd7a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java @@ -0,0 +1,105 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.travel_history.v0") +public class HistorieDerReiseObservation { + @Path("/language") + private Language language; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0134]/items[openEHR-EHR-CLUSTER.location.v1]") + private StandortCluster standort; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0111]/value|defining_code") + private AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningcode; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/subject") + private PartyProxy subject; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0100]/items[at0101]") + private List extensionEn; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0109]") + private List detaillierteAngabenZurExposition; + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setStandort(StandortCluster standort) { + this.standort = standort; + } + + public StandortCluster getStandort() { + return this.standort; + } + + public void setAufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningcode( + AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningcode) { + this.aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningcode = aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningcode; + } + + public AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ getAufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningcode( + ) { + return this.aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningcode; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue; + } + + public void setExtensionEn(List extensionEn) { + this.extensionEn = extensionEn; + } + + public List getExtensionEn() { + return this.extensionEn; + } + + public void setDetaillierteAngabenZurExposition(List detaillierteAngabenZurExposition) { + this.detaillierteAngabenZurExposition = detaillierteAngabenZurExposition; + } + + public List getDetaillierteAngabenZurExposition() { + return this.detaillierteAngabenZurExposition; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java new file mode 100644 index 000000000..a8ea0feba --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; + +public class HistorieDerReiseObservationContainment extends Containment { + public SelectAqlField HISTORIE_DER_REISE_OBSERVATION = new AqlFieldImp(HistorieDerReiseObservation.class, "", "HistorieDerReiseObservation", HistorieDerReiseObservation.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(HistorieDerReiseObservation.class, "/language", "language", Language.class, this); + + public SelectAqlField STANDORT = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0134]/items[openEHR-EHR-CLUSTER.location.v1]", "standort", StandortCluster.class, this); + + public SelectAqlField AUFENTHALT_IN_DEN_LETZTEN14_TAGE_IN_EINEM_DER_RISIKOGEBIETE_FUR_CORONAINFEKTION_ODER_KONTAKT_ZU_MENSCHEN_DIE_DORT_WAREN_DEFININGCODE = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0111]/value|defining_code", "aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningcode", AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(HistorieDerReiseObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField EXTENSION_EN = new ListAqlFieldImp(HistorieDerReiseObservation.class, "/protocol[at0100]/items[at0101]", "extensionEn", Cluster.class, this); + + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUR_EXPOSITION = new ListAqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0109]", "detaillierteAngabenZurExposition", Cluster.class, this); + + private HistorieDerReiseObservationContainment() { + super("openEHR-EHR-OBSERVATION.travel_history.v0"); + } + + public static HistorieDerReiseObservationContainment getInstance() { + return new HistorieDerReiseObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HustenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HustenObservation.java new file mode 100644 index 000000000..86a1ce56e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HustenObservation.java @@ -0,0 +1,104 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class HustenObservation { + @Path("/language") + private Language language; + + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningcode vorhandenDefiningcode; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/subject") + private PartyProxy subject; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List anzeichen; + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue; + } + + public void setVorhandenDefiningcode(VorhandenDefiningcode vorhandenDefiningcode) { + this.vorhandenDefiningcode = vorhandenDefiningcode; + } + + public VorhandenDefiningcode getVorhandenDefiningcode() { + return this.vorhandenDefiningcode; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue; + } + + public void setAnzeichen(List anzeichen) { + this.anzeichen = anzeichen; + } + + public List getAnzeichen() { + return this.anzeichen; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HustenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HustenObservationContainment.java new file mode 100644 index 000000000..509fdc18d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/HustenObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; + +public class HustenObservationContainment extends Containment { + public SelectAqlField HUSTEN_OBSERVATION = new AqlFieldImp(HustenObservation.class, "", "HustenObservation", HustenObservation.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(HustenObservation.class, "/language", "language", Language.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(HustenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFININGCODE = new AqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningcode", VorhandenDefiningcode.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(HustenObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(HustenObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ANZEICHEN = new ListAqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "anzeichen", Cluster.class, this); + + private HustenObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static HustenObservationContainment getInstance() { + return new HustenObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/InlandAuslandDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/InlandAuslandDefiningcode.java new file mode 100644 index 000000000..c0640129b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/InlandAuslandDefiningcode.java @@ -0,0 +1,42 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum InlandAuslandDefiningcode implements EnumValueSet { + INLANDSREISE("Inlandsreise", "Die Person ist innerhalb des angegebenen Zeitraums im Inland gereist.", "local", "at0028"), + + INLANDS_UND_AUSLANDSREISE("Inlands- und Auslandsreise", "Die Person ist innerhalb des festgelegten Zeitraums sowohl im Inland als auch international gereist.", "local", "at0030"), + + AUSLANDREISE("Auslandreise", "Die Person ist innerhalb des angegebenen Zeitraums international gereist.", "local", "at0029"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + InlandAuslandDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/KontaktSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/KontaktSection.java new file mode 100644 index 000000000..971a0d609 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/KontaktSection.java @@ -0,0 +1,32 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-SECTION.adhoc.v1") +public class KontaktSection { + @Path("/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Aufenthalt in Gesundheitseinrichtung']") + private AufenthaltInGesundheitseinrichtungObservation aufenthaltInGesundheitseinrichtung; + + @Path("/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Personenkontakt']") + private PersonenkontaktObservation personenkontakt; + + public void setAufenthaltInGesundheitseinrichtung( + AufenthaltInGesundheitseinrichtungObservation aufenthaltInGesundheitseinrichtung) { + this.aufenthaltInGesundheitseinrichtung = aufenthaltInGesundheitseinrichtung; + } + + public AufenthaltInGesundheitseinrichtungObservation getAufenthaltInGesundheitseinrichtung() { + return this.aufenthaltInGesundheitseinrichtung; + } + + public void setPersonenkontakt(PersonenkontaktObservation personenkontakt) { + this.personenkontakt = personenkontakt; + } + + public PersonenkontaktObservation getPersonenkontakt() { + return this.personenkontakt; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/KontaktSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/KontaktSectionContainment.java new file mode 100644 index 000000000..e7089d114 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/KontaktSectionContainment.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class KontaktSectionContainment extends Containment { + public SelectAqlField KONTAKT_SECTION = new AqlFieldImp(KontaktSection.class, "", "KontaktSection", KontaktSection.class, this); + + public SelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG = new AqlFieldImp(KontaktSection.class, "/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Aufenthalt in Gesundheitseinrichtung']", "aufenthaltInGesundheitseinrichtung", AufenthaltInGesundheitseinrichtungObservation.class, this); + + public SelectAqlField PERSONENKONTAKT = new AqlFieldImp(KontaktSection.class, "/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Personenkontakt']", "personenkontakt", PersonenkontaktObservation.class, this); + + private KontaktSectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } + + public static KontaktSectionContainment getInstance() { + return new KontaktSectionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java new file mode 100644 index 000000000..b90e23eed --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java @@ -0,0 +1,148 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.body_temperature.v2") +public class KorpertemperaturObservation { + @Path("/protocol[at0020]/items[at0062]") + private List erweiterung; + + @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0066]") + private List storfaktoren; + + @Path("/language") + private Language language; + + @Path("/protocol[at0020]/items[at0064]") + private List strukturierteLokalisationDerMessung; + + @Path("/data[at0002]/origin|value") + private TemporalAccessor originValue; + + @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0057]") + private Cluster betatigung; + + @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude") + private Double temperaturMagnitude; + + @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units") + private String temperaturUnits; + + @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0056]") + private List umgebungsbedingungen; + + @Path("/protocol[at0020]/items[at0059]") + private Cluster gerat; + + @Path("/subject") + private PartyProxy subject; + + @Path("/data[at0002]/events[at0003]/time|value") + private TemporalAccessor timeValue; + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } + + public void setStorfaktoren(List storfaktoren) { + this.storfaktoren = storfaktoren; + } + + public List getStorfaktoren() { + return this.storfaktoren; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setStrukturierteLokalisationDerMessung( + List strukturierteLokalisationDerMessung) { + this.strukturierteLokalisationDerMessung = strukturierteLokalisationDerMessung; + } + + public List getStrukturierteLokalisationDerMessung() { + return this.strukturierteLokalisationDerMessung; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue; + } + + public void setBetatigung(Cluster betatigung) { + this.betatigung = betatigung; + } + + public Cluster getBetatigung() { + return this.betatigung; + } + + public void setTemperaturMagnitude(Double temperaturMagnitude) { + this.temperaturMagnitude = temperaturMagnitude; + } + + public Double getTemperaturMagnitude() { + return this.temperaturMagnitude; + } + + public void setTemperaturUnits(String temperaturUnits) { + this.temperaturUnits = temperaturUnits; + } + + public String getTemperaturUnits() { + return this.temperaturUnits; + } + + public void setUmgebungsbedingungen(List umgebungsbedingungen) { + this.umgebungsbedingungen = umgebungsbedingungen; + } + + public List getUmgebungsbedingungen() { + return this.umgebungsbedingungen; + } + + public void setGerat(Cluster gerat) { + this.gerat = gerat; + } + + public Cluster getGerat() { + return this.gerat; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java new file mode 100644 index 000000000..935a31db5 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java @@ -0,0 +1,48 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; + +public class KorpertemperaturObservationContainment extends Containment { + public SelectAqlField KORPERTEMPERATUR_OBSERVATION = new AqlFieldImp(KorpertemperaturObservation.class, "", "KorpertemperaturObservation", KorpertemperaturObservation.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(KorpertemperaturObservation.class, "/protocol[at0020]/items[at0062]", "erweiterung", Cluster.class, this); + + public ListSelectAqlField STORFAKTOREN = new ListAqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0066]", "storfaktoren", KorpertemperaturStorfaktorenElement.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(KorpertemperaturObservation.class, "/language", "language", Language.class, this); + + public ListSelectAqlField STRUKTURIERTE_LOKALISATION_DER_MESSUNG = new ListAqlFieldImp(KorpertemperaturObservation.class, "/protocol[at0020]/items[at0064]", "strukturierteLokalisationDerMessung", Cluster.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); + + public SelectAqlField BETATIGUNG = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0057]", "betatigung", Cluster.class, this); + + public SelectAqlField TEMPERATUR_MAGNITUDE = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude", "temperaturMagnitude", Double.class, this); + + public SelectAqlField TEMPERATUR_UNITS = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units", "temperaturUnits", String.class, this); + + public ListSelectAqlField UMGEBUNGSBEDINGUNGEN = new ListAqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0056]", "umgebungsbedingungen", Cluster.class, this); + + public SelectAqlField GERAT = new AqlFieldImp(KorpertemperaturObservation.class, "/protocol[at0020]/items[at0059]", "gerat", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(KorpertemperaturObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/time|value", "timeValue", TemporalAccessor.class, this); + + private KorpertemperaturObservationContainment() { + super("openEHR-EHR-OBSERVATION.body_temperature.v2"); + } + + public static KorpertemperaturObservationContainment getInstance() { + return new KorpertemperaturObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java new file mode 100644 index 000000000..534148dcf --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java @@ -0,0 +1,18 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class KorpertemperaturStorfaktorenElement { + @Path("/value|value") + private String value; + + public void setValue(String value) { + this.value = value; + } + + public String getValue() { + return this.value; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/LetzteReiseDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/LetzteReiseDefiningcode.java new file mode 100644 index 000000000..931c99831 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/LetzteReiseDefiningcode.java @@ -0,0 +1,42 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum LetzteReiseDefiningcode implements EnumValueSet { + NEIN("Nein", "Die Person ist nicht innerhalb des angegebenen Zeitraums gereist.", "local", "at0005"), + + UNBEKANNT("Unbekannt", "Es ist nicht bekannt, ob die Person innerhalb des angegebenen Zeitinraumss gereist ist.", "local", "at0027"), + + JA_NATIONAL("Ja - national", "Die Person ist innerhalb des angegebenen Zeitraums national gereist.", "local", "at0006"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + LetzteReiseDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningcode.java new file mode 100644 index 000000000..3bb366994 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningcode.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum MedikamentInVerwendungDefiningcode implements EnumValueSet { + NICHT_IN_VERWENDUNG("Nicht in Verwendung", "Die Person verwendet das Medikament zum Zeitpunkt des Ergebnis oder währendessen nicht oder hat es nicht verwendet.", "local", "at0032"), + + UNBEKANNT("Unbekannt", "Es ist unbekannt, ob die Person das Medikament zum Zeitpunkt des Ergebnis oder währendessen verwendet oder es verwendet hat.", "local", "at0033"), + + IN_VERWENDUNG("In Verwendung", "Die Person verwendet das Medikament zum Zeitpunkt des Ergebnis oder währendessen oder hat es verwendet.", "local", "at0031"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + MedikamentInVerwendungDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningcode.java new file mode 100644 index 000000000..93100f54d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningcode.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum MedikamentenklasseInVerwendungDefiningcode implements EnumValueSet { + IN_VERWENDUNG("In Verwendung", "Die Person verwendet die Medikamentenklasse zum Zeitpunkt des Ergebnis oder währendessen oder hat sie verwendet.", "local", "at0028"), + + UNBEKANNT("Unbekannt", "Es ist unbekannt, ob die Person die Medikamentenklasse zum Zeitpunkt des Ergebnis oder währendessen verwendet oder sie verwendet hat.", "local", "at0030"), + + NICHT_IN_VERWENDUNG("Nicht in Verwendung", "Die Person verwendet die Medikamentenklasse zum Zeitpunkt des Ergebnis oder währendessen nicht oder hat sie nicht verwendet.", "local", "at0029"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + MedikamentenklasseInVerwendungDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/OrganisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/OrganisationCluster.java new file mode 100644 index 000000000..a0624f632 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/OrganisationCluster.java @@ -0,0 +1,78 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.organisation_cc.v0") +public class OrganisationCluster { + @Path("/items[at0014]") + private List telefon; + + @Path("/items[at0012]/value|value") + private String nameDerEinrichtungValue; + + @Path("/items[at0017]") + private List teilVon; + + @Path("/items[at0016]") + private List kontakt; + + @Path("/items[openEHR-EHR-CLUSTER.address_cc.v0]") + private List adresse; + + @Path("/items[at0018]") + private List identifier; + + public void setTelefon(List telefon) { + this.telefon = telefon; + } + + public List getTelefon() { + return this.telefon; + } + + public void setNameDerEinrichtungValue(String nameDerEinrichtungValue) { + this.nameDerEinrichtungValue = nameDerEinrichtungValue; + } + + public String getNameDerEinrichtungValue() { + return this.nameDerEinrichtungValue; + } + + public void setTeilVon(List teilVon) { + this.teilVon = teilVon; + } + + public List getTeilVon() { + return this.teilVon; + } + + public void setKontakt(List kontakt) { + this.kontakt = kontakt; + } + + public List getKontakt() { + return this.kontakt; + } + + public void setAdresse(List adresse) { + this.adresse = adresse; + } + + public List getAdresse() { + return this.adresse; + } + + public void setIdentifier(List identifier) { + this.identifier = identifier; + } + + public List getIdentifier() { + return this.identifier; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java new file mode 100644 index 000000000..3790b787f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java @@ -0,0 +1,32 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class OrganisationClusterContainment extends Containment { + public SelectAqlField ORGANISATION_CLUSTER = new AqlFieldImp(OrganisationCluster.class, "", "OrganisationCluster", OrganisationCluster.class, this); + + public ListSelectAqlField TELEFON = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0014]", "telefon", Cluster.class, this); + + public SelectAqlField NAME_DER_EINRICHTUNG_VALUE = new AqlFieldImp(OrganisationCluster.class, "/items[at0012]/value|value", "nameDerEinrichtungValue", String.class, this); + + public ListSelectAqlField TEIL_VON = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0017]", "teilVon", Cluster.class, this); + + public ListSelectAqlField KONTAKT = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0016]", "kontakt", Cluster.class, this); + + public ListSelectAqlField ADRESSE = new ListAqlFieldImp(OrganisationCluster.class, "/items[openEHR-EHR-CLUSTER.address_cc.v0]", "adresse", AdresseCluster.class, this); + + public ListSelectAqlField IDENTIFIER = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0018]", "identifier", Cluster.class, this); + + private OrganisationClusterContainment() { + super("openEHR-EHR-CLUSTER.organisation_cc.v0"); + } + + public static OrganisationClusterContainment getInstance() { + return new OrganisationClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java new file mode 100644 index 000000000..7121b3374 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java @@ -0,0 +1,127 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.exposure_assessment.v0") +public class PersonenkontaktObservation { + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value") + private String kommentarValue; + + @Path("/protocol[at0004]/items[at0056]") + private List erweiterung; + + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value") + private String exposureEnValue; + + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code") + private VorhandenseinDefiningcodeSpecificExposureEn vorhandenseinDefiningcode; + + @Path("/language") + private Language language; + + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value") + private String agentEnValue; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/subject") + private PartyProxy subject; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code") + private PresenceOfAnyExposureEnDefiningcode presenceOfAnyExposureEnDefiningcode; + + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } + + public String getKommentarValue() { + return this.kommentarValue; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } + + public void setExposureEnValue(String exposureEnValue) { + this.exposureEnValue = exposureEnValue; + } + + public String getExposureEnValue() { + return this.exposureEnValue; + } + + public void setVorhandenseinDefiningcode( + VorhandenseinDefiningcodeSpecificExposureEn vorhandenseinDefiningcode) { + this.vorhandenseinDefiningcode = vorhandenseinDefiningcode; + } + + public VorhandenseinDefiningcodeSpecificExposureEn getVorhandenseinDefiningcode() { + return this.vorhandenseinDefiningcode; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setAgentEnValue(String agentEnValue) { + this.agentEnValue = agentEnValue; + } + + public String getAgentEnValue() { + return this.agentEnValue; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue; + } + + public void setPresenceOfAnyExposureEnDefiningcode( + PresenceOfAnyExposureEnDefiningcode presenceOfAnyExposureEnDefiningcode) { + this.presenceOfAnyExposureEnDefiningcode = presenceOfAnyExposureEnDefiningcode; + } + + public PresenceOfAnyExposureEnDefiningcode getPresenceOfAnyExposureEnDefiningcode() { + return this.presenceOfAnyExposureEnDefiningcode; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java new file mode 100644 index 000000000..e3977ac40 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; + +public class PersonenkontaktObservationContainment extends Containment { + public SelectAqlField PERSONENKONTAKT_OBSERVATION = new AqlFieldImp(PersonenkontaktObservation.class, "", "PersonenkontaktObservation", PersonenkontaktObservation.class, this); + + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value", "kommentarValue", String.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(PersonenkontaktObservation.class, "/protocol[at0004]/items[at0056]", "erweiterung", Cluster.class, this); + + public SelectAqlField EXPOSURE_EN_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value", "exposureEnValue", String.class, this); + + public SelectAqlField VORHANDENSEIN_DEFININGCODE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code", "vorhandenseinDefiningcode", VorhandenseinDefiningcodeSpecificExposureEn.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(PersonenkontaktObservation.class, "/language", "language", Language.class, this); + + public SelectAqlField AGENT_EN_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value", "agentEnValue", String.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(PersonenkontaktObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public SelectAqlField PRESENCE_OF_ANY_EXPOSURE_EN_DEFININGCODE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code", "presenceOfAnyExposureEnDefiningcode", PresenceOfAnyExposureEnDefiningcode.class, this); + + private PersonenkontaktObservationContainment() { + super("openEHR-EHR-OBSERVATION.exposure_assessment.v0"); + } + + public static PersonenkontaktObservationContainment getInstance() { + return new PersonenkontaktObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningcode.java new file mode 100644 index 000000000..ca18b01de --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningcode.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum PresenceOfAnyExposureEnDefiningcode implements EnumValueSet { + ABSENT_EN("*Absent (en)", "*Exposure is or has been absent at or during the event. (en)", "local", "at0059"), + + UNKNOWN_EN("*Unknown (en)", "*It is not known whether any exposure is or has been present or absent at or during the event. (en)", "local", "at0060"), + + PRESENT_EN("*Present (en)", "*Exposure is or has been present at or during the event. (en)", "local", "at0058"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + PresenceOfAnyExposureEnDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java new file mode 100644 index 000000000..fc478e7cb --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java @@ -0,0 +1,91 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.problem_diagnosis.v1") +public class ProblemDiagnoseEvaluation { + @Path("/data[at0001]/items[at0046]") + private List status; + + @Path("/protocol[at0032]/items[at0071]") + private List erweiterung; + + @Path("/data[at0001]/items[at0002]/value|value") + private String nameDesProblemsDerDiagnoseValue; + + @Path("/data[at0001]/items[at0039]") + private List anatomischeStelleStrukturiert; + + @Path("/language") + private Language language; + + @Path("/subject") + private PartyProxy subject; + + @Path("/data[at0001]/items[at0043]") + private List spezifischeAngaben; + + public void setStatus(List status) { + this.status = status; + } + + public List getStatus() { + return this.status; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } + + public void setNameDesProblemsDerDiagnoseValue(String nameDesProblemsDerDiagnoseValue) { + this.nameDesProblemsDerDiagnoseValue = nameDesProblemsDerDiagnoseValue; + } + + public String getNameDesProblemsDerDiagnoseValue() { + return this.nameDesProblemsDerDiagnoseValue; + } + + public void setAnatomischeStelleStrukturiert(List anatomischeStelleStrukturiert) { + this.anatomischeStelleStrukturiert = anatomischeStelleStrukturiert; + } + + public List getAnatomischeStelleStrukturiert() { + return this.anatomischeStelleStrukturiert; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setSpezifischeAngaben(List spezifischeAngaben) { + this.spezifischeAngaben = spezifischeAngaben; + } + + public List getSpezifischeAngaben() { + return this.spezifischeAngaben; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java new file mode 100644 index 000000000..1fba8433d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java @@ -0,0 +1,36 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +public class ProblemDiagnoseEvaluationContainment extends Containment { + public SelectAqlField PROBLEM_DIAGNOSE_EVALUATION = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "", "ProblemDiagnoseEvaluation", ProblemDiagnoseEvaluation.class, this); + + public ListSelectAqlField STATUS = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0046]", "status", Cluster.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/protocol[at0032]/items[at0071]", "erweiterung", Cluster.class, this); + + public SelectAqlField NAME_DES_PROBLEMS_DER_DIAGNOSE_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0002]/value|value", "nameDesProblemsDerDiagnoseValue", String.class, this); + + public ListSelectAqlField ANATOMISCHE_STELLE_STRUKTURIERT = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0039]", "anatomischeStelleStrukturiert", Cluster.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/language", "language", Language.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public ListSelectAqlField SPEZIFISCHE_ANGABEN = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0043]", "spezifischeAngaben", Cluster.class, this); + + private ProblemDiagnoseEvaluationContainment() { + super("openEHR-EHR-EVALUATION.problem_diagnosis.v1"); + } + + public static ProblemDiagnoseEvaluationContainment getInstance() { + return new ProblemDiagnoseEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java new file mode 100644 index 000000000..859cf33e8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java @@ -0,0 +1,128 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +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.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1") +public class ProblemDiganoseCoronovirusEvaluation { + @Path("/protocol[at0032]/items[at0071]") + private List erweiterung; + + @Path("/data[at0001]/items[at0069]/value|value") + private String kommentarValue; + + @Path("/data[at0001]/items[at0002]/value|value") + private String nameDesProblemsDerDiagnoseValue; + + @Path("/data[at0001]/items[at0039]") + private List anatomischeStelleStrukturiert; + + @Path("/language") + private Language language; + + @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.problem_qualifier.v1 and name/value='Status']") + private StatusCluster status; + + @Path("/protocol[at0032]/items[at0070]/value|value") + private TemporalAccessor zuletztAktualisiertValue; + + @Path("/subject") + private PartyProxy subject; + + @Path("/data[at0001]/items[at0043]") + private List spezifischeAngaben; + + @Path("/data[at0001]/items[at0073]/value") + @Choice + private StatusDiagnostischeSicherheitChoice diagnostischeSicherheit; + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } + + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } + + public String getKommentarValue() { + return this.kommentarValue; + } + + public void setNameDesProblemsDerDiagnoseValue(String nameDesProblemsDerDiagnoseValue) { + this.nameDesProblemsDerDiagnoseValue = nameDesProblemsDerDiagnoseValue; + } + + public String getNameDesProblemsDerDiagnoseValue() { + return this.nameDesProblemsDerDiagnoseValue; + } + + public void setAnatomischeStelleStrukturiert(List anatomischeStelleStrukturiert) { + this.anatomischeStelleStrukturiert = anatomischeStelleStrukturiert; + } + + public List getAnatomischeStelleStrukturiert() { + return this.anatomischeStelleStrukturiert; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setStatus(StatusCluster status) { + this.status = status; + } + + public StatusCluster getStatus() { + return this.status; + } + + public void setZuletztAktualisiertValue(TemporalAccessor zuletztAktualisiertValue) { + this.zuletztAktualisiertValue = zuletztAktualisiertValue; + } + + public TemporalAccessor getZuletztAktualisiertValue() { + return this.zuletztAktualisiertValue; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setSpezifischeAngaben(List spezifischeAngaben) { + this.spezifischeAngaben = spezifischeAngaben; + } + + public List getSpezifischeAngaben() { + return this.spezifischeAngaben; + } + + public void setDiagnostischeSicherheit( + StatusDiagnostischeSicherheitChoice diagnostischeSicherheit) { + this.diagnostischeSicherheit = diagnostischeSicherheit; + } + + public StatusDiagnostischeSicherheitChoice getDiagnostischeSicherheit() { + return this.diagnostischeSicherheit; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java new file mode 100644 index 000000000..b92804f96 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; + +public class ProblemDiganoseCoronovirusEvaluationContainment extends Containment { + public SelectAqlField PROBLEM_DIGANOSE_CORONOVIRUS_EVALUATION = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "", "ProblemDiganoseCoronovirusEvaluation", ProblemDiganoseCoronovirusEvaluation.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/protocol[at0032]/items[at0071]", "erweiterung", Cluster.class, this); + + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0069]/value|value", "kommentarValue", String.class, this); + + public SelectAqlField NAME_DES_PROBLEMS_DER_DIAGNOSE_VALUE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0002]/value|value", "nameDesProblemsDerDiagnoseValue", String.class, this); + + public ListSelectAqlField ANATOMISCHE_STELLE_STRUKTURIERT = new ListAqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0039]", "anatomischeStelleStrukturiert", Cluster.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/language", "language", Language.class, this); + + public SelectAqlField STATUS = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.problem_qualifier.v1 and name/value='Status']", "status", StatusCluster.class, this); + + public SelectAqlField ZULETZT_AKTUALISIERT_VALUE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/protocol[at0032]/items[at0070]/value|value", "zuletztAktualisiertValue", TemporalAccessor.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public ListSelectAqlField SPEZIFISCHE_ANGABEN = new ListAqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0043]", "spezifischeAngaben", Cluster.class, this); + + public SelectAqlField DIAGNOSTISCHE_SICHERHEIT = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0073]/value", "diagnostischeSicherheit", StatusDiagnostischeSicherheitChoice.class, this); + + private ProblemDiganoseCoronovirusEvaluationContainment() { + super("openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1"); + } + + public static ProblemDiganoseCoronovirusEvaluationContainment getInstance() { + return new ProblemDiganoseCoronovirusEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisChoice.java new file mode 100644 index 000000000..cafd60d29 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +public interface ReisefallBeliebigesIntervallereignisChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java new file mode 100644 index 000000000..52bf81068 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java @@ -0,0 +1,80 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.MathFunctionDefiningcode; + +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.util.List; + +@Entity +@OptionFor("INTERVAL_EVENT") +public class ReisefallBeliebigesIntervallereignisIntervalEvent implements ReisefallBeliebigesIntervallereignisChoice { + @Path("/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0003]/items[at0004]/value|defining_code") + private LetzteReiseDefiningcode letzteReiseDefiningcode; + + @Path("/math_function|defining_code") + private MathFunctionDefiningcode mathFunctionDefiningcode; + + @Path("/data[at0003]/items[at0008]") + private List bestimmteReise; + + @Path("/width|value") + private TemporalAmount widthValue; + + @Path("/data[at0003]/items[at0026]/value|defining_code") + private InlandAuslandDefiningcode inlandAuslandDefiningcode; + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue; + } + + public void setLetzteReiseDefiningcode(LetzteReiseDefiningcode letzteReiseDefiningcode) { + this.letzteReiseDefiningcode = letzteReiseDefiningcode; + } + + public LetzteReiseDefiningcode getLetzteReiseDefiningcode() { + return this.letzteReiseDefiningcode; + } + + public void setMathFunctionDefiningcode(MathFunctionDefiningcode mathFunctionDefiningcode) { + this.mathFunctionDefiningcode = mathFunctionDefiningcode; + } + + public MathFunctionDefiningcode getMathFunctionDefiningcode() { + return this.mathFunctionDefiningcode; + } + + public void setBestimmteReise(List bestimmteReise) { + this.bestimmteReise = bestimmteReise; + } + + public List getBestimmteReise() { + return this.bestimmteReise; + } + + public void setWidthValue(TemporalAmount widthValue) { + this.widthValue = widthValue; + } + + public TemporalAmount getWidthValue() { + return this.widthValue; + } + + public void setInlandAuslandDefiningcode(InlandAuslandDefiningcode inlandAuslandDefiningcode) { + this.inlandAuslandDefiningcode = inlandAuslandDefiningcode; + } + + public InlandAuslandDefiningcode getInlandAuslandDefiningcode() { + return this.inlandAuslandDefiningcode; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisPointEvent.java new file mode 100644 index 000000000..c4f32a590 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisPointEvent.java @@ -0,0 +1,56 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@OptionFor("POINT_EVENT") +public class ReisefallBeliebigesIntervallereignisPointEvent implements ReisefallBeliebigesIntervallereignisChoice { + @Path("/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0003]/items[at0004]/value|defining_code") + private LetzteReiseDefiningcode letzteReiseDefiningcode; + + @Path("/data[at0003]/items[at0008]") + private List bestimmteReise; + + @Path("/data[at0003]/items[at0026]/value|defining_code") + private InlandAuslandDefiningcode inlandAuslandDefiningcode; + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue; + } + + public void setLetzteReiseDefiningcode(LetzteReiseDefiningcode letzteReiseDefiningcode) { + this.letzteReiseDefiningcode = letzteReiseDefiningcode; + } + + public LetzteReiseDefiningcode getLetzteReiseDefiningcode() { + return this.letzteReiseDefiningcode; + } + + public void setBestimmteReise(List bestimmteReise) { + this.bestimmteReise = bestimmteReise; + } + + public List getBestimmteReise() { + return this.bestimmteReise; + } + + public void setInlandAuslandDefiningcode(InlandAuslandDefiningcode inlandAuslandDefiningcode) { + this.inlandAuslandDefiningcode = inlandAuslandDefiningcode; + } + + public InlandAuslandDefiningcode getInlandAuslandDefiningcode() { + return this.inlandAuslandDefiningcode; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java new file mode 100644 index 000000000..a1adc207a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java @@ -0,0 +1,45 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +public class ReisefallBestimmteReiseCluster { + @Path("/items[at0010]") + private List bestimmtesReiseziel; + + @Path("/items[at0025]") + private List zusatzlicheReisedetails; + + @Path("/items[at0019]/value|value") + private TemporalAccessor ruckreisedatumValue; + + public void setBestimmtesReiseziel( + List bestimmtesReiseziel) { + this.bestimmtesReiseziel = bestimmtesReiseziel; + } + + public List getBestimmtesReiseziel() { + return this.bestimmtesReiseziel; + } + + public void setZusatzlicheReisedetails(List zusatzlicheReisedetails) { + this.zusatzlicheReisedetails = zusatzlicheReisedetails; + } + + public List getZusatzlicheReisedetails() { + return this.zusatzlicheReisedetails; + } + + public void setRuckreisedatumValue(TemporalAccessor ruckreisedatumValue) { + this.ruckreisedatumValue = ruckreisedatumValue; + } + + public TemporalAccessor getRuckreisedatumValue() { + return this.ruckreisedatumValue; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java new file mode 100644 index 000000000..c002e12d1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java @@ -0,0 +1,65 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +import java.util.List; + +@Entity +public class ReisefallBestimmtesReisezielCluster { + @Path("/items[at0031]/value|value") + private String bestimmteGegendValue; + + @Path("/items[at0024]") + private List zusatzlicheAngabenZumZielort; + + @Path("/items[at0012]/value|value") + private String bundeslandRegionValue; + + @Path("/items[at0011]/value|value") + private String landValue; + + @Path("/items[at0013]/value|value") + private String stadtValue; + + public void setBestimmteGegendValue(String bestimmteGegendValue) { + this.bestimmteGegendValue = bestimmteGegendValue; + } + + public String getBestimmteGegendValue() { + return this.bestimmteGegendValue; + } + + public void setZusatzlicheAngabenZumZielort(List zusatzlicheAngabenZumZielort) { + this.zusatzlicheAngabenZumZielort = zusatzlicheAngabenZumZielort; + } + + public List getZusatzlicheAngabenZumZielort() { + return this.zusatzlicheAngabenZumZielort; + } + + public void setBundeslandRegionValue(String bundeslandRegionValue) { + this.bundeslandRegionValue = bundeslandRegionValue; + } + + public String getBundeslandRegionValue() { + return this.bundeslandRegionValue; + } + + public void setLandValue(String landValue) { + this.landValue = landValue; + } + + public String getLandValue() { + return this.landValue; + } + + public void setStadtValue(String stadtValue) { + this.stadtValue = stadtValue; + } + + public String getStadtValue() { + return this.stadtValue; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallObservation.java new file mode 100644 index 000000000..20e8b0c42 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallObservation.java @@ -0,0 +1,73 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +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.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.travel_event.v0") +public class ReisefallObservation { + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/data[at0001]/events[at0002]") + @Choice + private List beliebigesIntervallereignis; + + @Path("/language") + private Language language; + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue; + } + + public void setBeliebigesIntervallereignis( + List beliebigesIntervallereignis) { + this.beliebigesIntervallereignis = beliebigesIntervallereignis; + } + + public List getBeliebigesIntervallereignis() { + return this.beliebigesIntervallereignis; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java new file mode 100644 index 000000000..b9d65c9ad --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java @@ -0,0 +1,34 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; + +public class ReisefallObservationContainment extends Containment { + public SelectAqlField REISEFALL_OBSERVATION = new AqlFieldImp(ReisefallObservation.class, "", "ReisefallObservation", ReisefallObservation.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ReisefallObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(ReisefallObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(ReisefallObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField BELIEBIGES_INTERVALLEREIGNIS = new ListAqlFieldImp(ReisefallObservation.class, "/data[at0001]/events[at0002]", "beliebigesIntervallereignis", ReisefallBeliebigesIntervallereignisChoice.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(ReisefallObservation.class, "/language", "language", Language.class, this); + + private ReisefallObservationContainment() { + super("openEHR-EHR-OBSERVATION.travel_event.v0"); + } + + public static ReisefallObservationContainment getInstance() { + return new ReisefallObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/RisikogebietSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/RisikogebietSection.java new file mode 100644 index 000000000..307f722d1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/RisikogebietSection.java @@ -0,0 +1,33 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-SECTION.adhoc.v1") +public class RisikogebietSection { + @Path("/items[openEHR-EHR-OBSERVATION.travel_history.v0]") + private List historieDerReise; + + @Path("/items[openEHR-EHR-OBSERVATION.travel_event.v0]") + private List reisefall; + + public void setHistorieDerReise(List historieDerReise) { + this.historieDerReise = historieDerReise; + } + + public List getHistorieDerReise() { + return this.historieDerReise; + } + + public void setReisefall(List reisefall) { + this.reisefall = reisefall; + } + + public List getReisefall() { + return this.reisefall; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/RisikogebietSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/RisikogebietSectionContainment.java new file mode 100644 index 000000000..a2a09b4ce --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/RisikogebietSectionContainment.java @@ -0,0 +1,23 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class RisikogebietSectionContainment extends Containment { + public SelectAqlField RISIKOGEBIET_SECTION = new AqlFieldImp(RisikogebietSection.class, "", "RisikogebietSection", RisikogebietSection.class, this); + + public ListSelectAqlField HISTORIE_DER_REISE = new ListAqlFieldImp(RisikogebietSection.class, "/items[openEHR-EHR-OBSERVATION.travel_history.v0]", "historieDerReise", HistorieDerReiseObservation.class, this); + + public ListSelectAqlField REISEFALL = new ListAqlFieldImp(RisikogebietSection.class, "/items[openEHR-EHR-OBSERVATION.travel_event.v0]", "reisefall", ReisefallObservation.class, this); + + private RisikogebietSectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } + + public static RisikogebietSectionContainment getInstance() { + return new RisikogebietSectionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/SchnupfenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/SchnupfenObservation.java new file mode 100644 index 000000000..e9dca89a9 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/SchnupfenObservation.java @@ -0,0 +1,104 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class SchnupfenObservation { + @Path("/language") + private Language language; + + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningcode vorhandenDefiningcode; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/subject") + private PartyProxy subject; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List anzeichen; + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue; + } + + public void setVorhandenDefiningcode(VorhandenDefiningcode vorhandenDefiningcode) { + this.vorhandenDefiningcode = vorhandenDefiningcode; + } + + public VorhandenDefiningcode getVorhandenDefiningcode() { + return this.vorhandenDefiningcode; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue; + } + + public void setAnzeichen(List anzeichen) { + this.anzeichen = anzeichen; + } + + public List getAnzeichen() { + return this.anzeichen; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java new file mode 100644 index 000000000..d1ea44867 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; + +public class SchnupfenObservationContainment extends Containment { + public SelectAqlField SCHNUPFEN_OBSERVATION = new AqlFieldImp(SchnupfenObservation.class, "", "SchnupfenObservation", SchnupfenObservation.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(SchnupfenObservation.class, "/language", "language", Language.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(SchnupfenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFININGCODE = new AqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningcode", VorhandenDefiningcode.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(SchnupfenObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(SchnupfenObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ANZEICHEN = new ListAqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "anzeichen", Cluster.class, this); + + private SchnupfenObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static SchnupfenObservationContainment getInstance() { + return new SchnupfenObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StandortCluster.java new file mode 100644 index 000000000..37537d250 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StandortCluster.java @@ -0,0 +1,34 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.location.v1") +public class StandortCluster { + @Path("/items[at0047]") + private List details; + + @Path("/items[at0046]/value|value") + private String standortbeschreibungValue; + + public void setDetails(List details) { + this.details = details; + } + + public List getDetails() { + return this.details; + } + + public void setStandortbeschreibungValue(String standortbeschreibungValue) { + this.standortbeschreibungValue = standortbeschreibungValue; + } + + public String getStandortbeschreibungValue() { + return this.standortbeschreibungValue; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StandortClusterContainment.java new file mode 100644 index 000000000..32dfa9574 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StandortClusterContainment.java @@ -0,0 +1,24 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class StandortClusterContainment extends Containment { + public SelectAqlField STANDORT_CLUSTER = new AqlFieldImp(StandortCluster.class, "", "StandortCluster", StandortCluster.class, this); + + public ListSelectAqlField DETAILS = new ListAqlFieldImp(StandortCluster.class, "/items[at0047]", "details", Cluster.class, this); + + public SelectAqlField STANDORTBESCHREIBUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0046]/value|value", "standortbeschreibungValue", String.class, this); + + private StandortClusterContainment() { + super("openEHR-EHR-CLUSTER.location.v1"); + } + + public static StandortClusterContainment getInstance() { + return new StandortClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StatusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StatusCluster.java new file mode 100644 index 000000000..2fa63e284 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StatusCluster.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.problem_qualifier.v1") +public class StatusCluster { + @Path("/items[at0004]/value|defining_code") + private DiagnosestatusDefiningcode diagnosestatusDefiningcode; + + public void setDiagnosestatusDefiningcode(DiagnosestatusDefiningcode diagnosestatusDefiningcode) { + this.diagnosestatusDefiningcode = diagnosestatusDefiningcode; + } + + public DiagnosestatusDefiningcode getDiagnosestatusDefiningcode() { + return this.diagnosestatusDefiningcode; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StatusClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StatusClusterContainment.java new file mode 100644 index 000000000..79e37b63b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StatusClusterContainment.java @@ -0,0 +1,19 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class StatusClusterContainment extends Containment { + public SelectAqlField STATUS_CLUSTER = new AqlFieldImp(StatusCluster.class, "", "StatusCluster", StatusCluster.class, this); + + public SelectAqlField DIAGNOSESTATUS_DEFININGCODE = new AqlFieldImp(StatusCluster.class, "/items[at0004]/value|defining_code", "diagnosestatusDefiningcode", DiagnosestatusDefiningcode.class, this); + + private StatusClusterContainment() { + super("openEHR-EHR-CLUSTER.problem_qualifier.v1"); + } + + public static StatusClusterContainment getInstance() { + return new StatusClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitChoice.java new file mode 100644 index 000000000..1360ce588 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +public interface StatusDiagnostischeSicherheitChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitDvcodedtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitDvcodedtext.java new file mode 100644 index 000000000..5677506d9 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitDvcodedtext.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class StatusDiagnostischeSicherheitDvcodedtext implements StatusDiagnostischeSicherheitChoice { + @Path("|defining_code") + private DiagnostischeSicherheitDefiningcode diagnostischeSicherheitDefiningcode; + + public void setDiagnostischeSicherheitDefiningcode( + DiagnostischeSicherheitDefiningcode diagnostischeSicherheitDefiningcode) { + this.diagnostischeSicherheitDefiningcode = diagnostischeSicherheitDefiningcode; + } + + public DiagnostischeSicherheitDefiningcode getDiagnostischeSicherheitDefiningcode() { + return this.diagnostischeSicherheitDefiningcode; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitDvtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitDvtext.java new file mode 100644 index 000000000..55de251f1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitDvtext.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class StatusDiagnostischeSicherheitDvtext implements StatusDiagnostischeSicherheitChoice { + @Path("|value") + private String diagnostischeSicherheitValue; + + public void setDiagnostischeSicherheitValue(String diagnostischeSicherheitValue) { + this.diagnostischeSicherheitValue = diagnostischeSicherheitValue; + } + + public String getDiagnostischeSicherheitValue() { + return this.diagnostischeSicherheitValue; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/SymptomeSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/SymptomeSection.java new file mode 100644 index 000000000..5369d1806 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/SymptomeSection.java @@ -0,0 +1,110 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-SECTION.adhoc.v1") +public class SymptomeSection { + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Weitere Symptome']") + private WeitereSymptomeObservation weitereSymptome; + + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Fieber oder erhöhte Körpertemperatur']") + private FieberOderErhohteKorpertemperaturObservation fieberOderErhohteKorpertemperatur; + + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geschmackssinn']") + private GestorterGeschmackssinnObservation gestorterGeschmackssinn; + + @Path("/items[openEHR-EHR-OBSERVATION.body_temperature.v2]") + private KorpertemperaturObservation korpertemperatur; + + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Heiserkeit']") + private HeiserkeitObservation heiserkeit; + + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Husten']") + private HustenObservation husten; + + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geruchssinn']") + private GestorterGeruchssinnObservation gestorterGeruchssinn; + + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Durchfall']") + private DurchfallObservation durchfall; + + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Schnupfen']") + private SchnupfenObservation schnupfen; + + public void setWeitereSymptome(WeitereSymptomeObservation weitereSymptome) { + this.weitereSymptome = weitereSymptome; + } + + public WeitereSymptomeObservation getWeitereSymptome() { + return this.weitereSymptome; + } + + public void setFieberOderErhohteKorpertemperatur( + FieberOderErhohteKorpertemperaturObservation fieberOderErhohteKorpertemperatur) { + this.fieberOderErhohteKorpertemperatur = fieberOderErhohteKorpertemperatur; + } + + public FieberOderErhohteKorpertemperaturObservation getFieberOderErhohteKorpertemperatur() { + return this.fieberOderErhohteKorpertemperatur; + } + + public void setGestorterGeschmackssinn( + GestorterGeschmackssinnObservation gestorterGeschmackssinn) { + this.gestorterGeschmackssinn = gestorterGeschmackssinn; + } + + public GestorterGeschmackssinnObservation getGestorterGeschmackssinn() { + return this.gestorterGeschmackssinn; + } + + public void setKorpertemperatur(KorpertemperaturObservation korpertemperatur) { + this.korpertemperatur = korpertemperatur; + } + + public KorpertemperaturObservation getKorpertemperatur() { + return this.korpertemperatur; + } + + public void setHeiserkeit(HeiserkeitObservation heiserkeit) { + this.heiserkeit = heiserkeit; + } + + public HeiserkeitObservation getHeiserkeit() { + return this.heiserkeit; + } + + public void setHusten(HustenObservation husten) { + this.husten = husten; + } + + public HustenObservation getHusten() { + return this.husten; + } + + public void setGestorterGeruchssinn(GestorterGeruchssinnObservation gestorterGeruchssinn) { + this.gestorterGeruchssinn = gestorterGeruchssinn; + } + + public GestorterGeruchssinnObservation getGestorterGeruchssinn() { + return this.gestorterGeruchssinn; + } + + public void setDurchfall(DurchfallObservation durchfall) { + this.durchfall = durchfall; + } + + public DurchfallObservation getDurchfall() { + return this.durchfall; + } + + public void setSchnupfen(SchnupfenObservation schnupfen) { + this.schnupfen = schnupfen; + } + + public SchnupfenObservation getSchnupfen() { + return this.schnupfen; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/SymptomeSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/SymptomeSectionContainment.java new file mode 100644 index 000000000..5dcd67924 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/SymptomeSectionContainment.java @@ -0,0 +1,35 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class SymptomeSectionContainment extends Containment { + public SelectAqlField SYMPTOME_SECTION = new AqlFieldImp(SymptomeSection.class, "", "SymptomeSection", SymptomeSection.class, this); + + public SelectAqlField WEITERE_SYMPTOME = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Weitere Symptome']", "weitereSymptome", WeitereSymptomeObservation.class, this); + + public SelectAqlField FIEBER_ODER_ERHOHTE_KORPERTEMPERATUR = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Fieber oder erhöhte Körpertemperatur']", "fieberOderErhohteKorpertemperatur", FieberOderErhohteKorpertemperaturObservation.class, this); + + public SelectAqlField GESTORTER_GESCHMACKSSINN = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geschmackssinn']", "gestorterGeschmackssinn", GestorterGeschmackssinnObservation.class, this); + + public SelectAqlField KORPERTEMPERATUR = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.body_temperature.v2]", "korpertemperatur", KorpertemperaturObservation.class, this); + + public SelectAqlField HEISERKEIT = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Heiserkeit']", "heiserkeit", HeiserkeitObservation.class, this); + + public SelectAqlField HUSTEN = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Husten']", "husten", HustenObservation.class, this); + + public SelectAqlField GESTORTER_GERUCHSSINN = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geruchssinn']", "gestorterGeruchssinn", GestorterGeruchssinnObservation.class, this); + + public SelectAqlField DURCHFALL = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Durchfall']", "durchfall", DurchfallObservation.class, this); + + public SelectAqlField SCHNUPFEN = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Schnupfen']", "schnupfen", SchnupfenObservation.class, this); + + private SymptomeSectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } + + public static SymptomeSectionContainment getInstance() { + return new SymptomeSectionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/VorhandenDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/VorhandenDefiningcode.java new file mode 100644 index 000000000..ad90f3a23 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/VorhandenDefiningcode.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum VorhandenDefiningcode implements EnumValueSet { + NICHT_VORHANDEN("Nicht vorhanden", "Das spezifische Symptom oder Anzeichen ist nicht vorhanden.", "local", "at0024"), + + VORHANDEN("Vorhanden", "Das spezifische Symptom oder Anzeichen ist vorhanden.", "local", "at0023"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + VorhandenDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/VorhandenDefiningcode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/VorhandenDefiningcode2.java new file mode 100644 index 000000000..3782fea8e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/VorhandenDefiningcode2.java @@ -0,0 +1,42 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum VorhandenDefiningcode2 implements EnumValueSet { + NICHT_VORHANDEN("Nicht vorhanden", "Das spezifische Symptom oder Anzeichen ist nicht vorhanden.", "local", "at0024"), + + VORHANDEN("Vorhanden", "Das spezifische Symptom oder Anzeichen ist vorhanden.", "local", "at0023"), + + UNBEKANNT("Unbekannt", "Es ist nicht bekannt, ob das Symptom oder Anzeichen vorhanden ist oder nicht.", "local", "at0027"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + VorhandenDefiningcode2(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/VorhandenseinDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/VorhandenseinDefiningcode.java new file mode 100644 index 000000000..254826f25 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/VorhandenseinDefiningcode.java @@ -0,0 +1,42 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum VorhandenseinDefiningcode implements EnumValueSet { + VORHANDEN("Vorhanden", "Der Risikofaktor wurde bei der Person identifiziert.", "local", "at0018"), + + UNBESTIMMT("Unbestimmt", "Es ist nicht möglich festzustellen, ob der Risikofaktor vorhanden oder nicht vorhanden ist.", "local", "at0026"), + + NICHT_VORHANDEN("Nicht vorhanden", "Der Risikofaktor wurde bei der Person nicht festgestellt.", "local", "at0019"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + VorhandenseinDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/VorhandenseinDefiningcodeSpecificExposureEn.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/VorhandenseinDefiningcodeSpecificExposureEn.java new file mode 100644 index 000000000..e4f95f022 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/VorhandenseinDefiningcodeSpecificExposureEn.java @@ -0,0 +1,41 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum VorhandenseinDefiningcodeSpecificExposureEn implements EnumValueSet { + NICHT_VORHANDEN("Nicht vorhanden", "*The specific exposure is or has been absent at or during the event.(en)", "local", "at0049"), + + VORHANDEN("Vorhanden", "*The specific exposure is or has been present at or during the event.(en)", "local", "at0047"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + VorhandenseinDefiningcodeSpecificExposureEn(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java new file mode 100644 index 000000000..cfc4af296 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +public interface WeitereSymptomeBeliebigesEreignisChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java new file mode 100644 index 000000000..458c08bfa --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java @@ -0,0 +1,60 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.MathFunctionDefiningcode; + +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.util.List; + +@Entity +@OptionFor("INTERVAL_EVENT") +public class WeitereSymptomeBeliebigesEreignisIntervalEvent implements WeitereSymptomeBeliebigesEreignisChoice { + @Path("/time|value") + private TemporalAccessor timeValue; + + @Path("/math_function|defining_code") + private MathFunctionDefiningcode mathFunctionDefiningcode; + + @Path("/data[at0003]/items[at0022]") + private List spezifischesSymptomAnzeichen; + + @Path("/width|value") + private TemporalAmount widthValue; + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue; + } + + public void setMathFunctionDefiningcode(MathFunctionDefiningcode mathFunctionDefiningcode) { + this.mathFunctionDefiningcode = mathFunctionDefiningcode; + } + + public MathFunctionDefiningcode getMathFunctionDefiningcode() { + return this.mathFunctionDefiningcode; + } + + public void setSpezifischesSymptomAnzeichen( + List spezifischesSymptomAnzeichen) { + this.spezifischesSymptomAnzeichen = spezifischesSymptomAnzeichen; + } + + public List getSpezifischesSymptomAnzeichen( + ) { + return this.spezifischesSymptomAnzeichen; + } + + public void setWidthValue(TemporalAmount widthValue) { + this.widthValue = widthValue; + } + + public TemporalAmount getWidthValue() { + return this.widthValue; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java new file mode 100644 index 000000000..da57eb545 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java @@ -0,0 +1,36 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@OptionFor("POINT_EVENT") +public class WeitereSymptomeBeliebigesEreignisPointEvent implements WeitereSymptomeBeliebigesEreignisChoice { + @Path("/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0003]/items[at0022]") + private List spezifischesSymptomAnzeichen; + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue; + } + + public void setSpezifischesSymptomAnzeichen( + List spezifischesSymptomAnzeichen) { + this.spezifischesSymptomAnzeichen = spezifischesSymptomAnzeichen; + } + + public List getSpezifischesSymptomAnzeichen( + ) { + return this.spezifischesSymptomAnzeichen; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java new file mode 100644 index 000000000..c4aaa11cd --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java @@ -0,0 +1,73 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +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.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class WeitereSymptomeObservation { + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/data[at0001]/events[at0002]") + @Choice + private List beliebigesEreignis; + + @Path("/language") + private Language language; + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue; + } + + public void setBeliebigesEreignis( + List beliebigesEreignis) { + this.beliebigesEreignis = beliebigesEreignis; + } + + public List getBeliebigesEreignis() { + return this.beliebigesEreignis; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java new file mode 100644 index 000000000..4c937e0e9 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java @@ -0,0 +1,34 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; + +public class WeitereSymptomeObservationContainment extends Containment { + public SelectAqlField WEITERE_SYMPTOME_OBSERVATION = new AqlFieldImp(WeitereSymptomeObservation.class, "", "WeitereSymptomeObservation", WeitereSymptomeObservation.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(WeitereSymptomeObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(WeitereSymptomeObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(WeitereSymptomeObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField BELIEBIGES_EREIGNIS = new ListAqlFieldImp(WeitereSymptomeObservation.class, "/data[at0001]/events[at0002]", "beliebigesEreignis", WeitereSymptomeBeliebigesEreignisChoice.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(WeitereSymptomeObservation.class, "/language", "language", Language.class, this); + + private WeitereSymptomeObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static WeitereSymptomeObservationContainment getInstance() { + return new WeitereSymptomeObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java new file mode 100644 index 000000000..f3e67ed5f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java @@ -0,0 +1,55 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +import java.util.List; + +@Entity +public class WeitereSymptomeSpezifischesSymptomAnzeichenCluster { + @Path("/items[at0005]/value|defining_code") + private VorhandenDefiningcode2 vorhandenDefiningcode; + + @Path("/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + @Path("/items[at0035]/value|value") + private String kommentarValue; + + @Path("/items[at0026]") + private List anzeichen; + + public void setVorhandenDefiningcode(VorhandenDefiningcode2 vorhandenDefiningcode) { + this.vorhandenDefiningcode = vorhandenDefiningcode; + } + + public VorhandenDefiningcode2 getVorhandenDefiningcode() { + return this.vorhandenDefiningcode; + } + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue; + } + + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } + + public String getKommentarValue() { + return this.kommentarValue; + } + + public void setAnzeichen(List anzeichen) { + this.anzeichen = anzeichen; + } + + public List getAnzeichen() { + return this.anzeichen; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java new file mode 100644 index 000000000..1665277ee --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java @@ -0,0 +1,80 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.living_arrangement.v0") +public class WohnsituationEvaluation { + @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.dwelling.v0]") + private List wohnstatte; + + @Path("/data[at0001]/items[at0003]/value|value") + private String beschreibungValue; + + @Path("/data[at0001]/items[at0007]/value|magnitude") + private Long anzahlDerHaushaltsmitgliederMagnitude; + + @Path("/protocol[at0002]/items[at0011]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setWohnstatte(List wohnstatte) { + this.wohnstatte = wohnstatte; + } + + public List getWohnstatte() { + return this.wohnstatte; + } + + public void setBeschreibungValue(String beschreibungValue) { + this.beschreibungValue = beschreibungValue; + } + + public String getBeschreibungValue() { + return this.beschreibungValue; + } + + public void setAnzahlDerHaushaltsmitgliederMagnitude(Long anzahlDerHaushaltsmitgliederMagnitude) { + this.anzahlDerHaushaltsmitgliederMagnitude = anzahlDerHaushaltsmitgliederMagnitude; + } + + public Long getAnzahlDerHaushaltsmitgliederMagnitude() { + return this.anzahlDerHaushaltsmitgliederMagnitude; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java new file mode 100644 index 000000000..91850c6f4 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java @@ -0,0 +1,34 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +public class WohnsituationEvaluationContainment extends Containment { + public SelectAqlField WOHNSITUATION_EVALUATION = new AqlFieldImp(WohnsituationEvaluation.class, "", "WohnsituationEvaluation", WohnsituationEvaluation.class, this); + + public ListSelectAqlField WOHNSTATTE = new ListAqlFieldImp(WohnsituationEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.dwelling.v0]", "wohnstatte", WohnstatteCluster.class, this); + + public SelectAqlField BESCHREIBUNG_VALUE = new AqlFieldImp(WohnsituationEvaluation.class, "/data[at0001]/items[at0003]/value|value", "beschreibungValue", String.class, this); + + public SelectAqlField ANZAHL_DER_HAUSHALTSMITGLIEDER_MAGNITUDE = new AqlFieldImp(WohnsituationEvaluation.class, "/data[at0001]/items[at0007]/value|magnitude", "anzahlDerHaushaltsmitgliederMagnitude", Long.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(WohnsituationEvaluation.class, "/protocol[at0002]/items[at0011]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(WohnsituationEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(WohnsituationEvaluation.class, "/language", "language", Language.class, this); + + private WohnsituationEvaluationContainment() { + super("openEHR-EHR-EVALUATION.living_arrangement.v0"); + } + + public static WohnsituationEvaluationContainment getInstance() { + return new WohnsituationEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WohnstatteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WohnstatteCluster.java new file mode 100644 index 000000000..37c64dba6 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WohnstatteCluster.java @@ -0,0 +1,34 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.dwelling.v0") +public class WohnstatteCluster { + @Path("/items[at0028]/value|magnitude") + private Long anzahlDerSchlafzimmerMagnitude; + + @Path("/items[at0003]") + private List erganzendeDetails; + + public void setAnzahlDerSchlafzimmerMagnitude(Long anzahlDerSchlafzimmerMagnitude) { + this.anzahlDerSchlafzimmerMagnitude = anzahlDerSchlafzimmerMagnitude; + } + + public Long getAnzahlDerSchlafzimmerMagnitude() { + return this.anzahlDerSchlafzimmerMagnitude; + } + + public void setErganzendeDetails(List erganzendeDetails) { + this.erganzendeDetails = erganzendeDetails; + } + + public List getErganzendeDetails() { + return this.erganzendeDetails; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java new file mode 100644 index 000000000..8f43be9e2 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java @@ -0,0 +1,24 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class WohnstatteClusterContainment extends Containment { + public SelectAqlField WOHNSTATTE_CLUSTER = new AqlFieldImp(WohnstatteCluster.class, "", "WohnstatteCluster", WohnstatteCluster.class, this); + + public SelectAqlField ANZAHL_DER_SCHLAFZIMMER_MAGNITUDE = new AqlFieldImp(WohnstatteCluster.class, "/items[at0028]/value|magnitude", "anzahlDerSchlafzimmerMagnitude", Long.class, this); + + public ListSelectAqlField ERGANZENDE_DETAILS = new ListAqlFieldImp(WohnstatteCluster.class, "/items[at0003]", "erganzendeDetails", Cluster.class, this); + + private WohnstatteClusterContainment() { + super("openEHR-EHR-CLUSTER.dwelling.v0"); + } + + public static WohnstatteClusterContainment getInstance() { + return new WohnstatteClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/CategoryDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/CategoryDefiningcode.java new file mode 100644 index 000000000..f6fbe3a43 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/CategoryDefiningcode.java @@ -0,0 +1,42 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum CategoryDefiningcode implements EnumValueSet { + EVENT("event", "event", "openehr", "433"), + + EPISODIC("episodic", "episodic", "openehr", "435"), + + PERSISTENT("persistent", "persistent", "openehr", "431"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + CategoryDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/Definingcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/Definingcode.java new file mode 100644 index 000000000..2e05d816a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/Definingcode.java @@ -0,0 +1,42 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum Definingcode implements EnumValueSet { + N840544004("840544004", "840544004", "SNOMED-CT", "840544004"), + + N840539006("840539006", "840539006", "SNOMED-CT", "840539006"), + + N840546002("840546002", "840546002", "SNOMED-CT", "840546002"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + Definingcode(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/Language.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/Language.java new file mode 100644 index 000000000..3eee24697 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/Language.java @@ -0,0 +1,296 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum Language implements EnumValueSet { + ZU("zu", "zu", "ISO_639-1", "zu"), + + ES_MX("es-mx", "es-mx", "ISO_639-1", "es-mx"), + + ES_HN("es-hn", "es-hn", "ISO_639-1", "es-hn"), + + ES_CL("es-cl", "es-cl", "ISO_639-1", "es-cl"), + + AR_LY("ar-ly", "ar-ly", "ISO_639-1", "ar-ly"), + + MK("mk", "mk", "ISO_639-1", "mk"), + + DA("da", "da", "ISO_639-1", "da"), + + UK("uk", "uk", "ISO_639-1", "uk"), + + RM("rm", "rm", "ISO_639-1", "rm"), + + AR_DZ("ar-dz", "ar-dz", "ISO_639-1", "ar-dz"), + + ES_GT("es-gt", "es-gt", "ISO_639-1", "es-gt"), + + NL_BE("nl-be", "nl-be", "ISO_639-1", "nl-be"), + + EN_JM("en-jm", "en-jm", "ISO_639-1", "en-jm"), + + ES_NI("es-ni", "es-ni", "ISO_639-1", "es-ni"), + + MT("mt", "mt", "ISO_639-1", "mt"), + + VE("ve", "ve", "ISO_639-1", "ve"), + + EL("el", "el", "ISO_639-1", "el"), + + IT("it", "it", "ISO_639-1", "it"), + + ES_PE("es-pe", "es-pe", "ISO_639-1", "es-pe"), + + EN_US("en-us", "en-us", "ISO_639-1", "en-us"), + + HR("hr", "hr", "ISO_639-1", "hr"), + + SX("sx", "sx", "ISO_639-1", "sx"), + + ET("et", "et", "ISO_639-1", "et"), + + TR("tr", "tr", "ISO_639-1", "tr"), + + CY("cy", "cy", "ISO_639-1", "cy"), + + ID("id", "id", "ISO_639-1", "id"), + + NN("nn", "nn", "ISO_639-1", "nn"), + + RU_MO("ru-mo", "ru-mo", "ISO_639-1", "ru-mo"), + + BG("bg", "bg", "ISO_639-1", "bg"), + + ZH_CN("zh-cn", "zh-cn", "ISO_639-1", "zh-cn"), + + CY_GB("cy-gb", "cy-gb", "ISO_639-1", "cy-gb"), + + AR_KW("ar-kw", "ar-kw", "ISO_639-1", "ar-kw"), + + FO("fo", "fo", "ISO_639-1", "fo"), + + EU("eu", "eu", "ISO_639-1", "eu"), + + AR_SY("ar-sy", "ar-sy", "ISO_639-1", "ar-sy"), + + EN_AU("en-au", "en-au", "ISO_639-1", "en-au"), + + AR_AE("ar-ae", "ar-ae", "ISO_639-1", "ar-ae"), + + ES_SV("es-sv", "es-sv", "ISO_639-1", "es-sv"), + + ES_AR("es-ar", "es-ar", "ISO_639-1", "es-ar"), + + AA("aa", "aa", "ISO_639-1", "aa"), + + AR_LB("ar-lb", "ar-lb", "ISO_639-1", "ar-lb"), + + EN_CA("en-ca", "en-ca", "ISO_639-1", "en-ca"), + + AZ("az", "az", "ISO_639-1", "az"), + + FR_CA("fr-ca", "fr-ca", "ISO_639-1", "fr-ca"), + + SV("sv", "sv", "ISO_639-1", "sv"), + + AR_BH("ar-bh", "ar-bh", "ISO_639-1", "ar-bh"), + + AR_YE("ar-ye", "ar-ye", "ISO_639-1", "ar-ye"), + + UR("ur", "ur", "ISO_639-1", "ur"), + + ZH_TW("zh-tw", "zh-tw", "ISO_639-1", "zh-tw"), + + FR_LU("fr-lu", "fr-lu", "ISO_639-1", "fr-lu"), + + DE_LI("de-li", "de-li", "ISO_639-1", "de-li"), + + NL("nl", "nl", "ISO_639-1", "nl"), + + IT_CH("it-ch", "it-ch", "ISO_639-1", "it-ch"), + + EN_IE("en-ie", "en-ie", "ISO_639-1", "en-ie"), + + AR_SA("ar-sa", "ar-sa", "ISO_639-1", "ar-sa"), + + TH("th", "th", "ISO_639-1", "th"), + + ES_DO("es-do", "es-do", "ISO_639-1", "es-do"), + + ES_UY("es-uy", "es-uy", "ISO_639-1", "es-uy"), + + BE("be", "be", "ISO_639-1", "be"), + + HI("hi", "hi", "ISO_639-1", "hi"), + + RU("ru", "ru", "ISO_639-1", "ru"), + + XH("xh", "xh", "ISO_639-1", "xh"), + + KO("ko", "ko", "ISO_639-1", "ko"), + + EN_TT("en-tt", "en-tt", "ISO_639-1", "en-tt"), + + IS("is", "is", "ISO_639-1", "is"), + + ES("es", "es", "ISO_639-1", "es"), + + PT_PT("pt-pt", "pt-pt", "ISO_639-1", "pt-pt"), + + AR_JO("ar-jo", "ar-jo", "ISO_639-1", "ar-jo"), + + AR_EG("ar-eg", "ar-eg", "ISO_639-1", "ar-eg"), + + ES_VE("es-ve", "es-ve", "ISO_639-1", "es-ve"), + + RO_MO("ro-mo", "ro-mo", "ISO_639-1", "ro-mo"), + + JA("ja", "ja", "ISO_639-1", "ja"), + + ES_PA("es-pa", "es-pa", "ISO_639-1", "es-pa"), + + EN_GB("en-gb", "en-gb", "ISO_639-1", "en-gb"), + + ES_PR("es-pr", "es-pr", "ISO_639-1", "es-pr"), + + KK("kk", "kk", "ISO_639-1", "kk"), + + FA("fa", "fa", "ISO_639-1", "fa"), + + VI("vi", "vi", "ISO_639-1", "vi"), + + FR_CH("fr-ch", "fr-ch", "ISO_639-1", "fr-ch"), + + JI("ji", "ji", "ISO_639-1", "ji"), + + HE("he", "he", "ISO_639-1", "he"), + + SK("sk", "sk", "ISO_639-1", "sk"), + + DE_AT("de-at", "de-at", "ISO_639-1", "de-at"), + + ZH_SG("zh-sg", "zh-sg", "ISO_639-1", "zh-sg"), + + ES_EC("es-ec", "es-ec", "ISO_639-1", "es-ec"), + + FR("fr", "fr", "ISO_639-1", "fr"), + + DE_CH("de-ch", "de-ch", "ISO_639-1", "de-ch"), + + LV("lv", "lv", "ISO_639-1", "lv"), + + SL("sl", "sl", "ISO_639-1", "sl"), + + TN("tn", "tn", "ISO_639-1", "tn"), + + NB("nb", "nb", "ISO_639-1", "nb"), + + EN_BZ("en-bz", "en-bz", "ISO_639-1", "en-bz"), + + ES_PY("es-py", "es-py", "ISO_639-1", "es-py"), + + ES_CO("es-co", "es-co", "ISO_639-1", "es-co"), + + GD("gd", "gd", "ISO_639-1", "gd"), + + PT_BR("pt-br", "pt-br", "ISO_639-1", "pt-br"), + + KM("km", "km", "ISO_639-1", "km"), + + EN_ZA("en-za", "en-za", "ISO_639-1", "en-za"), + + EN_NZ("en-nz", "en-nz", "ISO_639-1", "en-nz"), + + CY_AR("cy-ar", "cy-ar", "ISO_639-1", "cy-ar"), + + SQ("sq", "sq", "ISO_639-1", "sq"), + + TS("ts", "ts", "ISO_639-1", "ts"), + + ES_CR("es-cr", "es-cr", "ISO_639-1", "es-cr"), + + RO("ro", "ro", "ISO_639-1", "ro"), + + AF("af", "af", "ISO_639-1", "af"), + + GD_IE("gd-ie", "gd-ie", "ISO_639-1", "gd-ie"), + + CA("ca", "ca", "ISO_639-1", "ca"), + + SI("si", "si", "ISO_639-1", "si"), + + AR_TN("ar-tn", "ar-tn", "ISO_639-1", "ar-tn"), + + LT("lt", "lt", "ISO_639-1", "lt"), + + PT("pt", "pt", "ISO_639-1", "pt"), + + EN("en", "en", "ISO_639-1", "en"), + + SZ("sz", "sz", "ISO_639-1", "sz"), + + ZH_HK("zh-hk", "zh-hk", "ISO_639-1", "zh-hk"), + + SR("sr", "sr", "ISO_639-1", "sr"), + + ES_BO("es-bo", "es-bo", "ISO_639-1", "es-bo"), + + AR_QA("ar-qa", "ar-qa", "ISO_639-1", "ar-qa"), + + FR_BE("fr-be", "fr-be", "ISO_639-1", "fr-be"), + + PL("pl", "pl", "ISO_639-1", "pl"), + + AR_MA("ar-ma", "ar-ma", "ISO_639-1", "ar-ma"), + + DE("de", "de", "ISO_639-1", "de"), + + FI("fi", "fi", "ISO_639-1", "fi"), + + ZH("zh", "zh", "ISO_639-1", "zh"), + + AR_OM("ar-om", "ar-om", "ISO_639-1", "ar-om"), + + SB("sb", "sb", "ISO_639-1", "sb"), + + DE_LU("de-lu", "de-lu", "ISO_639-1", "de-lu"), + + SV_FI("sv-fi", "sv-fi", "ISO_639-1", "sv-fi"), + + AR_IQ("ar-iq", "ar-iq", "ISO_639-1", "ar-iq"), + + CS("cs", "cs", "ISO_639-1", "cs"), + + HU("hu", "hu", "ISO_639-1", "hu"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + Language(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/MathFunctionDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/MathFunctionDefiningcode.java new file mode 100644 index 000000000..532c5fb08 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/MathFunctionDefiningcode.java @@ -0,0 +1,58 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum MathFunctionDefiningcode implements EnumValueSet { + DECREASE("decrease", "decrease", "openehr", "521"), + + TOTAL("total", "total", "openehr", "148"), + + MAXIMUM("maximum", "maximum", "openehr", "144"), + + MODE("mode", "mode", "openehr", "267"), + + INCREASE("increase", "increase", "openehr", "522"), + + ACTUAL("actual", "actual", "openehr", "640"), + + VARIATION("variation", "variation", "openehr", "149"), + + MINIMUM("minimum", "minimum", "openehr", "145"), + + CHANGE("change", "change", "openehr", "147"), + + MEAN("mean", "mean", "openehr", "146"), + + MEDIAN("median", "median", "openehr", "268"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + MathFunctionDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/ServiceNameDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/ServiceNameDefiningcode.java new file mode 100644 index 000000000..2b5bc0adf --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/ServiceNameDefiningcode.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum ServiceNameDefiningcode implements EnumValueSet { + N170499009("170499009", "170499009", "SNOMED-CT", "170499009"), + + N225368008("225368008", "225368008", "SNOMED-CT", "225368008"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + ServiceNameDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/ServicePlannedDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/ServicePlannedDefiningcode.java new file mode 100644 index 000000000..ab374dceb --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/ServicePlannedDefiningcode.java @@ -0,0 +1,38 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum ServicePlannedDefiningcode implements EnumValueSet { + PLANNED("planned", "planned", "openehr", "526"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + ServicePlannedDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/SettingDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/SettingDefiningcode.java new file mode 100644 index 000000000..c4eb76205 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/SettingDefiningcode.java @@ -0,0 +1,62 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum SettingDefiningcode implements EnumValueSet { + COMPLEMENTARY_HEALTH_CARE("complementary health care", "complementary health care", "openehr", "235"), + + HOME("home", "home", "openehr", "225"), + + SECONDARY_NURSING_CARE("secondary nursing care", "secondary nursing care", "openehr", "233"), + + DENTAL_CARE("dental care", "dental care", "openehr", "236"), + + OTHER_CARE("other care", "other care", "openehr", "238"), + + NURSING_HOME_CARE("nursing home care", "nursing home care", "openehr", "237"), + + SECONDARY_ALLIED_HEALTH_CARE("secondary allied health care", "secondary allied health care", "openehr", "234"), + + EMERGENCY_CARE("emergency care", "emergency care", "openehr", "227"), + + PRIMARY_NURSING_CARE("primary nursing care", "primary nursing care", "openehr", "229"), + + PRIMARY_MEDICAL_CARE("primary medical care", "primary medical care", "openehr", "228"), + + PRIMARY_ALLIED_HEALTH_CARE("primary allied health care", "primary allied health care", "openehr", "230"), + + SECONDARY_MEDICAL_CARE("secondary medical care", "secondary medical care", "openehr", "232"), + + MIDWIFERY_CARE("midwifery care", "midwifery care", "openehr", "231"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + SettingDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/SymptomSignNameDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/SymptomSignNameDefiningcode.java new file mode 100644 index 000000000..f605e235c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/SymptomSignNameDefiningcode.java @@ -0,0 +1,38 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum SymptomSignNameDefiningcode implements EnumValueSet { + N315642008("315642008", "315642008", "SNOMED-CT", "315642008"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + SymptomSignNameDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/Territory.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/Territory.java new file mode 100644 index 000000000..3036527f7 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/Territory.java @@ -0,0 +1,528 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum Territory implements EnumValueSet { + AD("AD", "AD", "ISO_3166-1", "AD"), + + BF("BF", "BF", "ISO_3166-1", "BF"), + + DJ("DJ", "DJ", "ISO_3166-1", "DJ"), + + CH("CH", "CH", "ISO_3166-1", "CH"), + + PR("PR", "PR", "ISO_3166-1", "PR"), + + HR("HR", "HR", "ISO_3166-1", "HR"), + + GP("GP", "GP", "ISO_3166-1", "GP"), + + TZ("TZ", "TZ", "ISO_3166-1", "TZ"), + + IT("IT", "IT", "ISO_3166-1", "IT"), + + AT("AT", "AT", "ISO_3166-1", "AT"), + + BV("BV", "BV", "ISO_3166-1", "BV"), + + DZ("DZ", "DZ", "ISO_3166-1", "DZ"), + + CX("CX", "CX", "ISO_3166-1", "CX"), + + PA("PA", "PA", "ISO_3166-1", "PA"), + + MK("MK", "MK", "ISO_3166-1", "MK"), + + LI("LI", "LI", "ISO_3166-1", "LI"), + + RE("RE", "RE", "ISO_3166-1", "RE"), + + SG("SG", "SG", "ISO_3166-1", "SG"), + + JE("JE", "JE", "ISO_3166-1", "JE"), + + KG("KG", "KG", "ISO_3166-1", "KG"), + + AE("AE", "AE", "ISO_3166-1", "AE"), + + BG("BG", "BG", "ISO_3166-1", "BG"), + + CI("CI", "CI", "ISO_3166-1", "CI"), + + PS("PS", "PS", "ISO_3166-1", "PS"), + + NO("NO", "NO", "ISO_3166-1", "NO"), + + DK("DK", "DK", "ISO_3166-1", "DK"), + + KY("KY", "KY", "ISO_3166-1", "KY"), + + GQ("GQ", "GQ", "ISO_3166-1", "GQ"), + + FO("FO", "FO", "ISO_3166-1", "FO"), + + RW("RW", "RW", "ISO_3166-1", "RW"), + + SY("SY", "SY", "ISO_3166-1", "SY"), + + YT("YT", "YT", "ISO_3166-1", "YT"), + + AU("AU", "AU", "ISO_3166-1", "AU"), + + BW("BW", "BW", "ISO_3166-1", "BW"), + + CY("CY", "CY", "ISO_3166-1", "CY"), + + KH("KH", "KH", "ISO_3166-1", "KH"), + + ID("ID", "ID", "ISO_3166-1", "ID"), + + ML("ML", "ML", "ISO_3166-1", "ML"), + + SH("SH", "SH", "ISO_3166-1", "SH"), + + TJ("TJ", "TJ", "ISO_3166-1", "TJ"), + + VN("VN", "VN", "ISO_3166-1", "VN"), + + BD("BD", "BD", "ISO_3166-1", "BD"), + + CF("CF", "CF", "ISO_3166-1", "CF"), + + GN("GN", "GN", "ISO_3166-1", "GN"), + + QA("QA", "QA", "ISO_3166-1", "QA"), + + MZ("MZ", "MZ", "ISO_3166-1", "MZ"), + + SV("SV", "SV", "ISO_3166-1", "SV"), + + IR("IR", "IR", "ISO_3166-1", "IR"), + + UZ("UZ", "UZ", "ISO_3166-1", "UZ"), + + AR("AR", "AR", "ISO_3166-1", "AR"), + + BT("BT", "BT", "ISO_3166-1", "BT"), + + CV("CV", "CV", "ISO_3166-1", "CV"), + + SE("SE", "SE", "ISO_3166-1", "SE"), + + TG("TG", "TG", "ISO_3166-1", "TG"), + + OM("OM", "OM", "ISO_3166-1", "OM"), + + KE("KE", "KE", "ISO_3166-1", "KE"), + + BE("BE", "BE", "ISO_3166-1", "BE"), + + CG("CG", "CG", "ISO_3166-1", "CG"), + + FM("FM", "FM", "ISO_3166-1", "FM"), + + LY("LY", "LY", "ISO_3166-1", "LY"), + + RU("RU", "RU", "ISO_3166-1", "RU"), + + IS("IS", "IS", "ISO_3166-1", "IS"), + + KW("KW", "KW", "ISO_3166-1", "KW"), + + AS("AS", "AS", "ISO_3166-1", "AS"), + + TH("TH", "TH", "ISO_3166-1", "TH"), + + NL("NL", "NL", "ISO_3166-1", "NL"), + + CD("CD", "CD", "ISO_3166-1", "CD"), + + FJ("FJ", "FJ", "ISO_3166-1", "FJ"), + + EH("EH", "EH", "ISO_3166-1", "EH"), + + GL("GL", "GL", "ISO_3166-1", "GL"), + + HN("HN", "HN", "ISO_3166-1", "HN"), + + SC("SC", "SC", "ISO_3166-1", "SC"), + + ST("ST", "ST", "ISO_3166-1", "ST"), + + TV("TV", "TV", "ISO_3166-1", "TV"), + + LV("LV", "LV", "ISO_3166-1", "LV"), + + ZA("ZA", "ZA", "ISO_3166-1", "ZA"), + + NZ("NZ", "NZ", "ISO_3166-1", "NZ"), + + MX("MX", "MX", "ISO_3166-1", "MX"), + + BR("BR", "BR", "ISO_3166-1", "BR"), + + UG("UG", "UG", "ISO_3166-1", "UG"), + + PM("PM", "PM", "ISO_3166-1", "PM"), + + VI("VI", "VI", "ISO_3166-1", "VI"), + + MG("MG", "MG", "ISO_3166-1", "MG"), + + NI("NI", "NI", "ISO_3166-1", "NI"), + + BA("BA", "BA", "ISO_3166-1", "BA"), + + CC("CC", "CC", "ISO_3166-1", "CC"), + + IQ("IQ", "IQ", "ISO_3166-1", "IQ"), + + FK("FK", "FK", "ISO_3166-1", "FK"), + + GM("GM", "GM", "ISO_3166-1", "GM"), + + RS("RS", "RS", "ISO_3166-1", "RS"), + + UY("UY", "UY", "ISO_3166-1", "UY"), + + TW("TW", "TW", "ISO_3166-1", "TW"), + + MY("MY", "MY", "ISO_3166-1", "MY"), + + AQ("AQ", "AQ", "ISO_3166-1", "AQ"), + + BS("BS", "BS", "ISO_3166-1", "BS"), + + CU("CU", "CU", "ISO_3166-1", "CU"), + + SD("SD", "SD", "ISO_3166-1", "SD"), + + TF("TF", "TF", "ISO_3166-1", "TF"), + + PN("PN", "PN", "ISO_3166-1", "PN"), + + MH("MH", "MH", "ISO_3166-1", "MH"), + + BB("BB", "BB", "ISO_3166-1", "BB"), + + JP("JP", "JP", "ISO_3166-1", "JP"), + + KR("KR", "KR", "ISO_3166-1", "KR"), + + LT("LT", "LT", "ISO_3166-1", "LT"), + + SA("SA", "SA", "ISO_3166-1", "SA"), + + TC("TC", "TC", "ISO_3166-1", "TC"), + + IN("IN", "IN", "ISO_3166-1", "IN"), + + AN("AN", "AN", "ISO_3166-1", "AN"), + + MV("MV", "MV", "ISO_3166-1", "MV"), + + CR("CR", "CR", "ISO_3166-1", "CR"), + + ME("ME", "ME", "ISO_3166-1", "ME"), + + LC("LC", "LC", "ISO_3166-1", "LC"), + + RO("RO", "RO", "ISO_3166-1", "RO"), + + VG("VG", "VG", "ISO_3166-1", "VG"), + + PK("PK", "PK", "ISO_3166-1", "PK"), + + CA("CA", "CA", "ISO_3166-1", "CA"), + + NG("NG", "NG", "ISO_3166-1", "NG"), + + EE("EE", "EE", "ISO_3166-1", "EE"), + + EG("EG", "EG", "ISO_3166-1", "EG"), + + FI("FI", "FI", "ISO_3166-1", "FI"), + + DE("DE", "DE", "ISO_3166-1", "DE"), + + IO("IO", "IO", "ISO_3166-1", "IO"), + + SB("SB", "SB", "ISO_3166-1", "SB"), + + HM("HM", "HM", "ISO_3166-1", "HM"), + + TD("TD", "TD", "ISO_3166-1", "TD"), + + MW("MW", "MW", "ISO_3166-1", "MW"), + + LU("LU", "LU", "ISO_3166-1", "LU"), + + AO("AO", "AO", "ISO_3166-1", "AO"), + + SR("SR", "SR", "ISO_3166-1", "SR"), + + TT("TT", "TT", "ISO_3166-1", "TT"), + + PL("PL", "PL", "ISO_3166-1", "PL"), + + MF("MF", "MF", "ISO_3166-1", "MF"), + + KP("KP", "KP", "ISO_3166-1", "KP"), + + LR("LR", "LR", "ISO_3166-1", "LR"), + + IL("IL", "IL", "ISO_3166-1", "IL"), + + GH("GH", "GH", "ISO_3166-1", "GH"), + + MT("MT", "MT", "ISO_3166-1", "MT"), + + VE("VE", "VE", "ISO_3166-1", "VE"), + + AL("AL", "AL", "ISO_3166-1", "AL"), + + BN("BN", "BN", "ISO_3166-1", "BN"), + + ET("ET", "ET", "ISO_3166-1", "ET"), + + NE("NE", "NE", "ISO_3166-1", "NE"), + + MC("MC", "MC", "ISO_3166-1", "MC"), + + LA("LA", "LA", "ISO_3166-1", "LA"), + + SO("SO", "SO", "ISO_3166-1", "SO"), + + US("US", "US", "ISO_3166-1", "US"), + + VU("VU", "VU", "ISO_3166-1", "VU"), + + ZM("ZM", "ZM", "ISO_3166-1", "ZM"), + + EC("EC", "EC", "ISO_3166-1", "EC"), + + GG("GG", "GG", "ISO_3166-1", "GG"), + + IM("IM", "IM", "ISO_3166-1", "IM"), + + JO("JO", "JO", "ISO_3166-1", "JO"), + + HK("HK", "HK", "ISO_3166-1", "HK"), + + MU("MU", "MU", "ISO_3166-1", "MU"), + + GI("GI", "GI", "ISO_3166-1", "GI"), + + LS("LS", "LS", "ISO_3166-1", "LS"), + + AM("AM", "AM", "ISO_3166-1", "AM"), + + BO("BO", "BO", "ISO_3166-1", "BO"), + + LB("LB", "LB", "ISO_3166-1", "LB"), + + NF("NF", "NF", "ISO_3166-1", "NF"), + + GY("GY", "GY", "ISO_3166-1", "GY"), + + MD("MD", "MD", "ISO_3166-1", "MD"), + + TR("TR", "TR", "ISO_3166-1", "TR"), + + MR("MR", "MR", "ISO_3166-1", "MR"), + + UA("UA", "UA", "ISO_3166-1", "UA"), + + VC("VC", "VC", "ISO_3166-1", "VC"), + + KN("KN", "KN", "ISO_3166-1", "KN"), + + BL("BL", "BL", "ISO_3166-1", "BL"), + + CN("CN", "CN", "ISO_3166-1", "CN"), + + ER("ER", "ER", "ISO_3166-1", "ER"), + + PG("PG", "PG", "ISO_3166-1", "PG"), + + SM("SM", "SM", "ISO_3166-1", "SM"), + + NC("NC", "NC", "ISO_3166-1", "NC"), + + TO("TO", "TO", "ISO_3166-1", "TO"), + + MA("MA", "MA", "ISO_3166-1", "MA"), + + AZ("AZ", "AZ", "ISO_3166-1", "AZ"), + + GE("GE", "GE", "ISO_3166-1", "GE"), + + MS("MS", "MS", "ISO_3166-1", "MS"), + + NU("NU", "NU", "ISO_3166-1", "NU"), + + WF("WF", "WF", "ISO_3166-1", "WF"), + + JM("JM", "JM", "ISO_3166-1", "JM"), + + BM("BM", "BM", "ISO_3166-1", "BM"), + + CO("CO", "CO", "ISO_3166-1", "CO"), + + GW("GW", "GW", "ISO_3166-1", "GW"), + + PY("PY", "PY", "ISO_3166-1", "PY"), + + ES("ES", "ES", "ISO_3166-1", "ES"), + + PH("PH", "PH", "ISO_3166-1", "PH"), + + SN("SN", "SN", "ISO_3166-1", "SN"), + + GF("GF", "GF", "ISO_3166-1", "GF"), + + VA("VA", "VA", "ISO_3166-1", "VA"), + + NR("NR", "NR", "ISO_3166-1", "NR"), + + MP("MP", "MP", "ISO_3166-1", "MP"), + + BJ("BJ", "BJ", "ISO_3166-1", "BJ"), + + FR("FR", "FR", "ISO_3166-1", "FR"), + + CL("CL", "CL", "ISO_3166-1", "CL"), + + GT("GT", "GT", "ISO_3166-1", "GT"), + + WS("WS", "WS", "ISO_3166-1", "WS"), + + TM("TM", "TM", "ISO_3166-1", "TM"), + + PE("PE", "PE", "ISO_3166-1", "PE"), + + NA("NA", "NA", "ISO_3166-1", "NA"), + + AX("AX", "AX", "ISO_3166-1", "AX"), + + BZ("BZ", "BZ", "ISO_3166-1", "BZ"), + + SK("SK", "SK", "ISO_3166-1", "SK"), + + PW("PW", "PW", "ISO_3166-1", "PW"), + + KM("KM", "KM", "ISO_3166-1", "KM"), + + MQ("MQ", "MQ", "ISO_3166-1", "MQ"), + + AI("AI", "AI", "ISO_3166-1", "AI"), + + CM("CM", "CM", "ISO_3166-1", "CM"), + + DO("DO", "DO", "ISO_3166-1", "DO"), + + GU("GU", "GU", "ISO_3166-1", "GU"), + + SL("SL", "SL", "ISO_3166-1", "SL"), + + TN("TN", "TN", "ISO_3166-1", "TN"), + + PF("PF", "PF", "ISO_3166-1", "PF"), + + GD("GD", "GD", "ISO_3166-1", "GD"), + + YE("YE", "YE", "ISO_3166-1", "YE"), + + AF("AF", "AF", "ISO_3166-1", "AF"), + + PT("PT", "PT", "ISO_3166-1", "PT"), + + MN("MN", "MN", "ISO_3166-1", "MN"), + + BH("BH", "BH", "ISO_3166-1", "BH"), + + NP("NP", "NP", "ISO_3166-1", "NP"), + + HT("HT", "HT", "ISO_3166-1", "HT"), + + GR("GR", "GR", "ISO_3166-1", "GR"), + + KZ("KZ", "KZ", "ISO_3166-1", "KZ"), + + SZ("SZ", "SZ", "ISO_3166-1", "SZ"), + + ZW("ZW", "ZW", "ISO_3166-1", "ZW"), + + CZ("CZ", "CZ", "ISO_3166-1", "CZ"), + + IE("IE", "IE", "ISO_3166-1", "IE"), + + KI("KI", "KI", "ISO_3166-1", "KI"), + + MM("MM", "MM", "ISO_3166-1", "MM"), + + GA("GA", "GA", "ISO_3166-1", "GA"), + + LK("LK", "LK", "ISO_3166-1", "LK"), + + SI("SI", "SI", "ISO_3166-1", "SI"), + + UM("UM", "UM", "ISO_3166-1", "UM"), + + TK("TK", "TK", "ISO_3166-1", "TK"), + + MO("MO", "MO", "ISO_3166-1", "MO"), + + AG("AG", "AG", "ISO_3166-1", "AG"), + + BI("BI", "BI", "ISO_3166-1", "BI"), + + CK("CK", "CK", "ISO_3166-1", "CK"), + + GS("GS", "GS", "ISO_3166-1", "GS"), + + DM("DM", "DM", "ISO_3166-1", "DM"), + + HU("HU", "HU", "ISO_3166-1", "HU"), + + AW("AW", "AW", "ISO_3166-1", "AW"), + + BY("BY", "BY", "ISO_3166-1", "BY"), + + GB("GB", "GB", "ISO_3166-1", "GB"), + + SJ("SJ", "SJ", "ISO_3166-1", "SJ"), + + TL("TL", "TL", "ISO_3166-1", "TL"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + Territory(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/TransitionDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/TransitionDefiningcode.java new file mode 100644 index 000000000..e816140ba --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/shareddefinition/TransitionDefiningcode.java @@ -0,0 +1,76 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum TransitionDefiningcode implements EnumValueSet { + CANCEL("cancel", "cancel", "openehr", "166"), + + INITIATE("initiate", "initiate", "openehr", "535"), + + SUSPEND("suspend", "suspend", "openehr", "544"), + + SCHEDULED_STEP("scheduled step", "scheduled step", "openehr", "534"), + + RESTORE("restore", "restore", "openehr", "538"), + + POSTPONE("postpone", "postpone", "openehr", "537"), + + RESUME("resume", "resume", "openehr", "546"), + + SUSPENDED_STEP("suspended step", "suspended step", "openehr", "545"), + + NOTIFY_ABORTED("notify aborted", "notify aborted", "openehr", "550"), + + START("start", "start", "openehr", "540"), + + FINISH("finish", "finish", "openehr", "548"), + + SCHEDULE("schedule", "schedule", "openehr", "539"), + + NOTIFY_COMPLETED("notify completed", "notify completed", "openehr", "551"), + + ACTIVE_STEP("active step", "active step", "openehr", "543"), + + DO("do", "do", "openehr", "541"), + + PLAN_STEP("plan step", "plan step", "openehr", "536"), + + TIME_OUT("time out", "time out", "openehr", "549"), + + NOTIFY_CANCELLED("notify cancelled", "notify cancelled", "openehr", "552"), + + POSTPONED_STEP("postponed step", "postponed step", "openehr", "542"), + + ABORT("abort", "abort", "openehr", "547"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + TransitionDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/TestAllTypesEnV1Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/TestAllTypesEnV1Composition.java new file mode 100644 index 000000000..97064926a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/TestAllTypesEnV1Composition.java @@ -0,0 +1,207 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.generic.Participation; +import com.nedap.archie.rm.generic.PartyIdentified; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Id; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.annotations.Template; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.CategoryDefiningcode; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.SettingDefiningcode; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition.ContextCodedTextDefiningcode; +import org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition.TestAllTypesEvaluation; +import org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition.TestAllTypesObservation; +import org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition.TestAllTypesSection; +import org.ehrbase.client.openehrclient.VersionUid; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-COMPOSITION.test_all_types.v1") +@Template("test_all_types.en.v1") +public class TestAllTypesEnV1Composition { + @Id + private VersionUid versionUid; + + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + @Path("/context/participations") + private List participations; + + @Path("/language") + private Language language; + + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; + + @Path("/territory") + private Territory territory; + + @Path("/context/other_context[at0004]/item[at0005]/value|defining_code") + private ContextCodedTextDefiningcode contextCodedTextDefiningcode; + + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; + + @Path("/content[openEHR-EHR-EVALUATION.test_all_types.v1]") + private List testAllTypes; + + @Path("/content[openEHR-EHR-SECTION.test_all_types.v1]") + private List testAllTypesContentOpenehrEhrSectionTestAllTypesV1; + + @Path("/composer") + private PartyProxy composer; + + @Path("/context/setting|defining_code") + private SettingDefiningcode settingDefiningcode; + + @Path("/feeder_audit") + private FeederAudit feederAudit; + + @Path("/content[openEHR-EHR-OBSERVATION.test_all_types.v1]") + private List testAllTypesContentOpenehrEhrObservationTestAllTypesV1; + + @Path("/context/location") + private String location; + + @Path("/category|defining_code") + private CategoryDefiningcode categoryDefiningcode; + + public VersionUid getVersionUid() { + return this.versionUid; + } + + public void setVersionUid(VersionUid versionUid) { + this.versionUid = versionUid; + } + + public void setEndTimeValue(TemporalAccessor endTimeValue) { + this.endTimeValue = endTimeValue; + } + + public TemporalAccessor getEndTimeValue() { + return this.endTimeValue; + } + + public void setParticipations(List participations) { + this.participations = participations; + } + + public List getParticipations() { + return this.participations; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setHealthCareFacility(PartyIdentified healthCareFacility) { + this.healthCareFacility = healthCareFacility; + } + + public PartyIdentified getHealthCareFacility() { + return this.healthCareFacility; + } + + public void setTerritory(Territory territory) { + this.territory = territory; + } + + public Territory getTerritory() { + return this.territory; + } + + public void setContextCodedTextDefiningcode( + ContextCodedTextDefiningcode contextCodedTextDefiningcode) { + this.contextCodedTextDefiningcode = contextCodedTextDefiningcode; + } + + public ContextCodedTextDefiningcode getContextCodedTextDefiningcode() { + return this.contextCodedTextDefiningcode; + } + + public void setStartTimeValue(TemporalAccessor startTimeValue) { + this.startTimeValue = startTimeValue; + } + + public TemporalAccessor getStartTimeValue() { + return this.startTimeValue; + } + + public void setTestAllTypes(List testAllTypes) { + this.testAllTypes = testAllTypes; + } + + public List getTestAllTypes() { + return this.testAllTypes; + } + + public void setTestAllTypesContentOpenehrEhrSectionTestAllTypesV1( + List testAllTypesContentOpenehrEhrSectionTestAllTypesV1) { + this.testAllTypesContentOpenehrEhrSectionTestAllTypesV1 = testAllTypesContentOpenehrEhrSectionTestAllTypesV1; + } + + public List getTestAllTypesContentOpenehrEhrSectionTestAllTypesV1() { + return this.testAllTypesContentOpenehrEhrSectionTestAllTypesV1; + } + + public void setComposer(PartyProxy composer) { + this.composer = composer; + } + + public PartyProxy getComposer() { + return this.composer; + } + + public void setSettingDefiningcode(SettingDefiningcode settingDefiningcode) { + this.settingDefiningcode = settingDefiningcode; + } + + public SettingDefiningcode getSettingDefiningcode() { + return this.settingDefiningcode; + } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit; + } + + public void setTestAllTypesContentOpenehrEhrObservationTestAllTypesV1( + List testAllTypesContentOpenehrEhrObservationTestAllTypesV1) { + this.testAllTypesContentOpenehrEhrObservationTestAllTypesV1 = testAllTypesContentOpenehrEhrObservationTestAllTypesV1; + } + + public List getTestAllTypesContentOpenehrEhrObservationTestAllTypesV1() { + return this.testAllTypesContentOpenehrEhrObservationTestAllTypesV1; + } + + public void setLocation(String location) { + this.location = location; + } + + public String getLocation() { + return this.location; + } + + public void setCategoryDefiningcode(CategoryDefiningcode categoryDefiningcode) { + this.categoryDefiningcode = categoryDefiningcode; + } + + public CategoryDefiningcode getCategoryDefiningcode() { + return this.categoryDefiningcode; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java new file mode 100644 index 000000000..ccb4969cc --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java @@ -0,0 +1,63 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.generic.Participation; +import com.nedap.archie.rm.generic.PartyIdentified; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.CategoryDefiningcode; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.SettingDefiningcode; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition.ContextCodedTextDefiningcode; +import org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition.TestAllTypesEvaluation; +import org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition.TestAllTypesObservation; +import org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition.TestAllTypesSection; + +import java.time.temporal.TemporalAccessor; + +public class TestAllTypesEnV1CompositionContainment extends Containment { + public SelectAqlField TEST_ALL_TYPES_EN_V1_COMPOSITION = new AqlFieldImp(TestAllTypesEnV1Composition.class, "", "TestAllTypesEnV1Composition", TestAllTypesEnV1Composition.class, this); + + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/context/participations", "participations", Participation.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/language", "language", Language.class, this); + + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + + public SelectAqlField TERRITORY = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/territory", "territory", Territory.class, this); + + public SelectAqlField CONTEXT_CODED_TEXT_DEFININGCODE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/other_context[at0004]/item[at0005]/value|defining_code", "contextCodedTextDefiningcode", ContextCodedTextDefiningcode.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + + public ListSelectAqlField TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-EVALUATION.test_all_types.v1]", "testAllTypes", TestAllTypesEvaluation.class, this); + + public ListSelectAqlField TEST_ALL_TYPES_CONTENT_OPENEHR_EHR_SECTION_TEST_ALL_TYPES_V1 = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-SECTION.test_all_types.v1]", "testAllTypesContentOpenehrEhrSectionTestAllTypesV1", TestAllTypesSection.class, this); + + public SelectAqlField COMPOSER = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/composer", "composer", PartyProxy.class, this); + + public SelectAqlField SETTING_DEFININGCODE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/setting|defining_code", "settingDefiningcode", SettingDefiningcode.class, this); + + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + + public ListSelectAqlField TEST_ALL_TYPES_CONTENT_OPENEHR_EHR_OBSERVATION_TEST_ALL_TYPES_V1 = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-OBSERVATION.test_all_types.v1]", "testAllTypesContentOpenehrEhrObservationTestAllTypesV1", TestAllTypesObservation.class, this); + + public SelectAqlField LOCATION = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/location", "location", String.class, this); + + public SelectAqlField CATEGORY_DEFININGCODE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/category|defining_code", "categoryDefiningcode", CategoryDefiningcode.class, this); + + private TestAllTypesEnV1CompositionContainment() { + super("openEHR-EHR-COMPOSITION.test_all_types.v1"); + } + + public static TestAllTypesEnV1CompositionContainment getInstance() { + return new TestAllTypesEnV1CompositionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/ActiveDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/ActiveDefiningcode.java new file mode 100644 index 000000000..4d1fecd73 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/ActiveDefiningcode.java @@ -0,0 +1,38 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum ActiveDefiningcode implements EnumValueSet { + ACTIVE("active", "active", "openehr", "245"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + ActiveDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/ActiveDefiningcode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/ActiveDefiningcode2.java new file mode 100644 index 000000000..52b05e860 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/ActiveDefiningcode2.java @@ -0,0 +1,38 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum ActiveDefiningcode2 implements EnumValueSet { + ACTIVE("Active", "*", "local", "at0004"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + ActiveDefiningcode2(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/CompletedDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/CompletedDefiningcode.java new file mode 100644 index 000000000..17dd24859 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/CompletedDefiningcode.java @@ -0,0 +1,38 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum CompletedDefiningcode implements EnumValueSet { + COMPLETED("Completed", "*", "local", "at0005"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + CompletedDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/CompletedDefiningcode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/CompletedDefiningcode2.java new file mode 100644 index 000000000..60fa45af0 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/CompletedDefiningcode2.java @@ -0,0 +1,38 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum CompletedDefiningcode2 implements EnumValueSet { + COMPLETED("completed", "completed", "openehr", "532"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + CompletedDefiningcode2(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/ContextCodedTextDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/ContextCodedTextDefiningcode.java new file mode 100644 index 000000000..6b0d98bd0 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/ContextCodedTextDefiningcode.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum ContextCodedTextDefiningcode implements EnumValueSet { + VALUE1("value1", "*", "local", "at0006"), + + VALUE2("value2", "*", "local", "at0007"), + + VALUE3("value3", "*", "local", "at0008"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + ContextCodedTextDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/PlannedDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/PlannedDefiningcode.java new file mode 100644 index 000000000..fcf9c12bd --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/PlannedDefiningcode.java @@ -0,0 +1,38 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum PlannedDefiningcode implements EnumValueSet { + PLANNED("Planned", "*", "local", "at0003"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + PlannedDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/PlannedDefiningcode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/PlannedDefiningcode2.java new file mode 100644 index 000000000..6dd1bfd82 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/PlannedDefiningcode2.java @@ -0,0 +1,38 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum PlannedDefiningcode2 implements EnumValueSet { + PLANNED("planned", "planned", "openehr", "526"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + PlannedDefiningcode2(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/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesAction.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesAction.java new file mode 100644 index 000000000..4c4438c7e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesAction.java @@ -0,0 +1,163 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.TransitionDefiningcode; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-ACTION.test_all_types.v1") +public class TestAllTypesAction { + @Path("/ism_transition[at0004]/transition|defining_code") + private TransitionDefiningcode transitionDefiningcode; + + @Path("/ism_transition[at0005]/transition|defining_code") + private TransitionDefiningcode transitionDefiningcodeCompleted; + + @Path("/ism_transition[at0005]/careflow_step|defining_code") + private CompletedDefiningcode completedDefiningcode; + + @Path("/ism_transition[at0005]/current_state|defining_code") + private CompletedDefiningcode2 completedDefiningcodeCurrentState; + + @Path("/language") + private Language language; + + @Path("/ism_transition[at0003]/careflow_step|defining_code") + private PlannedDefiningcode plannedDefiningcode; + + @Path("/ism_transition[at0003]/transition|defining_code") + private TransitionDefiningcode transitionDefiningcodePlanned; + + @Path("/description[at0001]/items[openEHR-EHR-CLUSTER.test_all_types.v1]") + private List testAllTypes; + + @Path("/time|value") + private TemporalAccessor timeValue; + + @Path("/ism_transition[at0003]/current_state|defining_code") + private PlannedDefiningcode2 plannedDefiningcodeCurrentState; + + @Path("/ism_transition[at0004]/current_state|defining_code") + private ActiveDefiningcode activeDefiningcode; + + @Path("/ism_transition[at0004]/careflow_step|defining_code") + private ActiveDefiningcode2 activeDefiningcodeCareflowStep; + + @Path("/subject") + private PartyProxy subject; + + public void setTransitionDefiningcode(TransitionDefiningcode transitionDefiningcode) { + this.transitionDefiningcode = transitionDefiningcode; + } + + public TransitionDefiningcode getTransitionDefiningcode() { + return this.transitionDefiningcode; + } + + public void setTransitionDefiningcodeCompleted( + TransitionDefiningcode transitionDefiningcodeCompleted) { + this.transitionDefiningcodeCompleted = transitionDefiningcodeCompleted; + } + + public TransitionDefiningcode getTransitionDefiningcodeCompleted() { + return this.transitionDefiningcodeCompleted; + } + + public void setCompletedDefiningcode(CompletedDefiningcode completedDefiningcode) { + this.completedDefiningcode = completedDefiningcode; + } + + public CompletedDefiningcode getCompletedDefiningcode() { + return this.completedDefiningcode; + } + + public void setCompletedDefiningcodeCurrentState( + CompletedDefiningcode2 completedDefiningcodeCurrentState) { + this.completedDefiningcodeCurrentState = completedDefiningcodeCurrentState; + } + + public CompletedDefiningcode2 getCompletedDefiningcodeCurrentState() { + return this.completedDefiningcodeCurrentState; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setPlannedDefiningcode(PlannedDefiningcode plannedDefiningcode) { + this.plannedDefiningcode = plannedDefiningcode; + } + + public PlannedDefiningcode getPlannedDefiningcode() { + return this.plannedDefiningcode; + } + + public void setTransitionDefiningcodePlanned( + TransitionDefiningcode transitionDefiningcodePlanned) { + this.transitionDefiningcodePlanned = transitionDefiningcodePlanned; + } + + public TransitionDefiningcode getTransitionDefiningcodePlanned() { + return this.transitionDefiningcodePlanned; + } + + public void setTestAllTypes(List testAllTypes) { + this.testAllTypes = testAllTypes; + } + + public List getTestAllTypes() { + return this.testAllTypes; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue; + } + + public void setPlannedDefiningcodeCurrentState( + PlannedDefiningcode2 plannedDefiningcodeCurrentState) { + this.plannedDefiningcodeCurrentState = plannedDefiningcodeCurrentState; + } + + public PlannedDefiningcode2 getPlannedDefiningcodeCurrentState() { + return this.plannedDefiningcodeCurrentState; + } + + public void setActiveDefiningcode(ActiveDefiningcode activeDefiningcode) { + this.activeDefiningcode = activeDefiningcode; + } + + public ActiveDefiningcode getActiveDefiningcode() { + return this.activeDefiningcode; + } + + public void setActiveDefiningcodeCareflowStep( + ActiveDefiningcode2 activeDefiningcodeCareflowStep) { + this.activeDefiningcodeCareflowStep = activeDefiningcodeCareflowStep; + } + + public ActiveDefiningcode2 getActiveDefiningcodeCareflowStep() { + return this.activeDefiningcodeCareflowStep; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java new file mode 100644 index 000000000..6f1516cb3 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java @@ -0,0 +1,50 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.TransitionDefiningcode; + +import java.time.temporal.TemporalAccessor; + +public class TestAllTypesActionContainment extends Containment { + public SelectAqlField TEST_ALL_TYPES_ACTION = new AqlFieldImp(TestAllTypesAction.class, "", "TestAllTypesAction", TestAllTypesAction.class, this); + + public SelectAqlField TRANSITION_DEFININGCODE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition[at0004]/transition|defining_code", "transitionDefiningcode", TransitionDefiningcode.class, this); + + public SelectAqlField TRANSITION_DEFININGCODE_COMPLETED = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition[at0005]/transition|defining_code", "transitionDefiningcodeCompleted", TransitionDefiningcode.class, this); + + public SelectAqlField COMPLETED_DEFININGCODE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition[at0005]/careflow_step|defining_code", "completedDefiningcode", CompletedDefiningcode.class, this); + + public SelectAqlField COMPLETED_DEFININGCODE_CURRENT_STATE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition[at0005]/current_state|defining_code", "completedDefiningcodeCurrentState", CompletedDefiningcode2.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesAction.class, "/language", "language", Language.class, this); + + public SelectAqlField PLANNED_DEFININGCODE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition[at0003]/careflow_step|defining_code", "plannedDefiningcode", PlannedDefiningcode.class, this); + + public SelectAqlField TRANSITION_DEFININGCODE_PLANNED = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition[at0003]/transition|defining_code", "transitionDefiningcodePlanned", TransitionDefiningcode.class, this); + + public ListSelectAqlField TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesAction.class, "/description[at0001]/items[openEHR-EHR-CLUSTER.test_all_types.v1]", "testAllTypes", TestAllTypesCluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(TestAllTypesAction.class, "/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField PLANNED_DEFININGCODE_CURRENT_STATE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition[at0003]/current_state|defining_code", "plannedDefiningcodeCurrentState", PlannedDefiningcode2.class, this); + + public SelectAqlField ACTIVE_DEFININGCODE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition[at0004]/current_state|defining_code", "activeDefiningcode", ActiveDefiningcode.class, this); + + public SelectAqlField ACTIVE_DEFININGCODE_CAREFLOW_STEP = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition[at0004]/careflow_step|defining_code", "activeDefiningcodeCareflowStep", ActiveDefiningcode2.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(TestAllTypesAction.class, "/subject", "subject", PartyProxy.class, this); + + private TestAllTypesActionContainment() { + super("openEHR-EHR-ACTION.test_all_types.v1"); + } + + public static TestAllTypesActionContainment getInstance() { + return new TestAllTypesActionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java new file mode 100644 index 000000000..8b36f08f1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-ADMIN_ENTRY.test_all_types.v1") +public class TestAllTypesAdminEntry { + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + @Path("/data[at0001]/item[at0002]/value|magnitude") + private Long count3Magnitude; + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setCount3Magnitude(Long count3Magnitude) { + this.count3Magnitude = count3Magnitude; + } + + public Long getCount3Magnitude() { + return this.count3Magnitude; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java new file mode 100644 index 000000000..85cadd0c2 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java @@ -0,0 +1,25 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +public class TestAllTypesAdminEntryContainment extends Containment { + public SelectAqlField TEST_ALL_TYPES_ADMIN_ENTRY = new AqlFieldImp(TestAllTypesAdminEntry.class, "", "TestAllTypesAdminEntry", TestAllTypesAdminEntry.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(TestAllTypesAdminEntry.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesAdminEntry.class, "/language", "language", Language.class, this); + + public SelectAqlField COUNT3_MAGNITUDE = new AqlFieldImp(TestAllTypesAdminEntry.class, "/data[at0001]/item[at0002]/value|magnitude", "count3Magnitude", Long.class, this); + + private TestAllTypesAdminEntryContainment() { + super("openEHR-EHR-ADMIN_ENTRY.test_all_types.v1"); + } + + public static TestAllTypesAdminEntryContainment getInstance() { + return new TestAllTypesAdminEntryContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesChoiceChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesChoiceChoice.java new file mode 100644 index 000000000..64f57332c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesChoiceChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +public interface TestAllTypesChoiceChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesChoiceDvcount.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesChoiceDvcount.java new file mode 100644 index 000000000..9a253e43e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesChoiceDvcount.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_COUNT") +public class TestAllTypesChoiceDvcount implements TestAllTypesChoiceChoice { + @Path("|magnitude") + private Long choiceMagnitude; + + public void setChoiceMagnitude(Long choiceMagnitude) { + this.choiceMagnitude = choiceMagnitude; + } + + public Long getChoiceMagnitude() { + return this.choiceMagnitude; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesChoiceDvquantity.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesChoiceDvquantity.java new file mode 100644 index 000000000..1f5973226 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesChoiceDvquantity.java @@ -0,0 +1,31 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_QUANTITY") +public class TestAllTypesChoiceDvquantity implements TestAllTypesChoiceChoice { + @Path("|magnitude") + private Double choiceMagnitude; + + @Path("|units") + private String choiceUnits; + + public void setChoiceMagnitude(Double choiceMagnitude) { + this.choiceMagnitude = choiceMagnitude; + } + + public Double getChoiceMagnitude() { + return this.choiceMagnitude; + } + + public void setChoiceUnits(String choiceUnits) { + this.choiceUnits = choiceUnits; + } + + public String getChoiceUnits() { + return this.choiceUnits; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesCluster.java new file mode 100644 index 000000000..cd8cfa5be --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesCluster.java @@ -0,0 +1,32 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import com.nedap.archie.rm.datavalues.DataValue; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.test_all_types.v1") +public class TestAllTypesCluster { + @Path("/items[at0001]/items[at0002]/items[at0003]/value") + private DataValue value; + + @Path("/items[at0001]/items[at0002]/items[at0003]/value|value") + private Boolean boolean2Value; + + public void setValue(DataValue value) { + this.value = value; + } + + public DataValue getValue() { + return this.value; + } + + public void setBoolean2Value(Boolean boolean2Value) { + this.boolean2Value = boolean2Value; + } + + public Boolean isBoolean2Value() { + return this.boolean2Value; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java new file mode 100644 index 000000000..e7578dcf5 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java @@ -0,0 +1,22 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import com.nedap.archie.rm.datavalues.DataValue; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class TestAllTypesClusterContainment extends Containment { + public SelectAqlField TEST_ALL_TYPES_CLUSTER = new AqlFieldImp(TestAllTypesCluster.class, "", "TestAllTypesCluster", TestAllTypesCluster.class, this); + + public SelectAqlField VALUE = new AqlFieldImp(TestAllTypesCluster.class, "/items[at0001]/items[at0002]/items[at0003]/value", "value", DataValue.class, this); + + public SelectAqlField BOOLEAN2_VALUE = new AqlFieldImp(TestAllTypesCluster.class, "/items[at0001]/items[at0002]/items[at0003]/value\\n", "boolean2Value", Boolean.class, this); + + private TestAllTypesClusterContainment() { + super("openEHR-EHR-CLUSTER.test_all_types.v1"); + } + + public static TestAllTypesClusterContainment getInstance() { + return new TestAllTypesClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java new file mode 100644 index 000000000..ca357750b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java @@ -0,0 +1,104 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import com.nedap.archie.rm.datavalues.quantity.DvInterval; +import com.nedap.archie.rm.generic.PartyProxy; +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.olddtoexamples.shareddefinition.Language; + +import java.net.URI; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.test_all_types.v1") +public class TestAllTypesEvaluation { + @Path("/data[at0001]/items[at0004]/value") + private DvInterval intervalQuantity; + + @Path("/data[at0001]/items[at0006]/items[at0007]/items[at0008]/items[at0010]/value|value") + private String text2Value; + + @Path("/data[at0001]/items[at0003]/value") + private DvInterval intervalCount; + + @Path("/data[at0001]/items[at0005]/value") + private DvInterval intervalDatetime; + + @Path("/data[at0001]/items[at0002]/value|value") + private URI uriValue; + + @Path("/language") + private Language language; + + @Path("/data[at0001]/items[at0009]/value") + @Choice + private TestAllTypesChoiceChoice choice; + + @Path("/subject") + private PartyProxy subject; + + public void setIntervalQuantity(DvInterval intervalQuantity) { + this.intervalQuantity = intervalQuantity; + } + + public DvInterval getIntervalQuantity() { + return this.intervalQuantity; + } + + public void setText2Value(String text2Value) { + this.text2Value = text2Value; + } + + public String getText2Value() { + return this.text2Value; + } + + public void setIntervalCount(DvInterval intervalCount) { + this.intervalCount = intervalCount; + } + + public DvInterval getIntervalCount() { + return this.intervalCount; + } + + public void setIntervalDatetime(DvInterval intervalDatetime) { + this.intervalDatetime = intervalDatetime; + } + + public DvInterval getIntervalDatetime() { + return this.intervalDatetime; + } + + public void setUriValue(URI uriValue) { + this.uriValue = uriValue; + } + + public URI getUriValue() { + return this.uriValue; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setChoice(TestAllTypesChoiceChoice choice) { + this.choice = choice; + } + + public TestAllTypesChoiceChoice getChoice() { + return this.choice; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java new file mode 100644 index 000000000..e1ae5a7f2 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java @@ -0,0 +1,38 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import com.nedap.archie.rm.datavalues.quantity.DvInterval; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.net.URI; + +public class TestAllTypesEvaluationContainment extends Containment { + public SelectAqlField TEST_ALL_TYPES_EVALUATION = new AqlFieldImp(TestAllTypesEvaluation.class, "", "TestAllTypesEvaluation", TestAllTypesEvaluation.class, this); + + public SelectAqlField INTERVAL_QUANTITY = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0004]/value", "intervalQuantity", DvInterval.class, this); + + public SelectAqlField TEXT2_VALUE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0006]/items[at0007]/items[at0008]/items[at0010]/value|value", "text2Value", String.class, this); + + public SelectAqlField INTERVAL_COUNT = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0003]/value", "intervalCount", DvInterval.class, this); + + public SelectAqlField INTERVAL_DATETIME = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0005]/value", "intervalDatetime", DvInterval.class, this); + + public SelectAqlField URI_VALUE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0002]/value|value", "uriValue", URI.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesEvaluation.class, "/language", "language", Language.class, this); + + public SelectAqlField CHOICE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0009]/value", "choice", TestAllTypesChoiceChoice.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(TestAllTypesEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + private TestAllTypesEvaluationContainment() { + super("openEHR-EHR-EVALUATION.test_all_types.v1"); + } + + public static TestAllTypesEvaluationContainment getInstance() { + return new TestAllTypesEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesInstruction.java new file mode 100644 index 000000000..218c81551 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesInstruction.java @@ -0,0 +1,92 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import com.nedap.archie.rm.datastructures.ItemStructure; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.Temporal; +import java.time.temporal.TemporalAccessor; + +@Entity +@Archetype("openEHR-EHR-INSTRUCTION.test_all_types.v1") +public class TestAllTypesInstruction { + @Path("/narrative|value") + private String narrativeValue; + + @Path("/language") + private Language language; + + @Path("/activities[at0001]/description") + private ItemStructure description; + + @Path("/activities[at0001]/description[at0002]/items[at0003]/value|value") + private Temporal partialDateValue; + + @Path("/subject") + private PartyProxy subject; + + @Path("/activities[at0001]/action_archetype_id") + private String currentActivity; + + @Path("/activities[at0001]/description[at0002]/items[at0004]/value|value") + private TemporalAccessor partialDatetimeValue; + + public void setNarrativeValue(String narrativeValue) { + this.narrativeValue = narrativeValue; + } + + public String getNarrativeValue() { + return this.narrativeValue; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setDescription(ItemStructure description) { + this.description = description; + } + + public ItemStructure getDescription() { + return this.description; + } + + public void setPartialDateValue(Temporal partialDateValue) { + this.partialDateValue = partialDateValue; + } + + public Temporal getPartialDateValue() { + return this.partialDateValue; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setCurrentActivity(String currentActivity) { + this.currentActivity = currentActivity; + } + + public String getCurrentActivity() { + return this.currentActivity; + } + + public void setPartialDatetimeValue(TemporalAccessor partialDatetimeValue) { + this.partialDatetimeValue = partialDatetimeValue; + } + + public TemporalAccessor getPartialDatetimeValue() { + return this.partialDatetimeValue; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java new file mode 100644 index 000000000..fd0fde507 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java @@ -0,0 +1,37 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import com.nedap.archie.rm.datastructures.ItemStructure; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.Temporal; +import java.time.temporal.TemporalAccessor; + +public class TestAllTypesInstructionContainment extends Containment { + public SelectAqlField TEST_ALL_TYPES_INSTRUCTION = new AqlFieldImp(TestAllTypesInstruction.class, "", "TestAllTypesInstruction", TestAllTypesInstruction.class, this); + + public SelectAqlField NARRATIVE_VALUE = new AqlFieldImp(TestAllTypesInstruction.class, "/narrative|value", "narrativeValue", String.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesInstruction.class, "/language", "language", Language.class, this); + + public SelectAqlField DESCRIPTION = new AqlFieldImp(TestAllTypesInstruction.class, "/activities[at0001]/description", "description", ItemStructure.class, this); + + public SelectAqlField PARTIAL_DATE_VALUE = new AqlFieldImp(TestAllTypesInstruction.class, "/activities[at0001]/description[at0002]/items[at0003]/value|value", "partialDateValue", Temporal.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(TestAllTypesInstruction.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField CURRENT_ACTIVITY = new AqlFieldImp(TestAllTypesInstruction.class, "/activities[at0001]/action_archetype_id", "currentActivity", String.class, this); + + public SelectAqlField PARTIAL_DATETIME_VALUE = new AqlFieldImp(TestAllTypesInstruction.class, "/activities[at0001]/description[at0002]/items[at0004]/value|value", "partialDatetimeValue", TemporalAccessor.class, this); + + private TestAllTypesInstructionContainment() { + super("openEHR-EHR-INSTRUCTION.test_all_types.v1"); + } + + public static TestAllTypesInstructionContainment getInstance() { + return new TestAllTypesInstructionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesObservation.java new file mode 100644 index 000000000..96aca12e7 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesObservation.java @@ -0,0 +1,252 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.datavalues.DvIdentifier; +import com.nedap.archie.rm.datavalues.encapsulated.DvMultimedia; +import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; +import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; +import com.nedap.archie.rm.datavalues.quantity.DvProportion; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.Temporal; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.test_all_types.v1") +public class TestAllTypesObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0019]/value") + private DvMultimedia multimediaAny; + + @Path("/language") + private Language language; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0012]/value|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0020]/value") + private DvParsable parsableAny; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0021]/value") + private DvIdentifier identifier; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value") + private String textValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|defining_code") + private CodePhrase codedTextDefiningcode; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/value") + private DvProportion proportionAny; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValueTime; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value|defining_code") + private CodePhrase codedTextTerminologyDefiningcode; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|magnitude") + private Double quantityMagnitude; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|units") + private String quantityUnits; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|magnitude") + private Long countMagnitude; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0009]/value|value") + private Temporal dateValue; + + @Path("/subject") + private PartyProxy subject; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0018]/value|value") + private TemporalAmount durationAnyValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0013]/value") + private DvOrdinal ordinal; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0017]/value|value") + private Boolean booleanValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0010]/value|value") + private TemporalAccessor datetimeValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|value") + private TemporalAccessor datetimeAnyValue; + + public void setMultimediaAny(DvMultimedia multimediaAny) { + this.multimediaAny = multimediaAny; + } + + public DvMultimedia getMultimediaAny() { + return this.multimediaAny; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue; + } + + public void setParsableAny(DvParsable parsableAny) { + this.parsableAny = parsableAny; + } + + public DvParsable getParsableAny() { + return this.parsableAny; + } + + public void setIdentifier(DvIdentifier identifier) { + this.identifier = identifier; + } + + public DvIdentifier getIdentifier() { + return this.identifier; + } + + public void setTextValue(String textValue) { + this.textValue = textValue; + } + + public String getTextValue() { + return this.textValue; + } + + public void setCodedTextDefiningcode(CodePhrase codedTextDefiningcode) { + this.codedTextDefiningcode = codedTextDefiningcode; + } + + public CodePhrase getCodedTextDefiningcode() { + return this.codedTextDefiningcode; + } + + public void setProportionAny(DvProportion proportionAny) { + this.proportionAny = proportionAny; + } + + public DvProportion getProportionAny() { + return this.proportionAny; + } + + public void setTimeValueTime(TemporalAccessor timeValueTime) { + this.timeValueTime = timeValueTime; + } + + public TemporalAccessor getTimeValueTime() { + return this.timeValueTime; + } + + public void setCodedTextTerminologyDefiningcode(CodePhrase codedTextTerminologyDefiningcode) { + this.codedTextTerminologyDefiningcode = codedTextTerminologyDefiningcode; + } + + public CodePhrase getCodedTextTerminologyDefiningcode() { + return this.codedTextTerminologyDefiningcode; + } + + public void setQuantityMagnitude(Double quantityMagnitude) { + this.quantityMagnitude = quantityMagnitude; + } + + public Double getQuantityMagnitude() { + return this.quantityMagnitude; + } + + public void setQuantityUnits(String quantityUnits) { + this.quantityUnits = quantityUnits; + } + + public String getQuantityUnits() { + return this.quantityUnits; + } + + public void setCountMagnitude(Long countMagnitude) { + this.countMagnitude = countMagnitude; + } + + public Long getCountMagnitude() { + return this.countMagnitude; + } + + public void setDateValue(Temporal dateValue) { + this.dateValue = dateValue; + } + + public Temporal getDateValue() { + return this.dateValue; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue; + } + + public void setDurationAnyValue(TemporalAmount durationAnyValue) { + this.durationAnyValue = durationAnyValue; + } + + public TemporalAmount getDurationAnyValue() { + return this.durationAnyValue; + } + + public void setOrdinal(DvOrdinal ordinal) { + this.ordinal = ordinal; + } + + public DvOrdinal getOrdinal() { + return this.ordinal; + } + + public void setBooleanValue(Boolean booleanValue) { + this.booleanValue = booleanValue; + } + + public Boolean isBooleanValue() { + return this.booleanValue; + } + + public void setDatetimeValue(TemporalAccessor datetimeValue) { + this.datetimeValue = datetimeValue; + } + + public TemporalAccessor getDatetimeValue() { + return this.datetimeValue; + } + + public void setDatetimeAnyValue(TemporalAccessor datetimeAnyValue) { + this.datetimeAnyValue = datetimeAnyValue; + } + + public TemporalAccessor getDatetimeAnyValue() { + return this.datetimeAnyValue; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java new file mode 100644 index 000000000..5f11aafd1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java @@ -0,0 +1,71 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.datavalues.DvIdentifier; +import com.nedap.archie.rm.datavalues.encapsulated.DvMultimedia; +import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; +import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; +import com.nedap.archie.rm.datavalues.quantity.DvProportion; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.olddtoexamples.shareddefinition.Language; + +import java.time.temporal.Temporal; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; + +public class TestAllTypesObservationContainment extends Containment { + public SelectAqlField TEST_ALL_TYPES_OBSERVATION = new AqlFieldImp(TestAllTypesObservation.class, "", "TestAllTypesObservation", TestAllTypesObservation.class, this); + + public SelectAqlField MULTIMEDIA_ANY = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0019]/value", "multimediaAny", DvMultimedia.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesObservation.class, "/language", "language", Language.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0012]/value|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField PARSABLE_ANY = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0020]/value", "parsableAny", DvParsable.class, this); + + public SelectAqlField IDENTIFIER = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0021]/value", "identifier", DvIdentifier.class, this); + + public SelectAqlField TEXT_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value", "textValue", String.class, this); + + public SelectAqlField CODED_TEXT_DEFININGCODE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|defining_code", "codedTextDefiningcode", CodePhrase.class, this); + + public SelectAqlField PROPORTION_ANY = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/value", "proportionAny", DvProportion.class, this); + + public SelectAqlField TIME_VALUE_TIME = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValueTime", TemporalAccessor.class, this); + + public SelectAqlField CODED_TEXT_TERMINOLOGY_DEFININGCODE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value|defining_code", "codedTextTerminologyDefiningcode", CodePhrase.class, this); + + public SelectAqlField QUANTITY_MAGNITUDE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|magnitude", "quantityMagnitude", Double.class, this); + + public SelectAqlField QUANTITY_UNITS = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|units", "quantityUnits", String.class, this); + + public SelectAqlField COUNT_MAGNITUDE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|magnitude", "countMagnitude", Long.class, this); + + public SelectAqlField DATE_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0009]/value|value", "dateValue", Temporal.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(TestAllTypesObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public SelectAqlField DURATION_ANY_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0018]/value|value", "durationAnyValue", TemporalAmount.class, this); + + public SelectAqlField ORDINAL = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0013]/value", "ordinal", DvOrdinal.class, this); + + public SelectAqlField BOOLEAN_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0017]/value|value", "booleanValue", Boolean.class, this); + + public SelectAqlField DATETIME_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0010]/value|value", "datetimeValue", TemporalAccessor.class, this); + + public SelectAqlField DATETIME_ANY_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|value", "datetimeAnyValue", TemporalAccessor.class, this); + + private TestAllTypesObservationContainment() { + super("openEHR-EHR-OBSERVATION.test_all_types.v1"); + } + + public static TestAllTypesObservationContainment getInstance() { + return new TestAllTypesObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesSection.java new file mode 100644 index 000000000..a015d11e9 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesSection.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +import java.util.List; + +@Entity +@Archetype("openEHR-EHR-SECTION.test_all_types.v1") +public class TestAllTypesSection { + @Path("/items[at0001]/items[at0002]/items[openEHR-EHR-ACTION.test_all_types.v1]") + private List testAllTypes; + + @Path("/items[at0001]/items[at0002]/items[openEHR-EHR-INSTRUCTION.test_all_types.v1]") + private List testAllTypesSection3; + + @Path("/items[at0001]/items[openEHR-EHR-ADMIN_ENTRY.test_all_types.v1]") + private List testAllTypesSection2; + + public void setTestAllTypes(List testAllTypes) { + this.testAllTypes = testAllTypes; + } + + public List getTestAllTypes() { + return this.testAllTypes; + } + + public void setTestAllTypesSection3(List testAllTypesSection3) { + this.testAllTypesSection3 = testAllTypesSection3; + } + + public List getTestAllTypesSection3() { + return this.testAllTypesSection3; + } + + public void setTestAllTypesSection2(List testAllTypesSection2) { + this.testAllTypesSection2 = testAllTypesSection2; + } + + public List getTestAllTypesSection2() { + return this.testAllTypesSection2; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesSectionContainment.java new file mode 100644 index 000000000..10b3895b3 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/olddtoexamples/testalltypesenv1composition/definition/TestAllTypesSectionContainment.java @@ -0,0 +1,25 @@ +package org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class TestAllTypesSectionContainment extends Containment { + public SelectAqlField TEST_ALL_TYPES_SECTION = new AqlFieldImp(TestAllTypesSection.class, "", "TestAllTypesSection", TestAllTypesSection.class, this); + + public ListSelectAqlField TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesSection.class, "/items[at0001]/items[at0002]/items[openEHR-EHR-ACTION.test_all_types.v1]", "testAllTypes", TestAllTypesAction.class, this); + + public ListSelectAqlField TEST_ALL_TYPES_SECTION3 = new ListAqlFieldImp(TestAllTypesSection.class, "/items[at0001]/items[at0002]/items[openEHR-EHR-INSTRUCTION.test_all_types.v1]", "testAllTypesSection3", TestAllTypesInstruction.class, this); + + public ListSelectAqlField TEST_ALL_TYPES_SECTION2 = new ListAqlFieldImp(TestAllTypesSection.class, "/items[at0001]/items[openEHR-EHR-ADMIN_ENTRY.test_all_types.v1]", "testAllTypesSection2", TestAllTypesAdminEntry.class, this); + + private TestAllTypesSectionContainment() { + super("openEHR-EHR-SECTION.test_all_types.v1"); + } + + public static TestAllTypesSectionContainment getInstance() { + return new TestAllTypesSectionContainment(); + } +} diff --git a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java index 93d0449bb..4179a16a2 100644 --- a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java +++ b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java @@ -47,7 +47,7 @@ public class ClassGeneratorNewTest { public static final String PACKAGE_NAME = "org.ehrbase.client.classgenerator.examples2"; - private static final boolean WRITE_FILES = false; + private static final boolean WRITE_FILES = true; @Test public void testGenerate() throws IOException, XmlException { From 210a671f696187183ebc3dc9b43dcb9044435a9a Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Tue, 1 Dec 2020 16:24:47 +0100 Subject: [PATCH 18/54] switch to new class generator see https://github.com/ehrbase/project_management/issues/424 --- .../org/ehrbase/client/aql/query/Query.java | 23 +- .../openehrclient/TemplateEndpoint.java | 1 - .../DefaultRestDirectoryEndpoint.java | 1 - .../DefaultRestTemplateEndpoint.java | 3 +- .../java/org/ehrbase/client/TestData.java | 87 +- .../aql/containment/ContainmentTest.java | 4 +- .../client/aql/query/EntityQueryTest.java | 8 +- .../AlternativeEventsComposition.java | 264 ++-- ...ternativeEventsCompositionContainment.java | 38 +- .../KorpergewichtAnyEventEnIntervalEvent.java | 132 +- .../KorpergewichtAnyEventEnPointEvent.java | 98 +- .../definition/KorpergewichtBirthEnEvent.java | 77 - .../KorpergewichtBirthEnPointEvent.java | 77 + ...pergewichtConfoundingFactorsEnElement.java | 16 +- .../definition/KorpergewichtObservation.java | 116 +- .../KorpergewichtObservationContainment.java | 16 +- .../StateOfDressEnDefiningcode.java | 16 +- .../BefundDerBlutgasanalyseComposition.java | 182 +-- ...rBlutgasanalyseCompositionContainment.java | 40 +- .../KohlendioxidpartialdruckCluster.java | 32 +- ...ndioxidpartialdruckClusterContainment.java | 6 +- .../definition/LaborergebnisObservation.java | 178 +-- .../LaborergebnisObservationContainment.java | 34 +- .../LabortestBezeichnungDefiningcode.java | 10 +- .../definition/PhWertCluster.java | 32 +- .../definition/PhWertClusterContainment.java | 6 +- .../SauerstoffpartialdruckCluster.java | 32 +- ...erstoffpartialdruckClusterContainment.java | 6 +- .../SauerstoffsattigungCluster.java | 32 +- ...SauerstoffsattigungClusterContainment.java | 6 +- .../definition/StatusDefiningcode.java | 4 +- .../UntersuchterAnalytDefiningcode.java | 16 +- .../UntersuchterAnalytDefiningcode2.java | 10 +- .../UntersuchterAnalytDefiningcode3.java | 16 +- .../UntersuchterAnalytDefiningcode4.java | 8 +- .../CoronaAnamneseComposition.java | 328 ++--- .../CoronaAnamneseCompositionContainment.java | 42 +- .../definition/AdresseCluster.java | 32 +- .../definition/AllgemeineAngabenSection.java | 154 +- .../AllgemeineAngabenSectionContainment.java | 16 +- ...AndereAktuelleErkrankungenObservation.java | 133 +- ...lleErkrankungenObservationContainment.java | 18 +- ...ogebieteFurCoronainfektionOderKontak_.java | 10 +- ...ltInGesundheitseinrichtungObservation.java | 165 ++- ...eitseinrichtungObservationContainment.java | 20 +- .../definition/BeschaftigungCluster.java | 48 +- ...esundheitsrisikosDetailsClusterSpezi_.java | 23 - ...esundheitsrisikosRisikofaktorDvtextS_.java | 20 - ...esundheitsrisikosVorhandenseinDvcode_.java | 20 - ...ngDesGesundheitsrisikosDetailsCluster.java | 23 - ...ertungDesGesundheitsrisikosEvaluation.java | 201 +-- ...sundheitsrisikosEvaluationContainment.java | 26 +- ...sGesundheitsrisikosRisikofaktorChoice.java | 4 - ...sGesundheitsrisikosRisikofaktorDvtext.java | 20 - ...GesundheitsrisikosVorhandenseinChoice.java | 4 - ...dheitsrisikosVorhandenseinDvcodedtext.java | 20 - .../ChronischeErkrankungenObservation.java | 133 +- ...cheErkrankungenObservationContainment.java | 18 +- .../DiagnosestatusDefiningcode.java | 12 +- .../DiagnostischeSicherheitDefiningcode.java | 14 +- ...enstleistungAktuelleAktivitatActivity.java | 116 +- ...leistungGrundFurDieAnforderungElement.java | 16 +- .../definition/DienstleistungInstruction.java | 144 +- .../DienstleistungInstructionContainment.java | 18 +- .../definition/DurchfallObservation.java | 133 +- .../DurchfallObservationContainment.java | 18 +- ...derErhohteKorpertemperaturObservation.java | 133 +- ...orpertemperaturObservationContainment.java | 18 +- ...genZumMedikationsScreeningObservation.java | 156 +- ...ationsScreeningObservationContainment.java | 18 +- ...creeningSpezifischeMedikamenteCluster.java | 34 +- ...storieBeliebigesEreignisIntervalEvent.java | 82 +- ...eHistorieBeliebigesEreignisPointEvent.java | 48 +- .../GeschichteHistorieGeschichteElement.java | 16 +- .../GeschichteHistorieObservation.java | 86 +- ...chichteHistorieObservationContainment.java | 10 +- .../GestorterGeruchssinnObservation.java | 133 +- ...rterGeruchssinnObservationContainment.java | 18 +- .../GestorterGeschmackssinnObservation.java | 133 +- ...rGeschmackssinnObservationContainment.java | 18 +- .../GesundheitsbezogenerBerufEvaluation.java | 98 +- ...tsbezogenerBerufEvaluationContainment.java | 10 +- .../definition/HeiserkeitObservation.java | 133 +- .../HeiserkeitObservationContainment.java | 18 +- .../HistorieDerReiseObservation.java | 134 +- ...istorieDerReiseObservationContainment.java | 12 +- .../definition/HustenObservation.java | 133 +- .../HustenObservationContainment.java | 18 +- .../definition/InlandAuslandDefiningcode.java | 12 +- .../definition/KontaktSection.java | 34 +- .../definition/KontaktSectionContainment.java | 18 +- .../KorpertemperaturObservation.java | 196 +-- ...orpertemperaturObservationContainment.java | 22 +- .../KorpertemperaturStorfaktorenElement.java | 16 +- .../definition/LetzteReiseDefiningcode.java | 12 +- .../MedikamentInVerwendungDefiningcode.java | 14 +- ...amentenklasseInVerwendungDefiningcode.java | 14 +- .../definition/OrganisationCluster.java | 96 +- .../OrganisationClusterContainment.java | 10 +- .../PersonenkontaktObservation.java | 165 ++- ...PersonenkontaktObservationContainment.java | 20 +- .../PresenceOfAnyExposureEnDefiningcode.java | 20 +- .../definition/ProblemDiagnoseEvaluation.java | 114 +- .../ProblemDiagnoseEvaluationContainment.java | 14 +- ...novirusDiagnostischeSicherheitChoice.java} | 2 +- ...rusDiagnostischeSicherheitDvCodedText.java | 21 + ...onovirusDiagnostischeSicherheitDvText.java | 20 + .../ProblemDiganoseCoronovirusEvaluation.java | 166 +-- ...anoseCoronovirusEvaluationContainment.java | 18 +- ...fallBeliebigesIntervallereignisChoice.java | 4 - ...iebigesIntervallereignisIntervalEvent.java | 102 +- ...BeliebigesIntervallereignisPointEvent.java | 56 - .../ReisefallBestimmteReiseCluster.java | 50 +- .../ReisefallBestimmtesReisezielCluster.java | 80 +- .../definition/ReisefallObservation.java | 86 +- .../ReisefallObservationContainment.java | 10 +- .../definition/RisikogebietSection.java | 32 +- .../RisikogebietSectionContainment.java | 18 +- .../definition/SchnupfenObservation.java | 133 +- .../SchnupfenObservationContainment.java | 18 +- .../definition/StandortCluster.java | 32 +- .../StandortClusterContainment.java | 4 +- .../definition/StatusCluster.java | 16 +- .../definition/StatusClusterContainment.java | 16 +- .../StatusDiagnostischeSicherheitChoice.java | 4 - ...tusDiagnostischeSicherheitDvcodedtext.java | 21 - .../StatusDiagnostischeSicherheitDvtext.java | 20 - .../definition/SymptomeSection.java | 148 +- .../SymptomeSectionContainment.java | 18 +- .../definition/VorhandenDefiningcode.java | 12 +- .../definition/VorhandenDefiningcode2.java | 12 +- .../VorhandenseinDefiningCode2.java | 42 + .../definition/VorhandenseinDefiningcode.java | 18 +- ...denseinDefiningcodeSpecificExposureEn.java | 41 - ...mptomeBeliebigesEreignisIntervalEvent.java | 70 +- ...eSymptomeBeliebigesEreignisPointEvent.java | 36 +- .../WeitereSymptomeObservation.java | 86 +- ...WeitereSymptomeObservationContainment.java | 8 +- ...meSpezifischesSymptomAnzeichenCluster.java | 67 +- .../definition/WohnsituationEvaluation.java | 98 +- .../WohnsituationEvaluationContainment.java | 6 +- .../definition/WohnstatteCluster.java | 32 +- .../DiagnoseComposition.java | 248 ++-- .../DiagnoseCompositionContainment.java | 32 +- .../AnatomischeLokalisationCluster.java | 64 +- ...omischeLokalisationClusterContainment.java | 8 +- ...ionDiagnostischeSicherheitDvcodedtext.java | 21 - ...lisationDiagnostischeSicherheitDvtext.java | 20 - ...thogeneseAtiologieDerKrankheitElement.java | 18 +- ...eneseBeschreibungDesEntstehensElement.java | 16 +- .../definition/AtiopathogeneseCluster.java | 36 +- .../AtiopathogeneseClusterContainment.java | 18 +- .../AtiopathogeneseDvcodedtext.java | 20 - .../definition/AtiopathogeneseDvtext.java | 20 - ...AtiopathogeneseSchweregradDvcodedtext.java | 20 - .../AtiopathogeneseSchweregradDvtext.java | 20 - ...e.java => AtiopathogeneseValueChoice.java} | 2 +- .../AtiopathogeneseValueDvCodedText.java | 20 + .../AtiopathogeneseValueDvText.java | 20 + .../definition/DiagnosedetailsCluster.java | 64 +- .../DiagnostischeSicherheitDefiningcode.java | 14 +- .../definition/FallidentifikationCluster.java | 16 +- .../definition/LateralitatDefiningcode.java | 12 +- ...ameDesProblemsDerDiagnoseDefiningcode.java | 22 +- ...iagnoseDiagnostischeSicherheitChoice.java} | 2 +- ...oseDiagnostischeSicherheitDvCodedText.java | 21 + ...DiagnoseDiagnostischeSicherheitDvText.java | 20 + .../definition/ProblemDiagnoseEvaluation.java | 312 ++-- .../ProblemDiagnoseEvaluationContainment.java | 32 +- ... => ProblemDiagnoseSchweregradChoice.java} | 2 +- ...ProblemDiagnoseSchweregradDvCodedText.java | 20 + .../ProblemDiagnoseSchweregradDvText.java | 20 + .../definition/SchweregradDefiningcode.java | 12 +- .../definition/ValueDefiningcode.java | 12 +- ...aseBloodPressureSimpleDeV0Composition.java | 244 ++-- ...ssureSimpleDeV0CompositionContainment.java | 30 +- ...loodPressureTrainingSampleObservation.java | 366 ++--- ...eTrainingSampleObservationContainment.java | 40 +- .../definition/CuffSizeDefiningcode.java | 18 +- .../DeviceDetailsTrainingSampleCluster.java | 145 +- ...tailsTrainingSampleClusterContainment.java | 18 +- .../KorotkoffSoundsDefiningcode.java | 18 +- .../LocationOfMeasurementDefiningcode.java | 14 +- .../definition/PositionDefiningcode.java | 20 +- ...EhrbaseMultiOccurrenceDeV1Composition.java | 232 +-- ...iOccurrenceDeV1CompositionContainment.java | 30 +- .../definition/BodyExposureDefiningcode.java | 26 +- .../BodyTemperatureAnyEventIntervalEvent.java | 164 +-- .../BodyTemperatureAnyEventPointEvent.java | 130 +- .../BodyTemperatureBodyExposureChoice2.java | 4 - ...odyTemperatureBodyExposureDvcodedtext.java | 18 +- ...dyTemperatureBodyExposureDvcodedtext2.java | 20 - .../BodyTemperatureBodyExposureDvtext.java | 18 +- .../BodyTemperatureBodyExposureDvtext2.java | 20 - ...atureLocationOfMeasurementDvcodedtext.java | 20 +- ...emperatureLocationOfMeasurementDvtext.java | 18 +- .../BodyTemperatureObservation.java | 136 +- ...BodyTemperatureObservationContainment.java | 16 +- .../LocationOfMeasurementDefiningcode.java | 26 +- .../EpisodeOfCareComposition.java | 216 +-- .../EpisodeOfCareCompositionContainment.java | 30 +- .../definition/EpisodeofcareAdminEntry.java | 197 +-- .../EpisodeofcareAdminEntryContainment.java | 24 +- .../EpisodeofcareDiagnosisCluster.java | 48 +- .../EpisodeofcareIdentifierElement.java | 16 +- .../definition/EpisodeofcareTeamElement.java | 16 +- .../definition/StatusDefiningcode.java | 12 +- .../OpenEREACTCareComposition.java | 280 ++-- .../OpenEREACTCareCompositionContainment.java | 36 +- .../definition/AbdomenSymptomCluster.java | 98 +- .../AbdomenSymptomClusterContainment.java | 25 +- .../definition/AcvpuDefiningcode.java | 12 +- .../definition/AcvpuScaleObservation.java | 110 +- .../AcvpuScaleObservationContainment.java | 13 +- .../definition/AllergiesEvaluation.java | 66 +- .../AllergiesEvaluationContainment.java | 10 +- ...5.java => AmberFlagAcuteDefiningCode.java} | 14 +- .../definition/AssessmentSection.java | 64 +- .../AssessmentSectionContainment.java | 22 +- .../definition/BackgroundSection.java | 96 +- .../BackgroundSectionContainment.java | 24 +- .../definition/BloodPressureObservation.java | 194 +-- .../BloodPressureObservationContainment.java | 20 +- ...va => BreathingIndicatorDefiningCode.java} | 13 +- ...ode.java => CareflowStepDefiningCode.java} | 14 +- .../definition/ChestSymptomCluster.java | 98 +- .../ChestSymptomClusterContainment.java | 25 +- ... => CirculationIndicatorDefiningCode.java} | 15 +- .../ClinicalRiskCategoryDefiningcode.java | 14 +- ...rCareHomeHasSuspectedConfirmedCovid19.java | 23 - ...CareHomeHasSuspectedConfirmedCovid192.java | 23 - ...edtextCareHomeHasSuspectedConfirmedC_.java | 21 - ...dtextCareHomeHasSuspectedConfirmedC_2.java | 21 - ...odedtextCareHomeHasSuspectedConfirme_.java | 21 - ...dedtextCareHomeHasSuspectedConfirme_2.java | 21 - .../Covid19ExposureDetailChoice.java | 4 - .../Covid19ExposureDetailCluster.java | 23 - .../definition/Covid19ExposureEvaluation.java | 202 ++- .../Covid19ExposureEvaluationContainment.java | 42 +- .../Covid19ExposurePresenceChoice.java | 4 - .../Covid19ExposurePresenceDvcodedtext.java | 21 - .../Covid19ExposureRiskFactorChoice.java | 4 - .../Covid19ExposureRiskFactorDvcodedtext.java | 20 - .../definition/CovidNotesEvaluation.java | 66 +- .../CovidNotesEvaluationContainment.java | 10 +- .../definition/CovidSection.java | 64 +- .../definition/CovidSectionContainment.java | 22 +- .../definition/CovidSymptomsObservation.java | 194 +-- .../CovidSymptomsObservationContainment.java | 22 +- ...de8.java => CurrentStateDefiningCode.java} | 14 +- .../definition/Definingcode.java | 42 - .../DenwisAgitationIndicatorElement.java | 18 +- .../DenwisBreathingIndicatorElement.java | 16 +- .../definition/DenwisChoice5.java | 4 - .../definition/DenwisChoice6.java | 4 - .../definition/DenwisChoice7.java | 4 - .../DenwisCirculationIndicatorElement.java | 16 +- .../definition/DenwisDvcodedtext.java | 20 - .../definition/DenwisDvcodedtext2.java | 20 - .../definition/DenwisDvcodedtext3.java | 20 - .../definition/DenwisDvcodedtext4.java | 20 - .../definition/DenwisDvcodedtext5.java | 20 - .../definition/DenwisDvcodedtext6.java | 20 - .../definition/DenwisDvcodedtext7.java | 20 - .../definition/DenwisDvtext.java | 20 - .../definition/DenwisDvtext2.java | 20 - .../definition/DenwisDvtext3.java | 20 - .../definition/DenwisDvtext4.java | 20 - .../definition/DenwisDvtext5.java | 20 - .../definition/DenwisDvtext6.java | 20 - .../definition/DenwisDvtext7.java | 20 - .../DenwisMentationIndicatorElement.java | 18 +- ...DenwisNurseSubjectiveIndicatorElement.java | 18 +- .../definition/DenwisObservation.java | 470 +++--- .../DenwisObservationContainment.java | 53 +- .../DenwisPainIndicatorElement.java | 18 +- .../DenwisPatientIndicatorElement.java | 18 +- .../DenwisTemperatureIndicatorElement.java | 18 +- .../DenwisTrajectoryIndicatorElement.java | 18 +- ...wisChoice3.java => DenwisValueChoice.java} | 2 +- ...isChoice4.java => DenwisValueChoice2.java} | 2 +- ...wisChoice.java => DenwisValueChoice3.java} | 2 +- ...isChoice2.java => DenwisValueChoice4.java} | 2 +- .../definition/DenwisValueChoice5.java | 4 + .../definition/DenwisValueChoice6.java | 4 + .../definition/DenwisValueDvCodedText.java | 20 + .../definition/DenwisValueDvCodedText2.java | 20 + .../definition/DenwisValueDvCodedText3.java | 20 + .../definition/DenwisValueDvCodedText4.java | 20 + .../definition/DenwisValueDvCodedText5.java | 20 + .../definition/DenwisValueDvCodedText6.java | 20 + .../definition/DenwisValueDvText.java | 20 + .../definition/DenwisValueDvText2.java | 20 + .../definition/DenwisValueDvText3.java | 20 + .../definition/DenwisValueDvText4.java | 20 + .../definition/DenwisValueDvText5.java | 20 + .../definition/DenwisValueDvText6.java | 20 + .../definition/FirstSymptomsCluster.java | 162 +-- .../FirstSymptomsClusterContainment.java | 21 +- .../definition/FrailtyObservation.java | 98 +- .../FrailtyObservationContainment.java | 8 +- .../definition/HealthRiskDefiningcode.java | 12 +- .../definition/HeightObservation.java | 142 +- .../HeightObservationContainment.java | 13 +- .../definition/KeyCovidSymptomCluster.java | 98 +- .../KeyCovidSymptomClusterContainment.java | 25 +- .../LatestCovid19TestObservation.java | 278 ++-- ...testCovid19TestObservationContainment.java | 28 +- ...vid19TestOverallTestStatusDvcodedtext.java | 20 +- ...estCovid19TestOverallTestStatusDvtext.java | 18 +- ...tCovid19TestTestRequestDetailsCluster.java | 32 +- .../definition/MedicationEvaluation.java | 66 +- .../MedicationEvaluationContainment.java | 10 +- ...ngcode4.java => N999FlagDefiningCode.java} | 14 +- .../definition/NeuroSymptomCluster.java | 98 +- .../NeuroSymptomClusterContainment.java | 25 +- .../definition/News2ScoreObservation.java | 254 ++-- .../News2ScoreObservationContainment.java | 24 +- .../definition/News2Section.java | 112 +- .../definition/News2SectionContainment.java | 26 +- .../definition/OtherSymptomCluster.java | 96 +- .../OtherSymptomClusterContainment.java | 10 +- .../OverallTestStatusDefiningcode.java | 14 +- .../definition/PastHistoryEvaluation.java | 66 +- .../PastHistoryEvaluationContainment.java | 10 +- ...ovid19.java => PresenceDefiningCode2.java} | 13 +- .../definition/PresenceDefiningcode.java | 12 +- .../definition/PulseObservation.java | 146 +- .../PulseObservationContainment.java | 18 +- .../definition/PulseOximetryObservation.java | 178 +-- .../PulseOximetryObservationContainment.java | 22 +- .../definition/RecommendationEvaluation.java | 66 +- .../RecommendationEvaluationContainment.java | 24 +- .../RecommendationRecommendationElement.java | 16 +- ...de3.java => RedFlagAcuteDefiningCode.java} | 18 +- .../definition/RespirationsObservation.java | 146 +- .../RespirationsObservationContainment.java | 12 +- .../definition/ResponseSection.java | 48 +- .../ResponseSectionContainment.java | 20 +- .../RiskAssessmentDefiningcode.java | 12 +- ...Case.java => RiskFactorDefiningCode2.java} | 13 +- ...well.java => RiskFactorDefiningCode3.java} | 13 +- .../definition/RiskFactorDefiningcode.java | 12 +- ... => RiskFactorsForSepsisDefiningCode.java} | 17 +- .../SepsisScreening999FlagElement.java | 18 + .../SepsisScreeningA999FlagElement.java | 18 - .../SepsisScreeningAmberFlagAcuteElement.java | 16 +- .../definition/SepsisScreeningChoice.java | 4 - .../SepsisScreeningDvcodedtext.java | 20 - .../definition/SepsisScreeningDvtext.java | 20 - ...reeningLikelySourceOfInfectionElement.java | 18 +- .../SepsisScreeningObservation.java | 166 +-- ...SepsisScreeningObservationContainment.java | 16 +- .../SepsisScreeningRedFlagAcuteElement.java | 16 +- ...sScreeningRiskFactorsForSepsisElement.java | 16 +- .../SepsisScreeningValueChoice.java | 4 + .../SepsisScreeningValueDvCodedText.java | 20 + .../SepsisScreeningValueDvText.java | 20 + .../definition/SepsisSection.java | 16 +- .../definition/SepsisSectionContainment.java | 16 +- .../definition/ServiceAction.java | 197 ++- .../definition/ServiceActionContainment.java | 28 +- .../definition/ServiceNameDefiningcode.java | 40 - .../ServicePlannedDefiningcode2.java | 38 - ...ServiceRequestCurrentActivityActivity.java | 163 +-- .../definition/ServiceRequestInstruction.java | 142 +- .../ServiceRequestInstructionContainment.java | 18 +- ...ServiceRequestReasonForRequestElement.java | 17 +- .../definition/SituationSection.java | 16 +- .../SituationSectionContainment.java | 16 +- .../definition/StoryHistoryObservation.java | 130 +- .../StoryHistoryObservationContainment.java | 10 +- .../StoryHistorySoftSignsElement.java | 16 +- .../SymptomSignNameDefiningcode.java | 42 - .../SymptomSignNameDefiningcode2.java | 41 - .../SymptomSignNameDefiningcode3.java | 55 - .../SymptomSignNameDefiningcode4.java | 45 - .../SymptomSignNameDefiningcode5.java | 39 - .../definition/TemperatureObservation.java | 162 +-- .../TemperatureObservationContainment.java | 16 +- .../definition/TrendDefiningcode.java | 12 +- .../definition/ValueDefiningcode.java | 24 +- .../definition/ValueDefiningcode2.java | 16 +- .../definition/ValueDefiningcode3.java | 16 +- .../definition/ValueDefiningcode4.java | 16 +- .../definition/ValueDefiningcode5.java | 16 +- .../definition/ValueDefiningcode6.java | 16 +- .../definition/ValueDefiningcode7.java | 24 +- .../definition/WeightObservation.java | 142 +- .../WeightObservationContainment.java | 17 +- .../PatientenaufenthaltComposition.java | 166 +-- ...entenaufenthaltCompositionContainment.java | 36 +- .../definition/AbteilungsfallCluster.java | 3 +- .../AbteilungsfallClusterContainment.java | 1 - .../definition/DetailsZumBettCluster.java | 68 +- .../DetailsZumBettClusterContainment.java | 13 +- .../definition/StandortCluster.java | 109 +- .../StandortClusterContainment.java | 19 +- .../StandortschlusselDefiningcode.java | 299 ++-- .../definition/VersorgungsfallCluster.java | 3 +- .../VersorgungsfallClusterContainment.java | 1 - .../definition/VersorgungsortAdminEntry.java | 40 +- .../VersorgungsortAdminEntryContainment.java | 12 +- .../SchwangerschaftsstatusComposition.java | 266 ++-- ...erschaftsstatusCompositionContainment.java | 40 +- .../SchwangerschaftsstatusObservation.java | 98 +- ...erschaftsstatusObservationContainment.java | 12 +- .../definition/StatusDefiningcode.java | 12 +- .../definition/StatusDefiningcode2.java | 12 +- .../SmICSBefundComposition.java | 264 ++-- .../SmICSBefundCompositionContainment.java | 32 +- .../definition/AntibiogrammCluster.java | 16 +- .../AntibiogrammClusterContainment.java | 16 +- .../definition/AntibiotikumDefiningcode.java | 372 ++--- ...ava => ArtDerTypisierungDefiningCode.java} | 13 +- ...EventsummaryBeteiligtePersonenCluster.java | 31 - .../definition/ContextEventsummaryDvuri.java | 22 - ...ContextEventsummaryIdDerPersonElement.java | 20 - ...ertypisierungArtDerTypisierungElement.java | 18 - ...gersErregertypisierungErgebnisElement.java | 19 - .../definition/ErregerdetailsCluster.java | 173 ++- .../ErregerdetailsClusterContainment.java | 22 +- .../ErregerdetailsKeimSubtypElement.java | 18 + ...gerdetailsResistenzmechanismusCluster.java | 18 + .../definition/ErregernameDefiningcode.java | 1264 ++++++++--------- ...ertypisierungArtDerTypisierungElement.java | 18 + .../definition/ErregertypisierungCluster.java | 68 +- .../ErregertypisierungClusterContainment.java | 8 +- .../ErregertypisierungErgebnisElement.java | 19 + ...EventsummaryBeteiligtePersonenCluster.java | 31 + .../definition/EventsummaryCluster.java | 82 +- .../EventsummaryClusterContainment.java | 10 +- .../EventsummaryIdDerPersonElement.java | 20 + ...oice.java => EventsummaryValueChoice.java} | 2 +- ...ava => EventsummaryValueDvIdentifier.java} | 18 +- .../definition/EventsummaryValueDvUri.java | 22 + .../definition/KeimzahlDefiningcode.java | 44 - ...ultatAnzahlDerErregernachweiseElement.java | 18 - .../LaboranalytResultatCluster.java | 96 +- ...LaboranalytResultatClusterContainment.java | 10 +- .../LaboranalytResultatKeimSubtypElement.java | 18 - ...ytResultatResistenzmechanismusCluster.java | 18 - .../definition/MreKlasseDefiningcode.java | 12 +- ...ebnisAnzahlDerErregernachweiseElement.java | 18 + .../definition/SmicsErgebnisObservation.java | 386 ++--- .../SmicsErgebnisObservationContainment.java | 44 +- .../SmicsErgebniskategorieDefiningcode.java | 14 +- .../definition/StandortCluster.java | 96 +- .../StandortClusterContainment.java | 12 +- ...StationarerVersorgungsfallComposition.java | 188 +-- ...VersorgungsfallCompositionContainment.java | 46 +- .../definition/AufnahmedatenAdminEntry.java | 76 +- .../AufnahmedatenAdminEntryContainment.java | 18 +- .../EntlassungsdatenAdminEntry.java | 92 +- ...EntlassungsdatenAdminEntryContainment.java | 22 +- .../definition/FalltypDefiningcode.java | 5 +- ...ischerZustandDesPatientenDefiningcode.java | 5 +- .../TestAllTypesEnV1Composition.java | 286 ++-- ...estAllTypesEnV1CompositionContainment.java | 36 +- .../definition/ActiveDefiningcode2.java | 38 - ...ode.java => CareflowStepDefiningCode.java} | 18 +- .../definition/CompletedDefiningcode2.java | 38 - .../ContextCodedTextDefiningcode.java | 14 +- ...ode.java => CurrentStateDefiningCode.java} | 18 +- .../definition/PlannedDefiningcode.java | 38 - .../definition/PlannedDefiningcode2.java | 38 - .../definition/TestAllTypesAction.java | 187 +-- .../TestAllTypesActionContainment.java | 26 +- .../definition/TestAllTypesAdminEntry.java | 50 +- .../TestAllTypesAdminEntryContainment.java | 6 +- .../definition/TestAllTypesChoiceDvcount.java | 18 +- .../TestAllTypesChoiceDvquantity.java | 34 +- .../definition/TestAllTypesCluster.java | 28 +- .../TestAllTypesClusterContainment.java | 5 +- .../definition/TestAllTypesEvaluation.java | 255 +++- .../TestAllTypesEvaluationContainment.java | 40 +- .../definition/TestAllTypesInstruction.java | 116 +- .../TestAllTypesInstructionContainment.java | 18 +- .../definition/TestAllTypesObservation.java | 338 ++--- .../TestAllTypesObservationContainment.java | 44 +- .../definition/TestAllTypesSection.java | 48 +- .../TestAllTypesSectionContainment.java | 20 +- .../VirologischerBefundComposition.java | 264 ++-- ...logischerBefundCompositionContainment.java | 34 +- .../AnatomischeLokalisationCluster.java | 48 +- ...omischeLokalisationClusterContainment.java | 4 +- .../definition/BefundAnforderungElement.java | 18 + .../definition/BefundObservation.java | 318 ++--- .../BefundObservationContainment.java | 36 +- .../definition/EinsenderstandortCluster.java | 64 +- .../EinsenderstandortClusterContainment.java | 4 +- .../EmpfangerstandortAnforderungElement.java | 18 - .../definition/EmpfangerstandortCluster.java | 64 +- .../EmpfangerstandortClusterContainment.java | 4 +- .../definition/FallidentifikationCluster.java | 16 +- .../definition/KulturCluster.java | 16 +- .../definition/KulturClusterContainment.java | 16 +- .../definition/ProVirusCluster.java | 120 +- .../ProVirusClusterContainment.java | 14 +- .../definition/ProVirusNachweisChoice.java | 4 - .../ProVirusNachweisDvquantity.java | 31 - .../definition/ProVirusNachweisDvtext.java | 20 - .../definition/ProbeCluster.java | 312 ++-- .../definition/ProbeClusterContainment.java | 34 +- .../client/flattener/FlattenerTest.java | 48 +- .../client/flattener/RoundTripTest.java | 2 + .../client/flattener/UnflattenerTest.java | 25 - .../defaultrestclient/CoronaTestIT.java | 50 +- .../DefaultRestAqlEndpointTestIT.java | 16 +- .../DefaultRestCompositionEndpointIT.java | 24 +- generator/pom.xml | 2 +- .../client/classgenerator/ClassGenerator.java | 489 ------- .../classgenerator/ClassGeneratorConfig.java | 3 +- .../classgenerator/ClassGeneratorNew.java | 51 +- .../classgenerator/ClassGeneratorResult.java | 62 +- .../classgenerator/ClassGeneratorRunner.java | 85 ++ .../classgenerator/DefaultNamingStrategy.java | 2 +- .../client/classgenerator/FieldGenerator.java | 199 ++- .../classgenerator/RecordGenerator.java | 330 +++-- .../classgenerator/ClassGeneratorNewTest.java | 140 +- .../classgenerator/ClassGeneratorTest.java | 753 ---------- 521 files changed, 13870 insertions(+), 15556 deletions(-) delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosDetailsClusterSpezi_.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosRisikofaktorDvtextS_.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosVorhandenseinDvcode_.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosDetailsCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosRisikofaktorChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosRisikofaktorDvtext.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosVorhandenseinChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosVorhandenseinDvcodedtext.java rename client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/{BewertungDesGesundheitsrisikosDetailsChoice.java => ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java} (55%) create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisPointEvent.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitDvcodedtext.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitDvtext.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningcodeSpecificExposureEn.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationDiagnostischeSicherheitDvcodedtext.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationDiagnostischeSicherheitDvtext.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseDvcodedtext.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseDvtext.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseSchweregradDvcodedtext.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseSchweregradDvtext.java rename client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/{AtiopathogeneseChoice.java => AtiopathogeneseValueChoice.java} (65%) create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java rename client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/{AnatomischeLokalisationDiagnostischeSicherheitChoice.java => ProblemDiagnoseDiagnostischeSicherheitChoice.java} (54%) create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java rename client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/{AtiopathogeneseSchweregradChoice.java => ProblemDiagnoseSchweregradChoice.java} (62%) create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureChoice2.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvcodedtext2.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvtext2.java rename client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/{Definingcode5.java => AmberFlagAcuteDefiningCode.java} (76%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/{Definingcode7.java => BreathingIndicatorDefiningCode.java} (75%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/{ServicePlannedDefiningcode.java => CareflowStepDefiningCode.java} (65%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/{Definingcode6.java => CirculationIndicatorDefiningCode.java} (68%) delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposureDetailClusterCareHomeHasSuspectedConfirmedCovid19.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposureDetailClusterCareHomeHasSuspectedConfirmedCovid192.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposurePresenceDvcodedtextCareHomeHasSuspectedConfirmedC_.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposurePresenceDvcodedtextCareHomeHasSuspectedConfirmedC_2.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposureRiskFactorDvcodedtextCareHomeHasSuspectedConfirme_.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposureRiskFactorDvcodedtextCareHomeHasSuspectedConfirme_2.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureDetailChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureDetailCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposurePresenceChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposurePresenceDvcodedtext.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureRiskFactorChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureRiskFactorDvcodedtext.java rename client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/{ValueDefiningcode8.java => CurrentStateDefiningCode.java} (62%) delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Definingcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice5.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice6.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice7.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext2.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext3.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext4.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext5.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext6.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext7.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext2.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext3.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext4.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext5.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext6.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext7.java rename client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/{DenwisChoice3.java => DenwisValueChoice.java} (71%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/{DenwisChoice4.java => DenwisValueChoice2.java} (70%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/{DenwisChoice.java => DenwisValueChoice3.java} (70%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/{DenwisChoice2.java => DenwisValueChoice4.java} (70%) create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice5.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice6.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java rename client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/{Definingcode4.java => N999FlagDefiningCode.java} (76%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/{PresenceDefiningcodeCareHomeHasSuspectedConfirmedCovid19.java => PresenceDefiningCode2.java} (68%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/{Definingcode3.java => RedFlagAcuteDefiningCode.java} (65%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/{RiskFactorDefiningcodeContactWithConfirmedCase.java => RiskFactorDefiningCode2.java} (66%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/{RiskFactorDefiningcodeOtherResidentsHouseholdMembersUnwell.java => RiskFactorDefiningCode3.java} (63%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/{Definingcode2.java => RiskFactorsForSepsisDefiningCode.java} (55%) create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningA999FlagElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningDvcodedtext.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningDvtext.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceNameDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServicePlannedDefiningcode2.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SymptomSignNameDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SymptomSignNameDefiningcode2.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SymptomSignNameDefiningcode3.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SymptomSignNameDefiningcode4.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SymptomSignNameDefiningcode5.java rename client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/{Definingcode.java => ArtDerTypisierungDefiningCode.java} (77%) delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ContextEventsummaryBeteiligtePersonenCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ContextEventsummaryDvuri.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ContextEventsummaryIdDerPersonElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EigenschaftenDesBeteiligtenErregersErregertypisierungArtDerTypisierungElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EigenschaftenDesBeteiligtenErregersErregertypisierungErgebnisElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java rename client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/{ContextEventsummaryChoice.java => EventsummaryValueChoice.java} (66%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/{ContextEventsummaryDvidentifier.java => EventsummaryValueDvIdentifier.java} (53%) create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/KeimzahlDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatAnzahlDerErregernachweiseElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatKeimSubtypElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatResistenzmechanismusCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ActiveDefiningcode2.java rename client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/{ActiveDefiningcode.java => CareflowStepDefiningCode.java} (56%) delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CompletedDefiningcode2.java rename client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/{CompletedDefiningcode.java => CurrentStateDefiningCode.java} (56%) delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/PlannedDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/PlannedDefiningcode2.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortAnforderungElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusNachweisChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusNachweisDvquantity.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusNachweisDvtext.java delete mode 100644 generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java create mode 100644 generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorRunner.java delete mode 100644 generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java diff --git a/client/src/main/java/org/ehrbase/client/aql/query/Query.java b/client/src/main/java/org/ehrbase/client/aql/query/Query.java index 51b687be6..fd3d78c8c 100644 --- a/client/src/main/java/org/ehrbase/client/aql/query/Query.java +++ b/client/src/main/java/org/ehrbase/client/aql/query/Query.java @@ -3,7 +3,28 @@ import org.ehrbase.client.aql.containment.ContainmentExpression; import org.ehrbase.client.aql.field.AqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.aql.record.*; +import org.ehrbase.client.aql.record.Record; +import org.ehrbase.client.aql.record.Record1; +import org.ehrbase.client.aql.record.Record10; +import org.ehrbase.client.aql.record.Record11; +import org.ehrbase.client.aql.record.Record12; +import org.ehrbase.client.aql.record.Record13; +import org.ehrbase.client.aql.record.Record14; +import org.ehrbase.client.aql.record.Record15; +import org.ehrbase.client.aql.record.Record16; +import org.ehrbase.client.aql.record.Record17; +import org.ehrbase.client.aql.record.Record18; +import org.ehrbase.client.aql.record.Record19; +import org.ehrbase.client.aql.record.Record2; +import org.ehrbase.client.aql.record.Record20; +import org.ehrbase.client.aql.record.Record21; +import org.ehrbase.client.aql.record.Record3; +import org.ehrbase.client.aql.record.Record4; +import org.ehrbase.client.aql.record.Record5; +import org.ehrbase.client.aql.record.Record6; +import org.ehrbase.client.aql.record.Record7; +import org.ehrbase.client.aql.record.Record8; +import org.ehrbase.client.aql.record.Record9; import java.util.Arrays; diff --git a/client/src/main/java/org/ehrbase/client/openehrclient/TemplateEndpoint.java b/client/src/main/java/org/ehrbase/client/openehrclient/TemplateEndpoint.java index 10e17e9d7..7930019e0 100644 --- a/client/src/main/java/org/ehrbase/client/openehrclient/TemplateEndpoint.java +++ b/client/src/main/java/org/ehrbase/client/openehrclient/TemplateEndpoint.java @@ -22,7 +22,6 @@ import org.ehrbase.response.openehr.TemplatesResponseData; import org.openehr.schemas.v1.OPERATIONALTEMPLATE; -import java.util.List; import java.util.Optional; public interface TemplateEndpoint { diff --git a/client/src/main/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestDirectoryEndpoint.java b/client/src/main/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestDirectoryEndpoint.java index ab3d40d99..4495c26d4 100644 --- a/client/src/main/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestDirectoryEndpoint.java +++ b/client/src/main/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestDirectoryEndpoint.java @@ -32,7 +32,6 @@ import java.util.Optional; import java.util.UUID; -import static org.ehrbase.client.openehrclient.defaultrestclient.DefaultRestClient.*; import static org.ehrbase.client.openehrclient.defaultrestclient.DefaultRestEhrEndpoint.EHR_PATH; public class DefaultRestDirectoryEndpoint { diff --git a/client/src/main/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestTemplateEndpoint.java b/client/src/main/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestTemplateEndpoint.java index f9ab2ab93..c70745a56 100644 --- a/client/src/main/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestTemplateEndpoint.java +++ b/client/src/main/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestTemplateEndpoint.java @@ -40,7 +40,8 @@ import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import java.util.*; +import java.util.List; +import java.util.Optional; import static org.ehrbase.client.openehrclient.defaultrestclient.DefaultRestClient.OBJECT_MAPPER; diff --git a/client/src/test/java/org/ehrbase/client/TestData.java b/client/src/test/java/org/ehrbase/client/TestData.java index e188a4d2c..5438df56d 100644 --- a/client/src/test/java/org/ehrbase/client/TestData.java +++ b/client/src/test/java/org/ehrbase/client/TestData.java @@ -20,7 +20,6 @@ import com.nedap.archie.rm.archetyped.FeederAuditDetails; import com.nedap.archie.rm.datavalues.DvIdentifier; import com.nedap.archie.rm.datavalues.DvText; -import com.nedap.archie.rm.datavalues.quantity.DvInterval; import com.nedap.archie.rm.datavalues.quantity.datetime.DvDateTime; import com.nedap.archie.rm.generic.Participation; import com.nedap.archie.rm.generic.PartyIdentified; @@ -28,17 +27,17 @@ import org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.AlternativeEventsComposition; import org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.KorpergewichtAnyEventEnIntervalEvent; import org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.KorpergewichtAnyEventEnPointEvent; -import org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.KorpergewichtBirthEnEvent; +import org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.KorpergewichtBirthEnPointEvent; import org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.KorpergewichtObservation; import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.EhrbaseBloodPressureSimpleDeV0Composition; import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.BloodPressureTrainingSampleObservation; -import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.CuffSizeDefiningcode; -import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.KorotkoffSoundsDefiningcode; -import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.LocationOfMeasurementDefiningcode; +import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.CuffSizeDefiningCode; +import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.KorotkoffSoundsDefiningCode; +import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.LocationOfMeasurementDefiningCode; import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.EhrbaseMultiOccurrenceDeV1Composition; import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureAnyEventPointEvent; -import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementDvcodedtext; -import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementDvtext; +import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementDvCodedText; +import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementDvText; import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureObservation; import org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.EpisodeOfCareComposition; import org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition.EpisodeofcareAdminEntry; @@ -46,23 +45,23 @@ import org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition.EpisodeofcareTeamElement; import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.PatientenaufenthaltComposition; import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.StandortCluster; -import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.StandortschlusselDefiningcode; +import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.StandortschlusselDefiningCode; import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.VersorgungsortAdminEntry; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.MathFunctionDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.StationarerVersorgungsfallComposition; import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.AufnahmedatenAdminEntry; import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.EntlassungsdatenAdminEntry; -import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.KlinischerZustandDesPatientenDefiningcode; +import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.KlinischerZustandDesPatientenDefiningCode; import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.VirologischerBefundComposition; import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.BefundObservation; import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.FallidentifikationCluster; import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.KulturCluster; import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.ProVirusCluster; import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.ProbeCluster; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.flattener.BloodpressureListDe; import java.net.URI; @@ -101,8 +100,8 @@ public static EhrbaseBloodPressureSimpleDeV0Composition buildEhrbaseBloodPressur bloodPressureSimpleDeV0.setBloodPressureTrainingSample(new ArrayList<>()); bloodPressureSimpleDeV0.setLanguage(Language.DE); bloodPressureSimpleDeV0.setTerritory(Territory.DE); - bloodPressureSimpleDeV0.setCategoryDefiningcode(CategoryDefiningcode.EVENT); - bloodPressureSimpleDeV0.setSettingDefiningcode(SettingDefiningcode.NURSING_HOME_CARE); + bloodPressureSimpleDeV0.setCategoryDefiningCode (Category.EVENT); + bloodPressureSimpleDeV0.setSettingDefiningCode(Setting.NURSING_HOME_CARE); bloodPressureSimpleDeV0.setComposer(new PartyIdentified(null, "Test", null)); bloodPressureSimpleDeV0.setParticipations(new ArrayList<>()); bloodPressureSimpleDeV0.getParticipations().add(new Participation(new PartyIdentified(null, "Test", null), new DvText("Pos1"), null, null)); @@ -126,9 +125,9 @@ protected static BloodPressureTrainingSampleObservation buildBloodPressureTraini bloodPressureTrainingSample.setMeanArterialPressureUnits("mm[Hg]"); bloodPressureTrainingSample.setPulsePressureMagnitude(22d); bloodPressureTrainingSample.setPulsePressureUnits("mm[Hg]"); - bloodPressureTrainingSample.setKorotkoffSoundsDefiningcode(KorotkoffSoundsDefiningcode.FIFTH_SOUND); - bloodPressureTrainingSample.setCuffSizeDefiningcode(CuffSizeDefiningcode.ADULT); - bloodPressureTrainingSample.setLocationOfMeasurementDefiningcode(LocationOfMeasurementDefiningcode.FINGER); + bloodPressureTrainingSample.setKorotkoffSoundsDefiningCode(KorotkoffSoundsDefiningCode.FIFTH_SOUND); + bloodPressureTrainingSample.setCuffSizeDefiningCode(CuffSizeDefiningCode.ADULT); + bloodPressureTrainingSample.setLocationOfMeasurementDefiningCode(LocationOfMeasurementDefiningCode.FINGER); return bloodPressureTrainingSample; } @@ -139,8 +138,8 @@ public static EhrbaseMultiOccurrenceDeV1Composition buildEhrbaseMultiOccurrenceD dto.setEndTimeValue(OffsetDateTime.now()); dto.setLanguage(Language.DE); dto.setTerritory(Territory.DE); - dto.setSettingDefiningcode(SettingDefiningcode.DENTAL_CARE); - dto.setCategoryDefiningcode(CategoryDefiningcode.EVENT); + dto.setSettingDefiningCode(Setting.DENTAL_CARE); + dto.setCategoryDefiningCode(Category.EVENT); dto.setComposer(new PartyIdentified(null, "Test", null)); dto.setBodyTemperature(new ArrayList<>()); @@ -155,8 +154,8 @@ private static BodyTemperatureObservation buildBodyTemperature1() { bodyTemperature.setSubject(new PartySelf()); bodyTemperature.setOriginValue(OffsetDateTime.now()); bodyTemperature.setAnyEvent(new ArrayList<>()); - BodyTemperatureLocationOfMeasurementDvcodedtext locationOfMeasurement = new BodyTemperatureLocationOfMeasurementDvcodedtext(); - locationOfMeasurement.setLocationOfMeasurementDefiningcode(org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.LocationOfMeasurementDefiningcode.FOREHEAD); + BodyTemperatureLocationOfMeasurementDvCodedText locationOfMeasurement = new BodyTemperatureLocationOfMeasurementDvCodedText(); + locationOfMeasurement.setLocationOfMeasurementDefiningCode (org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.LocationOfMeasurementDefiningCode.FOREHEAD); bodyTemperature.setLocationOfMeasurement(locationOfMeasurement); BodyTemperatureAnyEventPointEvent history1 = new BodyTemperatureAnyEventPointEvent(); @@ -181,7 +180,7 @@ private static BodyTemperatureObservation buildBodyTemperature2() { bodyTemperature.setSubject(new PartySelf()); bodyTemperature.setOriginValue(OffsetDateTime.now()); bodyTemperature.setAnyEvent(new ArrayList<>()); - BodyTemperatureLocationOfMeasurementDvtext locationOfMeasurement = new BodyTemperatureLocationOfMeasurementDvtext(); + BodyTemperatureLocationOfMeasurementDvText locationOfMeasurement = new BodyTemperatureLocationOfMeasurementDvText(); locationOfMeasurement.setLocationOfMeasurementValue("location"); bodyTemperature.setLocationOfMeasurement(locationOfMeasurement); @@ -207,8 +206,8 @@ public static AlternativeEventsComposition buildAlternativeEventsComposition() { alternativeEventsComposition.setComposer(new PartyIdentified(null, "Test", null)); alternativeEventsComposition.setLanguage(Language.EN); alternativeEventsComposition.setTerritory(Territory.DE); - alternativeEventsComposition.setCategoryDefiningcode(CategoryDefiningcode.EVENT); - alternativeEventsComposition.setSettingDefiningcode(SettingDefiningcode.COMPLEMENTARY_HEALTH_CARE); + alternativeEventsComposition.setCategoryDefiningCode(Category.EVENT); + alternativeEventsComposition.setSettingDefiningCode(Setting.COMPLEMENTARY_HEALTH_CARE); alternativeEventsComposition.setKorpergewicht(new ArrayList<>()); KorpergewichtObservation korpergewichtObservation = new KorpergewichtObservation(); korpergewichtObservation.setLanguage(Language.EN); @@ -216,7 +215,8 @@ public static AlternativeEventsComposition buildAlternativeEventsComposition() { korpergewichtObservation.setOriginValue(OffsetDateTime.of(1990, 11, 02, 12, 00, 00, 00, ZoneOffset.UTC)); alternativeEventsComposition.getKorpergewicht().add(korpergewichtObservation); - KorpergewichtBirthEnEvent birthEnEvent = new KorpergewichtBirthEnEvent(); + + KorpergewichtBirthEnPointEvent birthEnEvent = new KorpergewichtBirthEnPointEvent(); birthEnEvent.setGewichtMagnitude(30d); birthEnEvent.setGewichtUnits("kg"); birthEnEvent.setTimeValue(OffsetDateTime.of(1990, 11, 02, 12, 00, 00, 00, ZoneOffset.UTC)); @@ -235,7 +235,7 @@ public static AlternativeEventsComposition buildAlternativeEventsComposition() { intervalEvent.setGewichtUnits("kg"); intervalEvent.setTimeValue(OffsetDateTime.of(2015, 11, 02, 12, 00, 00, 00, ZoneOffset.UTC)); intervalEvent.setWidthValue(Duration.ofDays(30)); - intervalEvent.setMathFunctionDefiningcode(MathFunctionDefiningcode.MEAN); + intervalEvent.setMathFunctionDefiningCode(MathFunction.MEAN); korpergewichtObservation.getAnyEventEn().add(intervalEvent); return alternativeEventsComposition; } @@ -243,12 +243,12 @@ public static AlternativeEventsComposition buildAlternativeEventsComposition() { public static EpisodeOfCareComposition buildEpisodeOfCareComposition() { EpisodeOfCareComposition episode = new EpisodeOfCareComposition(); episode.setComposer(new PartyIdentified(null, "Test", null)); - episode.setCategoryDefiningcode(CategoryDefiningcode.EVENT); + episode.setCategoryDefiningCode(Category.EVENT); episode.setLanguage(Language.DE); episode.setTerritory(Territory.DE); episode.setEpisodeofcare(new ArrayList<>()); episode.setStartTimeValue(OffsetDateTime.now()); - episode.setSettingDefiningcode(SettingDefiningcode.NURSING_HOME_CARE); + episode.setSettingDefiningCode(Setting.NURSING_HOME_CARE); FeederAudit audit = new FeederAudit(); audit.setFeederSystemAudit(new FeederAuditDetails()); @@ -259,10 +259,9 @@ public static EpisodeOfCareComposition buildEpisodeOfCareComposition() { EpisodeofcareAdminEntry episodeofcareAdminEntry = new EpisodeofcareAdminEntry(); - DvInterval periode = new DvInterval<>(); - periode.setLower(new DvDateTime(OffsetDateTime.now())); - periode.setUpper(new DvDateTime(OffsetDateTime.now())); - episodeofcareAdminEntry.setPeriod(periode); + + episodeofcareAdminEntry.setUpperValue(OffsetDateTime.now()); + episodeofcareAdminEntry.setLowerValue (OffsetDateTime.now()); episodeofcareAdminEntry.setLanguage(Language.DE); episodeofcareAdminEntry.setSubject(new PartySelf()); episodeofcareAdminEntry.setIdentifier(new ArrayList<>()); @@ -292,17 +291,17 @@ public static PatientenaufenthaltComposition buildTestPatientenaufenthaltComposi PatientenaufenthaltComposition patientenaufenthaltComposition = new PatientenaufenthaltComposition(); patientenaufenthaltComposition.setComposer(new PartyIdentified(null, "Test", null)); - patientenaufenthaltComposition.setCategoryDefiningcode(CategoryDefiningcode.EVENT); + patientenaufenthaltComposition.setCategoryDefiningCode (Category.EVENT); patientenaufenthaltComposition.setLanguage(Language.DE); patientenaufenthaltComposition.setTerritory(Territory.DE); patientenaufenthaltComposition.setStartTimeValue(OffsetDateTime.now()); - patientenaufenthaltComposition.setSettingDefiningcode(SettingDefiningcode.NURSING_HOME_CARE); + patientenaufenthaltComposition.setSettingDefiningCode(Setting.NURSING_HOME_CARE); VersorgungsortAdminEntry versorgungsortAdminEntry = new VersorgungsortAdminEntry(); StandortCluster standortCluster = new StandortCluster(); standortCluster.setStandorttypValue("Test"); standortCluster.setStandortbeschreibungValue("Beschreibung"); - standortCluster.setStandortschlusselDefiningcode(StandortschlusselDefiningcode.ANGIOLOGIE); + standortCluster.setStandortschlusselDefiningCode(StandortschlusselDefiningCode.ANGIOLOGIE.ANGIOLOGIE); standortCluster.setBettplatzkennungValue("Platz 2"); versorgungsortAdminEntry.setStandort(standortCluster); @@ -317,17 +316,19 @@ public static PatientenaufenthaltComposition buildTestPatientenaufenthaltComposi return patientenaufenthaltComposition; } + + public static VirologischerBefundComposition buildTestVirologischerBefundComposition() { //openEHR-EHR-COMPOSITION.report-result.v1 VirologischerBefundComposition virologischerBefundComposition = new VirologischerBefundComposition(); virologischerBefundComposition.setComposer(new PartyIdentified(null, "Test", null)); - virologischerBefundComposition.setCategoryDefiningcode(CategoryDefiningcode.EVENT); + virologischerBefundComposition.setCategoryDefiningCode(Category.EVENT); virologischerBefundComposition.setLanguage(Language.DE); virologischerBefundComposition.setTerritory(Territory.DE); virologischerBefundComposition.setStartTimeValue(OffsetDateTime.now()); - virologischerBefundComposition.setSettingDefiningcode(SettingDefiningcode.SECONDARY_MEDICAL_CARE); + virologischerBefundComposition.setSettingDefiningCode(Setting.SECONDARY_MEDICAL_CARE); //context, other_context FallidentifikationCluster fallidentifikationCluster = new FallidentifikationCluster(); @@ -384,13 +385,13 @@ public static StationarerVersorgungsfallComposition buildTestStationarerVersorgu StationarerVersorgungsfallComposition stationarerVersorgungsfallComposition = new StationarerVersorgungsfallComposition(); stationarerVersorgungsfallComposition.setComposer(new PartyIdentified(null, "Test", null)); - stationarerVersorgungsfallComposition.setCategoryDefiningcode(CategoryDefiningcode.EVENT); + stationarerVersorgungsfallComposition.setCategoryDefiningCode(Category.EVENT); stationarerVersorgungsfallComposition.setLanguage(Language.DE); stationarerVersorgungsfallComposition.setTerritory(Territory.DE); //context stationarerVersorgungsfallComposition.setStartTimeValue(new DvDateTime("2020-04-02T12:00:00Z").getValue()); - stationarerVersorgungsfallComposition.setSettingDefiningcode(SettingDefiningcode.NURSING_HOME_CARE); + stationarerVersorgungsfallComposition.setSettingDefiningCode(Setting.NURSING_HOME_CARE); //other_context stationarerVersorgungsfallComposition.setFallKennungValue("45657678"); @@ -404,7 +405,7 @@ public static StationarerVersorgungsfallComposition buildTestStationarerVersorgu EntlassungsdatenAdminEntry entlassungsdatenAdminEntry = new EntlassungsdatenAdminEntry(); entlassungsdatenAdminEntry.setLanguage(Language.DE); entlassungsdatenAdminEntry.setSubject(new PartySelf()); - entlassungsdatenAdminEntry.setKlinischerZustandDesPatientenDefiningcode(KlinischerZustandDesPatientenDefiningcode.UNBESTIMMT); + entlassungsdatenAdminEntry.setKlinischerZustandDesPatientenDefiningCode(KlinischerZustandDesPatientenDefiningCode.UNBESTIMMT); entlassungsdatenAdminEntry.setDatumUhrzeitDerEntlassungValue(new DvDateTime("2020-04-02T12:00:00Z").getValue()); //assemble @@ -413,4 +414,6 @@ public static StationarerVersorgungsfallComposition buildTestStationarerVersorgu return stationarerVersorgungsfallComposition; } + + } diff --git a/client/src/test/java/org/ehrbase/client/aql/containment/ContainmentTest.java b/client/src/test/java/org/ehrbase/client/aql/containment/ContainmentTest.java index 81b96596c..b619a94a4 100644 --- a/client/src/test/java/org/ehrbase/client/aql/containment/ContainmentTest.java +++ b/client/src/test/java/org/ehrbase/client/aql/containment/ContainmentTest.java @@ -29,7 +29,9 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; public class ContainmentTest { diff --git a/client/src/test/java/org/ehrbase/client/aql/query/EntityQueryTest.java b/client/src/test/java/org/ehrbase/client/aql/query/EntityQueryTest.java index 19c87db8d..833346151 100644 --- a/client/src/test/java/org/ehrbase/client/aql/query/EntityQueryTest.java +++ b/client/src/test/java/org/ehrbase/client/aql/query/EntityQueryTest.java @@ -31,7 +31,7 @@ import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.EhrbaseBloodPressureSimpleDeV0CompositionContainment; import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.BloodPressureTrainingSampleObservation; import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.BloodPressureTrainingSampleObservationContainment; -import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.CuffSizeDefiningcode; +import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.CuffSizeDefiningCode; import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.BefundObservationContainment; import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.ProVirusClusterContainment; import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.ProbeClusterContainment; @@ -54,18 +54,18 @@ public void buildAql() { ContainmentPath contains = containmentComposition.contains(containmentObservation); - EntityQuery> entityQuery = Query.buildEntityQuery( + EntityQuery> entityQuery = Query.buildEntityQuery( contains, containmentComposition.START_TIME_VALUE, containmentObservation.BLOOD_PRESSURE_TRAINING_SAMPLE_OBSERVATION, - containmentObservation.CUFF_SIZE_DEFININGCODE + containmentObservation.CUFF_SIZE_DEFINING_CODE ); Parameter ehrIdParameter = entityQuery.buildParameter(); entityQuery .where(Condition.equal(EhrFields.EHR_ID(), ehrIdParameter).and(Condition.greaterOrEqual(containmentObservation.SYSTOLIC_MAGNITUDE, 22d))) .orderBy(OrderByExpression.ascending(containmentComposition.START_TIME_VALUE).andThenDescending(containmentObservation.TIME_VALUE)); - assertThat(entityQuery.buildAql()).isEqualTo("Select c0/context/start_time/value as startTimeValue, o1 as BloodPressureTrainingSampleObservation, o1/protocol[at0011]/items[at0013]/value/defining_code as cuffSizeDefiningcode " + + assertThat(entityQuery.buildAql()).isEqualTo("Select c0/context/start_time/value as startTimeValue, o1 as BloodPressureTrainingSampleObservation, o1/protocol[at0011]/items[at0013]/value/defining_code as cuffSizeDefiningCode " + "from EHR e " + "contains COMPOSITION c0[openEHR-EHR-COMPOSITION.sample_encounter.v1] contains OBSERVATION o1[openEHR-EHR-OBSERVATION.sample_blood_pressure.v1] " + "where (e/ehr_id/value = $parm0 and o1/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value/magnitude >= 22.0) " + diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java index 9cc8fa5d9..cd7e24b08 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java @@ -11,10 +11,10 @@ import org.ehrbase.client.annotations.Path; import org.ehrbase.client.annotations.Template; import org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.KorpergewichtObservation; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; import java.time.temporal.TemporalAccessor; @@ -24,179 +24,179 @@ @Archetype("openEHR-EHR-COMPOSITION.report.v1") @Template("AlternativeEvents") public class AlternativeEventsComposition { - @Id - private VersionUid versionUid; + @Path("/context/other_context[at0001]/items[at0002]/value|value") + private String berichtIdValue; - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; + @Path("/context/other_context[at0001]/items[at0005]/value|value") + private String statusValue; - @Path("/context/participations") - private List participations; + @Path("/context/other_context[at0001]/items[at0006]") + private List erweiterung; - @Path("/language") - private Language language; + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; + @Path("/context/participations") + private List participations; - @Path("/context/other_context[at0001]/items[at0005]/value|value") - private String statusValue; + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; - @Path("/context/other_context[at0001]/items[at0002]/value|value") - private String berichtIdValue; + @Path("/context/location") + private String location; - @Path("/territory") - private Territory territory; + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; - @Path("/composer") - private PartyProxy composer; + @Path("/content[openEHR-EHR-OBSERVATION.body_weight.v2]") + private List korpergewicht; - @Path("/context/setting|defining_code") - private SettingDefiningcode settingDefiningcode; + @Path("/composer") + private PartyProxy composer; - @Path("/content[openEHR-EHR-OBSERVATION.body_weight.v2]") - private List korpergewicht; + @Path("/language") + private Language language; - @Path("/feeder_audit") - private FeederAudit feederAudit; + @Path("/feeder_audit") + private FeederAudit feederAudit; - @Path("/context/other_context[at0001]/items[at0006]") - private List erweiterung; + @Path("/category|defining_code") + private Category categoryDefiningCode; - @Path("/context/location") - private String location; + @Path("/territory") + private Territory territory; - @Path("/category|defining_code") - private CategoryDefiningcode categoryDefiningcode; + @Id + private VersionUid versionUid; - public VersionUid getVersionUid() { - return this.versionUid; - } + public void setBerichtIdValue(String berichtIdValue) { + this.berichtIdValue = berichtIdValue; + } - public void setVersionUid(VersionUid versionUid) { - this.versionUid = versionUid; - } + public String getBerichtIdValue() { + return this.berichtIdValue ; + } - public void setEndTimeValue(TemporalAccessor endTimeValue) { - this.endTimeValue = endTimeValue; - } + public void setStatusValue(String statusValue) { + this.statusValue = statusValue; + } - public TemporalAccessor getEndTimeValue() { - return this.endTimeValue; - } + public String getStatusValue() { + return this.statusValue ; + } - public void setParticipations(List participations) { - this.participations = participations; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public List getParticipations() { - return this.participations; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setStartTimeValue(TemporalAccessor startTimeValue) { + this.startTimeValue = startTimeValue; + } - public Language getLanguage() { - return this.language; - } + public TemporalAccessor getStartTimeValue() { + return this.startTimeValue ; + } - public void setHealthCareFacility(PartyIdentified healthCareFacility) { - this.healthCareFacility = healthCareFacility; - } + public void setParticipations(List participations) { + this.participations = participations; + } - public PartyIdentified getHealthCareFacility() { - return this.healthCareFacility; - } + public List getParticipations() { + return this.participations ; + } - public void setStatusValue(String statusValue) { - this.statusValue = statusValue; - } + public void setEndTimeValue(TemporalAccessor endTimeValue) { + this.endTimeValue = endTimeValue; + } - public String getStatusValue() { - return this.statusValue; - } + public TemporalAccessor getEndTimeValue() { + return this.endTimeValue ; + } - public void setBerichtIdValue(String berichtIdValue) { - this.berichtIdValue = berichtIdValue; - } + public void setLocation(String location) { + this.location = location; + } - public String getBerichtIdValue() { - return this.berichtIdValue; - } + public String getLocation() { + return this.location ; + } - public void setTerritory(Territory territory) { - this.territory = territory; - } + public void setHealthCareFacility(PartyIdentified healthCareFacility) { + this.healthCareFacility = healthCareFacility; + } - public Territory getTerritory() { - return this.territory; - } + public PartyIdentified getHealthCareFacility() { + return this.healthCareFacility ; + } - public void setStartTimeValue(TemporalAccessor startTimeValue) { - this.startTimeValue = startTimeValue; - } + public void setSettingDefiningCode(Setting settingDefiningCode) { + this.settingDefiningCode = settingDefiningCode; + } - public TemporalAccessor getStartTimeValue() { - return this.startTimeValue; - } + public Setting getSettingDefiningCode() { + return this.settingDefiningCode ; + } - public void setComposer(PartyProxy composer) { - this.composer = composer; - } + public void setKorpergewicht(List korpergewicht) { + this.korpergewicht = korpergewicht; + } - public PartyProxy getComposer() { - return this.composer; - } + public List getKorpergewicht() { + return this.korpergewicht ; + } - public void setSettingDefiningcode(SettingDefiningcode settingDefiningcode) { - this.settingDefiningcode = settingDefiningcode; - } + public void setComposer(PartyProxy composer) { + this.composer = composer; + } - public SettingDefiningcode getSettingDefiningcode() { - return this.settingDefiningcode; - } + public PartyProxy getComposer() { + return this.composer ; + } - public void setKorpergewicht(List korpergewicht) { - this.korpergewicht = korpergewicht; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getKorpergewicht() { - return this.korpergewicht; - } + public Language getLanguage() { + return this.language ; + } - public void setFeederAudit(FeederAudit feederAudit) { - this.feederAudit = feederAudit; - } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } - public FeederAudit getFeederAudit() { - return this.feederAudit; - } + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } - public List getErweiterung() { - return this.erweiterung; - } + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } - public void setLocation(String location) { - this.location = location; - } + public void setTerritory(Territory territory) { + this.territory = territory; + } - public String getLocation() { - return this.location; - } + public Territory getTerritory() { + return this.territory ; + } - public void setCategoryDefiningcode(CategoryDefiningcode categoryDefiningcode) { - this.categoryDefiningcode = categoryDefiningcode; - } + public VersionUid getVersionUid() { + return this.versionUid ; + } - public CategoryDefiningcode getCategoryDefiningcode() { - return this.categoryDefiningcode; - } + public void setVersionUid(VersionUid versionUid) { + this.versionUid = versionUid; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsCompositionContainment.java index 9e614ca7d..ac10ccf32 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsCompositionContainment.java @@ -11,45 +11,45 @@ import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.KorpergewichtObservation; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import java.time.temporal.TemporalAccessor; public class AlternativeEventsCompositionContainment extends Containment { public SelectAqlField ALTERNATIVE_EVENTS_COMPOSITION = new AqlFieldImp(AlternativeEventsComposition.class, "", "AlternativeEventsComposition", AlternativeEventsComposition.class, this); - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(AlternativeEventsComposition.class, "/context/participations", "participations", Participation.class, this); + public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(AlternativeEventsComposition.class, "/language", "language", Language.class, this); + public SelectAqlField STATUS_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "statusValue", String.class, this); - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(AlternativeEventsComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(AlternativeEventsComposition.class, "/context/other_context[at0001]/items[at0006]", "erweiterung", Cluster.class, this); - public SelectAqlField STATUS_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "statusValue", String.class, this); + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(AlternativeEventsComposition.class, "/context/participations", "participations", Participation.class, this); - public SelectAqlField TERRITORY = new AqlFieldImp(AlternativeEventsComposition.class, "/territory", "territory", Territory.class, this); + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + public SelectAqlField LOCATION = new AqlFieldImp(AlternativeEventsComposition.class, "/context/location", "location", String.class, this); - public SelectAqlField COMPOSER = new AqlFieldImp(AlternativeEventsComposition.class, "/composer", "composer", PartyProxy.class, this); + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(AlternativeEventsComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - public SelectAqlField SETTING_DEFININGCODE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/setting|defining_code", "settingDefiningcode", SettingDefiningcode.class, this); + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); public ListSelectAqlField KORPERGEWICHT = new ListAqlFieldImp(AlternativeEventsComposition.class, "/content[openEHR-EHR-OBSERVATION.body_weight.v2]", "korpergewicht", KorpergewichtObservation.class, this); - public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AlternativeEventsComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public SelectAqlField COMPOSER = new AqlFieldImp(AlternativeEventsComposition.class, "/composer", "composer", PartyProxy.class, this); - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(AlternativeEventsComposition.class, "/context/other_context[at0001]/items[at0006]", "erweiterung", Cluster.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(AlternativeEventsComposition.class, "/language", "language", Language.class, this); - public SelectAqlField LOCATION = new AqlFieldImp(AlternativeEventsComposition.class, "/context/location", "location", String.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AlternativeEventsComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(AlternativeEventsComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - public SelectAqlField CATEGORY_DEFININGCODE = new AqlFieldImp(AlternativeEventsComposition.class, "/category|defining_code", "categoryDefiningcode", CategoryDefiningcode.class, this); + public SelectAqlField TERRITORY = new AqlFieldImp(AlternativeEventsComposition.class, "/territory", "territory", Territory.class, this); private AlternativeEventsCompositionContainment() { super("openEHR-EHR-COMPOSITION.report.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java index f32568261..c7d143161 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java @@ -3,7 +3,7 @@ import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.MathFunctionDefiningcode; +import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; @@ -12,92 +12,92 @@ @Entity @OptionFor("INTERVAL_EVENT") public class KorpergewichtAnyEventEnIntervalEvent implements KorpergewichtAnyEventEnChoice { - @Path("/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/items[at0004]/value|magnitude") + private Double gewichtMagnitude; - @Path("/data[at0001]/items[at0004]/value|magnitude") - private Double gewichtMagnitude; + @Path("/data[at0001]/items[at0004]/value|units") + private String gewichtUnits; - @Path("/data[at0001]/items[at0004]/value|units") - private String gewichtUnits; + @Path("/data[at0001]/items[at0024]/value|value") + private String commentEnValue; - @Path("/state[at0008]/items[at0025]") - private List confoundingFactorsEn; + @Path("/state[at0008]/items[at0009]/value|defining_code") + private StateOfDressEnDefiningCode stateOfDressEnDefiningCode; - @Path("/width|value") - private TemporalAmount widthValue; + @Path("/state[at0008]/items[at0025]") + private List confoundingFactorsEn; - @Path("/data[at0001]/items[at0024]/value|value") - private String commentEnValue; + @Path("/time|value") + private TemporalAccessor timeValue; - @Path("/state[at0008]/items[at0009]/value|defining_code") - private StateOfDressEnDefiningcode stateOfDressEnDefiningcode; + @Path("/width|value") + private TemporalAmount widthValue; - @Path("/math_function|defining_code") - private MathFunctionDefiningcode mathFunctionDefiningcode; + @Path("/math_function|defining_code") + private MathFunction mathFunctionDefiningCode; - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setGewichtMagnitude(Double gewichtMagnitude) { + this.gewichtMagnitude = gewichtMagnitude; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public Double getGewichtMagnitude() { + return this.gewichtMagnitude ; + } - public void setGewichtMagnitude(Double gewichtMagnitude) { - this.gewichtMagnitude = gewichtMagnitude; - } + public void setGewichtUnits(String gewichtUnits) { + this.gewichtUnits = gewichtUnits; + } - public Double getGewichtMagnitude() { - return this.gewichtMagnitude; - } + public String getGewichtUnits() { + return this.gewichtUnits ; + } - public void setGewichtUnits(String gewichtUnits) { - this.gewichtUnits = gewichtUnits; - } + public void setCommentEnValue(String commentEnValue) { + this.commentEnValue = commentEnValue; + } - public String getGewichtUnits() { - return this.gewichtUnits; - } + public String getCommentEnValue() { + return this.commentEnValue ; + } - public void setConfoundingFactorsEn( - List confoundingFactorsEn) { - this.confoundingFactorsEn = confoundingFactorsEn; - } + public void setStateOfDressEnDefiningCode(StateOfDressEnDefiningCode stateOfDressEnDefiningCode) { + this.stateOfDressEnDefiningCode = stateOfDressEnDefiningCode; + } - public List getConfoundingFactorsEn() { - return this.confoundingFactorsEn; - } + public StateOfDressEnDefiningCode getStateOfDressEnDefiningCode() { + return this.stateOfDressEnDefiningCode ; + } - public void setWidthValue(TemporalAmount widthValue) { - this.widthValue = widthValue; - } + public void setConfoundingFactorsEn( + List confoundingFactorsEn) { + this.confoundingFactorsEn = confoundingFactorsEn; + } - public TemporalAmount getWidthValue() { - return this.widthValue; - } + public List getConfoundingFactorsEn() { + return this.confoundingFactorsEn ; + } - public void setCommentEnValue(String commentEnValue) { - this.commentEnValue = commentEnValue; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public String getCommentEnValue() { - return this.commentEnValue; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setStateOfDressEnDefiningcode(StateOfDressEnDefiningcode stateOfDressEnDefiningcode) { - this.stateOfDressEnDefiningcode = stateOfDressEnDefiningcode; - } + public void setWidthValue(TemporalAmount widthValue) { + this.widthValue = widthValue; + } - public StateOfDressEnDefiningcode getStateOfDressEnDefiningcode() { - return this.stateOfDressEnDefiningcode; - } + public TemporalAmount getWidthValue() { + return this.widthValue ; + } - public void setMathFunctionDefiningcode(MathFunctionDefiningcode mathFunctionDefiningcode) { - this.mathFunctionDefiningcode = mathFunctionDefiningcode; - } + public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { + this.mathFunctionDefiningCode = mathFunctionDefiningCode; + } - public MathFunctionDefiningcode getMathFunctionDefiningcode() { - return this.mathFunctionDefiningcode; - } + public MathFunction getMathFunctionDefiningCode() { + return this.mathFunctionDefiningCode ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java index 51ba712ef..9ed9cf5c1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java @@ -10,70 +10,70 @@ @Entity @OptionFor("POINT_EVENT") public class KorpergewichtAnyEventEnPointEvent implements KorpergewichtAnyEventEnChoice { - @Path("/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/items[at0004]/value|magnitude") + private Double gewichtMagnitude; - @Path("/data[at0001]/items[at0004]/value|magnitude") - private Double gewichtMagnitude; + @Path("/data[at0001]/items[at0004]/value|units") + private String gewichtUnits; - @Path("/data[at0001]/items[at0004]/value|units") - private String gewichtUnits; + @Path("/data[at0001]/items[at0024]/value|value") + private String commentEnValue; - @Path("/state[at0008]/items[at0025]") - private List confoundingFactorsEn; + @Path("/state[at0008]/items[at0009]/value|defining_code") + private StateOfDressEnDefiningCode stateOfDressEnDefiningCode; - @Path("/data[at0001]/items[at0024]/value|value") - private String commentEnValue; + @Path("/state[at0008]/items[at0025]") + private List confoundingFactorsEn; - @Path("/state[at0008]/items[at0009]/value|defining_code") - private StateOfDressEnDefiningcode stateOfDressEnDefiningcode; + @Path("/time|value") + private TemporalAccessor timeValue; - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setGewichtMagnitude(Double gewichtMagnitude) { + this.gewichtMagnitude = gewichtMagnitude; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public Double getGewichtMagnitude() { + return this.gewichtMagnitude ; + } - public void setGewichtMagnitude(Double gewichtMagnitude) { - this.gewichtMagnitude = gewichtMagnitude; - } + public void setGewichtUnits(String gewichtUnits) { + this.gewichtUnits = gewichtUnits; + } - public Double getGewichtMagnitude() { - return this.gewichtMagnitude; - } + public String getGewichtUnits() { + return this.gewichtUnits ; + } - public void setGewichtUnits(String gewichtUnits) { - this.gewichtUnits = gewichtUnits; - } + public void setCommentEnValue(String commentEnValue) { + this.commentEnValue = commentEnValue; + } - public String getGewichtUnits() { - return this.gewichtUnits; - } + public String getCommentEnValue() { + return this.commentEnValue ; + } - public void setConfoundingFactorsEn( - List confoundingFactorsEn) { - this.confoundingFactorsEn = confoundingFactorsEn; - } + public void setStateOfDressEnDefiningCode(StateOfDressEnDefiningCode stateOfDressEnDefiningCode) { + this.stateOfDressEnDefiningCode = stateOfDressEnDefiningCode; + } - public List getConfoundingFactorsEn() { - return this.confoundingFactorsEn; - } + public StateOfDressEnDefiningCode getStateOfDressEnDefiningCode() { + return this.stateOfDressEnDefiningCode ; + } - public void setCommentEnValue(String commentEnValue) { - this.commentEnValue = commentEnValue; - } + public void setConfoundingFactorsEn( + List confoundingFactorsEn) { + this.confoundingFactorsEn = confoundingFactorsEn; + } - public String getCommentEnValue() { - return this.commentEnValue; - } + public List getConfoundingFactorsEn() { + return this.confoundingFactorsEn ; + } - public void setStateOfDressEnDefiningcode(StateOfDressEnDefiningcode stateOfDressEnDefiningcode) { - this.stateOfDressEnDefiningcode = stateOfDressEnDefiningcode; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public StateOfDressEnDefiningcode getStateOfDressEnDefiningcode() { - return this.stateOfDressEnDefiningcode; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnEvent.java deleted file mode 100644 index 3c993f464..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnEvent.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -import java.time.temporal.TemporalAccessor; -import java.util.List; - -@Entity -public class KorpergewichtBirthEnEvent { - @Path("/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/items[at0004]/value|magnitude") - private Double gewichtMagnitude; - - @Path("/data[at0001]/items[at0004]/value|units") - private String gewichtUnits; - - @Path("/state[at0008]/items[at0025]") - private List confoundingFactorsEn; - - @Path("/data[at0001]/items[at0024]/value|value") - private String commentEnValue; - - @Path("/state[at0008]/items[at0009]/value|defining_code") - private StateOfDressEnDefiningcode stateOfDressEnDefiningcode; - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue; - } - - public void setGewichtMagnitude(Double gewichtMagnitude) { - this.gewichtMagnitude = gewichtMagnitude; - } - - public Double getGewichtMagnitude() { - return this.gewichtMagnitude; - } - - public void setGewichtUnits(String gewichtUnits) { - this.gewichtUnits = gewichtUnits; - } - - public String getGewichtUnits() { - return this.gewichtUnits; - } - - public void setConfoundingFactorsEn( - List confoundingFactorsEn) { - this.confoundingFactorsEn = confoundingFactorsEn; - } - - public List getConfoundingFactorsEn() { - return this.confoundingFactorsEn; - } - - public void setCommentEnValue(String commentEnValue) { - this.commentEnValue = commentEnValue; - } - - public String getCommentEnValue() { - return this.commentEnValue; - } - - public void setStateOfDressEnDefiningcode(StateOfDressEnDefiningcode stateOfDressEnDefiningcode) { - this.stateOfDressEnDefiningcode = stateOfDressEnDefiningcode; - } - - public StateOfDressEnDefiningcode getStateOfDressEnDefiningcode() { - return this.stateOfDressEnDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java new file mode 100644 index 000000000..aedc57ed4 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java @@ -0,0 +1,77 @@ +package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +@Entity +public class KorpergewichtBirthEnPointEvent { + @Path("/data[at0001]/items[at0004]/value|magnitude") + private Double gewichtMagnitude; + + @Path("/data[at0001]/items[at0004]/value|units") + private String gewichtUnits; + + @Path("/data[at0001]/items[at0024]/value|value") + private String commentEnValue; + + @Path("/state[at0008]/items[at0009]/value|defining_code") + private StateOfDressEnDefiningCode stateOfDressEnDefiningCode; + + @Path("/state[at0008]/items[at0025]") + private List confoundingFactorsEn; + + @Path("/time|value") + private TemporalAccessor timeValue; + + public void setGewichtMagnitude(Double gewichtMagnitude) { + this.gewichtMagnitude = gewichtMagnitude; + } + + public Double getGewichtMagnitude() { + return this.gewichtMagnitude ; + } + + public void setGewichtUnits(String gewichtUnits) { + this.gewichtUnits = gewichtUnits; + } + + public String getGewichtUnits() { + return this.gewichtUnits ; + } + + public void setCommentEnValue(String commentEnValue) { + this.commentEnValue = commentEnValue; + } + + public String getCommentEnValue() { + return this.commentEnValue ; + } + + public void setStateOfDressEnDefiningCode(StateOfDressEnDefiningCode stateOfDressEnDefiningCode) { + this.stateOfDressEnDefiningCode = stateOfDressEnDefiningCode; + } + + public StateOfDressEnDefiningCode getStateOfDressEnDefiningCode() { + return this.stateOfDressEnDefiningCode ; + } + + public void setConfoundingFactorsEn( + List confoundingFactorsEn) { + this.confoundingFactorsEn = confoundingFactorsEn; + } + + public List getConfoundingFactorsEn() { + return this.confoundingFactorsEn ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java index 353e377a6..2244262fe 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java @@ -5,14 +5,14 @@ @Entity public class KorpergewichtConfoundingFactorsEnElement { - @Path("/value|value") - private String value; + @Path("/value|value") + private String value; - public void setValue(String value) { - this.value = value; - } + public void setValue(String value) { + this.value = value; + } - public String getValue() { - return this.value; - } + public String getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java index 7f6ca4bfd..6c3bb09cb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java @@ -6,7 +6,7 @@ import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -14,81 +14,81 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.body_weight.v2") public class KorpergewichtObservation { - @Path("/data[at0002]/events[at0026]") - private KorpergewichtBirthEnEvent birthEn; + @Path("/data[at0002]/events[at0026]") + private KorpergewichtBirthEnPointEvent birthEn; - @Path("/data[at0002]/events[at0003]") - @Choice - private List anyEventEn; + @Path("/data[at0002]/origin|value") + private TemporalAccessor originValue; - @Path("/protocol[at0015]/items[at0027]") - private List extensionEn; + @Path("/protocol[at0015]/items[at0020]") + private Cluster gerat; - @Path("/language") - private Language language; + @Path("/protocol[at0015]/items[at0027]") + private List extensionEn; - @Path("/data[at0002]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - @Path("/protocol[at0015]/items[at0020]") - private Cluster gerat; + @Path("/language") + private Language language; - @Path("/subject") - private PartyProxy subject; + @Path("/data[at0002]/events[at0003]") + @Choice + private List anyEventEn; - public void setBirthEn(KorpergewichtBirthEnEvent birthEn) { - this.birthEn = birthEn; - } + public void setBirthEn(KorpergewichtBirthEnPointEvent birthEn) { + this.birthEn = birthEn; + } - public KorpergewichtBirthEnEvent getBirthEn() { - return this.birthEn; - } + public KorpergewichtBirthEnPointEvent getBirthEn() { + return this.birthEn ; + } - public void setAnyEventEn(List anyEventEn) { - this.anyEventEn = anyEventEn; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public List getAnyEventEn() { - return this.anyEventEn; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setExtensionEn(List extensionEn) { - this.extensionEn = extensionEn; - } + public void setGerat(Cluster gerat) { + this.gerat = gerat; + } - public List getExtensionEn() { - return this.extensionEn; - } + public Cluster getGerat() { + return this.gerat ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setExtensionEn(List extensionEn) { + this.extensionEn = extensionEn; + } - public Language getLanguage() { - return this.language; - } + public List getExtensionEn() { + return this.extensionEn ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setGerat(Cluster gerat) { - this.gerat = gerat; - } + public void setLanguage(Language language) { + this.language = language; + } - public Cluster getGerat() { - return this.gerat; - } + public Language getLanguage() { + return this.language ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setAnyEventEn(List anyEventEn) { + this.anyEventEn = anyEventEn; + } - public PartyProxy getSubject() { - return this.subject; - } + public List getAnyEventEn() { + return this.anyEventEn ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java index cb54e6c03..b8f12c63b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java @@ -7,27 +7,27 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class KorpergewichtObservationContainment extends Containment { public SelectAqlField KORPERGEWICHT_OBSERVATION = new AqlFieldImp(KorpergewichtObservation.class, "", "KorpergewichtObservation", KorpergewichtObservation.class, this); - public SelectAqlField BIRTH_EN = new AqlFieldImp(KorpergewichtObservation.class, "/data[at0002]/events[at0026]", "birthEn", KorpergewichtBirthEnEvent.class, this); - - public ListSelectAqlField ANY_EVENT_EN = new ListAqlFieldImp(KorpergewichtObservation.class, "/data[at0002]/events[at0003]", "anyEventEn", KorpergewichtAnyEventEnChoice.class, this); - - public ListSelectAqlField EXTENSION_EN = new ListAqlFieldImp(KorpergewichtObservation.class, "/protocol[at0015]/items[at0027]", "extensionEn", Cluster.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(KorpergewichtObservation.class, "/language", "language", Language.class, this); + public SelectAqlField BIRTH_EN = new AqlFieldImp(KorpergewichtObservation.class, "/data[at0002]/events[at0026]", "birthEn", KorpergewichtBirthEnPointEvent.class, this); public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(KorpergewichtObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); public SelectAqlField GERAT = new AqlFieldImp(KorpergewichtObservation.class, "/protocol[at0015]/items[at0020]", "gerat", Cluster.class, this); + public ListSelectAqlField EXTENSION_EN = new ListAqlFieldImp(KorpergewichtObservation.class, "/protocol[at0015]/items[at0027]", "extensionEn", Cluster.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(KorpergewichtObservation.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(KorpergewichtObservation.class, "/language", "language", Language.class, this); + + public ListSelectAqlField ANY_EVENT_EN = new ListAqlFieldImp(KorpergewichtObservation.class, "/data[at0002]/events[at0003]", "anyEventEn", KorpergewichtAnyEventEnChoice.class, this); + private KorpergewichtObservationContainment() { super("openEHR-EHR-OBSERVATION.body_weight.v2"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/StateOfDressEnDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/StateOfDressEnDefiningcode.java index 31def74cc..7f1552aca 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/StateOfDressEnDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/StateOfDressEnDefiningcode.java @@ -2,12 +2,12 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum StateOfDressEnDefiningcode implements EnumValueSet { - UNTERWASCHE("Leicht bekleidet / Unterwäsche", "Bekleidung, die nicht signifikant zum Gewicht beiträgt.", "local", "at0011"), +public enum StateOfDressEnDefiningCode implements EnumValueSet { + LEICHT_BEKLEIDET_UNTERWASCHE("Leicht bekleidet / Unterwäsche", "Bekleidung, die nicht signifikant zum Gewicht beiträgt.", "local", "at0011"), UNBEKLEIDET("Unbekleidet", "Ohne Kleidung.", "local", "at0013"), - FULLY_CLOTHED_WITHOUT_SHOES_EN("*Fully clothed, without shoes (en)", "*Clothing which may add significantly to weight. (en)", "local", "at0028"), + N_FULLY_CLOTHED_WITHOUT_SHOES_EN("*Fully clothed, without shoes (en)", "*Clothing which may add significantly to weight. (en)", "local", "at0028"), WINDEL("Windel", "Trägt Windel; kann signifikant zum Gewicht beitragen.", "local", "at0017"), @@ -21,7 +21,7 @@ public enum StateOfDressEnDefiningcode implements EnumValueSet { private String code; - StateOfDressEnDefiningcode(String value, String description, String terminologyId, String code) { + StateOfDressEnDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -29,18 +29,18 @@ public enum StateOfDressEnDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java index ceb2fa30c..80c109ad6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java @@ -11,11 +11,11 @@ import org.ehrbase.client.annotations.Path; import org.ehrbase.client.annotations.Template; import org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition.LaborergebnisObservation; -import org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition.StatusDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition.StatusDefiningCode; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; import java.time.temporal.TemporalAccessor; @@ -25,124 +25,132 @@ @Archetype("openEHR-EHR-COMPOSITION.registereintrag.v1") @Template("Befund der Blutgasanalyse") public class BefundDerBlutgasanalyseComposition { - @Id - private VersionUid versionUid; + @Path("/context/other_context[at0001]/items[at0002]") + private List erweiterung; - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; + @Path("/context/other_context[at0001]/items[at0004]/value|defining_code") + private StatusDefiningCode statusDefiningCode; + + @Path("/context/other_context[at0001]/items[at0005]/value|value") + private String kategorieValue; + + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; @Path("/context/participations") private List participations; - @Path("/language") - private Language language; + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + @Path("/context/location") + private String location; @Path("/context/health_care_facility") private PartyIdentified healthCareFacility; - @Path("/context/other_context[at0001]/items[at0004]/value|defining_code") - private StatusDefiningcode statusDefiningcode; - - @Path("/context/other_context[at0001]/items[at0005]/value|value") - private String kategorieValue; - - @Path("/territory") - private Territory territory; + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; + @Path("/content[openEHR-EHR-OBSERVATION.laboratory_test_result.v1]") + private LaborergebnisObservation laborergebnis; @Path("/composer") private PartyProxy composer; - @Path("/context/setting|defining_code") - private SettingDefiningcode settingDefiningcode; + @Path("/language") + private Language language; @Path("/feeder_audit") private FeederAudit feederAudit; - @Path("/context/location") - private String location; - @Path("/category|defining_code") - private CategoryDefiningcode categoryDefiningcode; + private Category categoryDefiningCode; - @Path("/context/other_context[at0001]/items[at0002]") - private List erweiterung; + @Path("/territory") + private Territory territory; - @Path("/content[openEHR-EHR-OBSERVATION.laboratory_test_result.v1]") - private LaborergebnisObservation laborergebnis; + @Id + private VersionUid versionUid; - public VersionUid getVersionUid() { - return this.versionUid ; + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; } - public void setVersionUid(VersionUid versionUid) { - this.versionUid = versionUid; + public List getErweiterung() { + return this.erweiterung ; } - public void setEndTimeValue(TemporalAccessor endTimeValue) { - this.endTimeValue = endTimeValue; + public void setStatusDefiningCode(StatusDefiningCode statusDefiningCode) { + this.statusDefiningCode = statusDefiningCode; } - public TemporalAccessor getEndTimeValue() { - return this.endTimeValue ; + public StatusDefiningCode getStatusDefiningCode() { + return this.statusDefiningCode ; } - public void setParticipations(List participations) { - this.participations = participations; + public void setKategorieValue(String kategorieValue) { + this.kategorieValue = kategorieValue; } - public List getParticipations() { - return this.participations ; + public String getKategorieValue() { + return this.kategorieValue ; } - public void setLanguage(Language language) { - this.language = language; + public void setStartTimeValue(TemporalAccessor startTimeValue) { + this.startTimeValue = startTimeValue; } - public Language getLanguage() { - return this.language ; + public TemporalAccessor getStartTimeValue() { + return this.startTimeValue ; } - public void setHealthCareFacility(PartyIdentified healthCareFacility) { - this.healthCareFacility = healthCareFacility; + public void setParticipations(List participations) { + this.participations = participations; } - public PartyIdentified getHealthCareFacility() { - return this.healthCareFacility ; + public List getParticipations() { + return this.participations ; } - public void setStatusDefiningcode(StatusDefiningcode statusDefiningcode) { - this.statusDefiningcode = statusDefiningcode; + public void setEndTimeValue(TemporalAccessor endTimeValue) { + this.endTimeValue = endTimeValue; } - public StatusDefiningcode getStatusDefiningcode() { - return this.statusDefiningcode ; + public TemporalAccessor getEndTimeValue() { + return this.endTimeValue ; } - public void setKategorieValue(String kategorieValue) { - this.kategorieValue = kategorieValue; + public void setLocation(String location) { + this.location = location; } - public String getKategorieValue() { - return this.kategorieValue ; + public String getLocation() { + return this.location ; } - public void setTerritory(Territory territory) { - this.territory = territory; + public void setHealthCareFacility(PartyIdentified healthCareFacility) { + this.healthCareFacility = healthCareFacility; } - public Territory getTerritory() { - return this.territory ; + public PartyIdentified getHealthCareFacility() { + return this.healthCareFacility ; } - public void setStartTimeValue(TemporalAccessor startTimeValue) { - this.startTimeValue = startTimeValue; + public void setSettingDefiningCode(Setting settingDefiningCode) { + this.settingDefiningCode = settingDefiningCode; } - public TemporalAccessor getStartTimeValue() { - return this.startTimeValue ; + public Setting getSettingDefiningCode() { + return this.settingDefiningCode ; + } + + public void setLaborergebnis(LaborergebnisObservation laborergebnis) { + this.laborergebnis = laborergebnis; + } + + public LaborergebnisObservation getLaborergebnis() { + return this.laborergebnis ; } public void setComposer(PartyProxy composer) { @@ -153,12 +161,12 @@ public PartyProxy getComposer() { return this.composer ; } - public void setSettingDefiningcode(SettingDefiningcode settingDefiningcode) { - this.settingDefiningcode = settingDefiningcode; + public void setLanguage(Language language) { + this.language = language; } - public SettingDefiningcode getSettingDefiningcode() { - return this.settingDefiningcode ; + public Language getLanguage() { + return this.language ; } public void setFeederAudit(FeederAudit feederAudit) { @@ -169,35 +177,27 @@ public FeederAudit getFeederAudit() { return this.feederAudit ; } - public void setLocation(String location) { - this.location = location; + public void setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; } - public String getLocation() { - return this.location ; - } - - public void setCategoryDefiningcode(CategoryDefiningcode categoryDefiningcode) { - this.categoryDefiningcode = categoryDefiningcode; + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; } - public CategoryDefiningcode getCategoryDefiningcode() { - return this.categoryDefiningcode ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; + public void setTerritory(Territory territory) { + this.territory = territory; } - public List getErweiterung() { - return this.erweiterung ; + public Territory getTerritory() { + return this.territory ; } - public void setLaborergebnis(LaborergebnisObservation laborergebnis) { - this.laborergebnis = laborergebnis; + public VersionUid getVersionUid() { + return this.versionUid ; } - public LaborergebnisObservation getLaborergebnis() { - return this.laborergebnis ; + public void setVersionUid(VersionUid versionUid) { + this.versionUid = versionUid; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseCompositionContainment.java index 022f50eab..d44d4fdc9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseCompositionContainment.java @@ -11,46 +11,46 @@ import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition.LaborergebnisObservation; -import org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition.StatusDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition.StatusDefiningCode; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import java.time.temporal.TemporalAccessor; public class BefundDerBlutgasanalyseCompositionContainment extends Containment { public SelectAqlField BEFUND_DER_BLUTGASANALYSE_COMPOSITION = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "", "BefundDerBlutgasanalyseComposition", BefundDerBlutgasanalyseComposition.class, this); - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/other_context[at0001]/items[at0002]", "erweiterung", Cluster.class, this); - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/participations", "participations", Participation.class, this); + public SelectAqlField STATUS_DEFINING_CODE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/other_context[at0001]/items[at0004]/value|defining_code", "statusDefiningCode", StatusDefiningCode.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/language", "language", Language.class, this); + public SelectAqlField KATEGORIE_VALUE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "kategorieValue", String.class, this); - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - public SelectAqlField STATUS_DEFININGCODE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/other_context[at0001]/items[at0004]/value|defining_code", "statusDefiningcode", StatusDefiningcode.class, this); + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/participations", "participations", Participation.class, this); - public SelectAqlField KATEGORIE_VALUE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "kategorieValue", String.class, this); + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - public SelectAqlField TERRITORY = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/territory", "territory", Territory.class, this); + public SelectAqlField LOCATION = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/location", "location", String.class, this); - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - public SelectAqlField COMPOSER = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/composer", "composer", PartyProxy.class, this); + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - public SelectAqlField SETTING_DEFININGCODE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/setting|defining_code", "settingDefiningcode", SettingDefiningcode.class, this); + public SelectAqlField LABORERGEBNIS = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/content[openEHR-EHR-OBSERVATION.laboratory_test_result.v1]", "laborergebnis", LaborergebnisObservation.class, this); - public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public SelectAqlField COMPOSER = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/composer", "composer", PartyProxy.class, this); - public SelectAqlField LOCATION = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/location", "location", String.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/language", "language", Language.class, this); - public SelectAqlField CATEGORY_DEFININGCODE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/category|defining_code", "categoryDefiningcode", CategoryDefiningcode.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/other_context[at0001]/items[at0002]", "erweiterung", Cluster.class, this); + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - public SelectAqlField LABORERGEBNIS = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/content[openEHR-EHR-OBSERVATION.laboratory_test_result.v1]", "laborergebnis", LaborergebnisObservation.class, this); + public SelectAqlField TERRITORY = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/territory", "territory", Territory.class, this); private BefundDerBlutgasanalyseCompositionContainment() { super("openEHR-EHR-COMPOSITION.registereintrag.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java index c50c8177c..d003473f4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java @@ -10,11 +10,8 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") public class KohlendioxidpartialdruckCluster { - @Path("/items[at0005]/value|value") - private String ergebnisStatusValue; - @Path("/items[at0024]/value|defining_code") - private UntersuchterAnalytDefiningcode3 untersuchterAnalytDefiningcode; + private UntersuchterAnalytDefiningCode untersuchterAnalytDefiningCode; @Path("/items[at0001]/value|magnitude") private Double analytResultatMagnitude; @@ -25,21 +22,16 @@ public class KohlendioxidpartialdruckCluster { @Path("/items[at0014]") private List analyseergebnisDetails; - public void setErgebnisStatusValue(String ergebnisStatusValue) { - this.ergebnisStatusValue = ergebnisStatusValue; - } - - public String getErgebnisStatusValue() { - return this.ergebnisStatusValue ; - } + @Path("/items[at0005]/value|value") + private String ergebnisStatusValue; - public void setUntersuchterAnalytDefiningcode( - UntersuchterAnalytDefiningcode3 untersuchterAnalytDefiningcode) { - this.untersuchterAnalytDefiningcode = untersuchterAnalytDefiningcode; + public void setUntersuchterAnalytDefiningCode( + UntersuchterAnalytDefiningCode untersuchterAnalytDefiningCode) { + this.untersuchterAnalytDefiningCode = untersuchterAnalytDefiningCode; } - public UntersuchterAnalytDefiningcode3 getUntersuchterAnalytDefiningcode() { - return this.untersuchterAnalytDefiningcode ; + public UntersuchterAnalytDefiningCode getUntersuchterAnalytDefiningCode() { + return this.untersuchterAnalytDefiningCode ; } public void setAnalytResultatMagnitude(Double analytResultatMagnitude) { @@ -65,4 +57,12 @@ public void setAnalyseergebnisDetails(List analyseergebnisDetails) { public List getAnalyseergebnisDetails() { return this.analyseergebnisDetails ; } + + public void setErgebnisStatusValue(String ergebnisStatusValue) { + this.ergebnisStatusValue = ergebnisStatusValue; + } + + public String getErgebnisStatusValue() { + return this.ergebnisStatusValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckClusterContainment.java index 457eade0d..759cc21b8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckClusterContainment.java @@ -10,9 +10,7 @@ public class KohlendioxidpartialdruckClusterContainment extends Containment { public SelectAqlField KOHLENDIOXIDPARTIALDRUCK_CLUSTER = new AqlFieldImp(KohlendioxidpartialdruckCluster.class, "", "KohlendioxidpartialdruckCluster", KohlendioxidpartialdruckCluster.class, this); - public SelectAqlField ERGEBNIS_STATUS_VALUE = new AqlFieldImp(KohlendioxidpartialdruckCluster.class, "/items[at0005]/value|value", "ergebnisStatusValue", String.class, this); - - public SelectAqlField UNTERSUCHTER_ANALYT_DEFININGCODE = new AqlFieldImp(KohlendioxidpartialdruckCluster.class, "/items[at0024]/value|defining_code", "untersuchterAnalytDefiningcode", UntersuchterAnalytDefiningcode3.class, this); + public SelectAqlField UNTERSUCHTER_ANALYT_DEFINING_CODE = new AqlFieldImp(KohlendioxidpartialdruckCluster.class, "/items[at0024]/value|defining_code", "untersuchterAnalytDefiningCode", UntersuchterAnalytDefiningCode.class, this); public SelectAqlField ANALYT_RESULTAT_MAGNITUDE = new AqlFieldImp(KohlendioxidpartialdruckCluster.class, "/items[at0001]/value|magnitude", "analytResultatMagnitude", Double.class, this); @@ -20,6 +18,8 @@ public class KohlendioxidpartialdruckClusterContainment extends Containment { public ListSelectAqlField ANALYSEERGEBNIS_DETAILS = new ListAqlFieldImp(KohlendioxidpartialdruckCluster.class, "/items[at0014]", "analyseergebnisDetails", Cluster.class, this); + public SelectAqlField ERGEBNIS_STATUS_VALUE = new AqlFieldImp(KohlendioxidpartialdruckCluster.class, "/items[at0005]/value|value", "ergebnisStatusValue", String.class, this); + private KohlendioxidpartialdruckClusterContainment() { super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java index 7ed30b837..ab4b83845 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,60 +13,86 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.laboratory_test_result.v1") public class LaborergebnisObservation { - @Path("/protocol[at0004]/items[at0110]") - private List testDetails; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|defining_code") + private LabortestBezeichnungDefiningCode labortestBezeichnungDefiningCode; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='pH-Wert']") - private PhWertCluster phWert; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0065]") + private List probendetail; - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Kohlendioxidpartialdruck']") + private KohlendioxidpartialdruckCluster kohlendioxidpartialdruck; @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Sauerstoffpartialdruck']") private SauerstoffpartialdruckCluster sauerstoffpartialdruck; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='pH-Wert']") + private PhWertCluster phWert; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Sauerstoffsättigung']") + private SauerstoffsattigungCluster sauerstoffsattigung; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0122]") + private List strukturierteTestdiagnostik; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0118]") private List multimediaDarstellung; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|defining_code") - private LabortestBezeichnungDefiningcode labortestBezeichnungDefiningcode; - @Path("/data[at0001]/events[at0002]/state[at0112]/items[at0114]") private List strukturierteErfassungDerStorfaktoren; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0122]") - private List strukturierteTestdiagnostik; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Kohlendioxidpartialdruck']") - private KohlendioxidpartialdruckCluster kohlendioxidpartialdruck; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Sauerstoffsättigung']") - private SauerstoffsattigungCluster sauerstoffsattigung; + @Path("/protocol[at0004]/items[at0017]") + private Cluster laborWelchesDenUntersuchungsauftragAnnimmt; + + @Path("/protocol[at0004]/items[at0110]") + private List testDetails; @Path("/protocol[at0004]/items[at0117]") private List erweiterung; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0065]") - private List probendetail; - @Path("/subject") private PartyProxy subject; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/language") + private Language language; - @Path("/protocol[at0004]/items[at0017]") - private Cluster laborWelchesDenUntersuchungsauftragAnnimmt; + public void setLabortestBezeichnungDefiningCode( + LabortestBezeichnungDefiningCode labortestBezeichnungDefiningCode) { + this.labortestBezeichnungDefiningCode = labortestBezeichnungDefiningCode; + } - public void setTestDetails(List testDetails) { - this.testDetails = testDetails; + public LabortestBezeichnungDefiningCode getLabortestBezeichnungDefiningCode() { + return this.labortestBezeichnungDefiningCode ; } - public List getTestDetails() { - return this.testDetails ; + public void setProbendetail(List probendetail) { + this.probendetail = probendetail; + } + + public List getProbendetail() { + return this.probendetail ; + } + + public void setKohlendioxidpartialdruck( + KohlendioxidpartialdruckCluster kohlendioxidpartialdruck) { + this.kohlendioxidpartialdruck = kohlendioxidpartialdruck; + } + + public KohlendioxidpartialdruckCluster getKohlendioxidpartialdruck() { + return this.kohlendioxidpartialdruck ; + } + + public void setSauerstoffpartialdruck(SauerstoffpartialdruckCluster sauerstoffpartialdruck) { + this.sauerstoffpartialdruck = sauerstoffpartialdruck; + } + + public SauerstoffpartialdruckCluster getSauerstoffpartialdruck() { + return this.sauerstoffpartialdruck ; } public void setPhWert(PhWertCluster phWert) { @@ -77,20 +103,20 @@ public PhWertCluster getPhWert() { return this.phWert ; } - public void setLanguage(Language language) { - this.language = language; + public void setSauerstoffsattigung(SauerstoffsattigungCluster sauerstoffsattigung) { + this.sauerstoffsattigung = sauerstoffsattigung; } - public Language getLanguage() { - return this.language ; + public SauerstoffsattigungCluster getSauerstoffsattigung() { + return this.sauerstoffsattigung ; } - public void setSauerstoffpartialdruck(SauerstoffpartialdruckCluster sauerstoffpartialdruck) { - this.sauerstoffpartialdruck = sauerstoffpartialdruck; + public void setStrukturierteTestdiagnostik(List strukturierteTestdiagnostik) { + this.strukturierteTestdiagnostik = strukturierteTestdiagnostik; } - public SauerstoffpartialdruckCluster getSauerstoffpartialdruck() { - return this.sauerstoffpartialdruck ; + public List getStrukturierteTestdiagnostik() { + return this.strukturierteTestdiagnostik ; } public void setMultimediaDarstellung(List multimediaDarstellung) { @@ -101,15 +127,6 @@ public List getMultimediaDarstellung() { return this.multimediaDarstellung ; } - public void setLabortestBezeichnungDefiningcode( - LabortestBezeichnungDefiningcode labortestBezeichnungDefiningcode) { - this.labortestBezeichnungDefiningcode = labortestBezeichnungDefiningcode; - } - - public LabortestBezeichnungDefiningcode getLabortestBezeichnungDefiningcode() { - return this.labortestBezeichnungDefiningcode ; - } - public void setStrukturierteErfassungDerStorfaktoren( List strukturierteErfassungDerStorfaktoren) { this.strukturierteErfassungDerStorfaktoren = strukturierteErfassungDerStorfaktoren; @@ -119,53 +136,45 @@ public List getStrukturierteErfassungDerStorfaktoren() { return this.strukturierteErfassungDerStorfaktoren ; } - public void setStrukturierteTestdiagnostik(List strukturierteTestdiagnostik) { - this.strukturierteTestdiagnostik = strukturierteTestdiagnostik; - } - - public List getStrukturierteTestdiagnostik() { - return this.strukturierteTestdiagnostik ; - } - - public void setKohlendioxidpartialdruck( - KohlendioxidpartialdruckCluster kohlendioxidpartialdruck) { - this.kohlendioxidpartialdruck = kohlendioxidpartialdruck; + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; } - public KohlendioxidpartialdruckCluster getKohlendioxidpartialdruck() { - return this.kohlendioxidpartialdruck ; + public TemporalAccessor getTimeValue() { + return this.timeValue ; } - public void setSauerstoffsattigung(SauerstoffsattigungCluster sauerstoffsattigung) { - this.sauerstoffsattigung = sauerstoffsattigung; + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; } - public SauerstoffsattigungCluster getSauerstoffsattigung() { - return this.sauerstoffsattigung ; + public TemporalAccessor getOriginValue() { + return this.originValue ; } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; + public void setLaborWelchesDenUntersuchungsauftragAnnimmt( + Cluster laborWelchesDenUntersuchungsauftragAnnimmt) { + this.laborWelchesDenUntersuchungsauftragAnnimmt = laborWelchesDenUntersuchungsauftragAnnimmt; } - public List getErweiterung() { - return this.erweiterung ; + public Cluster getLaborWelchesDenUntersuchungsauftragAnnimmt() { + return this.laborWelchesDenUntersuchungsauftragAnnimmt ; } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; + public void setTestDetails(List testDetails) { + this.testDetails = testDetails; } - public TemporalAccessor getTimeValue() { - return this.timeValue ; + public List getTestDetails() { + return this.testDetails ; } - public void setProbendetail(List probendetail) { - this.probendetail = probendetail; + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; } - public List getProbendetail() { - return this.probendetail ; + public List getErweiterung() { + return this.erweiterung ; } public void setSubject(PartyProxy subject) { @@ -176,20 +185,11 @@ public PartyProxy getSubject() { return this.subject ; } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setLaborWelchesDenUntersuchungsauftragAnnimmt( - Cluster laborWelchesDenUntersuchungsauftragAnnimmt) { - this.laborWelchesDenUntersuchungsauftragAnnimmt = laborWelchesDenUntersuchungsauftragAnnimmt; + public void setLanguage(Language language) { + this.language = language; } - public Cluster getLaborWelchesDenUntersuchungsauftragAnnimmt() { - return this.laborWelchesDenUntersuchungsauftragAnnimmt ; + public Language getLanguage() { + return this.language ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservationContainment.java index b9093fb5b..8230cf4bd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservationContainment.java @@ -7,45 +7,45 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class LaborergebnisObservationContainment extends Containment { public SelectAqlField LABORERGEBNIS_OBSERVATION = new AqlFieldImp(LaborergebnisObservation.class, "", "LaborergebnisObservation", LaborergebnisObservation.class, this); - public ListSelectAqlField TEST_DETAILS = new ListAqlFieldImp(LaborergebnisObservation.class, "/protocol[at0004]/items[at0110]", "testDetails", Cluster.class, this); - - public SelectAqlField PH_WERT = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='pH-Wert']", "phWert", PhWertCluster.class, this); + public SelectAqlField LABORTEST_BEZEICHNUNG_DEFINING_CODE = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|defining_code", "labortestBezeichnungDefiningCode", LabortestBezeichnungDefiningCode.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(LaborergebnisObservation.class, "/language", "language", Language.class, this); + public ListSelectAqlField PROBENDETAIL = new ListAqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0065]", "probendetail", Cluster.class, this); - public SelectAqlField SAUERSTOFFPARTIALDRUCK = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Sauerstoffpartialdruck']", "sauerstoffpartialdruck", SauerstoffpartialdruckCluster.class, this); + public SelectAqlField KOHLENDIOXIDPARTIALDRUCK = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]", "kohlendioxidpartialdruck", KohlendioxidpartialdruckCluster.class, this); - public ListSelectAqlField MULTIMEDIA_DARSTELLUNG = new ListAqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0118]", "multimediaDarstellung", Cluster.class, this); + public SelectAqlField SAUERSTOFFPARTIALDRUCK = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]", "sauerstoffpartialdruck", SauerstoffpartialdruckCluster.class, this); - public SelectAqlField LABORTEST_BEZEICHNUNG_DEFININGCODE = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|defining_code", "labortestBezeichnungDefiningcode", LabortestBezeichnungDefiningcode.class, this); + public SelectAqlField PH_WERT = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]", "phWert", PhWertCluster.class, this); - public ListSelectAqlField STRUKTURIERTE_ERFASSUNG_DER_STORFAKTOREN = new ListAqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/state[at0112]/items[at0114]", "strukturierteErfassungDerStorfaktoren", Cluster.class, this); + public SelectAqlField SAUERSTOFFSATTIGUNG = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]", "sauerstoffsattigung", SauerstoffsattigungCluster.class, this); public ListSelectAqlField STRUKTURIERTE_TESTDIAGNOSTIK = new ListAqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0122]", "strukturierteTestdiagnostik", Cluster.class, this); - public SelectAqlField KOHLENDIOXIDPARTIALDRUCK = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Kohlendioxidpartialdruck']", "kohlendioxidpartialdruck", KohlendioxidpartialdruckCluster.class, this); - - public SelectAqlField SAUERSTOFFSATTIGUNG = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Sauerstoffsättigung']", "sauerstoffsattigung", SauerstoffsattigungCluster.class, this); + public ListSelectAqlField MULTIMEDIA_DARSTELLUNG = new ListAqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0118]", "multimediaDarstellung", Cluster.class, this); - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(LaborergebnisObservation.class, "/protocol[at0004]/items[at0117]", "erweiterung", Cluster.class, this); + public ListSelectAqlField STRUKTURIERTE_ERFASSUNG_DER_STORFAKTOREN = new ListAqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/state[at0112]/items[at0114]", "strukturierteErfassungDerStorfaktoren", Cluster.class, this); public SelectAqlField TIME_VALUE = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - public ListSelectAqlField PROBENDETAIL = new ListAqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0065]", "probendetail", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(LaborergebnisObservation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); public SelectAqlField LABOR_WELCHES_DEN_UNTERSUCHUNGSAUFTRAG_ANNIMMT = new AqlFieldImp(LaborergebnisObservation.class, "/protocol[at0004]/items[at0017]", "laborWelchesDenUntersuchungsauftragAnnimmt", Cluster.class, this); + public ListSelectAqlField TEST_DETAILS = new ListAqlFieldImp(LaborergebnisObservation.class, "/protocol[at0004]/items[at0110]", "testDetails", Cluster.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(LaborergebnisObservation.class, "/protocol[at0004]/items[at0117]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(LaborergebnisObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(LaborergebnisObservation.class, "/language", "language", Language.class, this); + private LaborergebnisObservationContainment() { super("openEHR-EHR-OBSERVATION.laboratory_test_result.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LabortestBezeichnungDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LabortestBezeichnungDefiningcode.java index 047e87cba..4bbfd1310 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LabortestBezeichnungDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LabortestBezeichnungDefiningcode.java @@ -2,12 +2,12 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum LabortestBezeichnungDefiningcode implements EnumValueSet { - GAS_PANEL_BLOOD("Gas panel - Blood", null, "LOINC", "24338-6"), +public enum LabortestBezeichnungDefiningCode implements EnumValueSet { + GAS_PANEL_CAPILLARY_BLOOD("Gas panel - Capillary blood", "Gas panel - Capillary blood", "LOINC", "24337-8"), - GAS_PANEL_CAPILLARY_BLOOD("Gas panel - Capillary blood", null, "LOINC", "24337-8"), + GAS_PANEL_ARTERIAL_BLOOD("Gas panel - Arterial blood", "Gas panel - Arterial blood", "LOINC", "24336-0"), - GAS_PANEL_ARTERIAL_BLOOD("Gas panel - Arterial blood", null, "LOINC", "24336-0"); + GAS_PANEL_BLOOD("Gas panel - Blood", "Gas panel - Blood", "LOINC", "24338-6"); private String value; @@ -17,7 +17,7 @@ public enum LabortestBezeichnungDefiningcode implements EnumValueSet { private String code; - LabortestBezeichnungDefiningcode(String value, String description, String terminologyId, + LabortestBezeichnungDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java index 77d1a7df6..af6491202 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java @@ -10,11 +10,8 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") public class PhWertCluster { - @Path("/items[at0005]/value|value") - private String ergebnisStatusValue; - @Path("/items[at0024]/value|defining_code") - private UntersuchterAnalytDefiningcode untersuchterAnalytDefiningcode; + private UntersuchterAnalytDefiningCode3 untersuchterAnalytDefiningCode; @Path("/items[at0001]/value|magnitude") private Double analytResultatMagnitude; @@ -25,21 +22,16 @@ public class PhWertCluster { @Path("/items[at0014]") private List analyseergebnisDetails; - public void setErgebnisStatusValue(String ergebnisStatusValue) { - this.ergebnisStatusValue = ergebnisStatusValue; - } - - public String getErgebnisStatusValue() { - return this.ergebnisStatusValue ; - } + @Path("/items[at0005]/value|value") + private String ergebnisStatusValue; - public void setUntersuchterAnalytDefiningcode( - UntersuchterAnalytDefiningcode untersuchterAnalytDefiningcode) { - this.untersuchterAnalytDefiningcode = untersuchterAnalytDefiningcode; + public void setUntersuchterAnalytDefiningCode( + UntersuchterAnalytDefiningCode3 untersuchterAnalytDefiningCode) { + this.untersuchterAnalytDefiningCode = untersuchterAnalytDefiningCode; } - public UntersuchterAnalytDefiningcode getUntersuchterAnalytDefiningcode() { - return this.untersuchterAnalytDefiningcode ; + public UntersuchterAnalytDefiningCode3 getUntersuchterAnalytDefiningCode() { + return this.untersuchterAnalytDefiningCode ; } public void setAnalytResultatMagnitude(Double analytResultatMagnitude) { @@ -65,4 +57,12 @@ public void setAnalyseergebnisDetails(List analyseergebnisDetails) { public List getAnalyseergebnisDetails() { return this.analyseergebnisDetails ; } + + public void setErgebnisStatusValue(String ergebnisStatusValue) { + this.ergebnisStatusValue = ergebnisStatusValue; + } + + public String getErgebnisStatusValue() { + return this.ergebnisStatusValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertClusterContainment.java index 97a7a845d..034a1b14f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertClusterContainment.java @@ -10,9 +10,7 @@ public class PhWertClusterContainment extends Containment { public SelectAqlField PH_WERT_CLUSTER = new AqlFieldImp(PhWertCluster.class, "", "PhWertCluster", PhWertCluster.class, this); - public SelectAqlField ERGEBNIS_STATUS_VALUE = new AqlFieldImp(PhWertCluster.class, "/items[at0005]/value|value", "ergebnisStatusValue", String.class, this); - - public SelectAqlField UNTERSUCHTER_ANALYT_DEFININGCODE = new AqlFieldImp(PhWertCluster.class, "/items[at0024]/value|defining_code", "untersuchterAnalytDefiningcode", UntersuchterAnalytDefiningcode.class, this); + public SelectAqlField UNTERSUCHTER_ANALYT_DEFINING_CODE = new AqlFieldImp(PhWertCluster.class, "/items[at0024]/value|defining_code", "untersuchterAnalytDefiningCode", UntersuchterAnalytDefiningCode3.class, this); public SelectAqlField ANALYT_RESULTAT_MAGNITUDE = new AqlFieldImp(PhWertCluster.class, "/items[at0001]/value|magnitude", "analytResultatMagnitude", Double.class, this); @@ -20,6 +18,8 @@ public class PhWertClusterContainment extends Containment { public ListSelectAqlField ANALYSEERGEBNIS_DETAILS = new ListAqlFieldImp(PhWertCluster.class, "/items[at0014]", "analyseergebnisDetails", Cluster.class, this); + public SelectAqlField ERGEBNIS_STATUS_VALUE = new AqlFieldImp(PhWertCluster.class, "/items[at0005]/value|value", "ergebnisStatusValue", String.class, this); + private PhWertClusterContainment() { super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java index 165dad54c..d141e0737 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java @@ -10,11 +10,8 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") public class SauerstoffpartialdruckCluster { - @Path("/items[at0005]/value|value") - private String ergebnisStatusValue; - @Path("/items[at0024]/value|defining_code") - private UntersuchterAnalytDefiningcode2 untersuchterAnalytDefiningcode; + private UntersuchterAnalytDefiningCode2 untersuchterAnalytDefiningCode; @Path("/items[at0001]/value|magnitude") private Double analytResultatMagnitude; @@ -25,21 +22,16 @@ public class SauerstoffpartialdruckCluster { @Path("/items[at0014]") private List analyseergebnisDetails; - public void setErgebnisStatusValue(String ergebnisStatusValue) { - this.ergebnisStatusValue = ergebnisStatusValue; - } - - public String getErgebnisStatusValue() { - return this.ergebnisStatusValue ; - } + @Path("/items[at0005]/value|value") + private String ergebnisStatusValue; - public void setUntersuchterAnalytDefiningcode( - UntersuchterAnalytDefiningcode2 untersuchterAnalytDefiningcode) { - this.untersuchterAnalytDefiningcode = untersuchterAnalytDefiningcode; + public void setUntersuchterAnalytDefiningCode( + UntersuchterAnalytDefiningCode2 untersuchterAnalytDefiningCode) { + this.untersuchterAnalytDefiningCode = untersuchterAnalytDefiningCode; } - public UntersuchterAnalytDefiningcode2 getUntersuchterAnalytDefiningcode() { - return this.untersuchterAnalytDefiningcode ; + public UntersuchterAnalytDefiningCode2 getUntersuchterAnalytDefiningCode() { + return this.untersuchterAnalytDefiningCode ; } public void setAnalytResultatMagnitude(Double analytResultatMagnitude) { @@ -65,4 +57,12 @@ public void setAnalyseergebnisDetails(List analyseergebnisDetails) { public List getAnalyseergebnisDetails() { return this.analyseergebnisDetails ; } + + public void setErgebnisStatusValue(String ergebnisStatusValue) { + this.ergebnisStatusValue = ergebnisStatusValue; + } + + public String getErgebnisStatusValue() { + return this.ergebnisStatusValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckClusterContainment.java index a4a1679f4..36cbdc229 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckClusterContainment.java @@ -10,9 +10,7 @@ public class SauerstoffpartialdruckClusterContainment extends Containment { public SelectAqlField SAUERSTOFFPARTIALDRUCK_CLUSTER = new AqlFieldImp(SauerstoffpartialdruckCluster.class, "", "SauerstoffpartialdruckCluster", SauerstoffpartialdruckCluster.class, this); - public SelectAqlField ERGEBNIS_STATUS_VALUE = new AqlFieldImp(SauerstoffpartialdruckCluster.class, "/items[at0005]/value|value", "ergebnisStatusValue", String.class, this); - - public SelectAqlField UNTERSUCHTER_ANALYT_DEFININGCODE = new AqlFieldImp(SauerstoffpartialdruckCluster.class, "/items[at0024]/value|defining_code", "untersuchterAnalytDefiningcode", UntersuchterAnalytDefiningcode2.class, this); + public SelectAqlField UNTERSUCHTER_ANALYT_DEFINING_CODE = new AqlFieldImp(SauerstoffpartialdruckCluster.class, "/items[at0024]/value|defining_code", "untersuchterAnalytDefiningCode", UntersuchterAnalytDefiningCode2.class, this); public SelectAqlField ANALYT_RESULTAT_MAGNITUDE = new AqlFieldImp(SauerstoffpartialdruckCluster.class, "/items[at0001]/value|magnitude", "analytResultatMagnitude", Double.class, this); @@ -20,6 +18,8 @@ public class SauerstoffpartialdruckClusterContainment extends Containment { public ListSelectAqlField ANALYSEERGEBNIS_DETAILS = new ListAqlFieldImp(SauerstoffpartialdruckCluster.class, "/items[at0014]", "analyseergebnisDetails", Cluster.class, this); + public SelectAqlField ERGEBNIS_STATUS_VALUE = new AqlFieldImp(SauerstoffpartialdruckCluster.class, "/items[at0005]/value|value", "ergebnisStatusValue", String.class, this); + private SauerstoffpartialdruckClusterContainment() { super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java index 00ac818ac..d7859d988 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java @@ -10,11 +10,8 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") public class SauerstoffsattigungCluster { - @Path("/items[at0005]/value|value") - private String ergebnisStatusValue; - @Path("/items[at0024]/value|defining_code") - private UntersuchterAnalytDefiningcode4 untersuchterAnalytDefiningcode; + private UntersuchterAnalytDefiningCode4 untersuchterAnalytDefiningCode; @Path("/items[at0001]/value|magnitude") private Double analytResultatMagnitude; @@ -25,21 +22,16 @@ public class SauerstoffsattigungCluster { @Path("/items[at0014]") private List analyseergebnisDetails; - public void setErgebnisStatusValue(String ergebnisStatusValue) { - this.ergebnisStatusValue = ergebnisStatusValue; - } - - public String getErgebnisStatusValue() { - return this.ergebnisStatusValue ; - } + @Path("/items[at0005]/value|value") + private String ergebnisStatusValue; - public void setUntersuchterAnalytDefiningcode( - UntersuchterAnalytDefiningcode4 untersuchterAnalytDefiningcode) { - this.untersuchterAnalytDefiningcode = untersuchterAnalytDefiningcode; + public void setUntersuchterAnalytDefiningCode( + UntersuchterAnalytDefiningCode4 untersuchterAnalytDefiningCode) { + this.untersuchterAnalytDefiningCode = untersuchterAnalytDefiningCode; } - public UntersuchterAnalytDefiningcode4 getUntersuchterAnalytDefiningcode() { - return this.untersuchterAnalytDefiningcode ; + public UntersuchterAnalytDefiningCode4 getUntersuchterAnalytDefiningCode() { + return this.untersuchterAnalytDefiningCode ; } public void setAnalytResultatMagnitude(Double analytResultatMagnitude) { @@ -65,4 +57,12 @@ public void setAnalyseergebnisDetails(List analyseergebnisDetails) { public List getAnalyseergebnisDetails() { return this.analyseergebnisDetails ; } + + public void setErgebnisStatusValue(String ergebnisStatusValue) { + this.ergebnisStatusValue = ergebnisStatusValue; + } + + public String getErgebnisStatusValue() { + return this.ergebnisStatusValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungClusterContainment.java index 2ba2f9000..73454082e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungClusterContainment.java @@ -10,9 +10,7 @@ public class SauerstoffsattigungClusterContainment extends Containment { public SelectAqlField SAUERSTOFFSATTIGUNG_CLUSTER = new AqlFieldImp(SauerstoffsattigungCluster.class, "", "SauerstoffsattigungCluster", SauerstoffsattigungCluster.class, this); - public SelectAqlField ERGEBNIS_STATUS_VALUE = new AqlFieldImp(SauerstoffsattigungCluster.class, "/items[at0005]/value|value", "ergebnisStatusValue", String.class, this); - - public SelectAqlField UNTERSUCHTER_ANALYT_DEFININGCODE = new AqlFieldImp(SauerstoffsattigungCluster.class, "/items[at0024]/value|defining_code", "untersuchterAnalytDefiningcode", UntersuchterAnalytDefiningcode4.class, this); + public SelectAqlField UNTERSUCHTER_ANALYT_DEFINING_CODE = new AqlFieldImp(SauerstoffsattigungCluster.class, "/items[at0024]/value|defining_code", "untersuchterAnalytDefiningCode", UntersuchterAnalytDefiningCode4.class, this); public SelectAqlField ANALYT_RESULTAT_MAGNITUDE = new AqlFieldImp(SauerstoffsattigungCluster.class, "/items[at0001]/value|magnitude", "analytResultatMagnitude", Double.class, this); @@ -20,6 +18,8 @@ public class SauerstoffsattigungClusterContainment extends Containment { public ListSelectAqlField ANALYSEERGEBNIS_DETAILS = new ListAqlFieldImp(SauerstoffsattigungCluster.class, "/items[at0014]", "analyseergebnisDetails", Cluster.class, this); + public SelectAqlField ERGEBNIS_STATUS_VALUE = new AqlFieldImp(SauerstoffsattigungCluster.class, "/items[at0005]/value|value", "ergebnisStatusValue", String.class, this); + private SauerstoffsattigungClusterContainment() { super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/StatusDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/StatusDefiningcode.java index 295d135c2..977a85917 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/StatusDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/StatusDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum StatusDefiningcode implements EnumValueSet { +public enum StatusDefiningCode implements EnumValueSet { VORLAUFIG("vorläufig", "*", "local", "at0011"), FINAL("final", "*", "local", "at0012"), @@ -19,7 +19,7 @@ public enum StatusDefiningcode implements EnumValueSet { private String code; - StatusDefiningcode(String value, String description, String terminologyId, String code) { + StatusDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode.java index 7d21c3523..d02bc3ae0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode.java @@ -2,18 +2,12 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum UntersuchterAnalytDefiningcode implements EnumValueSet { - PH_OF_SERUM_OR_PLASMA("pH of Serum or Plasma", null, "LOINC", "2753-2"), +public enum UntersuchterAnalytDefiningCode implements EnumValueSet { + CARBON_DIOXIDE_PARTIAL_PRESSURE_IN_CAPILLARY_BLOOD("Carbon dioxide [Partial pressure] in Capillary blood", "Carbon dioxide [Partial pressure] in Capillary blood", "LOINC", "2020-6"), - PH_OF_CAPILLARY_BLOOD("pH of Capillary blood", null, "LOINC", "2745-8"), + CARBON_DIOXIDE_PARTIAL_PRESSURE_IN_BLOOD("Carbon dioxide [Partial pressure] in Blood", "Carbon dioxide [Partial pressure] in Blood", "LOINC", "11557-6"), - PH_OF_BLOOD("pH of Blood", null, "LOINC", "11558-4"), - - PH_OF_VENOUS_BLOOD("pH of Venous blood", null, "LOINC", "2746-6"), - - PH_OF_MIXED_VENOUS_BLOOD("pH of Mixed venous blood", null, "LOINC", "19213-8"), - - PH_OF_ARTERIAL_BLOOD("pH of Arterial blood", null, "LOINC", "2744-1"); + CARBON_DIOXIDE_PARTIAL_PRESSURE_IN_ARTERIAL_BLOOD("Carbon dioxide [Partial pressure] in Arterial blood", "Carbon dioxide [Partial pressure] in Arterial blood", "LOINC", "2019-8"); private String value; @@ -23,7 +17,7 @@ public enum UntersuchterAnalytDefiningcode implements EnumValueSet { private String code; - UntersuchterAnalytDefiningcode(String value, String description, String terminologyId, + UntersuchterAnalytDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode2.java index 99f60b4c0..d23150804 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode2.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode2.java @@ -2,12 +2,12 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum UntersuchterAnalytDefiningcode2 implements EnumValueSet { - OXYGEN_PARTIAL_PRESSURE_IN_ARTERIAL_BLOOD("Oxygen [Partial pressure] in Arterial blood", null, "LOINC", "2703-7"), +public enum UntersuchterAnalytDefiningCode2 implements EnumValueSet { + OXYGEN_PARTIAL_PRESSURE_IN_BLOOD("Oxygen [Partial pressure] in Blood", "Oxygen [Partial pressure] in Blood", "LOINC", "11556-8"), - OXYGEN_PARTIAL_PRESSURE_IN_BLOOD("Oxygen [Partial pressure] in Blood", null, "LOINC", "11556-8"), + OXYGEN_PARTIAL_PRESSURE_IN_ARTERIAL_BLOOD("Oxygen [Partial pressure] in Arterial blood", "Oxygen [Partial pressure] in Arterial blood", "LOINC", "2703-7"), - OXYGEN_PARTIAL_PRESSURE_IN_CAPILLARY_BLOOD("Oxygen [Partial pressure] in Capillary blood", null, "LOINC", "2704-5"); + OXYGEN_PARTIAL_PRESSURE_IN_CAPILLARY_BLOOD("Oxygen [Partial pressure] in Capillary blood", "Oxygen [Partial pressure] in Capillary blood", "LOINC", "2704-5"); private String value; @@ -17,7 +17,7 @@ public enum UntersuchterAnalytDefiningcode2 implements EnumValueSet { private String code; - UntersuchterAnalytDefiningcode2(String value, String description, String terminologyId, + UntersuchterAnalytDefiningCode2(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode3.java index 92f29b1d1..ed111caf5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode3.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode3.java @@ -2,12 +2,18 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum UntersuchterAnalytDefiningcode3 implements EnumValueSet { - CARBON_DIOXIDE_PARTIAL_PRESSURE_IN_CAPILLARY_BLOOD("Carbon dioxide [Partial pressure] in Capillary blood", null, "LOINC", "2020-6"), +public enum UntersuchterAnalytDefiningCode3 implements EnumValueSet { + PH_OF_VENOUS_BLOOD("pH of Venous blood", "pH of Venous blood", "LOINC", "2746-6"), - CARBON_DIOXIDE_PARTIAL_PRESSURE_IN_ARTERIAL_BLOOD("Carbon dioxide [Partial pressure] in Arterial blood", null, "LOINC", "2019-8"), + PH_OF_CAPILLARY_BLOOD("pH of Capillary blood", "pH of Capillary blood", "LOINC", "2745-8"), - CARBON_DIOXIDE_PARTIAL_PRESSURE_IN_BLOOD("Carbon dioxide [Partial pressure] in Blood", null, "LOINC", "11557-6"); + PH_OF_ARTERIAL_BLOOD("pH of Arterial blood", "pH of Arterial blood", "LOINC", "2744-1"), + + PH_OF_MIXED_VENOUS_BLOOD("pH of Mixed venous blood", "pH of Mixed venous blood", "LOINC", "19213-8"), + + PH_OF_SERUM_OR_PLASMA("pH of Serum or Plasma", "pH of Serum or Plasma", "LOINC", "2753-2"), + + PH_OF_BLOOD("pH of Blood", "pH of Blood", "LOINC", "11558-4"); private String value; @@ -17,7 +23,7 @@ public enum UntersuchterAnalytDefiningcode3 implements EnumValueSet { private String code; - UntersuchterAnalytDefiningcode3(String value, String description, String terminologyId, + UntersuchterAnalytDefiningCode3(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode4.java index 08691a795..c78f155f6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode4.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode4.java @@ -2,10 +2,10 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum UntersuchterAnalytDefiningcode4 implements EnumValueSet { - OXYGEN_SATURATION_IN_ARTERIAL_BLOOD("Oxygen saturation in Arterial blood", null, "LOINC", "2708-6"), +public enum UntersuchterAnalytDefiningCode4 implements EnumValueSet { + OXYGEN_SATURATION_IN_BLOOD("Oxygen saturation in Blood", "Oxygen saturation in Blood", "LOINC", "20564-1"), - OXYGEN_SATURATION_IN_BLOOD("Oxygen saturation in Blood", null, "LOINC", "20564-1"); + OXYGEN_SATURATION_IN_ARTERIAL_BLOOD("Oxygen saturation in Arterial blood", "Oxygen saturation in Arterial blood", "LOINC", "2708-6"); private String value; @@ -15,7 +15,7 @@ public enum UntersuchterAnalytDefiningcode4 implements EnumValueSet { private String code; - UntersuchterAnalytDefiningcode4(String value, String description, String terminologyId, + UntersuchterAnalytDefiningCode4(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java index 5a683acb3..dcb38d2cc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java @@ -15,10 +15,10 @@ import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.KontaktSection; import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.RisikogebietSection; import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.SymptomeSection; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; import java.time.temporal.TemporalAccessor; @@ -28,223 +28,223 @@ @Archetype("openEHR-EHR-COMPOSITION.report.v1") @Template("Corona_Anamnese") public class CoronaAnamneseComposition { - @Id - private VersionUid versionUid; + @Path("/context/other_context[at0001]/items[at0002]/value|value") + private String berichtIdValue; - @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Risikogebiet']") - private RisikogebietSection risikogebiet; + @Path("/context/other_context[at0001]/items[at0005]/value|value") + private String statusValue; - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; + @Path("/context/other_context[at0001]/items[at0006]") + private List erweiterung; - @Path("/context/participations") - private List participations; + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; - @Path("/language") - private Language language; + @Path("/context/participations") + private List participations; - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; - @Path("/context/other_context[at0001]/items[at0005]/value|value") - private String statusValue; + @Path("/context/location") + private String location; - @Path("/content[openEHR-EHR-OBSERVATION.story.v1]") - private List geschichteHistorie; + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; - @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']") - private AllgemeineAngabenSection allgemeineAngaben; + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; - @Path("/context/other_context[at0001]/items[at0002]/value|value") - private String berichtIdValue; + @Path("/content[openEHR-EHR-OBSERVATION.story.v1]") + private List geschichteHistorie; - @Path("/territory") - private Territory territory; + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']") + private SymptomeSection symptome; - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']") + private KontaktSection kontakt; - @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']") - private SymptomeSection symptome; + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Risikogebiet']") + private RisikogebietSection risikogebiet; - @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']") - private KontaktSection kontakt; + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']") + private AllgemeineAngabenSection allgemeineAngaben; - @Path("/composer") - private PartyProxy composer; + @Path("/composer") + private PartyProxy composer; - @Path("/context/setting|defining_code") - private SettingDefiningcode settingDefiningcode; + @Path("/language") + private Language language; - @Path("/feeder_audit") - private FeederAudit feederAudit; + @Path("/feeder_audit") + private FeederAudit feederAudit; - @Path("/context/other_context[at0001]/items[at0006]") - private List erweiterung; + @Path("/category|defining_code") + private Category categoryDefiningCode; - @Path("/context/location") - private String location; + @Path("/territory") + private Territory territory; - @Path("/category|defining_code") - private CategoryDefiningcode categoryDefiningcode; + @Id + private VersionUid versionUid; - public VersionUid getVersionUid() { - return this.versionUid; - } + public void setBerichtIdValue(String berichtIdValue) { + this.berichtIdValue = berichtIdValue; + } - public void setVersionUid(VersionUid versionUid) { - this.versionUid = versionUid; - } + public String getBerichtIdValue() { + return this.berichtIdValue ; + } - public void setRisikogebiet(RisikogebietSection risikogebiet) { - this.risikogebiet = risikogebiet; - } + public void setStatusValue(String statusValue) { + this.statusValue = statusValue; + } - public RisikogebietSection getRisikogebiet() { - return this.risikogebiet; - } + public String getStatusValue() { + return this.statusValue ; + } - public void setEndTimeValue(TemporalAccessor endTimeValue) { - this.endTimeValue = endTimeValue; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public TemporalAccessor getEndTimeValue() { - return this.endTimeValue; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setParticipations(List participations) { - this.participations = participations; - } + public void setStartTimeValue(TemporalAccessor startTimeValue) { + this.startTimeValue = startTimeValue; + } - public List getParticipations() { - return this.participations; - } + public TemporalAccessor getStartTimeValue() { + return this.startTimeValue ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setParticipations(List participations) { + this.participations = participations; + } - public Language getLanguage() { - return this.language; - } + public List getParticipations() { + return this.participations ; + } - public void setHealthCareFacility(PartyIdentified healthCareFacility) { - this.healthCareFacility = healthCareFacility; - } + public void setEndTimeValue(TemporalAccessor endTimeValue) { + this.endTimeValue = endTimeValue; + } - public PartyIdentified getHealthCareFacility() { - return this.healthCareFacility; - } + public TemporalAccessor getEndTimeValue() { + return this.endTimeValue ; + } - public void setStatusValue(String statusValue) { - this.statusValue = statusValue; - } + public void setLocation(String location) { + this.location = location; + } - public String getStatusValue() { - return this.statusValue; - } + public String getLocation() { + return this.location ; + } - public void setGeschichteHistorie(List geschichteHistorie) { - this.geschichteHistorie = geschichteHistorie; - } + public void setHealthCareFacility(PartyIdentified healthCareFacility) { + this.healthCareFacility = healthCareFacility; + } - public List getGeschichteHistorie() { - return this.geschichteHistorie; - } + public PartyIdentified getHealthCareFacility() { + return this.healthCareFacility ; + } - public void setAllgemeineAngaben(AllgemeineAngabenSection allgemeineAngaben) { - this.allgemeineAngaben = allgemeineAngaben; - } + public void setSettingDefiningCode(Setting settingDefiningCode) { + this.settingDefiningCode = settingDefiningCode; + } - public AllgemeineAngabenSection getAllgemeineAngaben() { - return this.allgemeineAngaben; - } + public Setting getSettingDefiningCode() { + return this.settingDefiningCode ; + } - public void setBerichtIdValue(String berichtIdValue) { - this.berichtIdValue = berichtIdValue; - } + public void setGeschichteHistorie(List geschichteHistorie) { + this.geschichteHistorie = geschichteHistorie; + } - public String getBerichtIdValue() { - return this.berichtIdValue; - } + public List getGeschichteHistorie() { + return this.geschichteHistorie ; + } - public void setTerritory(Territory territory) { - this.territory = territory; - } + public void setSymptome(SymptomeSection symptome) { + this.symptome = symptome; + } - public Territory getTerritory() { - return this.territory; - } + public SymptomeSection getSymptome() { + return this.symptome ; + } - public void setStartTimeValue(TemporalAccessor startTimeValue) { - this.startTimeValue = startTimeValue; - } + public void setKontakt(KontaktSection kontakt) { + this.kontakt = kontakt; + } - public TemporalAccessor getStartTimeValue() { - return this.startTimeValue; - } + public KontaktSection getKontakt() { + return this.kontakt ; + } - public void setSymptome(SymptomeSection symptome) { - this.symptome = symptome; - } + public void setRisikogebiet(RisikogebietSection risikogebiet) { + this.risikogebiet = risikogebiet; + } - public SymptomeSection getSymptome() { - return this.symptome; - } + public RisikogebietSection getRisikogebiet() { + return this.risikogebiet ; + } - public void setKontakt(KontaktSection kontakt) { - this.kontakt = kontakt; - } + public void setAllgemeineAngaben(AllgemeineAngabenSection allgemeineAngaben) { + this.allgemeineAngaben = allgemeineAngaben; + } - public KontaktSection getKontakt() { - return this.kontakt; - } + public AllgemeineAngabenSection getAllgemeineAngaben() { + return this.allgemeineAngaben ; + } - public void setComposer(PartyProxy composer) { - this.composer = composer; - } + public void setComposer(PartyProxy composer) { + this.composer = composer; + } - public PartyProxy getComposer() { - return this.composer; - } + public PartyProxy getComposer() { + return this.composer ; + } - public void setSettingDefiningcode(SettingDefiningcode settingDefiningcode) { - this.settingDefiningcode = settingDefiningcode; - } + public void setLanguage(Language language) { + this.language = language; + } - public SettingDefiningcode getSettingDefiningcode() { - return this.settingDefiningcode; - } + public Language getLanguage() { + return this.language ; + } - public void setFeederAudit(FeederAudit feederAudit) { - this.feederAudit = feederAudit; - } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } - public FeederAudit getFeederAudit() { - return this.feederAudit; - } + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } - public List getErweiterung() { - return this.erweiterung; - } + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } - public void setLocation(String location) { - this.location = location; - } + public void setTerritory(Territory territory) { + this.territory = territory; + } - public String getLocation() { - return this.location; - } + public Territory getTerritory() { + return this.territory ; + } - public void setCategoryDefiningcode(CategoryDefiningcode categoryDefiningcode) { - this.categoryDefiningcode = categoryDefiningcode; - } + public VersionUid getVersionUid() { + return this.versionUid ; + } - public CategoryDefiningcode getCategoryDefiningcode() { - return this.categoryDefiningcode; - } + public void setVersionUid(VersionUid versionUid) { + this.versionUid = versionUid; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java index 8ab322a7f..034081a5d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java @@ -15,53 +15,53 @@ import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.KontaktSection; import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.RisikogebietSection; import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.SymptomeSection; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import java.time.temporal.TemporalAccessor; public class CoronaAnamneseCompositionContainment extends Containment { public SelectAqlField CORONA_ANAMNESE_COMPOSITION = new AqlFieldImp(CoronaAnamneseComposition.class, "", "CoronaAnamneseComposition", CoronaAnamneseComposition.class, this); - public SelectAqlField RISIKOGEBIET = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Risikogebiet']", "risikogebiet", RisikogebietSection.class, this); + public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + public SelectAqlField STATUS_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "statusValue", String.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/context/other_context[at0001]/items[at0006]", "erweiterung", Cluster.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/context/participations", "participations", Participation.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/language", "language", Language.class, this); + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + + public SelectAqlField LOCATION = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/location", "location", String.class, this); public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - public SelectAqlField STATUS_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "statusValue", String.class, this); + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); public ListSelectAqlField GESCHICHTE_HISTORIE = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-OBSERVATION.story.v1]", "geschichteHistorie", GeschichteHistorieObservation.class, this); - public SelectAqlField ALLGEMEINE_ANGABEN = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']", "allgemeineAngaben", AllgemeineAngabenSection.class, this); - - public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); - - public SelectAqlField TERRITORY = new AqlFieldImp(CoronaAnamneseComposition.class, "/territory", "territory", Territory.class, this); + public SelectAqlField SYMPTOME = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "symptome", SymptomeSection.class, this); - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + public SelectAqlField KONTAKT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "kontakt", KontaktSection.class, this); - public SelectAqlField SYMPTOME = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']", "symptome", SymptomeSection.class, this); + public SelectAqlField RISIKOGEBIET = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "risikogebiet", RisikogebietSection.class, this); - public SelectAqlField KONTAKT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']", "kontakt", KontaktSection.class, this); + public SelectAqlField ALLGEMEINE_ANGABEN = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "allgemeineAngaben", AllgemeineAngabenSection.class, this); public SelectAqlField COMPOSER = new AqlFieldImp(CoronaAnamneseComposition.class, "/composer", "composer", PartyProxy.class, this); - public SelectAqlField SETTING_DEFININGCODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/setting|defining_code", "settingDefiningcode", SettingDefiningcode.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/language", "language", Language.class, this); public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(CoronaAnamneseComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/context/other_context[at0001]/items[at0006]", "erweiterung", Cluster.class, this); + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - public SelectAqlField LOCATION = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/location", "location", String.class, this); - - public SelectAqlField CATEGORY_DEFININGCODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/category|defining_code", "categoryDefiningcode", CategoryDefiningcode.class, this); + public SelectAqlField TERRITORY = new AqlFieldImp(CoronaAnamneseComposition.class, "/territory", "territory", Territory.class, this); private CoronaAnamneseCompositionContainment() { super("openEHR-EHR-COMPOSITION.report.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java index 4cdd30023..d173ceb8b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java @@ -7,25 +7,25 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.address_cc.v0") public class AdresseCluster { - @Path("/items[at0012]/value|value") - private String stadtValue; + @Path("/items[at0012]/value|value") + private String stadtValue; - @Path("/items[at0015]/value|value") - private String landValue; + @Path("/items[at0015]/value|value") + private String landValue; - public void setStadtValue(String stadtValue) { - this.stadtValue = stadtValue; - } + public void setStadtValue(String stadtValue) { + this.stadtValue = stadtValue; + } - public String getStadtValue() { - return this.stadtValue; - } + public String getStadtValue() { + return this.stadtValue ; + } - public void setLandValue(String landValue) { - this.landValue = landValue; - } + public void setLandValue(String landValue) { + this.landValue = landValue; + } - public String getLandValue() { - return this.landValue; - } + public String getLandValue() { + return this.landValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java index 957ae7828..210d3eed1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java @@ -9,107 +9,107 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class AllgemeineAngabenSection { - @Path("/items[openEHR-EHR-OBSERVATION.medication_use.v0]") - private FragebogenZumMedikationsScreeningObservation fragebogenZumMedikationsScreening; + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Andere aktuelle Erkrankungen']") + private AndereAktuelleErkrankungenObservation andereAktuelleErkrankungen; - @Path("/items[openEHR-EHR-EVALUATION.occupation_summary.v1 and name/value='Gesundheitsbezogener Beruf']") - private GesundheitsbezogenerBerufEvaluation gesundheitsbezogenerBeruf; + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Chronische Erkrankungen']") + private ChronischeErkrankungenObservation chronischeErkrankungen; - @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Chronische Erkrankungen']") - private ChronischeErkrankungenObservation chronischeErkrankungen; + @Path("/items[openEHR-EHR-EVALUATION.problem_diagnosis.v1]") + private List problemDiagnose; - @Path("/items[openEHR-EHR-EVALUATION.problem_diagnosis.v1]") - private List problemDiagnose; + @Path("/items[openEHR-EHR-OBSERVATION.medication_use.v0]") + private FragebogenZumMedikationsScreeningObservation fragebogenZumMedikationsScreening; - @Path("/items[openEHR-EHR-INSTRUCTION.service_request.v1]") - private List dienstleistung; + @Path("/items[openEHR-EHR-EVALUATION.occupation_summary.v1 and name/value='Gesundheitsbezogener Beruf']") + private GesundheitsbezogenerBerufEvaluation gesundheitsbezogenerBeruf; - @Path("/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1 and name/value='Problem/Diganose Coronovirus']") - private ProblemDiganoseCoronovirusEvaluation problemDiganoseCoronovirus; + @Path("/items[openEHR-EHR-EVALUATION.living_arrangement.v0]") + private List wohnsituation; - @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Andere aktuelle Erkrankungen']") - private AndereAktuelleErkrankungenObservation andereAktuelleErkrankungen; + @Path("/items[openEHR-EHR-EVALUATION.health_risk.v1]") + private List bewertungDesGesundheitsrisikos; - @Path("/items[openEHR-EHR-EVALUATION.health_risk.v1]") - private List bewertungDesGesundheitsrisikos; + @Path("/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1 and name/value='Problem/Diganose Coronovirus']") + private ProblemDiganoseCoronovirusEvaluation problemDiganoseCoronovirus; - @Path("/items[openEHR-EHR-EVALUATION.living_arrangement.v0]") - private List wohnsituation; + @Path("/items[openEHR-EHR-INSTRUCTION.service_request.v1]") + private List dienstleistung; - public void setFragebogenZumMedikationsScreening( - FragebogenZumMedikationsScreeningObservation fragebogenZumMedikationsScreening) { - this.fragebogenZumMedikationsScreening = fragebogenZumMedikationsScreening; - } + public void setAndereAktuelleErkrankungen( + AndereAktuelleErkrankungenObservation andereAktuelleErkrankungen) { + this.andereAktuelleErkrankungen = andereAktuelleErkrankungen; + } - public FragebogenZumMedikationsScreeningObservation getFragebogenZumMedikationsScreening() { - return this.fragebogenZumMedikationsScreening; - } + public AndereAktuelleErkrankungenObservation getAndereAktuelleErkrankungen() { + return this.andereAktuelleErkrankungen ; + } - public void setGesundheitsbezogenerBeruf( - GesundheitsbezogenerBerufEvaluation gesundheitsbezogenerBeruf) { - this.gesundheitsbezogenerBeruf = gesundheitsbezogenerBeruf; - } + public void setChronischeErkrankungen(ChronischeErkrankungenObservation chronischeErkrankungen) { + this.chronischeErkrankungen = chronischeErkrankungen; + } - public GesundheitsbezogenerBerufEvaluation getGesundheitsbezogenerBeruf() { - return this.gesundheitsbezogenerBeruf; - } + public ChronischeErkrankungenObservation getChronischeErkrankungen() { + return this.chronischeErkrankungen ; + } - public void setChronischeErkrankungen(ChronischeErkrankungenObservation chronischeErkrankungen) { - this.chronischeErkrankungen = chronischeErkrankungen; - } + public void setProblemDiagnose(List problemDiagnose) { + this.problemDiagnose = problemDiagnose; + } - public ChronischeErkrankungenObservation getChronischeErkrankungen() { - return this.chronischeErkrankungen; - } + public List getProblemDiagnose() { + return this.problemDiagnose ; + } - public void setProblemDiagnose(List problemDiagnose) { - this.problemDiagnose = problemDiagnose; - } + public void setFragebogenZumMedikationsScreening( + FragebogenZumMedikationsScreeningObservation fragebogenZumMedikationsScreening) { + this.fragebogenZumMedikationsScreening = fragebogenZumMedikationsScreening; + } - public List getProblemDiagnose() { - return this.problemDiagnose; - } + public FragebogenZumMedikationsScreeningObservation getFragebogenZumMedikationsScreening() { + return this.fragebogenZumMedikationsScreening ; + } - public void setDienstleistung(List dienstleistung) { - this.dienstleistung = dienstleistung; - } + public void setGesundheitsbezogenerBeruf( + GesundheitsbezogenerBerufEvaluation gesundheitsbezogenerBeruf) { + this.gesundheitsbezogenerBeruf = gesundheitsbezogenerBeruf; + } - public List getDienstleistung() { - return this.dienstleistung; - } + public GesundheitsbezogenerBerufEvaluation getGesundheitsbezogenerBeruf() { + return this.gesundheitsbezogenerBeruf ; + } - public void setProblemDiganoseCoronovirus( - ProblemDiganoseCoronovirusEvaluation problemDiganoseCoronovirus) { - this.problemDiganoseCoronovirus = problemDiganoseCoronovirus; - } + public void setWohnsituation(List wohnsituation) { + this.wohnsituation = wohnsituation; + } - public ProblemDiganoseCoronovirusEvaluation getProblemDiganoseCoronovirus() { - return this.problemDiganoseCoronovirus; - } + public List getWohnsituation() { + return this.wohnsituation ; + } - public void setAndereAktuelleErkrankungen( - AndereAktuelleErkrankungenObservation andereAktuelleErkrankungen) { - this.andereAktuelleErkrankungen = andereAktuelleErkrankungen; - } + public void setBewertungDesGesundheitsrisikos( + List bewertungDesGesundheitsrisikos) { + this.bewertungDesGesundheitsrisikos = bewertungDesGesundheitsrisikos; + } - public AndereAktuelleErkrankungenObservation getAndereAktuelleErkrankungen() { - return this.andereAktuelleErkrankungen; - } + public List getBewertungDesGesundheitsrisikos() { + return this.bewertungDesGesundheitsrisikos ; + } - public void setBewertungDesGesundheitsrisikos( - List bewertungDesGesundheitsrisikos) { - this.bewertungDesGesundheitsrisikos = bewertungDesGesundheitsrisikos; - } + public void setProblemDiganoseCoronovirus( + ProblemDiganoseCoronovirusEvaluation problemDiganoseCoronovirus) { + this.problemDiganoseCoronovirus = problemDiganoseCoronovirus; + } - public List getBewertungDesGesundheitsrisikos() { - return this.bewertungDesGesundheitsrisikos; - } + public ProblemDiganoseCoronovirusEvaluation getProblemDiganoseCoronovirus() { + return this.problemDiganoseCoronovirus ; + } - public void setWohnsituation(List wohnsituation) { - this.wohnsituation = wohnsituation; - } + public void setDienstleistung(List dienstleistung) { + this.dienstleistung = dienstleistung; + } - public List getWohnsituation() { - return this.wohnsituation; - } + public List getDienstleistung() { + return this.dienstleistung ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSectionContainment.java index daf42beb0..1606a7207 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSectionContainment.java @@ -9,23 +9,23 @@ public class AllgemeineAngabenSectionContainment extends Containment { public SelectAqlField ALLGEMEINE_ANGABEN_SECTION = new AqlFieldImp(AllgemeineAngabenSection.class, "", "AllgemeineAngabenSection", AllgemeineAngabenSection.class, this); - public SelectAqlField FRAGEBOGEN_ZUM_MEDIKATIONS_SCREENING = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-OBSERVATION.medication_use.v0]", "fragebogenZumMedikationsScreening", FragebogenZumMedikationsScreeningObservation.class, this); - - public SelectAqlField GESUNDHEITSBEZOGENER_BERUF = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.occupation_summary.v1 and name/value='Gesundheitsbezogener Beruf']", "gesundheitsbezogenerBeruf", GesundheitsbezogenerBerufEvaluation.class, this); + public SelectAqlField ANDERE_AKTUELLE_ERKRANKUNGEN = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "andereAktuelleErkrankungen", AndereAktuelleErkrankungenObservation.class, this); - public SelectAqlField CHRONISCHE_ERKRANKUNGEN = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Chronische Erkrankungen']", "chronischeErkrankungen", ChronischeErkrankungenObservation.class, this); + public SelectAqlField CHRONISCHE_ERKRANKUNGEN = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "chronischeErkrankungen", ChronischeErkrankungenObservation.class, this); public ListSelectAqlField PROBLEM_DIAGNOSE = new ListAqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.problem_diagnosis.v1]", "problemDiagnose", ProblemDiagnoseEvaluation.class, this); - public ListSelectAqlField DIENSTLEISTUNG = new ListAqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-INSTRUCTION.service_request.v1]", "dienstleistung", DienstleistungInstruction.class, this); + public SelectAqlField FRAGEBOGEN_ZUM_MEDIKATIONS_SCREENING = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-OBSERVATION.medication_use.v0]", "fragebogenZumMedikationsScreening", FragebogenZumMedikationsScreeningObservation.class, this); - public SelectAqlField PROBLEM_DIGANOSE_CORONOVIRUS = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1 and name/value='Problem/Diganose Coronovirus']", "problemDiganoseCoronovirus", ProblemDiganoseCoronovirusEvaluation.class, this); + public SelectAqlField GESUNDHEITSBEZOGENER_BERUF = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.occupation_summary.v1]", "gesundheitsbezogenerBeruf", GesundheitsbezogenerBerufEvaluation.class, this); - public SelectAqlField ANDERE_AKTUELLE_ERKRANKUNGEN = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Andere aktuelle Erkrankungen']", "andereAktuelleErkrankungen", AndereAktuelleErkrankungenObservation.class, this); + public ListSelectAqlField WOHNSITUATION = new ListAqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.living_arrangement.v0]", "wohnsituation", WohnsituationEvaluation.class, this); public ListSelectAqlField BEWERTUNG_DES_GESUNDHEITSRISIKOS = new ListAqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.health_risk.v1]", "bewertungDesGesundheitsrisikos", BewertungDesGesundheitsrisikosEvaluation.class, this); - public ListSelectAqlField WOHNSITUATION = new ListAqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.living_arrangement.v0]", "wohnsituation", WohnsituationEvaluation.class, this); + public SelectAqlField PROBLEM_DIGANOSE_CORONOVIRUS = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1]", "problemDiganoseCoronovirus", ProblemDiganoseCoronovirusEvaluation.class, this); + + public ListSelectAqlField DIENSTLEISTUNG = new ListAqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-INSTRUCTION.service_request.v1]", "dienstleistung", DienstleistungInstruction.class, this); private AllgemeineAngabenSectionContainment() { super("openEHR-EHR-SECTION.adhoc.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java index cfd5eeef9..b7b8e2299 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,92 +13,93 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class AndereAktuelleErkrankungenObservation { - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; - @Path("/protocol[at0007]/items[at0021]") - private List erweiterung; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") - private String bezeichnungDesSymptomsOderAnzeichensValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") - private VorhandenDefiningcode vorhandenDefiningcode; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") - private List anzeichen; + @Path("/language") + private Language language; - public void setLanguage(Language language) { - this.language = language; - } + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } - public Language getLanguage() { - return this.language; - } + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } - public List getErweiterung() { - return this.erweiterung; - } + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } - public void setBezeichnungDesSymptomsOderAnzeichensValue( - String bezeichnungDesSymptomsOderAnzeichensValue) { - this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; - } + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } - public String getBezeichnungDesSymptomsOderAnzeichensValue() { - return this.bezeichnungDesSymptomsOderAnzeichensValue; - } + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } - public void setVorhandenDefiningcode(VorhandenDefiningcode vorhandenDefiningcode) { - this.vorhandenDefiningcode = vorhandenDefiningcode; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public VorhandenDefiningcode getVorhandenDefiningcode() { - return this.vorhandenDefiningcode; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public PartyProxy getSubject() { - return this.subject; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setAnzeichen(List anzeichen) { - this.anzeichen = anzeichen; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getAnzeichen() { - return this.anzeichen; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java index d18739b65..04eba6abe 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java @@ -7,28 +7,28 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class AndereAktuelleErkrankungenObservationContainment extends Containment { public SelectAqlField ANDERE_AKTUELLE_ERKRANKUNGEN_OBSERVATION = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "", "AndereAktuelleErkrankungenObservation", AndereAktuelleErkrankungenObservation.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/language", "language", Language.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); - public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); - public SelectAqlField VORHANDEN_DEFININGCODE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningcode", VorhandenDefiningcode.class, this); + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public ListSelectAqlField ANZEICHEN = new ListAqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "anzeichen", Cluster.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/language", "language", Language.class, this); private AndereAktuelleErkrankungenObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java index 9aedcfed7..bcd39f709 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java @@ -16,7 +16,7 @@ public enum AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektio private String code; AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_(String value, - String description, String terminologyId, String code) { + String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -24,18 +24,18 @@ public enum AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektio } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java index 883b8155d..3d41837bd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,115 +13,114 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.exposure_assessment.v0") public class AufenthaltInGesundheitseinrichtungObservation { - @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value") - private String kommentarValue; + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value") + private String agentEnValue; - @Path("/protocol[at0004]/items[at0056]") - private List erweiterung; + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code") + private PresenceOfAnyExposureEnDefiningCode presenceOfAnyExposureEnDefiningCode; - @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value") - private String exposureEnValue; + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value") + private String exposureEnValue; - @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code") - private VorhandenseinDefiningcodeSpecificExposureEn vorhandenseinDefiningcode; + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code") + private VorhandenseinDefiningCode vorhandenseinDefiningCode; - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value") + private String kommentarValue; - @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value") - private String agentEnValue; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0004]/items[at0056]") + private List erweiterung; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code") - private PresenceOfAnyExposureEnDefiningcode presenceOfAnyExposureEnDefiningcode; + @Path("/language") + private Language language; - public void setKommentarValue(String kommentarValue) { - this.kommentarValue = kommentarValue; - } + public void setAgentEnValue(String agentEnValue) { + this.agentEnValue = agentEnValue; + } - public String getKommentarValue() { - return this.kommentarValue; - } + public String getAgentEnValue() { + return this.agentEnValue ; + } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setPresenceOfAnyExposureEnDefiningCode( + PresenceOfAnyExposureEnDefiningCode presenceOfAnyExposureEnDefiningCode) { + this.presenceOfAnyExposureEnDefiningCode = presenceOfAnyExposureEnDefiningCode; + } - public List getErweiterung() { - return this.erweiterung; - } + public PresenceOfAnyExposureEnDefiningCode getPresenceOfAnyExposureEnDefiningCode() { + return this.presenceOfAnyExposureEnDefiningCode ; + } - public void setExposureEnValue(String exposureEnValue) { - this.exposureEnValue = exposureEnValue; - } + public void setExposureEnValue(String exposureEnValue) { + this.exposureEnValue = exposureEnValue; + } - public String getExposureEnValue() { - return this.exposureEnValue; - } + public String getExposureEnValue() { + return this.exposureEnValue ; + } - public void setVorhandenseinDefiningcode( - VorhandenseinDefiningcodeSpecificExposureEn vorhandenseinDefiningcode) { - this.vorhandenseinDefiningcode = vorhandenseinDefiningcode; - } + public void setVorhandenseinDefiningCode(VorhandenseinDefiningCode vorhandenseinDefiningCode) { + this.vorhandenseinDefiningCode = vorhandenseinDefiningCode; + } - public VorhandenseinDefiningcodeSpecificExposureEn getVorhandenseinDefiningcode() { - return this.vorhandenseinDefiningcode; - } + public VorhandenseinDefiningCode getVorhandenseinDefiningCode() { + return this.vorhandenseinDefiningCode ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } - public Language getLanguage() { - return this.language; - } + public String getKommentarValue() { + return this.kommentarValue ; + } - public void setAgentEnValue(String agentEnValue) { - this.agentEnValue = agentEnValue; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public String getAgentEnValue() { - return this.agentEnValue; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public PartyProxy getSubject() { - return this.subject; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setPresenceOfAnyExposureEnDefiningcode( - PresenceOfAnyExposureEnDefiningcode presenceOfAnyExposureEnDefiningcode) { - this.presenceOfAnyExposureEnDefiningcode = presenceOfAnyExposureEnDefiningcode; - } + public void setLanguage(Language language) { + this.language = language; + } - public PresenceOfAnyExposureEnDefiningcode getPresenceOfAnyExposureEnDefiningcode() { - return this.presenceOfAnyExposureEnDefiningcode; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java index a7384d09a..bdf09520a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java @@ -7,32 +7,32 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class AufenthaltInGesundheitseinrichtungObservationContainment extends Containment { public SelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG_OBSERVATION = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "", "AufenthaltInGesundheitseinrichtungObservation", AufenthaltInGesundheitseinrichtungObservation.class, this); - public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value", "kommentarValue", String.class, this); + public SelectAqlField AGENT_EN_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value", "agentEnValue", String.class, this); - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/protocol[at0004]/items[at0056]", "erweiterung", Cluster.class, this); + public SelectAqlField PRESENCE_OF_ANY_EXPOSURE_EN_DEFINING_CODE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code", "presenceOfAnyExposureEnDefiningCode", PresenceOfAnyExposureEnDefiningCode.class, this); public SelectAqlField EXPOSURE_EN_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value", "exposureEnValue", String.class, this); - public SelectAqlField VORHANDENSEIN_DEFININGCODE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code", "vorhandenseinDefiningcode", VorhandenseinDefiningcodeSpecificExposureEn.class, this); + public SelectAqlField VORHANDENSEIN_DEFINING_CODE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code", "vorhandenseinDefiningCode", VorhandenseinDefiningCode.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/language", "language", Language.class, this); - - public SelectAqlField AGENT_EN_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value", "agentEnValue", String.class, this); + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value", "kommentarValue", String.class, this); public SelectAqlField TIME_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public SelectAqlField PRESENCE_OF_ANY_EXPOSURE_EN_DEFININGCODE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code", "presenceOfAnyExposureEnDefiningcode", PresenceOfAnyExposureEnDefiningcode.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/protocol[at0004]/items[at0056]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/language", "language", Language.class, this); private AufenthaltInGesundheitseinrichtungObservationContainment() { super("openEHR-EHR-OBSERVATION.exposure_assessment.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java index 7b3c0f8aa..65e324563 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java @@ -10,36 +10,36 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.occupation_record.v1") public class BeschaftigungCluster { - @Path("/items[at0005]/value|value") - private String berufsbezeichnungRolleValue; + @Path("/items[at0005]/value|value") + private String berufsbezeichnungRolleValue; - @Path("/items[openEHR-EHR-CLUSTER.organisation_cc.v0]") - private List organisation; + @Path("/items[openEHR-EHR-CLUSTER.organisation_cc.v0]") + private List organisation; - @Path("/items[at0018]") - private List zusatzlicheAngaben; + @Path("/items[at0018]") + private List zusatzlicheAngaben; - public void setBerufsbezeichnungRolleValue(String berufsbezeichnungRolleValue) { - this.berufsbezeichnungRolleValue = berufsbezeichnungRolleValue; - } + public void setBerufsbezeichnungRolleValue(String berufsbezeichnungRolleValue) { + this.berufsbezeichnungRolleValue = berufsbezeichnungRolleValue; + } - public String getBerufsbezeichnungRolleValue() { - return this.berufsbezeichnungRolleValue; - } + public String getBerufsbezeichnungRolleValue() { + return this.berufsbezeichnungRolleValue ; + } - public void setOrganisation(List organisation) { - this.organisation = organisation; - } + public void setOrganisation(List organisation) { + this.organisation = organisation; + } - public List getOrganisation() { - return this.organisation; - } + public List getOrganisation() { + return this.organisation ; + } - public void setZusatzlicheAngaben(List zusatzlicheAngaben) { - this.zusatzlicheAngaben = zusatzlicheAngaben; - } + public void setZusatzlicheAngaben(List zusatzlicheAngaben) { + this.zusatzlicheAngaben = zusatzlicheAngaben; + } - public List getZusatzlicheAngaben() { - return this.zusatzlicheAngaben; - } + public List getZusatzlicheAngaben() { + return this.zusatzlicheAngaben ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosDetailsClusterSpezi_.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosDetailsClusterSpezi_.java deleted file mode 100644 index 7492fac62..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosDetailsClusterSpezi_.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -import java.util.List; - -@Entity -@OptionFor("CLUSTER") -public class BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosDetailsClusterSpezi_ implements BewertungDesGesundheitsrisikosDetailsChoice { - @Path("") - private List details; - - public void setDetails(List details) { - this.details = details; - } - - public List getDetails() { - return this.details; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosRisikofaktorDvtextS_.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosRisikofaktorDvtextS_.java deleted file mode 100644 index d9aec90cf..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosRisikofaktorDvtextS_.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosRisikofaktorDvtextS_ implements BewertungDesGesundheitsrisikosRisikofaktorChoice { - @Path("|value") - private String risikofaktorValue; - - public void setRisikofaktorValue(String risikofaktorValue) { - this.risikofaktorValue = risikofaktorValue; - } - - public String getRisikofaktorValue() { - return this.risikofaktorValue; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosVorhandenseinDvcode_.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosVorhandenseinDvcode_.java deleted file mode 100644 index c99b43a83..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosVorhandenseinDvcode_.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class BewertungDesGesundheitsrisikosBewertungDesGesundheitsrisikosVorhandenseinDvcode_ implements BewertungDesGesundheitsrisikosVorhandenseinChoice { - @Path("|defining_code") - private VorhandenseinDefiningcode vorhandenseinDefiningcode; - - public void setVorhandenseinDefiningcode(VorhandenseinDefiningcode vorhandenseinDefiningcode) { - this.vorhandenseinDefiningcode = vorhandenseinDefiningcode; - } - - public VorhandenseinDefiningcode getVorhandenseinDefiningcode() { - return this.vorhandenseinDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosDetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosDetailsCluster.java deleted file mode 100644 index 998668086..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosDetailsCluster.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -import java.util.List; - -@Entity -@OptionFor("CLUSTER") -public class BewertungDesGesundheitsrisikosDetailsCluster implements BewertungDesGesundheitsrisikosDetailsChoice { - @Path("") - private List details; - - public void setDetails(List details) { - this.details = details; - } - - public List getDetails() { - return this.details; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java index d6b281ec9..841c4940b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java @@ -3,10 +3,9 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; 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.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -14,116 +13,148 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.health_risk.v1") public class BewertungDesGesundheitsrisikosEvaluation { - @Path("/protocol[at0010]/items[at0024]/value|value") - private TemporalAccessor letzteAktualisierungValue; + @Path("/data[at0001]/items[at0002]/value|value") + private String gesundheitsrisikoValue; - @Path("/data[at0001]/items[at0016]/items[at0013]/value") - @Choice - private BewertungDesGesundheitsrisikosRisikofaktorChoice risikofaktor; + @Path("/data[at0001]/items[at0016 and name/value='Spezifischer Risikofaktor']/items[at0013]/value|value") + private String spezifischerRisikofaktorRisikofaktorValue; - @Path("/data[at0001]/items[at0003]/value|value") - private String risikobewertungValue; + @Path("/data[at0001]/items[at0016 and name/value='Spezifischer Risikofaktor']/items[at0017]/value|defining_code") + private VorhandenseinDefiningCode2 vorhandenseinDefiningCode; - @Path("/protocol[at0010]/items[at0011]") - private List erweiterung; + @Path("/data[at0001]/items[at0016 and name/value='Spezifischer Risikofaktor']/items[at0027]") + private List spezifischerRisikofaktorDetails; - @Path("/data[at0001]/items[at0002]/value|value") - private String gesundheitsrisikoValue; + @Path("/data[at0001]/items[at0016 and name/value='Andere Risikofaktoren']/items[at0013]/value|value") + private String andereRisikofaktorenRisikofaktorValue; - @Path("/language") - private Language language; + @Path("/data[at0001]/items[at0016 and name/value='Andere Risikofaktoren']/items[at0017]/value|defining_code") + private VorhandenseinDefiningCode2 vorhandenseinDefiningCode2; - @Path("/data[at0001]/items[at0016]/items[at0017]/value") - @Choice - private BewertungDesGesundheitsrisikosVorhandenseinChoice vorhandensein; + @Path("/data[at0001]/items[at0016 and name/value='Andere Risikofaktoren']/items[at0027]") + private List andereRisikofaktorenDetails; - @Path("/subject") - private PartyProxy subject; + @Path("/data[at0001]/items[at0003]/value|value") + private String risikobewertungValue; - @Path("/protocol[at0010]/items[at0025]/value|value") - private String bewertungsmethodeValue; + @Path("/protocol[at0010]/items[at0024]/value|value") + private TemporalAccessor letzteAktualisierungValue; - @Path("/data[at0001]/items[at0016]/items[at0027]") - @Choice - private BewertungDesGesundheitsrisikosDetailsChoice details; + @Path("/protocol[at0010]/items[at0025]/value|value") + private String bewertungsmethodeValue; - public void setLetzteAktualisierungValue(TemporalAccessor letzteAktualisierungValue) { - this.letzteAktualisierungValue = letzteAktualisierungValue; - } + @Path("/protocol[at0010]/items[at0011]") + private List erweiterung; - public TemporalAccessor getLetzteAktualisierungValue() { - return this.letzteAktualisierungValue; - } + @Path("/subject") + private PartyProxy subject; - public void setRisikofaktor(BewertungDesGesundheitsrisikosRisikofaktorChoice risikofaktor) { - this.risikofaktor = risikofaktor; - } + @Path("/language") + private Language language; - public BewertungDesGesundheitsrisikosRisikofaktorChoice getRisikofaktor() { - return this.risikofaktor; - } + public void setGesundheitsrisikoValue(String gesundheitsrisikoValue) { + this.gesundheitsrisikoValue = gesundheitsrisikoValue; + } - public void setRisikobewertungValue(String risikobewertungValue) { - this.risikobewertungValue = risikobewertungValue; - } + public String getGesundheitsrisikoValue() { + return this.gesundheitsrisikoValue ; + } - public String getRisikobewertungValue() { - return this.risikobewertungValue; - } + public void setSpezifischerRisikofaktorRisikofaktorValue( + String spezifischerRisikofaktorRisikofaktorValue) { + this.spezifischerRisikofaktorRisikofaktorValue = spezifischerRisikofaktorRisikofaktorValue; + } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public String getSpezifischerRisikofaktorRisikofaktorValue() { + return this.spezifischerRisikofaktorRisikofaktorValue ; + } - public List getErweiterung() { - return this.erweiterung; - } + public void setVorhandenseinDefiningCode(VorhandenseinDefiningCode2 vorhandenseinDefiningCode) { + this.vorhandenseinDefiningCode = vorhandenseinDefiningCode; + } - public void setGesundheitsrisikoValue(String gesundheitsrisikoValue) { - this.gesundheitsrisikoValue = gesundheitsrisikoValue; - } + public VorhandenseinDefiningCode2 getVorhandenseinDefiningCode() { + return this.vorhandenseinDefiningCode ; + } - public String getGesundheitsrisikoValue() { - return this.gesundheitsrisikoValue; - } + public void setSpezifischerRisikofaktorDetails(List spezifischerRisikofaktorDetails) { + this.spezifischerRisikofaktorDetails = spezifischerRisikofaktorDetails; + } - public void setLanguage(Language language) { - this.language = language; - } + public List getSpezifischerRisikofaktorDetails() { + return this.spezifischerRisikofaktorDetails ; + } - public Language getLanguage() { - return this.language; - } + public void setAndereRisikofaktorenRisikofaktorValue( + String andereRisikofaktorenRisikofaktorValue) { + this.andereRisikofaktorenRisikofaktorValue = andereRisikofaktorenRisikofaktorValue; + } - public void setVorhandensein(BewertungDesGesundheitsrisikosVorhandenseinChoice vorhandensein) { - this.vorhandensein = vorhandensein; - } + public String getAndereRisikofaktorenRisikofaktorValue() { + return this.andereRisikofaktorenRisikofaktorValue ; + } - public BewertungDesGesundheitsrisikosVorhandenseinChoice getVorhandensein() { - return this.vorhandensein; - } + public void setVorhandenseinDefiningCode2(VorhandenseinDefiningCode2 vorhandenseinDefiningCode2) { + this.vorhandenseinDefiningCode2 = vorhandenseinDefiningCode2; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public VorhandenseinDefiningCode2 getVorhandenseinDefiningCode2() { + return this.vorhandenseinDefiningCode2 ; + } - public PartyProxy getSubject() { - return this.subject; - } + public void setAndereRisikofaktorenDetails(List andereRisikofaktorenDetails) { + this.andereRisikofaktorenDetails = andereRisikofaktorenDetails; + } - public void setBewertungsmethodeValue(String bewertungsmethodeValue) { - this.bewertungsmethodeValue = bewertungsmethodeValue; - } + public List getAndereRisikofaktorenDetails() { + return this.andereRisikofaktorenDetails ; + } - public String getBewertungsmethodeValue() { - return this.bewertungsmethodeValue; - } + public void setRisikobewertungValue(String risikobewertungValue) { + this.risikobewertungValue = risikobewertungValue; + } - public void setDetails(BewertungDesGesundheitsrisikosDetailsChoice details) { - this.details = details; - } + public String getRisikobewertungValue() { + return this.risikobewertungValue ; + } - public BewertungDesGesundheitsrisikosDetailsChoice getDetails() { - return this.details; - } + public void setLetzteAktualisierungValue(TemporalAccessor letzteAktualisierungValue) { + this.letzteAktualisierungValue = letzteAktualisierungValue; + } + + public TemporalAccessor getLetzteAktualisierungValue() { + return this.letzteAktualisierungValue ; + } + + public void setBewertungsmethodeValue(String bewertungsmethodeValue) { + this.bewertungsmethodeValue = bewertungsmethodeValue; + } + + public String getBewertungsmethodeValue() { + return this.bewertungsmethodeValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java index 23d7961d5..185a8eb05 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java @@ -7,32 +7,38 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class BewertungDesGesundheitsrisikosEvaluationContainment extends Containment { public SelectAqlField BEWERTUNG_DES_GESUNDHEITSRISIKOS_EVALUATION = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "", "BewertungDesGesundheitsrisikosEvaluation", BewertungDesGesundheitsrisikosEvaluation.class, this); - public SelectAqlField LETZTE_AKTUALISIERUNG_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/protocol[at0010]/items[at0024]/value|value", "letzteAktualisierungValue", TemporalAccessor.class, this); + public SelectAqlField GESUNDHEITSRISIKO_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0002]/value|value", "gesundheitsrisikoValue", String.class, this); - public SelectAqlField RISIKOFAKTOR = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0013]/value", "risikofaktor", BewertungDesGesundheitsrisikosRisikofaktorChoice.class, this); + public SelectAqlField SPEZIFISCHER_RISIKOFAKTOR_RISIKOFAKTOR_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0013]/value|value", "spezifischerRisikofaktorRisikofaktorValue", String.class, this); - public SelectAqlField RISIKOBEWERTUNG_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0003]/value|value", "risikobewertungValue", String.class, this); + public SelectAqlField VORHANDENSEIN_DEFINING_CODE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0017]/value|defining_code", "vorhandenseinDefiningCode", VorhandenseinDefiningCode2.class, this); - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/protocol[at0010]/items[at0011]", "erweiterung", Cluster.class, this); + public ListSelectAqlField SPEZIFISCHER_RISIKOFAKTOR_DETAILS = new ListAqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0027]", "spezifischerRisikofaktorDetails", Cluster.class, this); - public SelectAqlField GESUNDHEITSRISIKO_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0002]/value|value", "gesundheitsrisikoValue", String.class, this); + public SelectAqlField ANDERE_RISIKOFAKTOREN_RISIKOFAKTOR_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0013]/value|value", "andereRisikofaktorenRisikofaktorValue", String.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField VORHANDENSEIN_DEFINING_CODE2 = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0017]/value|defining_code", "vorhandenseinDefiningCode2", VorhandenseinDefiningCode2.class, this); - public SelectAqlField VORHANDENSEIN = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0017]/value", "vorhandensein", BewertungDesGesundheitsrisikosVorhandenseinChoice.class, this); + public ListSelectAqlField ANDERE_RISIKOFAKTOREN_DETAILS = new ListAqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0027]", "andereRisikofaktorenDetails", Cluster.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField RISIKOBEWERTUNG_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0003]/value|value", "risikobewertungValue", String.class, this); + + public SelectAqlField LETZTE_AKTUALISIERUNG_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/protocol[at0010]/items[at0024]/value|value", "letzteAktualisierungValue", TemporalAccessor.class, this); public SelectAqlField BEWERTUNGSMETHODE_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/protocol[at0010]/items[at0025]/value|value", "bewertungsmethodeValue", String.class, this); - public SelectAqlField DETAILS = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0027]", "details", BewertungDesGesundheitsrisikosDetailsChoice.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/protocol[at0010]/items[at0011]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/language", "language", Language.class, this); private BewertungDesGesundheitsrisikosEvaluationContainment() { super("openEHR-EHR-EVALUATION.health_risk.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosRisikofaktorChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosRisikofaktorChoice.java deleted file mode 100644 index 5afb5c490..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosRisikofaktorChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -public interface BewertungDesGesundheitsrisikosRisikofaktorChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosRisikofaktorDvtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosRisikofaktorDvtext.java deleted file mode 100644 index e2a91358a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosRisikofaktorDvtext.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class BewertungDesGesundheitsrisikosRisikofaktorDvtext implements BewertungDesGesundheitsrisikosRisikofaktorChoice { - @Path("|value") - private String risikofaktorValue; - - public void setRisikofaktorValue(String risikofaktorValue) { - this.risikofaktorValue = risikofaktorValue; - } - - public String getRisikofaktorValue() { - return this.risikofaktorValue; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosVorhandenseinChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosVorhandenseinChoice.java deleted file mode 100644 index f47f5bb34..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosVorhandenseinChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -public interface BewertungDesGesundheitsrisikosVorhandenseinChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosVorhandenseinDvcodedtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosVorhandenseinDvcodedtext.java deleted file mode 100644 index 237c3d941..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosVorhandenseinDvcodedtext.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class BewertungDesGesundheitsrisikosVorhandenseinDvcodedtext implements BewertungDesGesundheitsrisikosVorhandenseinChoice { - @Path("|defining_code") - private VorhandenseinDefiningcode vorhandenseinDefiningcode; - - public void setVorhandenseinDefiningcode(VorhandenseinDefiningcode vorhandenseinDefiningcode) { - this.vorhandenseinDefiningcode = vorhandenseinDefiningcode; - } - - public VorhandenseinDefiningcode getVorhandenseinDefiningcode() { - return this.vorhandenseinDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java index 5d592fcb0..280be915e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,92 +13,93 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class ChronischeErkrankungenObservation { - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; - @Path("/protocol[at0007]/items[at0021]") - private List erweiterung; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") - private String bezeichnungDesSymptomsOderAnzeichensValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") - private VorhandenDefiningcode vorhandenDefiningcode; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") - private List anzeichen; + @Path("/language") + private Language language; - public void setLanguage(Language language) { - this.language = language; - } + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } - public Language getLanguage() { - return this.language; - } + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } - public List getErweiterung() { - return this.erweiterung; - } + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } - public void setBezeichnungDesSymptomsOderAnzeichensValue( - String bezeichnungDesSymptomsOderAnzeichensValue) { - this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; - } + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } - public String getBezeichnungDesSymptomsOderAnzeichensValue() { - return this.bezeichnungDesSymptomsOderAnzeichensValue; - } + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } - public void setVorhandenDefiningcode(VorhandenDefiningcode vorhandenDefiningcode) { - this.vorhandenDefiningcode = vorhandenDefiningcode; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public VorhandenDefiningcode getVorhandenDefiningcode() { - return this.vorhandenDefiningcode; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public PartyProxy getSubject() { - return this.subject; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setAnzeichen(List anzeichen) { - this.anzeichen = anzeichen; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getAnzeichen() { - return this.anzeichen; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java index 63f86f5f8..2ea4adc80 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java @@ -7,28 +7,28 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class ChronischeErkrankungenObservationContainment extends Containment { public SelectAqlField CHRONISCHE_ERKRANKUNGEN_OBSERVATION = new AqlFieldImp(ChronischeErkrankungenObservation.class, "", "ChronischeErkrankungenObservation", ChronischeErkrankungenObservation.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/language", "language", Language.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ChronischeErkrankungenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); - public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); - public SelectAqlField VORHANDEN_DEFININGCODE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningcode", VorhandenDefiningcode.class, this); + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public ListSelectAqlField ANZEICHEN = new ListAqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "anzeichen", Cluster.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ChronischeErkrankungenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/language", "language", Language.class, this); private ChronischeErkrankungenObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnosestatusDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnosestatusDefiningcode.java index a87e073d5..e550ec3a1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnosestatusDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnosestatusDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum DiagnosestatusDefiningcode implements EnumValueSet { +public enum DiagnosestatusDefiningCode implements EnumValueSet { IN_BEARBEITUNG("In Bearbeitung", "Eine vorübergehende Diagnose, bei welcher Testergebnisse und klinische Hinweise oder Empfehlungen noch ausstehen, welche aber bereits auf einer soliden klinischen Sicherheit beruht. Sobald weitere Testresultate und klinische Hinweise oder Empfehlungen zur Verfügung stehen, kann sich die Diagnose noch ändern.", "local", "at0017"); private String value; @@ -13,7 +13,7 @@ public enum DiagnosestatusDefiningcode implements EnumValueSet { private String code; - DiagnosestatusDefiningcode(String value, String description, String terminologyId, String code) { + DiagnosestatusDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -21,18 +21,18 @@ public enum DiagnosestatusDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningcode.java index 46f841d55..a1bb980a8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum DiagnostischeSicherheitDefiningcode implements EnumValueSet { +public enum DiagnostischeSicherheitDefiningCode implements EnumValueSet { WAHRSCHEINLICH("Wahrscheinlich", "Die Diagnose wurde mit einem hohen Maß an Sicherheit gestellt.", "local", "at0075"), VERMUTET("Vermutet", "Die Diagnose wurde mit einem niedrigen Grad an Sicherheit gestellt.", "local", "at0074"), @@ -17,8 +17,8 @@ public enum DiagnostischeSicherheitDefiningcode implements EnumValueSet { private String code; - DiagnostischeSicherheitDefiningcode(String value, String description, String terminologyId, - String code) { + DiagnostischeSicherheitDefiningCode(String value, String description, String terminologyId, + String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -26,18 +26,18 @@ public enum DiagnostischeSicherheitDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java index e88128131..834824db9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java @@ -1,7 +1,7 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datastructures.ItemStructure; +import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -9,81 +9,81 @@ @Entity public class DienstleistungAktuelleAktivitatActivity { - @Path("/description[at0009]/items[at0149]") - private List unterstutzendeInformationen; + @Path("/description[at0009]/items[at0121]/value|value") + private String nameDerDienstleistungValue; - @Path("/description[at0009]/items[at0116]") - private List anforderungenAnPatienten; + @Path("/description[at0009]/items[at0062]") + private List grundFurDieAnforderung; - @Path("/description[at0009]/items[at0121]/value|value") - private String nameDerDienstleistungValue; + @Path("/description[at0009]/items[at0151]") + private List komplexeZeitplanung; - @Path("/description[at0009]/items[at0132]") - private List spezifischeDetails; + @Path("/description[at0009]/items[at0132]") + private List spezifischeDetails; - @Path("/description[at0009]/items[at0151]") - private List komplexeZeitplanung; + @Path("/description[at0009]/items[at0149]") + private List unterstutzendeInformationen; - @Path("/description[at0009]/items[at0062]") - private List grundFurDieAnforderung; + @Path("/description[at0009]/items[at0116]") + private List anforderungenAnPatienten; - @Path("/description") - private ItemStructure description; + @Path("/timing") + private DvParsable timing; - public void setUnterstutzendeInformationen(List unterstutzendeInformationen) { - this.unterstutzendeInformationen = unterstutzendeInformationen; - } + public void setNameDerDienstleistungValue(String nameDerDienstleistungValue) { + this.nameDerDienstleistungValue = nameDerDienstleistungValue; + } - public List getUnterstutzendeInformationen() { - return this.unterstutzendeInformationen; - } + public String getNameDerDienstleistungValue() { + return this.nameDerDienstleistungValue ; + } - public void setAnforderungenAnPatienten(List anforderungenAnPatienten) { - this.anforderungenAnPatienten = anforderungenAnPatienten; - } + public void setGrundFurDieAnforderung( + List grundFurDieAnforderung) { + this.grundFurDieAnforderung = grundFurDieAnforderung; + } - public List getAnforderungenAnPatienten() { - return this.anforderungenAnPatienten; - } + public List getGrundFurDieAnforderung() { + return this.grundFurDieAnforderung ; + } - public void setNameDerDienstleistungValue(String nameDerDienstleistungValue) { - this.nameDerDienstleistungValue = nameDerDienstleistungValue; - } + public void setKomplexeZeitplanung(List komplexeZeitplanung) { + this.komplexeZeitplanung = komplexeZeitplanung; + } - public String getNameDerDienstleistungValue() { - return this.nameDerDienstleistungValue; - } + public List getKomplexeZeitplanung() { + return this.komplexeZeitplanung ; + } - public void setSpezifischeDetails(List spezifischeDetails) { - this.spezifischeDetails = spezifischeDetails; - } + public void setSpezifischeDetails(List spezifischeDetails) { + this.spezifischeDetails = spezifischeDetails; + } - public List getSpezifischeDetails() { - return this.spezifischeDetails; - } + public List getSpezifischeDetails() { + return this.spezifischeDetails ; + } - public void setKomplexeZeitplanung(List komplexeZeitplanung) { - this.komplexeZeitplanung = komplexeZeitplanung; - } + public void setUnterstutzendeInformationen(List unterstutzendeInformationen) { + this.unterstutzendeInformationen = unterstutzendeInformationen; + } - public List getKomplexeZeitplanung() { - return this.komplexeZeitplanung; - } + public List getUnterstutzendeInformationen() { + return this.unterstutzendeInformationen ; + } - public void setGrundFurDieAnforderung( - List grundFurDieAnforderung) { - this.grundFurDieAnforderung = grundFurDieAnforderung; - } + public void setAnforderungenAnPatienten(List anforderungenAnPatienten) { + this.anforderungenAnPatienten = anforderungenAnPatienten; + } - public List getGrundFurDieAnforderung() { - return this.grundFurDieAnforderung; - } + public List getAnforderungenAnPatienten() { + return this.anforderungenAnPatienten ; + } - public void setDescription(ItemStructure description) { - this.description = description; - } + public void setTiming(DvParsable timing) { + this.timing = timing; + } - public ItemStructure getDescription() { - return this.description; - } + public DvParsable getTiming() { + return this.timing ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java index 79c30cd56..93c5158d7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java @@ -5,14 +5,14 @@ @Entity public class DienstleistungGrundFurDieAnforderungElement { - @Path("/value|value") - private String value; + @Path("/value|value") + private String value; - public void setValue(String value) { - this.value = value; - } + public void setValue(String value) { + this.value = value; + } - public String getValue() { - return this.value; - } + public String getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java index 6689a9fdd..65cff3c8b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java @@ -5,99 +5,111 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import java.time.temporal.TemporalAccessor; import java.util.List; @Entity @Archetype("openEHR-EHR-INSTRUCTION.service_request.v1") public class DienstleistungInstruction { - @Path("/narrative|value") - private String narrativeValue; + @Path("/activities[at0001]") + private List aktuelleAktivitat; - @Path("/language") - private Language language; + @Path("/protocol[at0008]/items[at0141]") + private Cluster einsender; - @Path("/protocol[at0008]/items[at0142]") - private Cluster empfanger; + @Path("/protocol[at0008]/items[at0142]") + private Cluster empfanger; - @Path("/protocol[at0008]/items[at0112]") - private List erweiterung; + @Path("/protocol[at0008]/items[at0128]") + private List verteilerliste; - @Path("/protocol[at0008]/items[at0141]") - private Cluster einsender; + @Path("/protocol[at0008]/items[at0112]") + private List erweiterung; - @Path("/subject") - private PartyProxy subject; + @Path("/subject") + private PartyProxy subject; - @Path("/activities[at0001]") - private List aktuelleAktivitat; + @Path("/narrative|value") + private String narrativeValue; - @Path("/protocol[at0008]/items[at0128]") - private List verteilerliste; + @Path("/language") + private Language language; - public void setNarrativeValue(String narrativeValue) { - this.narrativeValue = narrativeValue; - } + @Path("/expiry_time|value") + private TemporalAccessor expiryTimeValue; - public String getNarrativeValue() { - return this.narrativeValue; - } + public void setAktuelleAktivitat( + List aktuelleAktivitat) { + this.aktuelleAktivitat = aktuelleAktivitat; + } - public void setLanguage(Language language) { - this.language = language; - } + public List getAktuelleAktivitat() { + return this.aktuelleAktivitat ; + } - public Language getLanguage() { - return this.language; - } + public void setEinsender(Cluster einsender) { + this.einsender = einsender; + } - public void setEmpfanger(Cluster empfanger) { - this.empfanger = empfanger; - } + public Cluster getEinsender() { + return this.einsender ; + } - public Cluster getEmpfanger() { - return this.empfanger; - } + public void setEmpfanger(Cluster empfanger) { + this.empfanger = empfanger; + } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public Cluster getEmpfanger() { + return this.empfanger ; + } - public List getErweiterung() { - return this.erweiterung; - } + public void setVerteilerliste(List verteilerliste) { + this.verteilerliste = verteilerliste; + } - public void setEinsender(Cluster einsender) { - this.einsender = einsender; - } + public List getVerteilerliste() { + return this.verteilerliste ; + } - public Cluster getEinsender() { - return this.einsender; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public List getErweiterung() { + return this.erweiterung ; + } - public PartyProxy getSubject() { - return this.subject; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public void setAktuelleAktivitat( - List aktuelleAktivitat) { - this.aktuelleAktivitat = aktuelleAktivitat; - } + public PartyProxy getSubject() { + return this.subject ; + } - public List getAktuelleAktivitat() { - return this.aktuelleAktivitat; - } + public void setNarrativeValue(String narrativeValue) { + this.narrativeValue = narrativeValue; + } - public void setVerteilerliste(List verteilerliste) { - this.verteilerliste = verteilerliste; - } + public String getNarrativeValue() { + return this.narrativeValue ; + } - public List getVerteilerliste() { - return this.verteilerliste; - } + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setExpiryTimeValue(TemporalAccessor expiryTimeValue) { + this.expiryTimeValue = expiryTimeValue; + } + + public TemporalAccessor getExpiryTimeValue() { + return this.expiryTimeValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java index 680d1161f..d060d6ca6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java @@ -7,26 +7,30 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; public class DienstleistungInstructionContainment extends Containment { public SelectAqlField DIENSTLEISTUNG_INSTRUCTION = new AqlFieldImp(DienstleistungInstruction.class, "", "DienstleistungInstruction", DienstleistungInstruction.class, this); - public SelectAqlField NARRATIVE_VALUE = new AqlFieldImp(DienstleistungInstruction.class, "/narrative|value", "narrativeValue", String.class, this); + public ListSelectAqlField AKTUELLE_AKTIVITAT = new ListAqlFieldImp(DienstleistungInstruction.class, "/activities[at0001]", "aktuelleAktivitat", DienstleistungAktuelleAktivitatActivity.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(DienstleistungInstruction.class, "/language", "language", Language.class, this); + public SelectAqlField EINSENDER = new AqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0141]", "einsender", Cluster.class, this); public SelectAqlField EMPFANGER = new AqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0142]", "empfanger", Cluster.class, this); - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0112]", "erweiterung", Cluster.class, this); + public ListSelectAqlField VERTEILERLISTE = new ListAqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0128]", "verteilerliste", Cluster.class, this); - public SelectAqlField EINSENDER = new AqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0141]", "einsender", Cluster.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0112]", "erweiterung", Cluster.class, this); public SelectAqlField SUBJECT = new AqlFieldImp(DienstleistungInstruction.class, "/subject", "subject", PartyProxy.class, this); - public ListSelectAqlField AKTUELLE_AKTIVITAT = new ListAqlFieldImp(DienstleistungInstruction.class, "/activities[at0001]", "aktuelleAktivitat", DienstleistungAktuelleAktivitatActivity.class, this); + public SelectAqlField NARRATIVE_VALUE = new AqlFieldImp(DienstleistungInstruction.class, "/narrative|value", "narrativeValue", String.class, this); - public ListSelectAqlField VERTEILERLISTE = new ListAqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0128]", "verteilerliste", Cluster.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(DienstleistungInstruction.class, "/language", "language", Language.class, this); + + public SelectAqlField EXPIRY_TIME_VALUE = new AqlFieldImp(DienstleistungInstruction.class, "/expiry_time|value", "expiryTimeValue", TemporalAccessor.class, this); private DienstleistungInstructionContainment() { super("openEHR-EHR-INSTRUCTION.service_request.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java index e00029d38..0f9e74150 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,92 +13,93 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class DurchfallObservation { - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; - @Path("/protocol[at0007]/items[at0021]") - private List erweiterung; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") - private String bezeichnungDesSymptomsOderAnzeichensValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") - private VorhandenDefiningcode vorhandenDefiningcode; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") - private List anzeichen; + @Path("/language") + private Language language; - public void setLanguage(Language language) { - this.language = language; - } + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } - public Language getLanguage() { - return this.language; - } + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } - public List getErweiterung() { - return this.erweiterung; - } + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } - public void setBezeichnungDesSymptomsOderAnzeichensValue( - String bezeichnungDesSymptomsOderAnzeichensValue) { - this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; - } + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } - public String getBezeichnungDesSymptomsOderAnzeichensValue() { - return this.bezeichnungDesSymptomsOderAnzeichensValue; - } + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } - public void setVorhandenDefiningcode(VorhandenDefiningcode vorhandenDefiningcode) { - this.vorhandenDefiningcode = vorhandenDefiningcode; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public VorhandenDefiningcode getVorhandenDefiningcode() { - return this.vorhandenDefiningcode; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public PartyProxy getSubject() { - return this.subject; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setAnzeichen(List anzeichen) { - this.anzeichen = anzeichen; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getAnzeichen() { - return this.anzeichen; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java index 594e9e210..d268ce2e0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java @@ -7,28 +7,28 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class DurchfallObservationContainment extends Containment { public SelectAqlField DURCHFALL_OBSERVATION = new AqlFieldImp(DurchfallObservation.class, "", "DurchfallObservation", DurchfallObservation.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(DurchfallObservation.class, "/language", "language", Language.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(DurchfallObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); - public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); - public SelectAqlField VORHANDEN_DEFININGCODE = new AqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningcode", VorhandenDefiningcode.class, this); + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(DurchfallObservation.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(DurchfallObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public ListSelectAqlField ANZEICHEN = new ListAqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "anzeichen", Cluster.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(DurchfallObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(DurchfallObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(DurchfallObservation.class, "/language", "language", Language.class, this); private DurchfallObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java index ec6a1b958..4d53489c6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,92 +13,93 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class FieberOderErhohteKorpertemperaturObservation { - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; - @Path("/protocol[at0007]/items[at0021]") - private List erweiterung; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") - private String bezeichnungDesSymptomsOderAnzeichensValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") - private VorhandenDefiningcode vorhandenDefiningcode; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") - private List anzeichen; + @Path("/language") + private Language language; - public void setLanguage(Language language) { - this.language = language; - } + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } - public Language getLanguage() { - return this.language; - } + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } - public List getErweiterung() { - return this.erweiterung; - } + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } - public void setBezeichnungDesSymptomsOderAnzeichensValue( - String bezeichnungDesSymptomsOderAnzeichensValue) { - this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; - } + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } - public String getBezeichnungDesSymptomsOderAnzeichensValue() { - return this.bezeichnungDesSymptomsOderAnzeichensValue; - } + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } - public void setVorhandenDefiningcode(VorhandenDefiningcode vorhandenDefiningcode) { - this.vorhandenDefiningcode = vorhandenDefiningcode; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public VorhandenDefiningcode getVorhandenDefiningcode() { - return this.vorhandenDefiningcode; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public PartyProxy getSubject() { - return this.subject; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setAnzeichen(List anzeichen) { - this.anzeichen = anzeichen; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getAnzeichen() { - return this.anzeichen; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java index 5d4790a03..d33ce9209 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java @@ -7,28 +7,28 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class FieberOderErhohteKorpertemperaturObservationContainment extends Containment { public SelectAqlField FIEBER_ODER_ERHOHTE_KORPERTEMPERATUR_OBSERVATION = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "", "FieberOderErhohteKorpertemperaturObservation", FieberOderErhohteKorpertemperaturObservation.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/language", "language", Language.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); - public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); - public SelectAqlField VORHANDEN_DEFININGCODE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningcode", VorhandenDefiningcode.class, this); + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public ListSelectAqlField ANZEICHEN = new ListAqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "anzeichen", Cluster.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/language", "language", Language.class, this); private FieberOderErhohteKorpertemperaturObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java index b28e19fd6..d3fac31fd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java @@ -6,7 +6,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -14,107 +14,107 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.medication_use.v0") public class FragebogenZumMedikationsScreeningObservation { - @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0008]") - private List spezifischeMedikamente; + @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0027]/value|defining_code") + private CodePhrase medikamenteInVerwendungDefiningCode; - @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0003]/value|defining_code") - private MedikamentenklasseInVerwendungDefiningcode medikamentenklasseInVerwendungDefiningcode; + @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0002]/value|value") + private String nameDerMedikamentenklasseValue; - @Path("/language") - private Language language; + @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0003]/value|defining_code") + private MedikamentenklasseInVerwendungDefiningCode medikamentenklasseInVerwendungDefiningCode; - @Path("/data[at0022]/origin|value") - private TemporalAccessor originValue; + @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0008]") + private List spezifischeMedikamente; - @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0027]/value|defining_code") - private CodePhrase medikamenteInVerwendungDefiningcode; + @Path("/data[at0022]/events[at0023]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0002]/value|value") - private String nameDerMedikamentenklasseValue; + @Path("/data[at0022]/origin|value") + private TemporalAccessor originValue; - @Path("/data[at0022]/events[at0023]/time|value") - private TemporalAccessor timeValue; + @Path("/protocol[at0005]/items[at0019]") + private List erweiterung; - @Path("/subject") - private PartyProxy subject; + @Path("/subject") + private PartyProxy subject; - @Path("/protocol[at0005]/items[at0019]") - private List erweiterung; + @Path("/language") + private Language language; - public void setSpezifischeMedikamente( - List spezifischeMedikamente) { - this.spezifischeMedikamente = spezifischeMedikamente; - } + public void setMedikamenteInVerwendungDefiningCode( + CodePhrase medikamenteInVerwendungDefiningCode) { + this.medikamenteInVerwendungDefiningCode = medikamenteInVerwendungDefiningCode; + } - public List getSpezifischeMedikamente( - ) { - return this.spezifischeMedikamente; - } + public CodePhrase getMedikamenteInVerwendungDefiningCode() { + return this.medikamenteInVerwendungDefiningCode ; + } - public void setMedikamentenklasseInVerwendungDefiningcode( - MedikamentenklasseInVerwendungDefiningcode medikamentenklasseInVerwendungDefiningcode) { - this.medikamentenklasseInVerwendungDefiningcode = medikamentenklasseInVerwendungDefiningcode; - } + public void setNameDerMedikamentenklasseValue(String nameDerMedikamentenklasseValue) { + this.nameDerMedikamentenklasseValue = nameDerMedikamentenklasseValue; + } - public MedikamentenklasseInVerwendungDefiningcode getMedikamentenklasseInVerwendungDefiningcode( - ) { - return this.medikamentenklasseInVerwendungDefiningcode; - } + public String getNameDerMedikamentenklasseValue() { + return this.nameDerMedikamentenklasseValue ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setMedikamentenklasseInVerwendungDefiningCode( + MedikamentenklasseInVerwendungDefiningCode medikamentenklasseInVerwendungDefiningCode) { + this.medikamentenklasseInVerwendungDefiningCode = medikamentenklasseInVerwendungDefiningCode; + } - public Language getLanguage() { - return this.language; - } + public MedikamentenklasseInVerwendungDefiningCode getMedikamentenklasseInVerwendungDefiningCode( + ) { + return this.medikamentenklasseInVerwendungDefiningCode ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setSpezifischeMedikamente( + List spezifischeMedikamente) { + this.spezifischeMedikamente = spezifischeMedikamente; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public List getSpezifischeMedikamente( + ) { + return this.spezifischeMedikamente ; + } - public void setMedikamenteInVerwendungDefiningcode( - CodePhrase medikamenteInVerwendungDefiningcode) { - this.medikamenteInVerwendungDefiningcode = medikamenteInVerwendungDefiningcode; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public CodePhrase getMedikamenteInVerwendungDefiningcode() { - return this.medikamenteInVerwendungDefiningcode; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setNameDerMedikamentenklasseValue(String nameDerMedikamentenklasseValue) { - this.nameDerMedikamentenklasseValue = nameDerMedikamentenklasseValue; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public String getNameDerMedikamentenklasseValue() { - return this.nameDerMedikamentenklasseValue; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public PartyProxy getSubject() { - return this.subject; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getErweiterung() { - return this.erweiterung; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java index ff54d74e8..fac157170 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java @@ -8,30 +8,30 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class FragebogenZumMedikationsScreeningObservationContainment extends Containment { public SelectAqlField FRAGEBOGEN_ZUM_MEDIKATIONS_SCREENING_OBSERVATION = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "", "FragebogenZumMedikationsScreeningObservation", FragebogenZumMedikationsScreeningObservation.class, this); - public ListSelectAqlField SPEZIFISCHE_MEDIKAMENTE = new ListAqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0008]", "spezifischeMedikamente", FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.class, this); + public SelectAqlField MEDIKAMENTE_IN_VERWENDUNG_DEFINING_CODE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0027]/value|defining_code", "medikamenteInVerwendungDefiningCode", CodePhrase.class, this); - public SelectAqlField MEDIKAMENTENKLASSE_IN_VERWENDUNG_DEFININGCODE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0003]/value|defining_code", "medikamentenklasseInVerwendungDefiningcode", MedikamentenklasseInVerwendungDefiningcode.class, this); + public SelectAqlField NAME_DER_MEDIKAMENTENKLASSE_VALUE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0002]/value|value", "nameDerMedikamentenklasseValue", String.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/language", "language", Language.class, this); + public SelectAqlField MEDIKAMENTENKLASSE_IN_VERWENDUNG_DEFINING_CODE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0003]/value|defining_code", "medikamentenklasseInVerwendungDefiningCode", MedikamentenklasseInVerwendungDefiningCode.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/origin|value", "originValue", TemporalAccessor.class, this); + public ListSelectAqlField SPEZIFISCHE_MEDIKAMENTE = new ListAqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0008]", "spezifischeMedikamente", FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.class, this); - public SelectAqlField MEDIKAMENTE_IN_VERWENDUNG_DEFININGCODE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0027]/value|defining_code", "medikamenteInVerwendungDefiningcode", CodePhrase.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/time|value", "timeValue", TemporalAccessor.class, this); - public SelectAqlField NAME_DER_MEDIKAMENTENKLASSE_VALUE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0002]/value|value", "nameDerMedikamentenklasseValue", String.class, this); + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/origin|value", "originValue", TemporalAccessor.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/time|value", "timeValue", TemporalAccessor.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/protocol[at0005]/items[at0019]", "erweiterung", Cluster.class, this); public SelectAqlField SUBJECT = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/subject", "subject", PartyProxy.class, this); - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/protocol[at0005]/items[at0019]", "erweiterung", Cluster.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/language", "language", Language.class, this); private FragebogenZumMedikationsScreeningObservationContainment() { super("openEHR-EHR-OBSERVATION.medication_use.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java index ca6cfc4c2..f4b534edd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java @@ -5,26 +5,26 @@ @Entity public class FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster { - @Path("/items[at0021]/value|value") - private String nameDesMedikamentsValue; + @Path("/items[at0021]/value|value") + private String nameDesMedikamentsValue; - @Path("/items[at0024]/value|defining_code") - private MedikamentInVerwendungDefiningcode medikamentInVerwendungDefiningcode; + @Path("/items[at0024]/value|defining_code") + private MedikamentInVerwendungDefiningCode medikamentInVerwendungDefiningCode; - public void setNameDesMedikamentsValue(String nameDesMedikamentsValue) { - this.nameDesMedikamentsValue = nameDesMedikamentsValue; - } + public void setNameDesMedikamentsValue(String nameDesMedikamentsValue) { + this.nameDesMedikamentsValue = nameDesMedikamentsValue; + } - public String getNameDesMedikamentsValue() { - return this.nameDesMedikamentsValue; - } + public String getNameDesMedikamentsValue() { + return this.nameDesMedikamentsValue ; + } - public void setMedikamentInVerwendungDefiningcode( - MedikamentInVerwendungDefiningcode medikamentInVerwendungDefiningcode) { - this.medikamentInVerwendungDefiningcode = medikamentInVerwendungDefiningcode; - } + public void setMedikamentInVerwendungDefiningCode( + MedikamentInVerwendungDefiningCode medikamentInVerwendungDefiningCode) { + this.medikamentInVerwendungDefiningCode = medikamentInVerwendungDefiningCode; + } - public MedikamentInVerwendungDefiningcode getMedikamentInVerwendungDefiningcode() { - return this.medikamentInVerwendungDefiningcode; - } + public MedikamentInVerwendungDefiningCode getMedikamentInVerwendungDefiningCode() { + return this.medikamentInVerwendungDefiningCode ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java index d96ec156b..54f12c3a2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java @@ -4,7 +4,7 @@ import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.MathFunctionDefiningcode; +import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; @@ -13,58 +13,58 @@ @Entity @OptionFor("INTERVAL_EVENT") public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements GeschichteHistorieBeliebigesEreignisChoice { - @Path("/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0003]/items[at0004]") + private List geschichte; - @Path("/data[at0003]/items[at0004]") - private List geschichte; + @Path("/data[at0003]/items[at0006]") + private List strukturierteAngabe; - @Path("/math_function|defining_code") - private MathFunctionDefiningcode mathFunctionDefiningcode; + @Path("/time|value") + private TemporalAccessor timeValue; - @Path("/width|value") - private TemporalAmount widthValue; + @Path("/width|value") + private TemporalAmount widthValue; - @Path("/data[at0003]/items[at0006]") - private List strukturierteAngabe; + @Path("/math_function|defining_code") + private MathFunction mathFunctionDefiningCode; - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setGeschichte(List geschichte) { + this.geschichte = geschichte; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public List getGeschichte() { + return this.geschichte ; + } - public void setGeschichte(List geschichte) { - this.geschichte = geschichte; - } + public void setStrukturierteAngabe(List strukturierteAngabe) { + this.strukturierteAngabe = strukturierteAngabe; + } - public List getGeschichte() { - return this.geschichte; - } + public List getStrukturierteAngabe() { + return this.strukturierteAngabe ; + } - public void setMathFunctionDefiningcode(MathFunctionDefiningcode mathFunctionDefiningcode) { - this.mathFunctionDefiningcode = mathFunctionDefiningcode; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public MathFunctionDefiningcode getMathFunctionDefiningcode() { - return this.mathFunctionDefiningcode; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setWidthValue(TemporalAmount widthValue) { - this.widthValue = widthValue; - } + public void setWidthValue(TemporalAmount widthValue) { + this.widthValue = widthValue; + } - public TemporalAmount getWidthValue() { - return this.widthValue; - } + public TemporalAmount getWidthValue() { + return this.widthValue ; + } - public void setStrukturierteAngabe(List strukturierteAngabe) { - this.strukturierteAngabe = strukturierteAngabe; - } + public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { + this.mathFunctionDefiningCode = mathFunctionDefiningCode; + } - public List getStrukturierteAngabe() { - return this.strukturierteAngabe; - } + public MathFunction getMathFunctionDefiningCode() { + return this.mathFunctionDefiningCode ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java index a5b64888f..439e28213 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java @@ -11,36 +11,36 @@ @Entity @OptionFor("POINT_EVENT") public class GeschichteHistorieBeliebigesEreignisPointEvent implements GeschichteHistorieBeliebigesEreignisChoice { - @Path("/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0003]/items[at0004]") + private List geschichte; - @Path("/data[at0003]/items[at0004]") - private List geschichte; + @Path("/data[at0003]/items[at0006]") + private List strukturierteAngabe; - @Path("/data[at0003]/items[at0006]") - private List strukturierteAngabe; + @Path("/time|value") + private TemporalAccessor timeValue; - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setGeschichte(List geschichte) { + this.geschichte = geschichte; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public List getGeschichte() { + return this.geschichte ; + } - public void setGeschichte(List geschichte) { - this.geschichte = geschichte; - } + public void setStrukturierteAngabe(List strukturierteAngabe) { + this.strukturierteAngabe = strukturierteAngabe; + } - public List getGeschichte() { - return this.geschichte; - } + public List getStrukturierteAngabe() { + return this.strukturierteAngabe ; + } - public void setStrukturierteAngabe(List strukturierteAngabe) { - this.strukturierteAngabe = strukturierteAngabe; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public List getStrukturierteAngabe() { - return this.strukturierteAngabe; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java index e396fab63..1470f1785 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java @@ -5,14 +5,14 @@ @Entity public class GeschichteHistorieGeschichteElement { - @Path("/value|value") - private String value; + @Path("/value|value") + private String value; - public void setValue(String value) { - this.value = value; - } + public void setValue(String value) { + this.value = value; + } - public String getValue() { - return this.value; - } + public String getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java index 7c9d8b388..1481c0c6b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java @@ -6,7 +6,7 @@ import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -14,60 +14,60 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.story.v1") public class GeschichteHistorieObservation { - @Path("/subject") - private PartyProxy subject; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/protocol[at0007]/items[at0008]") + private List erweiterung; - @Path("/data[at0001]/events[at0002]") - @Choice - private List beliebigesEreignis; + @Path("/subject") + private PartyProxy subject; - @Path("/language") - private Language language; + @Path("/language") + private Language language; - @Path("/protocol[at0007]/items[at0008]") - private List erweiterung; + @Path("/data[at0001]/events[at0002]") + @Choice + private List beliebigesEreignis; - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public PartyProxy getSubject() { - return this.subject; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setBeliebigesEreignis( - List beliebigesEreignis) { - this.beliebigesEreignis = beliebigesEreignis; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public List getBeliebigesEreignis() { - return this.beliebigesEreignis; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setLanguage(Language language) { + this.language = language; + } - public Language getLanguage() { - return this.language; - } + public Language getLanguage() { + return this.language ; + } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setBeliebigesEreignis( + List beliebigesEreignis) { + this.beliebigesEreignis = beliebigesEreignis; + } - public List getErweiterung() { - return this.erweiterung; - } + public List getBeliebigesEreignis() { + return this.beliebigesEreignis ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java index 862bc6839..62a45e784 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java @@ -7,22 +7,22 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class GeschichteHistorieObservationContainment extends Containment { public SelectAqlField GESCHICHTE_HISTORIE_OBSERVATION = new AqlFieldImp(GeschichteHistorieObservation.class, "", "GeschichteHistorieObservation", GeschichteHistorieObservation.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(GeschichteHistorieObservation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(GeschichteHistorieObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public ListSelectAqlField BELIEBIGES_EREIGNIS = new ListAqlFieldImp(GeschichteHistorieObservation.class, "/data[at0001]/events[at0002]", "beliebigesEreignis", GeschichteHistorieBeliebigesEreignisChoice.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GeschichteHistorieObservation.class, "/protocol[at0007]/items[at0008]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(GeschichteHistorieObservation.class, "/subject", "subject", PartyProxy.class, this); public SelectAqlField LANGUAGE = new AqlFieldImp(GeschichteHistorieObservation.class, "/language", "language", Language.class, this); - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GeschichteHistorieObservation.class, "/protocol[at0007]/items[at0008]", "erweiterung", Cluster.class, this); + public ListSelectAqlField BELIEBIGES_EREIGNIS = new ListAqlFieldImp(GeschichteHistorieObservation.class, "/data[at0001]/events[at0002]", "beliebigesEreignis", GeschichteHistorieBeliebigesEreignisChoice.class, this); private GeschichteHistorieObservationContainment() { super("openEHR-EHR-OBSERVATION.story.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java index 93bae77d0..f02652146 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,92 +13,93 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class GestorterGeruchssinnObservation { - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; - @Path("/protocol[at0007]/items[at0021]") - private List erweiterung; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") - private String bezeichnungDesSymptomsOderAnzeichensValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") - private VorhandenDefiningcode vorhandenDefiningcode; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") - private List anzeichen; + @Path("/language") + private Language language; - public void setLanguage(Language language) { - this.language = language; - } + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } - public Language getLanguage() { - return this.language; - } + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } - public List getErweiterung() { - return this.erweiterung; - } + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } - public void setBezeichnungDesSymptomsOderAnzeichensValue( - String bezeichnungDesSymptomsOderAnzeichensValue) { - this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; - } + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } - public String getBezeichnungDesSymptomsOderAnzeichensValue() { - return this.bezeichnungDesSymptomsOderAnzeichensValue; - } + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } - public void setVorhandenDefiningcode(VorhandenDefiningcode vorhandenDefiningcode) { - this.vorhandenDefiningcode = vorhandenDefiningcode; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public VorhandenDefiningcode getVorhandenDefiningcode() { - return this.vorhandenDefiningcode; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public PartyProxy getSubject() { - return this.subject; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setAnzeichen(List anzeichen) { - this.anzeichen = anzeichen; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getAnzeichen() { - return this.anzeichen; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java index 4538c8b12..c8dca02b0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java @@ -7,28 +7,28 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class GestorterGeruchssinnObservationContainment extends Containment { public SelectAqlField GESTORTER_GERUCHSSINN_OBSERVATION = new AqlFieldImp(GestorterGeruchssinnObservation.class, "", "GestorterGeruchssinnObservation", GestorterGeruchssinnObservation.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/language", "language", Language.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GestorterGeruchssinnObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); - public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); - public SelectAqlField VORHANDEN_DEFININGCODE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningcode", VorhandenDefiningcode.class, this); + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public ListSelectAqlField ANZEICHEN = new ListAqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "anzeichen", Cluster.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GestorterGeruchssinnObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/language", "language", Language.class, this); private GestorterGeruchssinnObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java index bc83d7931..21c5ae8ab 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,92 +13,93 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class GestorterGeschmackssinnObservation { - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; - @Path("/protocol[at0007]/items[at0021]") - private List erweiterung; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") - private String bezeichnungDesSymptomsOderAnzeichensValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") - private VorhandenDefiningcode vorhandenDefiningcode; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") - private List anzeichen; + @Path("/language") + private Language language; - public void setLanguage(Language language) { - this.language = language; - } + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } - public Language getLanguage() { - return this.language; - } + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } - public List getErweiterung() { - return this.erweiterung; - } + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } - public void setBezeichnungDesSymptomsOderAnzeichensValue( - String bezeichnungDesSymptomsOderAnzeichensValue) { - this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; - } + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } - public String getBezeichnungDesSymptomsOderAnzeichensValue() { - return this.bezeichnungDesSymptomsOderAnzeichensValue; - } + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } - public void setVorhandenDefiningcode(VorhandenDefiningcode vorhandenDefiningcode) { - this.vorhandenDefiningcode = vorhandenDefiningcode; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public VorhandenDefiningcode getVorhandenDefiningcode() { - return this.vorhandenDefiningcode; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public PartyProxy getSubject() { - return this.subject; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setAnzeichen(List anzeichen) { - this.anzeichen = anzeichen; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getAnzeichen() { - return this.anzeichen; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java index c1c7e0c1e..cad3dfb7a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java @@ -7,28 +7,28 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class GestorterGeschmackssinnObservationContainment extends Containment { public SelectAqlField GESTORTER_GESCHMACKSSINN_OBSERVATION = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "", "GestorterGeschmackssinnObservation", GestorterGeschmackssinnObservation.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/language", "language", Language.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GestorterGeschmackssinnObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); - public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); - public SelectAqlField VORHANDEN_DEFININGCODE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningcode", VorhandenDefiningcode.class, this); + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public ListSelectAqlField ANZEICHEN = new ListAqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "anzeichen", Cluster.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GestorterGeschmackssinnObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/language", "language", Language.class, this); private GestorterGeschmackssinnObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java index d84b8a4a8..8011789ef 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java @@ -5,76 +5,76 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.util.List; @Entity @Archetype("openEHR-EHR-EVALUATION.occupation_summary.v1") public class GesundheitsbezogenerBerufEvaluation { - @Path("/data[at0001]/items[at0004]/value|value") - private String beschaftigungsstatusValue; + @Path("/data[at0001]/items[at0004]/value|value") + private String beschaftigungsstatusValue; - @Path("/subject") - private PartyProxy subject; + @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.occupation_record.v1]") + private List beschaftigung; - @Path("/language") - private Language language; + @Path("/data[at0001]/items[at0005]") + private List zusatzlicheAngaben; - @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.occupation_record.v1]") - private List beschaftigung; + @Path("/protocol[at0007]/items[at0008]") + private List erweiterung; - @Path("/data[at0001]/items[at0005]") - private List zusatzlicheAngaben; + @Path("/subject") + private PartyProxy subject; - @Path("/protocol[at0007]/items[at0008]") - private List erweiterung; + @Path("/language") + private Language language; - public void setBeschaftigungsstatusValue(String beschaftigungsstatusValue) { - this.beschaftigungsstatusValue = beschaftigungsstatusValue; - } + public void setBeschaftigungsstatusValue(String beschaftigungsstatusValue) { + this.beschaftigungsstatusValue = beschaftigungsstatusValue; + } - public String getBeschaftigungsstatusValue() { - return this.beschaftigungsstatusValue; - } + public String getBeschaftigungsstatusValue() { + return this.beschaftigungsstatusValue ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setBeschaftigung(List beschaftigung) { + this.beschaftigung = beschaftigung; + } - public PartyProxy getSubject() { - return this.subject; - } + public List getBeschaftigung() { + return this.beschaftigung ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setZusatzlicheAngaben(List zusatzlicheAngaben) { + this.zusatzlicheAngaben = zusatzlicheAngaben; + } - public Language getLanguage() { - return this.language; - } + public List getZusatzlicheAngaben() { + return this.zusatzlicheAngaben ; + } - public void setBeschaftigung(List beschaftigung) { - this.beschaftigung = beschaftigung; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public List getBeschaftigung() { - return this.beschaftigung; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setZusatzlicheAngaben(List zusatzlicheAngaben) { - this.zusatzlicheAngaben = zusatzlicheAngaben; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public List getZusatzlicheAngaben() { - return this.zusatzlicheAngaben; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getErweiterung() { - return this.erweiterung; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java index 585af9232..274b70745 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java @@ -7,23 +7,23 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; public class GesundheitsbezogenerBerufEvaluationContainment extends Containment { public SelectAqlField GESUNDHEITSBEZOGENER_BERUF_EVALUATION = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "", "GesundheitsbezogenerBerufEvaluation", GesundheitsbezogenerBerufEvaluation.class, this); public SelectAqlField BESCHAFTIGUNGSSTATUS_VALUE = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/data[at0001]/items[at0004]/value|value", "beschaftigungsstatusValue", String.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/language", "language", Language.class, this); - public ListSelectAqlField BESCHAFTIGUNG = new ListAqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.occupation_record.v1]", "beschaftigung", BeschaftigungCluster.class, this); public ListSelectAqlField ZUSATZLICHE_ANGABEN = new ListAqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/data[at0001]/items[at0005]", "zusatzlicheAngaben", Cluster.class, this); public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/protocol[at0007]/items[at0008]", "erweiterung", Cluster.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/language", "language", Language.class, this); + private GesundheitsbezogenerBerufEvaluationContainment() { super("openEHR-EHR-EVALUATION.occupation_summary.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java index b14dd46b2..1ddc04ed5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,92 +13,93 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class HeiserkeitObservation { - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; - @Path("/protocol[at0007]/items[at0021]") - private List erweiterung; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") - private String bezeichnungDesSymptomsOderAnzeichensValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") - private VorhandenDefiningcode vorhandenDefiningcode; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") - private List anzeichen; + @Path("/language") + private Language language; - public void setLanguage(Language language) { - this.language = language; - } + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } - public Language getLanguage() { - return this.language; - } + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } - public List getErweiterung() { - return this.erweiterung; - } + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } - public void setBezeichnungDesSymptomsOderAnzeichensValue( - String bezeichnungDesSymptomsOderAnzeichensValue) { - this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; - } + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } - public String getBezeichnungDesSymptomsOderAnzeichensValue() { - return this.bezeichnungDesSymptomsOderAnzeichensValue; - } + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } - public void setVorhandenDefiningcode(VorhandenDefiningcode vorhandenDefiningcode) { - this.vorhandenDefiningcode = vorhandenDefiningcode; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public VorhandenDefiningcode getVorhandenDefiningcode() { - return this.vorhandenDefiningcode; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public PartyProxy getSubject() { - return this.subject; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setAnzeichen(List anzeichen) { - this.anzeichen = anzeichen; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getAnzeichen() { - return this.anzeichen; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java index f9872ce35..0a21e54f7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java @@ -7,28 +7,28 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class HeiserkeitObservationContainment extends Containment { public SelectAqlField HEISERKEIT_OBSERVATION = new AqlFieldImp(HeiserkeitObservation.class, "", "HeiserkeitObservation", HeiserkeitObservation.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(HeiserkeitObservation.class, "/language", "language", Language.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(HeiserkeitObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); - public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); - public SelectAqlField VORHANDEN_DEFININGCODE = new AqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningcode", VorhandenDefiningcode.class, this); + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(HeiserkeitObservation.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public ListSelectAqlField ANZEICHEN = new ListAqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "anzeichen", Cluster.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(HeiserkeitObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(HeiserkeitObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(HeiserkeitObservation.class, "/language", "language", Language.class, this); private HeiserkeitObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java index 4ae585b4c..e028c30ec 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,93 +13,93 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.travel_history.v0") public class HistorieDerReiseObservation { - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0111 and name/value='Aufenthalt in den letzten 14 Tage in einem der Risikogebiete für Coronainfektion oder Kontakt zu Menschen, die dort waren']/value|defining_code") + private AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0134]/items[openEHR-EHR-CLUSTER.location.v1]") - private StandortCluster standort; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0134]/items[openEHR-EHR-CLUSTER.location.v1]") + private StandortCluster standort; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0111]/value|defining_code") - private AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningcode; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0109]") + private List detaillierteAngabenZurExposition; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/subject") - private PartyProxy subject; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/protocol[at0100]/items[at0101]") + private List extensionEn; - @Path("/protocol[at0100]/items[at0101]") - private List extensionEn; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0109]") - private List detaillierteAngabenZurExposition; + @Path("/language") + private Language language; - public void setLanguage(Language language) { - this.language = language; - } + public void setAufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode( + AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode) { + this.aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode = aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode; + } - public Language getLanguage() { - return this.language; - } + public AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ getAufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode( + ) { + return this.aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode ; + } - public void setStandort(StandortCluster standort) { - this.standort = standort; - } + public void setStandort(StandortCluster standort) { + this.standort = standort; + } - public StandortCluster getStandort() { - return this.standort; - } + public StandortCluster getStandort() { + return this.standort ; + } - public void setAufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningcode( - AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningcode) { - this.aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningcode = aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningcode; - } + public void setDetaillierteAngabenZurExposition(List detaillierteAngabenZurExposition) { + this.detaillierteAngabenZurExposition = detaillierteAngabenZurExposition; + } - public AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ getAufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningcode( - ) { - return this.aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningcode; - } + public List getDetaillierteAngabenZurExposition() { + return this.detaillierteAngabenZurExposition ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public PartyProxy getSubject() { - return this.subject; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setExtensionEn(List extensionEn) { + this.extensionEn = extensionEn; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public List getExtensionEn() { + return this.extensionEn ; + } - public void setExtensionEn(List extensionEn) { - this.extensionEn = extensionEn; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public List getExtensionEn() { - return this.extensionEn; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setDetaillierteAngabenZurExposition(List detaillierteAngabenZurExposition) { - this.detaillierteAngabenZurExposition = detaillierteAngabenZurExposition; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getDetaillierteAngabenZurExposition() { - return this.detaillierteAngabenZurExposition; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java index 3a6824674..2e6b80108 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java @@ -7,28 +7,28 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class HistorieDerReiseObservationContainment extends Containment { public SelectAqlField HISTORIE_DER_REISE_OBSERVATION = new AqlFieldImp(HistorieDerReiseObservation.class, "", "HistorieDerReiseObservation", HistorieDerReiseObservation.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(HistorieDerReiseObservation.class, "/language", "language", Language.class, this); + public SelectAqlField AUFENTHALT_IN_DEN_LETZTEN14_TAGE_IN_EINEM_DER_RISIKOGEBIETE_FUR_CORONAINFEKTION_ODER_KONTAKT_ZU_MENSCHEN_DIE_DORT_WAREN_DEFINING_CODE = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0111]/value|defining_code", "aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode", AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.class, this); public SelectAqlField STANDORT = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0134]/items[openEHR-EHR-CLUSTER.location.v1]", "standort", StandortCluster.class, this); - public SelectAqlField AUFENTHALT_IN_DEN_LETZTEN14_TAGE_IN_EINEM_DER_RISIKOGEBIETE_FUR_CORONAINFEKTION_ODER_KONTAKT_ZU_MENSCHEN_DIE_DORT_WAREN_DEFININGCODE = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0111]/value|defining_code", "aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningcode", AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.class, this); + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUR_EXPOSITION = new ListAqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0109]", "detaillierteAngabenZurExposition", Cluster.class, this); public SelectAqlField TIME_VALUE = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(HistorieDerReiseObservation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); public ListSelectAqlField EXTENSION_EN = new ListAqlFieldImp(HistorieDerReiseObservation.class, "/protocol[at0100]/items[at0101]", "extensionEn", Cluster.class, this); - public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUR_EXPOSITION = new ListAqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0109]", "detaillierteAngabenZurExposition", Cluster.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(HistorieDerReiseObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(HistorieDerReiseObservation.class, "/language", "language", Language.class, this); private HistorieDerReiseObservationContainment() { super("openEHR-EHR-OBSERVATION.travel_history.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java index 7b1292603..af3fa2a1e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,92 +13,93 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class HustenObservation { - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; - @Path("/protocol[at0007]/items[at0021]") - private List erweiterung; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") - private String bezeichnungDesSymptomsOderAnzeichensValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") - private VorhandenDefiningcode vorhandenDefiningcode; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") - private List anzeichen; + @Path("/language") + private Language language; - public void setLanguage(Language language) { - this.language = language; - } + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } - public Language getLanguage() { - return this.language; - } + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } - public List getErweiterung() { - return this.erweiterung; - } + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } - public void setBezeichnungDesSymptomsOderAnzeichensValue( - String bezeichnungDesSymptomsOderAnzeichensValue) { - this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; - } + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } - public String getBezeichnungDesSymptomsOderAnzeichensValue() { - return this.bezeichnungDesSymptomsOderAnzeichensValue; - } + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } - public void setVorhandenDefiningcode(VorhandenDefiningcode vorhandenDefiningcode) { - this.vorhandenDefiningcode = vorhandenDefiningcode; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public VorhandenDefiningcode getVorhandenDefiningcode() { - return this.vorhandenDefiningcode; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public PartyProxy getSubject() { - return this.subject; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setAnzeichen(List anzeichen) { - this.anzeichen = anzeichen; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getAnzeichen() { - return this.anzeichen; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservationContainment.java index 107659aec..7978ccb67 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservationContainment.java @@ -7,28 +7,28 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class HustenObservationContainment extends Containment { public SelectAqlField HUSTEN_OBSERVATION = new AqlFieldImp(HustenObservation.class, "", "HustenObservation", HustenObservation.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(HustenObservation.class, "/language", "language", Language.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(HustenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); - public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); - public SelectAqlField VORHANDEN_DEFININGCODE = new AqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningcode", VorhandenDefiningcode.class, this); + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(HustenObservation.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(HustenObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public ListSelectAqlField ANZEICHEN = new ListAqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "anzeichen", Cluster.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(HustenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(HustenObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(HustenObservation.class, "/language", "language", Language.class, this); private HustenObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/InlandAuslandDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/InlandAuslandDefiningcode.java index e2c9557c0..01e19c022 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/InlandAuslandDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/InlandAuslandDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum InlandAuslandDefiningcode implements EnumValueSet { +public enum InlandAuslandDefiningCode implements EnumValueSet { INLANDSREISE("Inlandsreise", "Die Person ist innerhalb des angegebenen Zeitraums im Inland gereist.", "local", "at0028"), INLANDS_UND_AUSLANDSREISE("Inlands- und Auslandsreise", "Die Person ist innerhalb des festgelegten Zeitraums sowohl im Inland als auch international gereist.", "local", "at0030"), @@ -17,7 +17,7 @@ public enum InlandAuslandDefiningcode implements EnumValueSet { private String code; - InlandAuslandDefiningcode(String value, String description, String terminologyId, String code) { + InlandAuslandDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -25,18 +25,18 @@ public enum InlandAuslandDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java index a1b5b06b7..faf97531b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java @@ -7,26 +7,26 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class KontaktSection { - @Path("/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Aufenthalt in Gesundheitseinrichtung']") - private AufenthaltInGesundheitseinrichtungObservation aufenthaltInGesundheitseinrichtung; + @Path("/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Personenkontakt']") + private PersonenkontaktObservation personenkontakt; - @Path("/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Personenkontakt']") - private PersonenkontaktObservation personenkontakt; + @Path("/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Aufenthalt in Gesundheitseinrichtung']") + private AufenthaltInGesundheitseinrichtungObservation aufenthaltInGesundheitseinrichtung; - public void setAufenthaltInGesundheitseinrichtung( - AufenthaltInGesundheitseinrichtungObservation aufenthaltInGesundheitseinrichtung) { - this.aufenthaltInGesundheitseinrichtung = aufenthaltInGesundheitseinrichtung; - } + public void setPersonenkontakt(PersonenkontaktObservation personenkontakt) { + this.personenkontakt = personenkontakt; + } - public AufenthaltInGesundheitseinrichtungObservation getAufenthaltInGesundheitseinrichtung() { - return this.aufenthaltInGesundheitseinrichtung; - } + public PersonenkontaktObservation getPersonenkontakt() { + return this.personenkontakt ; + } - public void setPersonenkontakt(PersonenkontaktObservation personenkontakt) { - this.personenkontakt = personenkontakt; - } + public void setAufenthaltInGesundheitseinrichtung( + AufenthaltInGesundheitseinrichtungObservation aufenthaltInGesundheitseinrichtung) { + this.aufenthaltInGesundheitseinrichtung = aufenthaltInGesundheitseinrichtung; + } - public PersonenkontaktObservation getPersonenkontakt() { - return this.personenkontakt; - } + public AufenthaltInGesundheitseinrichtungObservation getAufenthaltInGesundheitseinrichtung() { + return this.aufenthaltInGesundheitseinrichtung ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSectionContainment.java index 35ebfc5bb..cd530a6dd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSectionContainment.java @@ -5,17 +5,17 @@ import org.ehrbase.client.aql.field.SelectAqlField; public class KontaktSectionContainment extends Containment { - public SelectAqlField KONTAKT_SECTION = new AqlFieldImp(KontaktSection.class, "", "KontaktSection", KontaktSection.class, this); + public SelectAqlField KONTAKT_SECTION = new AqlFieldImp(KontaktSection.class, "", "KontaktSection", KontaktSection.class, this); - public SelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG = new AqlFieldImp(KontaktSection.class, "/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Aufenthalt in Gesundheitseinrichtung']", "aufenthaltInGesundheitseinrichtung", AufenthaltInGesundheitseinrichtungObservation.class, this); + public SelectAqlField PERSONENKONTAKT = new AqlFieldImp(KontaktSection.class, "/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]", "personenkontakt", PersonenkontaktObservation.class, this); - public SelectAqlField PERSONENKONTAKT = new AqlFieldImp(KontaktSection.class, "/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Personenkontakt']", "personenkontakt", PersonenkontaktObservation.class, this); + public SelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG = new AqlFieldImp(KontaktSection.class, "/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]", "aufenthaltInGesundheitseinrichtung", AufenthaltInGesundheitseinrichtungObservation.class, this); - private KontaktSectionContainment() { - super("openEHR-EHR-SECTION.adhoc.v1"); - } + private KontaktSectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } - public static KontaktSectionContainment getInstance() { - return new KontaktSectionContainment(); - } + public static KontaktSectionContainment getInstance() { + return new KontaktSectionContainment(); + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java index cbc04e7d4..6affd2529 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,136 +13,136 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.body_temperature.v2") public class KorpertemperaturObservation { - @Path("/protocol[at0020]/items[at0062]") - private List erweiterung; + @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude") + private Double temperaturMagnitude; - @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0066]") - private List storfaktoren; + @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units") + private String temperaturUnits; - @Path("/language") - private Language language; + @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0066]") + private List storfaktoren; - @Path("/protocol[at0020]/items[at0064]") - private List strukturierteLokalisationDerMessung; + @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0056]") + private List umgebungsbedingungen; - @Path("/data[at0002]/origin|value") - private TemporalAccessor originValue; + @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0057]") + private Cluster betatigung; - @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0057]") - private Cluster betatigung; + @Path("/data[at0002]/events[at0003]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude") - private Double temperaturMagnitude; + @Path("/data[at0002]/origin|value") + private TemporalAccessor originValue; - @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units") - private String temperaturUnits; + @Path("/protocol[at0020]/items[at0064]") + private List strukturierteLokalisationDerMessung; - @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0056]") - private List umgebungsbedingungen; + @Path("/protocol[at0020]/items[at0059]") + private Cluster gerat; - @Path("/protocol[at0020]/items[at0059]") - private Cluster gerat; + @Path("/protocol[at0020]/items[at0062]") + private List erweiterung; - @Path("/subject") - private PartyProxy subject; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0002]/events[at0003]/time|value") - private TemporalAccessor timeValue; + @Path("/language") + private Language language; - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setTemperaturMagnitude(Double temperaturMagnitude) { + this.temperaturMagnitude = temperaturMagnitude; + } - public List getErweiterung() { - return this.erweiterung; - } + public Double getTemperaturMagnitude() { + return this.temperaturMagnitude ; + } - public void setStorfaktoren(List storfaktoren) { - this.storfaktoren = storfaktoren; - } + public void setTemperaturUnits(String temperaturUnits) { + this.temperaturUnits = temperaturUnits; + } - public List getStorfaktoren() { - return this.storfaktoren; - } + public String getTemperaturUnits() { + return this.temperaturUnits ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setStorfaktoren(List storfaktoren) { + this.storfaktoren = storfaktoren; + } - public Language getLanguage() { - return this.language; - } + public List getStorfaktoren() { + return this.storfaktoren ; + } - public void setStrukturierteLokalisationDerMessung( - List strukturierteLokalisationDerMessung) { - this.strukturierteLokalisationDerMessung = strukturierteLokalisationDerMessung; - } + public void setUmgebungsbedingungen(List umgebungsbedingungen) { + this.umgebungsbedingungen = umgebungsbedingungen; + } - public List getStrukturierteLokalisationDerMessung() { - return this.strukturierteLokalisationDerMessung; - } + public List getUmgebungsbedingungen() { + return this.umgebungsbedingungen ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setBetatigung(Cluster betatigung) { + this.betatigung = betatigung; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public Cluster getBetatigung() { + return this.betatigung ; + } - public void setBetatigung(Cluster betatigung) { - this.betatigung = betatigung; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public Cluster getBetatigung() { - return this.betatigung; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setTemperaturMagnitude(Double temperaturMagnitude) { - this.temperaturMagnitude = temperaturMagnitude; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public Double getTemperaturMagnitude() { - return this.temperaturMagnitude; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setTemperaturUnits(String temperaturUnits) { - this.temperaturUnits = temperaturUnits; - } + public void setStrukturierteLokalisationDerMessung( + List strukturierteLokalisationDerMessung) { + this.strukturierteLokalisationDerMessung = strukturierteLokalisationDerMessung; + } - public String getTemperaturUnits() { - return this.temperaturUnits; - } + public List getStrukturierteLokalisationDerMessung() { + return this.strukturierteLokalisationDerMessung ; + } - public void setUmgebungsbedingungen(List umgebungsbedingungen) { - this.umgebungsbedingungen = umgebungsbedingungen; - } + public void setGerat(Cluster gerat) { + this.gerat = gerat; + } - public List getUmgebungsbedingungen() { - return this.umgebungsbedingungen; - } + public Cluster getGerat() { + return this.gerat ; + } - public void setGerat(Cluster gerat) { - this.gerat = gerat; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public Cluster getGerat() { - return this.gerat; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public PartyProxy getSubject() { - return this.subject; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setLanguage(Language language) { + this.language = language; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java index ff8bb042b..ee6356000 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java @@ -7,36 +7,36 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class KorpertemperaturObservationContainment extends Containment { public SelectAqlField KORPERTEMPERATUR_OBSERVATION = new AqlFieldImp(KorpertemperaturObservation.class, "", "KorpertemperaturObservation", KorpertemperaturObservation.class, this); - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(KorpertemperaturObservation.class, "/protocol[at0020]/items[at0062]", "erweiterung", Cluster.class, this); - - public ListSelectAqlField STORFAKTOREN = new ListAqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0066]", "storfaktoren", KorpertemperaturStorfaktorenElement.class, this); + public SelectAqlField TEMPERATUR_MAGNITUDE = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude", "temperaturMagnitude", Double.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(KorpertemperaturObservation.class, "/language", "language", Language.class, this); + public SelectAqlField TEMPERATUR_UNITS = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units", "temperaturUnits", String.class, this); - public ListSelectAqlField STRUKTURIERTE_LOKALISATION_DER_MESSUNG = new ListAqlFieldImp(KorpertemperaturObservation.class, "/protocol[at0020]/items[at0064]", "strukturierteLokalisationDerMessung", Cluster.class, this); + public ListSelectAqlField STORFAKTOREN = new ListAqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0066]", "storfaktoren", KorpertemperaturStorfaktorenElement.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); + public ListSelectAqlField UMGEBUNGSBEDINGUNGEN = new ListAqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0056]", "umgebungsbedingungen", Cluster.class, this); public SelectAqlField BETATIGUNG = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0057]", "betatigung", Cluster.class, this); - public SelectAqlField TEMPERATUR_MAGNITUDE = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude", "temperaturMagnitude", Double.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/time|value", "timeValue", TemporalAccessor.class, this); - public SelectAqlField TEMPERATUR_UNITS = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units", "temperaturUnits", String.class, this); + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); - public ListSelectAqlField UMGEBUNGSBEDINGUNGEN = new ListAqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0056]", "umgebungsbedingungen", Cluster.class, this); + public ListSelectAqlField STRUKTURIERTE_LOKALISATION_DER_MESSUNG = new ListAqlFieldImp(KorpertemperaturObservation.class, "/protocol[at0020]/items[at0064]", "strukturierteLokalisationDerMessung", Cluster.class, this); public SelectAqlField GERAT = new AqlFieldImp(KorpertemperaturObservation.class, "/protocol[at0020]/items[at0059]", "gerat", Cluster.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(KorpertemperaturObservation.class, "/protocol[at0020]/items[at0062]", "erweiterung", Cluster.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(KorpertemperaturObservation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/time|value", "timeValue", TemporalAccessor.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(KorpertemperaturObservation.class, "/language", "language", Language.class, this); private KorpertemperaturObservationContainment() { super("openEHR-EHR-OBSERVATION.body_temperature.v2"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java index d123ce5ea..2d5c3185f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java @@ -5,14 +5,14 @@ @Entity public class KorpertemperaturStorfaktorenElement { - @Path("/value|value") - private String value; + @Path("/value|value") + private String value; - public void setValue(String value) { - this.value = value; - } + public void setValue(String value) { + this.value = value; + } - public String getValue() { - return this.value; - } + public String getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/LetzteReiseDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/LetzteReiseDefiningcode.java index 104fa9a91..dd12b53e3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/LetzteReiseDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/LetzteReiseDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum LetzteReiseDefiningcode implements EnumValueSet { +public enum LetzteReiseDefiningCode implements EnumValueSet { NEIN("Nein", "Die Person ist nicht innerhalb des angegebenen Zeitraums gereist.", "local", "at0005"), UNBEKANNT("Unbekannt", "Es ist nicht bekannt, ob die Person innerhalb des angegebenen Zeitinraumss gereist ist.", "local", "at0027"), @@ -17,7 +17,7 @@ public enum LetzteReiseDefiningcode implements EnumValueSet { private String code; - LetzteReiseDefiningcode(String value, String description, String terminologyId, String code) { + LetzteReiseDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -25,18 +25,18 @@ public enum LetzteReiseDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningcode.java index 44e807ddd..cb7650b96 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum MedikamentInVerwendungDefiningcode implements EnumValueSet { +public enum MedikamentInVerwendungDefiningCode implements EnumValueSet { NICHT_IN_VERWENDUNG("Nicht in Verwendung", "Die Person verwendet das Medikament zum Zeitpunkt des Ergebnis oder währendessen nicht oder hat es nicht verwendet.", "local", "at0032"), UNBEKANNT("Unbekannt", "Es ist unbekannt, ob die Person das Medikament zum Zeitpunkt des Ergebnis oder währendessen verwendet oder es verwendet hat.", "local", "at0033"), @@ -17,8 +17,8 @@ public enum MedikamentInVerwendungDefiningcode implements EnumValueSet { private String code; - MedikamentInVerwendungDefiningcode(String value, String description, String terminologyId, - String code) { + MedikamentInVerwendungDefiningCode(String value, String description, String terminologyId, + String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -26,18 +26,18 @@ public enum MedikamentInVerwendungDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningcode.java index 1c13babec..d31efb2ae 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum MedikamentenklasseInVerwendungDefiningcode implements EnumValueSet { +public enum MedikamentenklasseInVerwendungDefiningCode implements EnumValueSet { IN_VERWENDUNG("In Verwendung", "Die Person verwendet die Medikamentenklasse zum Zeitpunkt des Ergebnis oder währendessen oder hat sie verwendet.", "local", "at0028"), UNBEKANNT("Unbekannt", "Es ist unbekannt, ob die Person die Medikamentenklasse zum Zeitpunkt des Ergebnis oder währendessen verwendet oder sie verwendet hat.", "local", "at0030"), @@ -17,8 +17,8 @@ public enum MedikamentenklasseInVerwendungDefiningcode implements EnumValueSet { private String code; - MedikamentenklasseInVerwendungDefiningcode(String value, String description, String terminologyId, - String code) { + MedikamentenklasseInVerwendungDefiningCode(String value, String description, String terminologyId, + String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -26,18 +26,18 @@ public enum MedikamentenklasseInVerwendungDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java index 3e8705d62..c87a5b17c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java @@ -10,69 +10,69 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.organisation_cc.v0") public class OrganisationCluster { - @Path("/items[at0014]") - private List telefon; + @Path("/items[at0018]") + private List identifier; - @Path("/items[at0012]/value|value") - private String nameDerEinrichtungValue; + @Path("/items[at0012 and name/value='Name der Einrichtung']/value|value") + private String nameDerEinrichtungValue; - @Path("/items[at0017]") - private List teilVon; + @Path("/items[at0014]") + private List telefon; - @Path("/items[at0016]") - private List kontakt; + @Path("/items[openEHR-EHR-CLUSTER.address_cc.v0]") + private List adresse; - @Path("/items[openEHR-EHR-CLUSTER.address_cc.v0]") - private List adresse; + @Path("/items[at0017]") + private List teilVon; - @Path("/items[at0018]") - private List identifier; + @Path("/items[at0016]") + private List kontakt; - public void setTelefon(List telefon) { - this.telefon = telefon; - } + public void setIdentifier(List identifier) { + this.identifier = identifier; + } - public List getTelefon() { - return this.telefon; - } + public List getIdentifier() { + return this.identifier ; + } - public void setNameDerEinrichtungValue(String nameDerEinrichtungValue) { - this.nameDerEinrichtungValue = nameDerEinrichtungValue; - } + public void setNameDerEinrichtungValue(String nameDerEinrichtungValue) { + this.nameDerEinrichtungValue = nameDerEinrichtungValue; + } - public String getNameDerEinrichtungValue() { - return this.nameDerEinrichtungValue; - } + public String getNameDerEinrichtungValue() { + return this.nameDerEinrichtungValue ; + } - public void setTeilVon(List teilVon) { - this.teilVon = teilVon; - } + public void setTelefon(List telefon) { + this.telefon = telefon; + } - public List getTeilVon() { - return this.teilVon; - } + public List getTelefon() { + return this.telefon ; + } - public void setKontakt(List kontakt) { - this.kontakt = kontakt; - } + public void setAdresse(List adresse) { + this.adresse = adresse; + } - public List getKontakt() { - return this.kontakt; - } + public List getAdresse() { + return this.adresse ; + } - public void setAdresse(List adresse) { - this.adresse = adresse; - } + public void setTeilVon(List teilVon) { + this.teilVon = teilVon; + } - public List getAdresse() { - return this.adresse; - } + public List getTeilVon() { + return this.teilVon ; + } - public void setIdentifier(List identifier) { - this.identifier = identifier; - } + public void setKontakt(List kontakt) { + this.kontakt = kontakt; + } - public List getIdentifier() { - return this.identifier; - } + public List getKontakt() { + return this.kontakt ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java index 8962e8db0..a35a9901a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java @@ -10,17 +10,17 @@ public class OrganisationClusterContainment extends Containment { public SelectAqlField ORGANISATION_CLUSTER = new AqlFieldImp(OrganisationCluster.class, "", "OrganisationCluster", OrganisationCluster.class, this); - public ListSelectAqlField TELEFON = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0014]", "telefon", Cluster.class, this); + public ListSelectAqlField IDENTIFIER = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0018]", "identifier", Cluster.class, this); public SelectAqlField NAME_DER_EINRICHTUNG_VALUE = new AqlFieldImp(OrganisationCluster.class, "/items[at0012]/value|value", "nameDerEinrichtungValue", String.class, this); - public ListSelectAqlField TEIL_VON = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0017]", "teilVon", Cluster.class, this); - - public ListSelectAqlField KONTAKT = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0016]", "kontakt", Cluster.class, this); + public ListSelectAqlField TELEFON = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0014]", "telefon", Cluster.class, this); public ListSelectAqlField ADRESSE = new ListAqlFieldImp(OrganisationCluster.class, "/items[openEHR-EHR-CLUSTER.address_cc.v0]", "adresse", AdresseCluster.class, this); - public ListSelectAqlField IDENTIFIER = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0018]", "identifier", Cluster.class, this); + public ListSelectAqlField TEIL_VON = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0017]", "teilVon", Cluster.class, this); + + public ListSelectAqlField KONTAKT = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0016]", "kontakt", Cluster.class, this); private OrganisationClusterContainment() { super("openEHR-EHR-CLUSTER.organisation_cc.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java index 37542bde6..bd15a732f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,115 +13,114 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.exposure_assessment.v0") public class PersonenkontaktObservation { - @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value") - private String kommentarValue; + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value") + private String agentEnValue; - @Path("/protocol[at0004]/items[at0056]") - private List erweiterung; + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code") + private PresenceOfAnyExposureEnDefiningCode presenceOfAnyExposureEnDefiningCode; - @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value") - private String exposureEnValue; + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value") + private String exposureEnValue; - @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code") - private VorhandenseinDefiningcodeSpecificExposureEn vorhandenseinDefiningcode; + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code") + private VorhandenseinDefiningCode vorhandenseinDefiningCode; - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value") + private String kommentarValue; - @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value") - private String agentEnValue; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0004]/items[at0056]") + private List erweiterung; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code") - private PresenceOfAnyExposureEnDefiningcode presenceOfAnyExposureEnDefiningcode; + @Path("/language") + private Language language; - public void setKommentarValue(String kommentarValue) { - this.kommentarValue = kommentarValue; - } + public void setAgentEnValue(String agentEnValue) { + this.agentEnValue = agentEnValue; + } - public String getKommentarValue() { - return this.kommentarValue; - } + public String getAgentEnValue() { + return this.agentEnValue ; + } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setPresenceOfAnyExposureEnDefiningCode( + PresenceOfAnyExposureEnDefiningCode presenceOfAnyExposureEnDefiningCode) { + this.presenceOfAnyExposureEnDefiningCode = presenceOfAnyExposureEnDefiningCode; + } - public List getErweiterung() { - return this.erweiterung; - } + public PresenceOfAnyExposureEnDefiningCode getPresenceOfAnyExposureEnDefiningCode() { + return this.presenceOfAnyExposureEnDefiningCode ; + } - public void setExposureEnValue(String exposureEnValue) { - this.exposureEnValue = exposureEnValue; - } + public void setExposureEnValue(String exposureEnValue) { + this.exposureEnValue = exposureEnValue; + } - public String getExposureEnValue() { - return this.exposureEnValue; - } + public String getExposureEnValue() { + return this.exposureEnValue ; + } - public void setVorhandenseinDefiningcode( - VorhandenseinDefiningcodeSpecificExposureEn vorhandenseinDefiningcode) { - this.vorhandenseinDefiningcode = vorhandenseinDefiningcode; - } + public void setVorhandenseinDefiningCode(VorhandenseinDefiningCode vorhandenseinDefiningCode) { + this.vorhandenseinDefiningCode = vorhandenseinDefiningCode; + } - public VorhandenseinDefiningcodeSpecificExposureEn getVorhandenseinDefiningcode() { - return this.vorhandenseinDefiningcode; - } + public VorhandenseinDefiningCode getVorhandenseinDefiningCode() { + return this.vorhandenseinDefiningCode ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } - public Language getLanguage() { - return this.language; - } + public String getKommentarValue() { + return this.kommentarValue ; + } - public void setAgentEnValue(String agentEnValue) { - this.agentEnValue = agentEnValue; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public String getAgentEnValue() { - return this.agentEnValue; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public PartyProxy getSubject() { - return this.subject; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setPresenceOfAnyExposureEnDefiningcode( - PresenceOfAnyExposureEnDefiningcode presenceOfAnyExposureEnDefiningcode) { - this.presenceOfAnyExposureEnDefiningcode = presenceOfAnyExposureEnDefiningcode; - } + public void setLanguage(Language language) { + this.language = language; + } - public PresenceOfAnyExposureEnDefiningcode getPresenceOfAnyExposureEnDefiningcode() { - return this.presenceOfAnyExposureEnDefiningcode; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java index d896233b9..574160e57 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java @@ -7,32 +7,32 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class PersonenkontaktObservationContainment extends Containment { public SelectAqlField PERSONENKONTAKT_OBSERVATION = new AqlFieldImp(PersonenkontaktObservation.class, "", "PersonenkontaktObservation", PersonenkontaktObservation.class, this); - public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value", "kommentarValue", String.class, this); + public SelectAqlField AGENT_EN_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value", "agentEnValue", String.class, this); - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(PersonenkontaktObservation.class, "/protocol[at0004]/items[at0056]", "erweiterung", Cluster.class, this); + public SelectAqlField PRESENCE_OF_ANY_EXPOSURE_EN_DEFINING_CODE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code", "presenceOfAnyExposureEnDefiningCode", PresenceOfAnyExposureEnDefiningCode.class, this); public SelectAqlField EXPOSURE_EN_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value", "exposureEnValue", String.class, this); - public SelectAqlField VORHANDENSEIN_DEFININGCODE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code", "vorhandenseinDefiningcode", VorhandenseinDefiningcodeSpecificExposureEn.class, this); + public SelectAqlField VORHANDENSEIN_DEFINING_CODE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code", "vorhandenseinDefiningCode", VorhandenseinDefiningCode.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(PersonenkontaktObservation.class, "/language", "language", Language.class, this); - - public SelectAqlField AGENT_EN_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value", "agentEnValue", String.class, this); + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value", "kommentarValue", String.class, this); public SelectAqlField TIME_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(PersonenkontaktObservation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public SelectAqlField PRESENCE_OF_ANY_EXPOSURE_EN_DEFININGCODE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code", "presenceOfAnyExposureEnDefiningcode", PresenceOfAnyExposureEnDefiningcode.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(PersonenkontaktObservation.class, "/protocol[at0004]/items[at0056]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(PersonenkontaktObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(PersonenkontaktObservation.class, "/language", "language", Language.class, this); private PersonenkontaktObservationContainment() { super("openEHR-EHR-OBSERVATION.exposure_assessment.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningcode.java index e477545eb..6784cce98 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningcode.java @@ -2,12 +2,12 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum PresenceOfAnyExposureEnDefiningcode implements EnumValueSet { - ABSENT_EN("*Absent (en)", "*Exposure is or has been absent at or during the event. (en)", "local", "at0059"), +public enum PresenceOfAnyExposureEnDefiningCode implements EnumValueSet { + N_ABSENT_EN("*Absent (en)", "*Exposure is or has been absent at or during the event. (en)", "local", "at0059"), - UNKNOWN_EN("*Unknown (en)", "*It is not known whether any exposure is or has been present or absent at or during the event. (en)", "local", "at0060"), + N_UNKNOWN_EN("*Unknown (en)", "*It is not known whether any exposure is or has been present or absent at or during the event. (en)", "local", "at0060"), - PRESENT_EN("*Present (en)", "*Exposure is or has been present at or during the event. (en)", "local", "at0058"); + N_PRESENT_EN("*Present (en)", "*Exposure is or has been present at or during the event. (en)", "local", "at0058"); private String value; @@ -17,8 +17,8 @@ public enum PresenceOfAnyExposureEnDefiningcode implements EnumValueSet { private String code; - PresenceOfAnyExposureEnDefiningcode(String value, String description, String terminologyId, - String code) { + PresenceOfAnyExposureEnDefiningCode(String value, String description, String terminologyId, + String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -26,18 +26,18 @@ public enum PresenceOfAnyExposureEnDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java index b6f7f18f7..f4ca9a9b6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java @@ -5,87 +5,87 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.util.List; @Entity @Archetype("openEHR-EHR-EVALUATION.problem_diagnosis.v1") public class ProblemDiagnoseEvaluation { - @Path("/data[at0001]/items[at0046]") - private List status; + @Path("/data[at0001]/items[at0002]/value|value") + private String nameDesProblemsDerDiagnoseValue; - @Path("/protocol[at0032]/items[at0071]") - private List erweiterung; + @Path("/data[at0001]/items[at0039]") + private List anatomischeStelleStrukturiert; - @Path("/data[at0001]/items[at0002]/value|value") - private String nameDesProblemsDerDiagnoseValue; + @Path("/data[at0001]/items[at0043]") + private List spezifischeAngaben; - @Path("/data[at0001]/items[at0039]") - private List anatomischeStelleStrukturiert; + @Path("/data[at0001]/items[at0046]") + private List status; - @Path("/language") - private Language language; + @Path("/protocol[at0032]/items[at0071]") + private List erweiterung; - @Path("/subject") - private PartyProxy subject; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/items[at0043]") - private List spezifischeAngaben; + @Path("/language") + private Language language; - public void setStatus(List status) { - this.status = status; - } + public void setNameDesProblemsDerDiagnoseValue(String nameDesProblemsDerDiagnoseValue) { + this.nameDesProblemsDerDiagnoseValue = nameDesProblemsDerDiagnoseValue; + } - public List getStatus() { - return this.status; - } + public String getNameDesProblemsDerDiagnoseValue() { + return this.nameDesProblemsDerDiagnoseValue ; + } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setAnatomischeStelleStrukturiert(List anatomischeStelleStrukturiert) { + this.anatomischeStelleStrukturiert = anatomischeStelleStrukturiert; + } - public List getErweiterung() { - return this.erweiterung; - } + public List getAnatomischeStelleStrukturiert() { + return this.anatomischeStelleStrukturiert ; + } - public void setNameDesProblemsDerDiagnoseValue(String nameDesProblemsDerDiagnoseValue) { - this.nameDesProblemsDerDiagnoseValue = nameDesProblemsDerDiagnoseValue; - } + public void setSpezifischeAngaben(List spezifischeAngaben) { + this.spezifischeAngaben = spezifischeAngaben; + } - public String getNameDesProblemsDerDiagnoseValue() { - return this.nameDesProblemsDerDiagnoseValue; - } + public List getSpezifischeAngaben() { + return this.spezifischeAngaben ; + } - public void setAnatomischeStelleStrukturiert(List anatomischeStelleStrukturiert) { - this.anatomischeStelleStrukturiert = anatomischeStelleStrukturiert; - } + public void setStatus(List status) { + this.status = status; + } - public List getAnatomischeStelleStrukturiert() { - return this.anatomischeStelleStrukturiert; - } + public List getStatus() { + return this.status ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public Language getLanguage() { - return this.language; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public PartyProxy getSubject() { - return this.subject; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setSpezifischeAngaben(List spezifischeAngaben) { - this.spezifischeAngaben = spezifischeAngaben; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getSpezifischeAngaben() { - return this.spezifischeAngaben; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java index e5f2ab751..4af01dd83 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java @@ -7,24 +7,24 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; public class ProblemDiagnoseEvaluationContainment extends Containment { public SelectAqlField PROBLEM_DIAGNOSE_EVALUATION = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "", "ProblemDiagnoseEvaluation", ProblemDiagnoseEvaluation.class, this); - public ListSelectAqlField STATUS = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0046]", "status", Cluster.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/protocol[at0032]/items[at0071]", "erweiterung", Cluster.class, this); - public SelectAqlField NAME_DES_PROBLEMS_DER_DIAGNOSE_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0002]/value|value", "nameDesProblemsDerDiagnoseValue", String.class, this); public ListSelectAqlField ANATOMISCHE_STELLE_STRUKTURIERT = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0039]", "anatomischeStelleStrukturiert", Cluster.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/language", "language", Language.class, this); + public ListSelectAqlField SPEZIFISCHE_ANGABEN = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0043]", "spezifischeAngaben", Cluster.class, this); + + public ListSelectAqlField STATUS = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0046]", "status", Cluster.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/protocol[at0032]/items[at0071]", "erweiterung", Cluster.class, this); public SelectAqlField SUBJECT = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/subject", "subject", PartyProxy.class, this); - public ListSelectAqlField SPEZIFISCHE_ANGABEN = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0043]", "spezifischeAngaben", Cluster.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/language", "language", Language.class, this); private ProblemDiagnoseEvaluationContainment() { super("openEHR-EHR-EVALUATION.problem_diagnosis.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosDetailsChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java similarity index 55% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosDetailsChoice.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java index f1baa69e1..254a3d0c0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosDetailsChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java @@ -1,4 +1,4 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; -public interface BewertungDesGesundheitsrisikosDetailsChoice { +public interface ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java new file mode 100644 index 000000000..e3cf68796 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText implements ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { + @Path("|defining_code") + private DiagnostischeSicherheitDefiningCode diagnostischeSicherheitDefiningCode; + + public void setDiagnostischeSicherheitDefiningCode( + DiagnostischeSicherheitDefiningCode diagnostischeSicherheitDefiningCode) { + this.diagnostischeSicherheitDefiningCode = diagnostischeSicherheitDefiningCode; + } + + public DiagnostischeSicherheitDefiningCode getDiagnostischeSicherheitDefiningCode() { + return this.diagnostischeSicherheitDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java new file mode 100644 index 000000000..fb3831c6e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText implements ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { + @Path("|value") + private String diagnostischeSicherheitValue; + + public void setDiagnostischeSicherheitValue(String diagnostischeSicherheitValue) { + this.diagnostischeSicherheitValue = diagnostischeSicherheitValue; + } + + public String getDiagnostischeSicherheitValue() { + return this.diagnostischeSicherheitValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java index 699840a26..b43a6ffdf 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java @@ -6,7 +6,7 @@ import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -14,115 +14,115 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1") public class ProblemDiganoseCoronovirusEvaluation { - @Path("/protocol[at0032]/items[at0071]") - private List erweiterung; + @Path("/data[at0001]/items[at0002]/value|value") + private String nameDesProblemsDerDiagnoseValue; - @Path("/data[at0001]/items[at0069]/value|value") - private String kommentarValue; + @Path("/data[at0001]/items[at0039]") + private List anatomischeStelleStrukturiert; - @Path("/data[at0001]/items[at0002]/value|value") - private String nameDesProblemsDerDiagnoseValue; + @Path("/data[at0001]/items[at0043]") + private List spezifischeAngaben; - @Path("/data[at0001]/items[at0039]") - private List anatomischeStelleStrukturiert; + @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.problem_qualifier.v1 and name/value='Status']") + private StatusCluster status; - @Path("/language") - private Language language; + @Path("/data[at0001]/items[at0069]/value|value") + private String kommentarValue; - @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.problem_qualifier.v1 and name/value='Status']") - private StatusCluster status; + @Path("/protocol[at0032]/items[at0070]/value|value") + private TemporalAccessor zuletztAktualisiertValue; - @Path("/protocol[at0032]/items[at0070]/value|value") - private TemporalAccessor zuletztAktualisiertValue; + @Path("/protocol[at0032]/items[at0071]") + private List erweiterung; - @Path("/subject") - private PartyProxy subject; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/items[at0043]") - private List spezifischeAngaben; + @Path("/language") + private Language language; - @Path("/data[at0001]/items[at0073]/value") - @Choice - private StatusDiagnostischeSicherheitChoice diagnostischeSicherheit; + @Path("/data[at0001]/items[at0073]/value") + @Choice + private ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice diagnostischeSicherheit; - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setNameDesProblemsDerDiagnoseValue(String nameDesProblemsDerDiagnoseValue) { + this.nameDesProblemsDerDiagnoseValue = nameDesProblemsDerDiagnoseValue; + } - public List getErweiterung() { - return this.erweiterung; - } + public String getNameDesProblemsDerDiagnoseValue() { + return this.nameDesProblemsDerDiagnoseValue ; + } - public void setKommentarValue(String kommentarValue) { - this.kommentarValue = kommentarValue; - } + public void setAnatomischeStelleStrukturiert(List anatomischeStelleStrukturiert) { + this.anatomischeStelleStrukturiert = anatomischeStelleStrukturiert; + } - public String getKommentarValue() { - return this.kommentarValue; - } + public List getAnatomischeStelleStrukturiert() { + return this.anatomischeStelleStrukturiert ; + } - public void setNameDesProblemsDerDiagnoseValue(String nameDesProblemsDerDiagnoseValue) { - this.nameDesProblemsDerDiagnoseValue = nameDesProblemsDerDiagnoseValue; - } + public void setSpezifischeAngaben(List spezifischeAngaben) { + this.spezifischeAngaben = spezifischeAngaben; + } - public String getNameDesProblemsDerDiagnoseValue() { - return this.nameDesProblemsDerDiagnoseValue; - } + public List getSpezifischeAngaben() { + return this.spezifischeAngaben ; + } - public void setAnatomischeStelleStrukturiert(List anatomischeStelleStrukturiert) { - this.anatomischeStelleStrukturiert = anatomischeStelleStrukturiert; - } + public void setStatus(StatusCluster status) { + this.status = status; + } - public List getAnatomischeStelleStrukturiert() { - return this.anatomischeStelleStrukturiert; - } + public StatusCluster getStatus() { + return this.status ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } - public Language getLanguage() { - return this.language; - } + public String getKommentarValue() { + return this.kommentarValue ; + } - public void setStatus(StatusCluster status) { - this.status = status; - } + public void setZuletztAktualisiertValue(TemporalAccessor zuletztAktualisiertValue) { + this.zuletztAktualisiertValue = zuletztAktualisiertValue; + } - public StatusCluster getStatus() { - return this.status; - } + public TemporalAccessor getZuletztAktualisiertValue() { + return this.zuletztAktualisiertValue ; + } - public void setZuletztAktualisiertValue(TemporalAccessor zuletztAktualisiertValue) { - this.zuletztAktualisiertValue = zuletztAktualisiertValue; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public TemporalAccessor getZuletztAktualisiertValue() { - return this.zuletztAktualisiertValue; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public PartyProxy getSubject() { - return this.subject; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setSpezifischeAngaben(List spezifischeAngaben) { - this.spezifischeAngaben = spezifischeAngaben; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getSpezifischeAngaben() { - return this.spezifischeAngaben; - } + public Language getLanguage() { + return this.language ; + } - public void setDiagnostischeSicherheit( - StatusDiagnostischeSicherheitChoice diagnostischeSicherheit) { - this.diagnostischeSicherheit = diagnostischeSicherheit; - } + public void setDiagnostischeSicherheit( + ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice diagnostischeSicherheit) { + this.diagnostischeSicherheit = diagnostischeSicherheit; + } - public StatusDiagnostischeSicherheitChoice getDiagnostischeSicherheit() { - return this.diagnostischeSicherheit; - } + public ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice getDiagnostischeSicherheit() { + return this.diagnostischeSicherheit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java index a5b62f288..0205c26e0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java @@ -7,32 +7,32 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class ProblemDiganoseCoronovirusEvaluationContainment extends Containment { public SelectAqlField PROBLEM_DIGANOSE_CORONOVIRUS_EVALUATION = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "", "ProblemDiganoseCoronovirusEvaluation", ProblemDiganoseCoronovirusEvaluation.class, this); - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/protocol[at0032]/items[at0071]", "erweiterung", Cluster.class, this); - - public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0069]/value|value", "kommentarValue", String.class, this); - public SelectAqlField NAME_DES_PROBLEMS_DER_DIAGNOSE_VALUE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0002]/value|value", "nameDesProblemsDerDiagnoseValue", String.class, this); public ListSelectAqlField ANATOMISCHE_STELLE_STRUKTURIERT = new ListAqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0039]", "anatomischeStelleStrukturiert", Cluster.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/language", "language", Language.class, this); + public ListSelectAqlField SPEZIFISCHE_ANGABEN = new ListAqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0043]", "spezifischeAngaben", Cluster.class, this); - public SelectAqlField STATUS = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.problem_qualifier.v1 and name/value='Status']", "status", StatusCluster.class, this); + public SelectAqlField STATUS = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.problem_qualifier.v1]", "status", StatusCluster.class, this); + + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0069]/value|value", "kommentarValue", String.class, this); public SelectAqlField ZULETZT_AKTUALISIERT_VALUE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/protocol[at0032]/items[at0070]/value|value", "zuletztAktualisiertValue", TemporalAccessor.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/protocol[at0032]/items[at0071]", "erweiterung", Cluster.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/subject", "subject", PartyProxy.class, this); - public ListSelectAqlField SPEZIFISCHE_ANGABEN = new ListAqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0043]", "spezifischeAngaben", Cluster.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/language", "language", Language.class, this); - public SelectAqlField DIAGNOSTISCHE_SICHERHEIT = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0073]/value", "diagnostischeSicherheit", StatusDiagnostischeSicherheitChoice.class, this); + public SelectAqlField DIAGNOSTISCHE_SICHERHEIT = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0073]/value", "diagnostischeSicherheit", ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.class, this); private ProblemDiganoseCoronovirusEvaluationContainment() { super("openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisChoice.java deleted file mode 100644 index 4f80f6579..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -public interface ReisefallBeliebigesIntervallereignisChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java index aa8ed6efc..4b2347524 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java @@ -1,80 +1,78 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.MathFunctionDefiningcode; +import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; @Entity -@OptionFor("INTERVAL_EVENT") -public class ReisefallBeliebigesIntervallereignisIntervalEvent implements ReisefallBeliebigesIntervallereignisChoice { - @Path("/time|value") - private TemporalAccessor timeValue; +public class ReisefallBeliebigesIntervallereignisIntervalEvent { + @Path("/data[at0003]/items[at0004 and name/value='Letzte Reise?']/value|defining_code") + private LetzteReiseDefiningCode letzteReiseDefiningCode; - @Path("/data[at0003]/items[at0004]/value|defining_code") - private LetzteReiseDefiningcode letzteReiseDefiningcode; + @Path("/data[at0003]/items[at0026]/value|defining_code") + private InlandAuslandDefiningCode inlandAuslandDefiningCode; - @Path("/math_function|defining_code") - private MathFunctionDefiningcode mathFunctionDefiningcode; + @Path("/data[at0003]/items[at0008]") + private List bestimmteReise; - @Path("/data[at0003]/items[at0008]") - private List bestimmteReise; + @Path("/math_function|defining_code") + private MathFunction mathFunctionDefiningCode; - @Path("/width|value") - private TemporalAmount widthValue; + @Path("/width|value") + private TemporalAmount widthValue; - @Path("/data[at0003]/items[at0026]/value|defining_code") - private InlandAuslandDefiningcode inlandAuslandDefiningcode; + @Path("/time|value") + private TemporalAccessor timeValue; - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setLetzteReiseDefiningCode(LetzteReiseDefiningCode letzteReiseDefiningCode) { + this.letzteReiseDefiningCode = letzteReiseDefiningCode; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public LetzteReiseDefiningCode getLetzteReiseDefiningCode() { + return this.letzteReiseDefiningCode ; + } - public void setLetzteReiseDefiningcode(LetzteReiseDefiningcode letzteReiseDefiningcode) { - this.letzteReiseDefiningcode = letzteReiseDefiningcode; - } + public void setInlandAuslandDefiningCode(InlandAuslandDefiningCode inlandAuslandDefiningCode) { + this.inlandAuslandDefiningCode = inlandAuslandDefiningCode; + } - public LetzteReiseDefiningcode getLetzteReiseDefiningcode() { - return this.letzteReiseDefiningcode; - } + public InlandAuslandDefiningCode getInlandAuslandDefiningCode() { + return this.inlandAuslandDefiningCode ; + } - public void setMathFunctionDefiningcode(MathFunctionDefiningcode mathFunctionDefiningcode) { - this.mathFunctionDefiningcode = mathFunctionDefiningcode; - } + public void setBestimmteReise(List bestimmteReise) { + this.bestimmteReise = bestimmteReise; + } - public MathFunctionDefiningcode getMathFunctionDefiningcode() { - return this.mathFunctionDefiningcode; - } + public List getBestimmteReise() { + return this.bestimmteReise ; + } - public void setBestimmteReise(List bestimmteReise) { - this.bestimmteReise = bestimmteReise; - } + public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { + this.mathFunctionDefiningCode = mathFunctionDefiningCode; + } - public List getBestimmteReise() { - return this.bestimmteReise; - } + public MathFunction getMathFunctionDefiningCode() { + return this.mathFunctionDefiningCode ; + } - public void setWidthValue(TemporalAmount widthValue) { - this.widthValue = widthValue; - } + public void setWidthValue(TemporalAmount widthValue) { + this.widthValue = widthValue; + } - public TemporalAmount getWidthValue() { - return this.widthValue; - } + public TemporalAmount getWidthValue() { + return this.widthValue ; + } - public void setInlandAuslandDefiningcode(InlandAuslandDefiningcode inlandAuslandDefiningcode) { - this.inlandAuslandDefiningcode = inlandAuslandDefiningcode; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public InlandAuslandDefiningcode getInlandAuslandDefiningcode() { - return this.inlandAuslandDefiningcode; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisPointEvent.java deleted file mode 100644 index 1fd379c67..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisPointEvent.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -import java.time.temporal.TemporalAccessor; -import java.util.List; - -@Entity -@OptionFor("POINT_EVENT") -public class ReisefallBeliebigesIntervallereignisPointEvent implements ReisefallBeliebigesIntervallereignisChoice { - @Path("/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0003]/items[at0004]/value|defining_code") - private LetzteReiseDefiningcode letzteReiseDefiningcode; - - @Path("/data[at0003]/items[at0008]") - private List bestimmteReise; - - @Path("/data[at0003]/items[at0026]/value|defining_code") - private InlandAuslandDefiningcode inlandAuslandDefiningcode; - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue; - } - - public void setLetzteReiseDefiningcode(LetzteReiseDefiningcode letzteReiseDefiningcode) { - this.letzteReiseDefiningcode = letzteReiseDefiningcode; - } - - public LetzteReiseDefiningcode getLetzteReiseDefiningcode() { - return this.letzteReiseDefiningcode; - } - - public void setBestimmteReise(List bestimmteReise) { - this.bestimmteReise = bestimmteReise; - } - - public List getBestimmteReise() { - return this.bestimmteReise; - } - - public void setInlandAuslandDefiningcode(InlandAuslandDefiningcode inlandAuslandDefiningcode) { - this.inlandAuslandDefiningcode = inlandAuslandDefiningcode; - } - - public InlandAuslandDefiningcode getInlandAuslandDefiningcode() { - return this.inlandAuslandDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java index ceabd9717..ad2ff1d61 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java @@ -9,37 +9,37 @@ @Entity public class ReisefallBestimmteReiseCluster { - @Path("/items[at0010]") - private List bestimmtesReiseziel; + @Path("/items[at0010]") + private List bestimmtesReiseziel; - @Path("/items[at0025]") - private List zusatzlicheReisedetails; + @Path("/items[at0025]") + private List zusatzlicheReisedetails; - @Path("/items[at0019]/value|value") - private TemporalAccessor ruckreisedatumValue; + @Path("/items[at0019]/value|value") + private TemporalAccessor ruckreisedatumValue; - public void setBestimmtesReiseziel( - List bestimmtesReiseziel) { - this.bestimmtesReiseziel = bestimmtesReiseziel; - } + public void setBestimmtesReiseziel( + List bestimmtesReiseziel) { + this.bestimmtesReiseziel = bestimmtesReiseziel; + } - public List getBestimmtesReiseziel() { - return this.bestimmtesReiseziel; - } + public List getBestimmtesReiseziel() { + return this.bestimmtesReiseziel ; + } - public void setZusatzlicheReisedetails(List zusatzlicheReisedetails) { - this.zusatzlicheReisedetails = zusatzlicheReisedetails; - } + public void setZusatzlicheReisedetails(List zusatzlicheReisedetails) { + this.zusatzlicheReisedetails = zusatzlicheReisedetails; + } - public List getZusatzlicheReisedetails() { - return this.zusatzlicheReisedetails; - } + public List getZusatzlicheReisedetails() { + return this.zusatzlicheReisedetails ; + } - public void setRuckreisedatumValue(TemporalAccessor ruckreisedatumValue) { - this.ruckreisedatumValue = ruckreisedatumValue; - } + public void setRuckreisedatumValue(TemporalAccessor ruckreisedatumValue) { + this.ruckreisedatumValue = ruckreisedatumValue; + } - public TemporalAccessor getRuckreisedatumValue() { - return this.ruckreisedatumValue; - } + public TemporalAccessor getRuckreisedatumValue() { + return this.ruckreisedatumValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java index 06e1179f4..0974a111e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java @@ -8,58 +8,58 @@ @Entity public class ReisefallBestimmtesReisezielCluster { - @Path("/items[at0031]/value|value") - private String bestimmteGegendValue; + @Path("/items[at0011]/value|value") + private String landValue; - @Path("/items[at0024]") - private List zusatzlicheAngabenZumZielort; + @Path("/items[at0012]/value|value") + private String bundeslandRegionValue; - @Path("/items[at0012]/value|value") - private String bundeslandRegionValue; + @Path("/items[at0013]/value|value") + private String stadtValue; - @Path("/items[at0011]/value|value") - private String landValue; + @Path("/items[at0031]/value|value") + private String bestimmteGegendValue; - @Path("/items[at0013]/value|value") - private String stadtValue; + @Path("/items[at0024]") + private List zusatzlicheAngabenZumZielort; - public void setBestimmteGegendValue(String bestimmteGegendValue) { - this.bestimmteGegendValue = bestimmteGegendValue; - } + public void setLandValue(String landValue) { + this.landValue = landValue; + } - public String getBestimmteGegendValue() { - return this.bestimmteGegendValue; - } + public String getLandValue() { + return this.landValue ; + } - public void setZusatzlicheAngabenZumZielort(List zusatzlicheAngabenZumZielort) { - this.zusatzlicheAngabenZumZielort = zusatzlicheAngabenZumZielort; - } + public void setBundeslandRegionValue(String bundeslandRegionValue) { + this.bundeslandRegionValue = bundeslandRegionValue; + } - public List getZusatzlicheAngabenZumZielort() { - return this.zusatzlicheAngabenZumZielort; - } + public String getBundeslandRegionValue() { + return this.bundeslandRegionValue ; + } - public void setBundeslandRegionValue(String bundeslandRegionValue) { - this.bundeslandRegionValue = bundeslandRegionValue; - } + public void setStadtValue(String stadtValue) { + this.stadtValue = stadtValue; + } - public String getBundeslandRegionValue() { - return this.bundeslandRegionValue; - } + public String getStadtValue() { + return this.stadtValue ; + } - public void setLandValue(String landValue) { - this.landValue = landValue; - } + public void setBestimmteGegendValue(String bestimmteGegendValue) { + this.bestimmteGegendValue = bestimmteGegendValue; + } - public String getLandValue() { - return this.landValue; - } + public String getBestimmteGegendValue() { + return this.bestimmteGegendValue ; + } - public void setStadtValue(String stadtValue) { - this.stadtValue = stadtValue; - } + public void setZusatzlicheAngabenZumZielort(List zusatzlicheAngabenZumZielort) { + this.zusatzlicheAngabenZumZielort = zusatzlicheAngabenZumZielort; + } - public String getStadtValue() { - return this.stadtValue; - } + public List getZusatzlicheAngabenZumZielort() { + return this.zusatzlicheAngabenZumZielort ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java index 39b4baca4..7dc06b8ff 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java @@ -3,10 +3,9 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; 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.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -14,60 +13,59 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.travel_event.v0") public class ReisefallObservation { - @Path("/protocol[at0007]/items[at0021]") - private List erweiterung; + @Path("/data[at0001]/events[at0002]") + private List beliebigesIntervallereignis; - @Path("/subject") - private PartyProxy subject; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; - @Path("/data[at0001]/events[at0002]") - @Choice - private List beliebigesIntervallereignis; + @Path("/subject") + private PartyProxy subject; - @Path("/language") - private Language language; + @Path("/language") + private Language language; - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setBeliebigesIntervallereignis( + List beliebigesIntervallereignis) { + this.beliebigesIntervallereignis = beliebigesIntervallereignis; + } - public List getErweiterung() { - return this.erweiterung; - } + public List getBeliebigesIntervallereignis() { + return this.beliebigesIntervallereignis ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public PartyProxy getSubject() { - return this.subject; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setBeliebigesIntervallereignis( - List beliebigesIntervallereignis) { - this.beliebigesIntervallereignis = beliebigesIntervallereignis; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public List getBeliebigesIntervallereignis() { - return this.beliebigesIntervallereignis; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setLanguage(Language language) { + this.language = language; + } - public Language getLanguage() { - return this.language; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java index 55ff1b123..5c4f3fc71 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java @@ -7,20 +7,20 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class ReisefallObservationContainment extends Containment { public SelectAqlField REISEFALL_OBSERVATION = new AqlFieldImp(ReisefallObservation.class, "", "ReisefallObservation", ReisefallObservation.class, this); - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ReisefallObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(ReisefallObservation.class, "/subject", "subject", PartyProxy.class, this); + public ListSelectAqlField BELIEBIGES_INTERVALLEREIGNIS = new ListAqlFieldImp(ReisefallObservation.class, "/data[at0001]/events[at0002]", "beliebigesIntervallereignis", ReisefallBeliebigesIntervallereignisIntervalEvent.class, this); public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(ReisefallObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public ListSelectAqlField BELIEBIGES_INTERVALLEREIGNIS = new ListAqlFieldImp(ReisefallObservation.class, "/data[at0001]/events[at0002]", "beliebigesIntervallereignis", ReisefallBeliebigesIntervallereignisChoice.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ReisefallObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(ReisefallObservation.class, "/subject", "subject", PartyProxy.class, this); public SelectAqlField LANGUAGE = new AqlFieldImp(ReisefallObservation.class, "/language", "language", Language.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java index 85a1ed5b9..4238d3a93 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java @@ -9,25 +9,25 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class RisikogebietSection { - @Path("/items[openEHR-EHR-OBSERVATION.travel_history.v0]") - private List historieDerReise; + @Path("/items[openEHR-EHR-OBSERVATION.travel_history.v0]") + private List historieDerReise; - @Path("/items[openEHR-EHR-OBSERVATION.travel_event.v0]") - private List reisefall; + @Path("/items[openEHR-EHR-OBSERVATION.travel_event.v0]") + private List reisefall; - public void setHistorieDerReise(List historieDerReise) { - this.historieDerReise = historieDerReise; - } + public void setHistorieDerReise(List historieDerReise) { + this.historieDerReise = historieDerReise; + } - public List getHistorieDerReise() { - return this.historieDerReise; - } + public List getHistorieDerReise() { + return this.historieDerReise ; + } - public void setReisefall(List reisefall) { - this.reisefall = reisefall; - } + public void setReisefall(List reisefall) { + this.reisefall = reisefall; + } - public List getReisefall() { - return this.reisefall; - } + public List getReisefall() { + return this.reisefall ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSectionContainment.java index 600307b63..94fd30af1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSectionContainment.java @@ -7,17 +7,17 @@ import org.ehrbase.client.aql.field.SelectAqlField; public class RisikogebietSectionContainment extends Containment { - public SelectAqlField RISIKOGEBIET_SECTION = new AqlFieldImp(RisikogebietSection.class, "", "RisikogebietSection", RisikogebietSection.class, this); + public SelectAqlField RISIKOGEBIET_SECTION = new AqlFieldImp(RisikogebietSection.class, "", "RisikogebietSection", RisikogebietSection.class, this); - public ListSelectAqlField HISTORIE_DER_REISE = new ListAqlFieldImp(RisikogebietSection.class, "/items[openEHR-EHR-OBSERVATION.travel_history.v0]", "historieDerReise", HistorieDerReiseObservation.class, this); + public ListSelectAqlField HISTORIE_DER_REISE = new ListAqlFieldImp(RisikogebietSection.class, "/items[openEHR-EHR-OBSERVATION.travel_history.v0]", "historieDerReise", HistorieDerReiseObservation.class, this); - public ListSelectAqlField REISEFALL = new ListAqlFieldImp(RisikogebietSection.class, "/items[openEHR-EHR-OBSERVATION.travel_event.v0]", "reisefall", ReisefallObservation.class, this); + public ListSelectAqlField REISEFALL = new ListAqlFieldImp(RisikogebietSection.class, "/items[openEHR-EHR-OBSERVATION.travel_event.v0]", "reisefall", ReisefallObservation.class, this); - private RisikogebietSectionContainment() { - super("openEHR-EHR-SECTION.adhoc.v1"); - } + private RisikogebietSectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } - public static RisikogebietSectionContainment getInstance() { - return new RisikogebietSectionContainment(); - } + public static RisikogebietSectionContainment getInstance() { + return new RisikogebietSectionContainment(); + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java index f888927a9..53a3b5780 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,92 +13,93 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class SchnupfenObservation { - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; - @Path("/protocol[at0007]/items[at0021]") - private List erweiterung; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") - private String bezeichnungDesSymptomsOderAnzeichensValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") - private VorhandenDefiningcode vorhandenDefiningcode; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") - private List anzeichen; + @Path("/language") + private Language language; - public void setLanguage(Language language) { - this.language = language; - } + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } - public Language getLanguage() { - return this.language; - } + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } - public List getErweiterung() { - return this.erweiterung; - } + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } - public void setBezeichnungDesSymptomsOderAnzeichensValue( - String bezeichnungDesSymptomsOderAnzeichensValue) { - this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; - } + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } - public String getBezeichnungDesSymptomsOderAnzeichensValue() { - return this.bezeichnungDesSymptomsOderAnzeichensValue; - } + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } - public void setVorhandenDefiningcode(VorhandenDefiningcode vorhandenDefiningcode) { - this.vorhandenDefiningcode = vorhandenDefiningcode; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public VorhandenDefiningcode getVorhandenDefiningcode() { - return this.vorhandenDefiningcode; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public PartyProxy getSubject() { - return this.subject; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setAnzeichen(List anzeichen) { - this.anzeichen = anzeichen; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getAnzeichen() { - return this.anzeichen; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java index 061b66bc3..ff1db2512 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java @@ -7,28 +7,28 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class SchnupfenObservationContainment extends Containment { public SelectAqlField SCHNUPFEN_OBSERVATION = new AqlFieldImp(SchnupfenObservation.class, "", "SchnupfenObservation", SchnupfenObservation.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(SchnupfenObservation.class, "/language", "language", Language.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(SchnupfenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); - public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); - public SelectAqlField VORHANDEN_DEFININGCODE = new AqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningcode", VorhandenDefiningcode.class, this); + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(SchnupfenObservation.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(SchnupfenObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public ListSelectAqlField ANZEICHEN = new ListAqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "anzeichen", Cluster.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(SchnupfenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(SchnupfenObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(SchnupfenObservation.class, "/language", "language", Language.class, this); private SchnupfenObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java index 32eb380fd..f6b00fc51 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java @@ -10,25 +10,25 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") public class StandortCluster { - @Path("/items[at0047]") - private List details; + @Path("/items[at0046]/value|value") + private String standortbeschreibungValue; - @Path("/items[at0046]/value|value") - private String standortbeschreibungValue; + @Path("/items[at0047]") + private List details; - public void setDetails(List details) { - this.details = details; - } + public void setStandortbeschreibungValue(String standortbeschreibungValue) { + this.standortbeschreibungValue = standortbeschreibungValue; + } - public List getDetails() { - return this.details; - } + public String getStandortbeschreibungValue() { + return this.standortbeschreibungValue ; + } - public void setStandortbeschreibungValue(String standortbeschreibungValue) { - this.standortbeschreibungValue = standortbeschreibungValue; - } + public void setDetails(List details) { + this.details = details; + } - public String getStandortbeschreibungValue() { - return this.standortbeschreibungValue; - } + public List getDetails() { + return this.details ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortClusterContainment.java index f10e45a2d..f96e1aadb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortClusterContainment.java @@ -10,10 +10,10 @@ public class StandortClusterContainment extends Containment { public SelectAqlField STANDORT_CLUSTER = new AqlFieldImp(StandortCluster.class, "", "StandortCluster", StandortCluster.class, this); - public ListSelectAqlField DETAILS = new ListAqlFieldImp(StandortCluster.class, "/items[at0047]", "details", Cluster.class, this); - public SelectAqlField STANDORTBESCHREIBUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0046]/value|value", "standortbeschreibungValue", String.class, this); + public ListSelectAqlField DETAILS = new ListAqlFieldImp(StandortCluster.class, "/items[at0047]", "details", Cluster.class, this); + private StandortClusterContainment() { super("openEHR-EHR-CLUSTER.location.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java index 3926ea507..08efbfbde 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java @@ -7,14 +7,14 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.problem_qualifier.v1") public class StatusCluster { - @Path("/items[at0004]/value|defining_code") - private DiagnosestatusDefiningcode diagnosestatusDefiningcode; + @Path("/items[at0004]/value|defining_code") + private DiagnosestatusDefiningCode diagnosestatusDefiningCode; - public void setDiagnosestatusDefiningcode(DiagnosestatusDefiningcode diagnosestatusDefiningcode) { - this.diagnosestatusDefiningcode = diagnosestatusDefiningcode; - } + public void setDiagnosestatusDefiningCode(DiagnosestatusDefiningCode diagnosestatusDefiningCode) { + this.diagnosestatusDefiningCode = diagnosestatusDefiningCode; + } - public DiagnosestatusDefiningcode getDiagnosestatusDefiningcode() { - return this.diagnosestatusDefiningcode; - } + public DiagnosestatusDefiningCode getDiagnosestatusDefiningCode() { + return this.diagnosestatusDefiningCode ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusClusterContainment.java index d8bc86de9..0758bd30d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusClusterContainment.java @@ -5,15 +5,15 @@ import org.ehrbase.client.aql.field.SelectAqlField; public class StatusClusterContainment extends Containment { - public SelectAqlField STATUS_CLUSTER = new AqlFieldImp(StatusCluster.class, "", "StatusCluster", StatusCluster.class, this); + public SelectAqlField STATUS_CLUSTER = new AqlFieldImp(StatusCluster.class, "", "StatusCluster", StatusCluster.class, this); - public SelectAqlField DIAGNOSESTATUS_DEFININGCODE = new AqlFieldImp(StatusCluster.class, "/items[at0004]/value|defining_code", "diagnosestatusDefiningcode", DiagnosestatusDefiningcode.class, this); + public SelectAqlField DIAGNOSESTATUS_DEFINING_CODE = new AqlFieldImp(StatusCluster.class, "/items[at0004]/value|defining_code", "diagnosestatusDefiningCode", DiagnosestatusDefiningCode.class, this); - private StatusClusterContainment() { - super("openEHR-EHR-CLUSTER.problem_qualifier.v1"); - } + private StatusClusterContainment() { + super("openEHR-EHR-CLUSTER.problem_qualifier.v1"); + } - public static StatusClusterContainment getInstance() { - return new StatusClusterContainment(); - } + public static StatusClusterContainment getInstance() { + return new StatusClusterContainment(); + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitChoice.java deleted file mode 100644 index f2aef6028..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -public interface StatusDiagnostischeSicherheitChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitDvcodedtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitDvcodedtext.java deleted file mode 100644 index a78e8745d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitDvcodedtext.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class StatusDiagnostischeSicherheitDvcodedtext implements StatusDiagnostischeSicherheitChoice { - @Path("|defining_code") - private DiagnostischeSicherheitDefiningcode diagnostischeSicherheitDefiningcode; - - public void setDiagnostischeSicherheitDefiningcode( - DiagnostischeSicherheitDefiningcode diagnostischeSicherheitDefiningcode) { - this.diagnostischeSicherheitDefiningcode = diagnostischeSicherheitDefiningcode; - } - - public DiagnostischeSicherheitDefiningcode getDiagnostischeSicherheitDefiningcode() { - return this.diagnostischeSicherheitDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitDvtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitDvtext.java deleted file mode 100644 index 9f7ec31c1..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusDiagnostischeSicherheitDvtext.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class StatusDiagnostischeSicherheitDvtext implements StatusDiagnostischeSicherheitChoice { - @Path("|value") - private String diagnostischeSicherheitValue; - - public void setDiagnostischeSicherheitValue(String diagnostischeSicherheitValue) { - this.diagnostischeSicherheitValue = diagnostischeSicherheitValue; - } - - public String getDiagnostischeSicherheitValue() { - return this.diagnostischeSicherheitValue; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java index b4d0750eb..ff5650378 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java @@ -7,104 +7,104 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class SymptomeSection { - @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Weitere Symptome']") - private WeitereSymptomeObservation weitereSymptome; + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Husten']") + private HustenObservation husten; - @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Fieber oder erhöhte Körpertemperatur']") - private FieberOderErhohteKorpertemperaturObservation fieberOderErhohteKorpertemperatur; + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Schnupfen']") + private SchnupfenObservation schnupfen; - @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geschmackssinn']") - private GestorterGeschmackssinnObservation gestorterGeschmackssinn; + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Heiserkeit']") + private HeiserkeitObservation heiserkeit; - @Path("/items[openEHR-EHR-OBSERVATION.body_temperature.v2]") - private KorpertemperaturObservation korpertemperatur; + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Fieber oder erhöhte Körpertemperatur']") + private FieberOderErhohteKorpertemperaturObservation fieberOderErhohteKorpertemperatur; - @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Heiserkeit']") - private HeiserkeitObservation heiserkeit; + @Path("/items[openEHR-EHR-OBSERVATION.body_temperature.v2]") + private KorpertemperaturObservation korpertemperatur; - @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Husten']") - private HustenObservation husten; + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geruchssinn']") + private GestorterGeruchssinnObservation gestorterGeruchssinn; - @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geruchssinn']") - private GestorterGeruchssinnObservation gestorterGeruchssinn; + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geschmackssinn']") + private GestorterGeschmackssinnObservation gestorterGeschmackssinn; - @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Durchfall']") - private DurchfallObservation durchfall; + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Durchfall']") + private DurchfallObservation durchfall; - @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Schnupfen']") - private SchnupfenObservation schnupfen; + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Weitere Symptome']") + private WeitereSymptomeObservation weitereSymptome; - public void setWeitereSymptome(WeitereSymptomeObservation weitereSymptome) { - this.weitereSymptome = weitereSymptome; - } + public void setHusten(HustenObservation husten) { + this.husten = husten; + } - public WeitereSymptomeObservation getWeitereSymptome() { - return this.weitereSymptome; - } + public HustenObservation getHusten() { + return this.husten ; + } - public void setFieberOderErhohteKorpertemperatur( - FieberOderErhohteKorpertemperaturObservation fieberOderErhohteKorpertemperatur) { - this.fieberOderErhohteKorpertemperatur = fieberOderErhohteKorpertemperatur; - } + public void setSchnupfen(SchnupfenObservation schnupfen) { + this.schnupfen = schnupfen; + } - public FieberOderErhohteKorpertemperaturObservation getFieberOderErhohteKorpertemperatur() { - return this.fieberOderErhohteKorpertemperatur; - } + public SchnupfenObservation getSchnupfen() { + return this.schnupfen ; + } - public void setGestorterGeschmackssinn( - GestorterGeschmackssinnObservation gestorterGeschmackssinn) { - this.gestorterGeschmackssinn = gestorterGeschmackssinn; - } + public void setHeiserkeit(HeiserkeitObservation heiserkeit) { + this.heiserkeit = heiserkeit; + } - public GestorterGeschmackssinnObservation getGestorterGeschmackssinn() { - return this.gestorterGeschmackssinn; - } + public HeiserkeitObservation getHeiserkeit() { + return this.heiserkeit ; + } - public void setKorpertemperatur(KorpertemperaturObservation korpertemperatur) { - this.korpertemperatur = korpertemperatur; - } + public void setFieberOderErhohteKorpertemperatur( + FieberOderErhohteKorpertemperaturObservation fieberOderErhohteKorpertemperatur) { + this.fieberOderErhohteKorpertemperatur = fieberOderErhohteKorpertemperatur; + } - public KorpertemperaturObservation getKorpertemperatur() { - return this.korpertemperatur; - } + public FieberOderErhohteKorpertemperaturObservation getFieberOderErhohteKorpertemperatur() { + return this.fieberOderErhohteKorpertemperatur ; + } - public void setHeiserkeit(HeiserkeitObservation heiserkeit) { - this.heiserkeit = heiserkeit; - } + public void setKorpertemperatur(KorpertemperaturObservation korpertemperatur) { + this.korpertemperatur = korpertemperatur; + } - public HeiserkeitObservation getHeiserkeit() { - return this.heiserkeit; - } + public KorpertemperaturObservation getKorpertemperatur() { + return this.korpertemperatur ; + } - public void setHusten(HustenObservation husten) { - this.husten = husten; - } + public void setGestorterGeruchssinn(GestorterGeruchssinnObservation gestorterGeruchssinn) { + this.gestorterGeruchssinn = gestorterGeruchssinn; + } - public HustenObservation getHusten() { - return this.husten; - } + public GestorterGeruchssinnObservation getGestorterGeruchssinn() { + return this.gestorterGeruchssinn ; + } - public void setGestorterGeruchssinn(GestorterGeruchssinnObservation gestorterGeruchssinn) { - this.gestorterGeruchssinn = gestorterGeruchssinn; - } + public void setGestorterGeschmackssinn( + GestorterGeschmackssinnObservation gestorterGeschmackssinn) { + this.gestorterGeschmackssinn = gestorterGeschmackssinn; + } - public GestorterGeruchssinnObservation getGestorterGeruchssinn() { - return this.gestorterGeruchssinn; - } + public GestorterGeschmackssinnObservation getGestorterGeschmackssinn() { + return this.gestorterGeschmackssinn ; + } - public void setDurchfall(DurchfallObservation durchfall) { - this.durchfall = durchfall; - } + public void setDurchfall(DurchfallObservation durchfall) { + this.durchfall = durchfall; + } - public DurchfallObservation getDurchfall() { - return this.durchfall; - } + public DurchfallObservation getDurchfall() { + return this.durchfall ; + } - public void setSchnupfen(SchnupfenObservation schnupfen) { - this.schnupfen = schnupfen; - } + public void setWeitereSymptome(WeitereSymptomeObservation weitereSymptome) { + this.weitereSymptome = weitereSymptome; + } - public SchnupfenObservation getSchnupfen() { - return this.schnupfen; - } + public WeitereSymptomeObservation getWeitereSymptome() { + return this.weitereSymptome ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSectionContainment.java index 24919dede..a15572738 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSectionContainment.java @@ -7,23 +7,23 @@ public class SymptomeSectionContainment extends Containment { public SelectAqlField SYMPTOME_SECTION = new AqlFieldImp(SymptomeSection.class, "", "SymptomeSection", SymptomeSection.class, this); - public SelectAqlField WEITERE_SYMPTOME = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Weitere Symptome']", "weitereSymptome", WeitereSymptomeObservation.class, this); + public SelectAqlField HUSTEN = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "husten", HustenObservation.class, this); - public SelectAqlField FIEBER_ODER_ERHOHTE_KORPERTEMPERATUR = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Fieber oder erhöhte Körpertemperatur']", "fieberOderErhohteKorpertemperatur", FieberOderErhohteKorpertemperaturObservation.class, this); + public SelectAqlField SCHNUPFEN = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "schnupfen", SchnupfenObservation.class, this); - public SelectAqlField GESTORTER_GESCHMACKSSINN = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geschmackssinn']", "gestorterGeschmackssinn", GestorterGeschmackssinnObservation.class, this); + public SelectAqlField HEISERKEIT = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "heiserkeit", HeiserkeitObservation.class, this); - public SelectAqlField KORPERTEMPERATUR = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.body_temperature.v2]", "korpertemperatur", KorpertemperaturObservation.class, this); + public SelectAqlField FIEBER_ODER_ERHOHTE_KORPERTEMPERATUR = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "fieberOderErhohteKorpertemperatur", FieberOderErhohteKorpertemperaturObservation.class, this); - public SelectAqlField HEISERKEIT = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Heiserkeit']", "heiserkeit", HeiserkeitObservation.class, this); + public SelectAqlField KORPERTEMPERATUR = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.body_temperature.v2]", "korpertemperatur", KorpertemperaturObservation.class, this); - public SelectAqlField HUSTEN = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Husten']", "husten", HustenObservation.class, this); + public SelectAqlField GESTORTER_GERUCHSSINN = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "gestorterGeruchssinn", GestorterGeruchssinnObservation.class, this); - public SelectAqlField GESTORTER_GERUCHSSINN = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geruchssinn']", "gestorterGeruchssinn", GestorterGeruchssinnObservation.class, this); + public SelectAqlField GESTORTER_GESCHMACKSSINN = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "gestorterGeschmackssinn", GestorterGeschmackssinnObservation.class, this); - public SelectAqlField DURCHFALL = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Durchfall']", "durchfall", DurchfallObservation.class, this); + public SelectAqlField DURCHFALL = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "durchfall", DurchfallObservation.class, this); - public SelectAqlField SCHNUPFEN = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Schnupfen']", "schnupfen", SchnupfenObservation.class, this); + public SelectAqlField WEITERE_SYMPTOME = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "weitereSymptome", WeitereSymptomeObservation.class, this); private SymptomeSectionContainment() { super("openEHR-EHR-SECTION.adhoc.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode.java index 7e8e7a1d1..e5367c4e8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum VorhandenDefiningcode implements EnumValueSet { +public enum VorhandenDefiningCode implements EnumValueSet { NICHT_VORHANDEN("Nicht vorhanden", "Das spezifische Symptom oder Anzeichen ist nicht vorhanden.", "local", "at0024"), VORHANDEN("Vorhanden", "Das spezifische Symptom oder Anzeichen ist vorhanden.", "local", "at0023"); @@ -15,7 +15,7 @@ public enum VorhandenDefiningcode implements EnumValueSet { private String code; - VorhandenDefiningcode(String value, String description, String terminologyId, String code) { + VorhandenDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -23,18 +23,18 @@ public enum VorhandenDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode2.java index a3d0272a9..2e0a44bfa 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode2.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode2.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum VorhandenDefiningcode2 implements EnumValueSet { +public enum VorhandenDefiningCode2 implements EnumValueSet { NICHT_VORHANDEN("Nicht vorhanden", "Das spezifische Symptom oder Anzeichen ist nicht vorhanden.", "local", "at0024"), VORHANDEN("Vorhanden", "Das spezifische Symptom oder Anzeichen ist vorhanden.", "local", "at0023"), @@ -17,7 +17,7 @@ public enum VorhandenDefiningcode2 implements EnumValueSet { private String code; - VorhandenDefiningcode2(String value, String description, String terminologyId, String code) { + VorhandenDefiningCode2(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -25,18 +25,18 @@ public enum VorhandenDefiningcode2 implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java new file mode 100644 index 000000000..aa2223b55 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java @@ -0,0 +1,42 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum VorhandenseinDefiningCode2 implements EnumValueSet { + VORHANDEN("Vorhanden", "Der Risikofaktor wurde bei der Person identifiziert.", "local", "at0018"), + + UNBESTIMMT("Unbestimmt", "Es ist nicht möglich festzustellen, ob der Risikofaktor vorhanden oder nicht vorhanden ist.", "local", "at0026"), + + NICHT_VORHANDEN("Nicht vorhanden", "Der Risikofaktor wurde bei der Person nicht festgestellt.", "local", "at0019"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + VorhandenseinDefiningCode2(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningcode.java index 62877d164..c624d7dbc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningcode.java @@ -2,12 +2,10 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum VorhandenseinDefiningcode implements EnumValueSet { - VORHANDEN("Vorhanden", "Der Risikofaktor wurde bei der Person identifiziert.", "local", "at0018"), +public enum VorhandenseinDefiningCode implements EnumValueSet { + NICHT_VORHANDEN("Nicht vorhanden", "*The specific exposure is or has been absent at or during the event.(en)", "local", "at0049"), - UNBESTIMMT("Unbestimmt", "Es ist nicht möglich festzustellen, ob der Risikofaktor vorhanden oder nicht vorhanden ist.", "local", "at0026"), - - NICHT_VORHANDEN("Nicht vorhanden", "Der Risikofaktor wurde bei der Person nicht festgestellt.", "local", "at0019"); + VORHANDEN("Vorhanden", "*The specific exposure is or has been present at or during the event.(en)", "local", "at0047"); private String value; @@ -17,7 +15,7 @@ public enum VorhandenseinDefiningcode implements EnumValueSet { private String code; - VorhandenseinDefiningcode(String value, String description, String terminologyId, String code) { + VorhandenseinDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -25,18 +23,18 @@ public enum VorhandenseinDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningcodeSpecificExposureEn.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningcodeSpecificExposureEn.java deleted file mode 100644 index dce9766e2..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningcodeSpecificExposureEn.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum VorhandenseinDefiningcodeSpecificExposureEn implements EnumValueSet { - NICHT_VORHANDEN("Nicht vorhanden", "*The specific exposure is or has been absent at or during the event.(en)", "local", "at0049"), - - VORHANDEN("Vorhanden", "*The specific exposure is or has been present at or during the event.(en)", "local", "at0047"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - VorhandenseinDefiningcodeSpecificExposureEn(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java index 9d1911318..dfcf5a4d8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java @@ -3,7 +3,7 @@ import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.MathFunctionDefiningcode; +import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; @@ -12,49 +12,49 @@ @Entity @OptionFor("INTERVAL_EVENT") public class WeitereSymptomeBeliebigesEreignisIntervalEvent implements WeitereSymptomeBeliebigesEreignisChoice { - @Path("/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0003]/items[at0022]") + private List spezifischesSymptomAnzeichen; - @Path("/math_function|defining_code") - private MathFunctionDefiningcode mathFunctionDefiningcode; + @Path("/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0003]/items[at0022]") - private List spezifischesSymptomAnzeichen; + @Path("/width|value") + private TemporalAmount widthValue; - @Path("/width|value") - private TemporalAmount widthValue; + @Path("/math_function|defining_code") + private MathFunction mathFunctionDefiningCode; - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setSpezifischesSymptomAnzeichen( + List spezifischesSymptomAnzeichen) { + this.spezifischesSymptomAnzeichen = spezifischesSymptomAnzeichen; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public List getSpezifischesSymptomAnzeichen( + ) { + return this.spezifischesSymptomAnzeichen ; + } - public void setMathFunctionDefiningcode(MathFunctionDefiningcode mathFunctionDefiningcode) { - this.mathFunctionDefiningcode = mathFunctionDefiningcode; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public MathFunctionDefiningcode getMathFunctionDefiningcode() { - return this.mathFunctionDefiningcode; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setSpezifischesSymptomAnzeichen( - List spezifischesSymptomAnzeichen) { - this.spezifischesSymptomAnzeichen = spezifischesSymptomAnzeichen; - } + public void setWidthValue(TemporalAmount widthValue) { + this.widthValue = widthValue; + } - public List getSpezifischesSymptomAnzeichen( - ) { - return this.spezifischesSymptomAnzeichen; - } + public TemporalAmount getWidthValue() { + return this.widthValue ; + } - public void setWidthValue(TemporalAmount widthValue) { - this.widthValue = widthValue; - } + public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { + this.mathFunctionDefiningCode = mathFunctionDefiningCode; + } - public TemporalAmount getWidthValue() { - return this.widthValue; - } + public MathFunction getMathFunctionDefiningCode() { + return this.mathFunctionDefiningCode ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java index 9eb66ba35..413debf84 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java @@ -10,27 +10,27 @@ @Entity @OptionFor("POINT_EVENT") public class WeitereSymptomeBeliebigesEreignisPointEvent implements WeitereSymptomeBeliebigesEreignisChoice { - @Path("/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0003]/items[at0022]") + private List spezifischesSymptomAnzeichen; - @Path("/data[at0003]/items[at0022]") - private List spezifischesSymptomAnzeichen; + @Path("/time|value") + private TemporalAccessor timeValue; - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setSpezifischesSymptomAnzeichen( + List spezifischesSymptomAnzeichen) { + this.spezifischesSymptomAnzeichen = spezifischesSymptomAnzeichen; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public List getSpezifischesSymptomAnzeichen( + ) { + return this.spezifischesSymptomAnzeichen ; + } - public void setSpezifischesSymptomAnzeichen( - List spezifischesSymptomAnzeichen) { - this.spezifischesSymptomAnzeichen = spezifischesSymptomAnzeichen; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public List getSpezifischesSymptomAnzeichen( - ) { - return this.spezifischesSymptomAnzeichen; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java index 44a5c7971..d446cf4fe 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java @@ -6,7 +6,7 @@ import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -14,60 +14,60 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class WeitereSymptomeObservation { - @Path("/protocol[at0007]/items[at0021]") - private List erweiterung; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/events[at0002]") - @Choice - private List beliebigesEreignis; + @Path("/language") + private Language language; - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]") + @Choice + private List beliebigesEreignis; - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public List getErweiterung() { - return this.erweiterung; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public PartyProxy getSubject() { - return this.subject; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setBeliebigesEreignis( - List beliebigesEreignis) { - this.beliebigesEreignis = beliebigesEreignis; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getBeliebigesEreignis() { - return this.beliebigesEreignis; - } + public Language getLanguage() { + return this.language ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setBeliebigesEreignis( + List beliebigesEreignis) { + this.beliebigesEreignis = beliebigesEreignis; + } - public Language getLanguage() { - return this.language; - } + public List getBeliebigesEreignis() { + return this.beliebigesEreignis ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java index 49e14fedd..583059206 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java @@ -7,23 +7,23 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class WeitereSymptomeObservationContainment extends Containment { public SelectAqlField WEITERE_SYMPTOME_OBSERVATION = new AqlFieldImp(WeitereSymptomeObservation.class, "", "WeitereSymptomeObservation", WeitereSymptomeObservation.class, this); + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(WeitereSymptomeObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(WeitereSymptomeObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); public SelectAqlField SUBJECT = new AqlFieldImp(WeitereSymptomeObservation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(WeitereSymptomeObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(WeitereSymptomeObservation.class, "/language", "language", Language.class, this); public ListSelectAqlField BELIEBIGES_EREIGNIS = new ListAqlFieldImp(WeitereSymptomeObservation.class, "/data[at0001]/events[at0002]", "beliebigesEreignis", WeitereSymptomeBeliebigesEreignisChoice.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(WeitereSymptomeObservation.class, "/language", "language", Language.class, this); - private WeitereSymptomeObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java index e3dd7ff15..65a3628dd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java @@ -8,48 +8,49 @@ @Entity public class WeitereSymptomeSpezifischesSymptomAnzeichenCluster { - @Path("/items[at0005]/value|defining_code") - private VorhandenDefiningcode2 vorhandenDefiningcode; + @Path("/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; - @Path("/items[at0004]/value|value") - private String bezeichnungDesSymptomsOderAnzeichensValue; + @Path("/items[at0005]/value|defining_code") + private VorhandenDefiningCode2 vorhandenDefiningCode; - @Path("/items[at0035]/value|value") - private String kommentarValue; + @Path("/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; - @Path("/items[at0026]") - private List anzeichen; + @Path("/items[at0035]/value|value") + private String kommentarValue; - public void setVorhandenDefiningcode(VorhandenDefiningcode2 vorhandenDefiningcode) { - this.vorhandenDefiningcode = vorhandenDefiningcode; - } + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } - public VorhandenDefiningcode2 getVorhandenDefiningcode() { - return this.vorhandenDefiningcode; - } + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } - public void setBezeichnungDesSymptomsOderAnzeichensValue( - String bezeichnungDesSymptomsOderAnzeichensValue) { - this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; - } + public void setVorhandenDefiningCode(VorhandenDefiningCode2 vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } - public String getBezeichnungDesSymptomsOderAnzeichensValue() { - return this.bezeichnungDesSymptomsOderAnzeichensValue; - } + public VorhandenDefiningCode2 getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } - public void setKommentarValue(String kommentarValue) { - this.kommentarValue = kommentarValue; - } + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } - public String getKommentarValue() { - return this.kommentarValue; - } + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } - public void setAnzeichen(List anzeichen) { - this.anzeichen = anzeichen; - } + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } - public List getAnzeichen() { - return this.anzeichen; - } + public String getKommentarValue() { + return this.kommentarValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java index d584a159f..34a7796d1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java @@ -5,76 +5,76 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.util.List; @Entity @Archetype("openEHR-EHR-EVALUATION.living_arrangement.v0") public class WohnsituationEvaluation { - @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.dwelling.v0]") - private List wohnstatte; + @Path("/data[at0001]/items[at0003]/value|value") + private String beschreibungValue; - @Path("/data[at0001]/items[at0003]/value|value") - private String beschreibungValue; + @Path("/data[at0001]/items[at0007]/value|magnitude") + private Long anzahlDerHaushaltsmitgliederMagnitude; - @Path("/data[at0001]/items[at0007]/value|magnitude") - private Long anzahlDerHaushaltsmitgliederMagnitude; + @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.dwelling.v0]") + private List wohnstatte; - @Path("/protocol[at0002]/items[at0011]") - private List erweiterung; + @Path("/protocol[at0002]/items[at0011]") + private List erweiterung; - @Path("/subject") - private PartyProxy subject; + @Path("/subject") + private PartyProxy subject; - @Path("/language") - private Language language; + @Path("/language") + private Language language; - public void setWohnstatte(List wohnstatte) { - this.wohnstatte = wohnstatte; - } + public void setBeschreibungValue(String beschreibungValue) { + this.beschreibungValue = beschreibungValue; + } - public List getWohnstatte() { - return this.wohnstatte; - } + public String getBeschreibungValue() { + return this.beschreibungValue ; + } - public void setBeschreibungValue(String beschreibungValue) { - this.beschreibungValue = beschreibungValue; - } + public void setAnzahlDerHaushaltsmitgliederMagnitude(Long anzahlDerHaushaltsmitgliederMagnitude) { + this.anzahlDerHaushaltsmitgliederMagnitude = anzahlDerHaushaltsmitgliederMagnitude; + } - public String getBeschreibungValue() { - return this.beschreibungValue; - } + public Long getAnzahlDerHaushaltsmitgliederMagnitude() { + return this.anzahlDerHaushaltsmitgliederMagnitude ; + } - public void setAnzahlDerHaushaltsmitgliederMagnitude(Long anzahlDerHaushaltsmitgliederMagnitude) { - this.anzahlDerHaushaltsmitgliederMagnitude = anzahlDerHaushaltsmitgliederMagnitude; - } + public void setWohnstatte(List wohnstatte) { + this.wohnstatte = wohnstatte; + } - public Long getAnzahlDerHaushaltsmitgliederMagnitude() { - return this.anzahlDerHaushaltsmitgliederMagnitude; - } + public List getWohnstatte() { + return this.wohnstatte ; + } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public List getErweiterung() { - return this.erweiterung; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public PartyProxy getSubject() { - return this.subject; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setLanguage(Language language) { + this.language = language; + } - public Language getLanguage() { - return this.language; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java index da1190f50..50519b151 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java @@ -7,17 +7,17 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; public class WohnsituationEvaluationContainment extends Containment { public SelectAqlField WOHNSITUATION_EVALUATION = new AqlFieldImp(WohnsituationEvaluation.class, "", "WohnsituationEvaluation", WohnsituationEvaluation.class, this); - public ListSelectAqlField WOHNSTATTE = new ListAqlFieldImp(WohnsituationEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.dwelling.v0]", "wohnstatte", WohnstatteCluster.class, this); - public SelectAqlField BESCHREIBUNG_VALUE = new AqlFieldImp(WohnsituationEvaluation.class, "/data[at0001]/items[at0003]/value|value", "beschreibungValue", String.class, this); public SelectAqlField ANZAHL_DER_HAUSHALTSMITGLIEDER_MAGNITUDE = new AqlFieldImp(WohnsituationEvaluation.class, "/data[at0001]/items[at0007]/value|magnitude", "anzahlDerHaushaltsmitgliederMagnitude", Long.class, this); + public ListSelectAqlField WOHNSTATTE = new ListAqlFieldImp(WohnsituationEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.dwelling.v0]", "wohnstatte", WohnstatteCluster.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(WohnsituationEvaluation.class, "/protocol[at0002]/items[at0011]", "erweiterung", Cluster.class, this); public SelectAqlField SUBJECT = new AqlFieldImp(WohnsituationEvaluation.class, "/subject", "subject", PartyProxy.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java index 8baf94b58..9ea4c8951 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java @@ -10,25 +10,25 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.dwelling.v0") public class WohnstatteCluster { - @Path("/items[at0028]/value|magnitude") - private Long anzahlDerSchlafzimmerMagnitude; + @Path("/items[at0028]/value|magnitude") + private Long anzahlDerSchlafzimmerMagnitude; - @Path("/items[at0003]") - private List erganzendeDetails; + @Path("/items[at0003]") + private List erganzendeDetails; - public void setAnzahlDerSchlafzimmerMagnitude(Long anzahlDerSchlafzimmerMagnitude) { - this.anzahlDerSchlafzimmerMagnitude = anzahlDerSchlafzimmerMagnitude; - } + public void setAnzahlDerSchlafzimmerMagnitude(Long anzahlDerSchlafzimmerMagnitude) { + this.anzahlDerSchlafzimmerMagnitude = anzahlDerSchlafzimmerMagnitude; + } - public Long getAnzahlDerSchlafzimmerMagnitude() { - return this.anzahlDerSchlafzimmerMagnitude; - } + public Long getAnzahlDerSchlafzimmerMagnitude() { + return this.anzahlDerSchlafzimmerMagnitude ; + } - public void setErganzendeDetails(List erganzendeDetails) { - this.erganzendeDetails = erganzendeDetails; - } + public void setErganzendeDetails(List erganzendeDetails) { + this.erganzendeDetails = erganzendeDetails; + } - public List getErganzendeDetails() { - return this.erganzendeDetails; - } + public List getErganzendeDetails() { + return this.erganzendeDetails ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java index 6fecffbd9..b55b36dce 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java @@ -11,10 +11,10 @@ import org.ehrbase.client.annotations.Template; import org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition.FallidentifikationCluster; import org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition.ProblemDiagnoseEvaluation; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; import java.time.temporal.TemporalAccessor; @@ -24,168 +24,168 @@ @Archetype("openEHR-EHR-COMPOSITION.report.v1") @Template("Diagnose") public class DiagnoseComposition { - @Id - private VersionUid versionUid; + @Path("/context/other_context[at0001]/items[at0002]/value|value") + private String berichtIdValue; - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; + @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]") + private FallidentifikationCluster fallidentifikation; - @Path("/context/participations") - private List participations; + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; - @Path("/content[openEHR-EHR-EVALUATION.problem_diagnosis.v1]") - private ProblemDiagnoseEvaluation problemDiagnose; + @Path("/context/participations") + private List participations; - @Path("/language") - private Language language; + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; + @Path("/context/location") + private String location; - @Path("/context/other_context[at0001]/items[at0002]/value|value") - private String berichtIdValue; + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; - @Path("/territory") - private Territory territory; + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; + @Path("/content[openEHR-EHR-EVALUATION.problem_diagnosis.v1]") + private ProblemDiagnoseEvaluation problemDiagnose; - @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]") - private FallidentifikationCluster fallidentifikation; + @Path("/composer") + private PartyProxy composer; - @Path("/composer") - private PartyProxy composer; + @Path("/language") + private Language language; - @Path("/context/setting|defining_code") - private SettingDefiningcode settingDefiningcode; + @Path("/feeder_audit") + private FeederAudit feederAudit; - @Path("/feeder_audit") - private FeederAudit feederAudit; + @Path("/category|defining_code") + private Category categoryDefiningCode; - @Path("/context/location") - private String location; + @Path("/territory") + private Territory territory; - @Path("/category|defining_code") - private CategoryDefiningcode categoryDefiningcode; + @Id + private VersionUid versionUid; - public VersionUid getVersionUid() { - return this.versionUid; - } + public void setBerichtIdValue(String berichtIdValue) { + this.berichtIdValue = berichtIdValue; + } - public void setVersionUid(VersionUid versionUid) { - this.versionUid = versionUid; - } + public String getBerichtIdValue() { + return this.berichtIdValue ; + } - public void setEndTimeValue(TemporalAccessor endTimeValue) { - this.endTimeValue = endTimeValue; - } + public void setFallidentifikation(FallidentifikationCluster fallidentifikation) { + this.fallidentifikation = fallidentifikation; + } - public TemporalAccessor getEndTimeValue() { - return this.endTimeValue; - } + public FallidentifikationCluster getFallidentifikation() { + return this.fallidentifikation ; + } - public void setParticipations(List participations) { - this.participations = participations; - } + public void setStartTimeValue(TemporalAccessor startTimeValue) { + this.startTimeValue = startTimeValue; + } - public List getParticipations() { - return this.participations; - } + public TemporalAccessor getStartTimeValue() { + return this.startTimeValue ; + } - public void setProblemDiagnose(ProblemDiagnoseEvaluation problemDiagnose) { - this.problemDiagnose = problemDiagnose; - } + public void setParticipations(List participations) { + this.participations = participations; + } - public ProblemDiagnoseEvaluation getProblemDiagnose() { - return this.problemDiagnose; - } + public List getParticipations() { + return this.participations ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setEndTimeValue(TemporalAccessor endTimeValue) { + this.endTimeValue = endTimeValue; + } - public Language getLanguage() { - return this.language; - } + public TemporalAccessor getEndTimeValue() { + return this.endTimeValue ; + } - public void setHealthCareFacility(PartyIdentified healthCareFacility) { - this.healthCareFacility = healthCareFacility; - } + public void setLocation(String location) { + this.location = location; + } - public PartyIdentified getHealthCareFacility() { - return this.healthCareFacility; - } + public String getLocation() { + return this.location ; + } - public void setBerichtIdValue(String berichtIdValue) { - this.berichtIdValue = berichtIdValue; - } + public void setHealthCareFacility(PartyIdentified healthCareFacility) { + this.healthCareFacility = healthCareFacility; + } - public String getBerichtIdValue() { - return this.berichtIdValue; - } + public PartyIdentified getHealthCareFacility() { + return this.healthCareFacility ; + } - public void setTerritory(Territory territory) { - this.territory = territory; - } + public void setSettingDefiningCode(Setting settingDefiningCode) { + this.settingDefiningCode = settingDefiningCode; + } - public Territory getTerritory() { - return this.territory; - } + public Setting getSettingDefiningCode() { + return this.settingDefiningCode ; + } - public void setStartTimeValue(TemporalAccessor startTimeValue) { - this.startTimeValue = startTimeValue; - } + public void setProblemDiagnose(ProblemDiagnoseEvaluation problemDiagnose) { + this.problemDiagnose = problemDiagnose; + } - public TemporalAccessor getStartTimeValue() { - return this.startTimeValue; - } + public ProblemDiagnoseEvaluation getProblemDiagnose() { + return this.problemDiagnose ; + } - public void setFallidentifikation(FallidentifikationCluster fallidentifikation) { - this.fallidentifikation = fallidentifikation; - } + public void setComposer(PartyProxy composer) { + this.composer = composer; + } - public FallidentifikationCluster getFallidentifikation() { - return this.fallidentifikation; - } + public PartyProxy getComposer() { + return this.composer ; + } - public void setComposer(PartyProxy composer) { - this.composer = composer; - } + public void setLanguage(Language language) { + this.language = language; + } - public PartyProxy getComposer() { - return this.composer; - } + public Language getLanguage() { + return this.language ; + } - public void setSettingDefiningcode(SettingDefiningcode settingDefiningcode) { - this.settingDefiningcode = settingDefiningcode; - } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } - public SettingDefiningcode getSettingDefiningcode() { - return this.settingDefiningcode; - } + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } - public void setFeederAudit(FeederAudit feederAudit) { - this.feederAudit = feederAudit; - } + public void setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } - public FeederAudit getFeederAudit() { - return this.feederAudit; - } + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } - public void setLocation(String location) { - this.location = location; - } + public void setTerritory(Territory territory) { + this.territory = territory; + } - public String getLocation() { - return this.location; - } + public Territory getTerritory() { + return this.territory ; + } - public void setCategoryDefiningcode(CategoryDefiningcode categoryDefiningcode) { - this.categoryDefiningcode = categoryDefiningcode; - } + public VersionUid getVersionUid() { + return this.versionUid ; + } - public CategoryDefiningcode getCategoryDefiningcode() { - return this.categoryDefiningcode; - } + public void setVersionUid(VersionUid versionUid) { + this.versionUid = versionUid; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseCompositionContainment.java index a01c613cd..ba6612af2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseCompositionContainment.java @@ -11,43 +11,43 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition.FallidentifikationCluster; import org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition.ProblemDiagnoseEvaluation; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import java.time.temporal.TemporalAccessor; public class DiagnoseCompositionContainment extends Containment { public SelectAqlField DIAGNOSE_COMPOSITION = new AqlFieldImp(DiagnoseComposition.class, "", "DiagnoseComposition", DiagnoseComposition.class, this); - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(DiagnoseComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(DiagnoseComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(DiagnoseComposition.class, "/context/participations", "participations", Participation.class, this); + public SelectAqlField FALLIDENTIFIKATION = new AqlFieldImp(DiagnoseComposition.class, "/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]", "fallidentifikation", FallidentifikationCluster.class, this); - public SelectAqlField PROBLEM_DIAGNOSE = new AqlFieldImp(DiagnoseComposition.class, "/content[openEHR-EHR-EVALUATION.problem_diagnosis.v1]", "problemDiagnose", ProblemDiagnoseEvaluation.class, this); + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(DiagnoseComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(DiagnoseComposition.class, "/language", "language", Language.class, this); + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(DiagnoseComposition.class, "/context/participations", "participations", Participation.class, this); - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(DiagnoseComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(DiagnoseComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(DiagnoseComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); + public SelectAqlField LOCATION = new AqlFieldImp(DiagnoseComposition.class, "/context/location", "location", String.class, this); - public SelectAqlField TERRITORY = new AqlFieldImp(DiagnoseComposition.class, "/territory", "territory", Territory.class, this); + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(DiagnoseComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(DiagnoseComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(DiagnoseComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - public SelectAqlField FALLIDENTIFIKATION = new AqlFieldImp(DiagnoseComposition.class, "/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]", "fallidentifikation", FallidentifikationCluster.class, this); + public SelectAqlField PROBLEM_DIAGNOSE = new AqlFieldImp(DiagnoseComposition.class, "/content[openEHR-EHR-EVALUATION.problem_diagnosis.v1]", "problemDiagnose", ProblemDiagnoseEvaluation.class, this); public SelectAqlField COMPOSER = new AqlFieldImp(DiagnoseComposition.class, "/composer", "composer", PartyProxy.class, this); - public SelectAqlField SETTING_DEFININGCODE = new AqlFieldImp(DiagnoseComposition.class, "/context/setting|defining_code", "settingDefiningcode", SettingDefiningcode.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(DiagnoseComposition.class, "/language", "language", Language.class, this); public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(DiagnoseComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - public SelectAqlField LOCATION = new AqlFieldImp(DiagnoseComposition.class, "/context/location", "location", String.class, this); + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(DiagnoseComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - public SelectAqlField CATEGORY_DEFININGCODE = new AqlFieldImp(DiagnoseComposition.class, "/category|defining_code", "categoryDefiningcode", CategoryDefiningcode.class, this); + public SelectAqlField TERRITORY = new AqlFieldImp(DiagnoseComposition.class, "/territory", "territory", Territory.class, this); private DiagnoseCompositionContainment() { super("openEHR-EHR-COMPOSITION.report.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java index 4d961ec5d..5c16f43a9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java @@ -10,47 +10,47 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.anatomical_location.v1") public class AnatomischeLokalisationCluster { - @Path("/items[at0053]") - private List alternativeStruktur; + @Path("/items[at0001]/value|value") + private String nameDerKorperstelleValue; - @Path("/items[at0001]/value|value") - private String nameDerKorperstelleValue; + @Path("/items[at0002]/value|defining_code") + private LateralitatDefiningCode lateralitatDefiningCode; - @Path("/items[at0054]") - private List multimedialeDarstellung; + @Path("/items[at0053]") + private List alternativeStruktur; - @Path("/items[at0002]/value|defining_code") - private LateralitatDefiningcode lateralitatDefiningcode; + @Path("/items[at0054]") + private List multimedialeDarstellung; - public void setAlternativeStruktur(List alternativeStruktur) { - this.alternativeStruktur = alternativeStruktur; - } + public void setNameDerKorperstelleValue(String nameDerKorperstelleValue) { + this.nameDerKorperstelleValue = nameDerKorperstelleValue; + } - public List getAlternativeStruktur() { - return this.alternativeStruktur; - } + public String getNameDerKorperstelleValue() { + return this.nameDerKorperstelleValue ; + } - public void setNameDerKorperstelleValue(String nameDerKorperstelleValue) { - this.nameDerKorperstelleValue = nameDerKorperstelleValue; - } + public void setLateralitatDefiningCode(LateralitatDefiningCode lateralitatDefiningCode) { + this.lateralitatDefiningCode = lateralitatDefiningCode; + } - public String getNameDerKorperstelleValue() { - return this.nameDerKorperstelleValue; - } + public LateralitatDefiningCode getLateralitatDefiningCode() { + return this.lateralitatDefiningCode ; + } - public void setMultimedialeDarstellung(List multimedialeDarstellung) { - this.multimedialeDarstellung = multimedialeDarstellung; - } + public void setAlternativeStruktur(List alternativeStruktur) { + this.alternativeStruktur = alternativeStruktur; + } - public List getMultimedialeDarstellung() { - return this.multimedialeDarstellung; - } + public List getAlternativeStruktur() { + return this.alternativeStruktur ; + } - public void setLateralitatDefiningcode(LateralitatDefiningcode lateralitatDefiningcode) { - this.lateralitatDefiningcode = lateralitatDefiningcode; - } + public void setMultimedialeDarstellung(List multimedialeDarstellung) { + this.multimedialeDarstellung = multimedialeDarstellung; + } - public LateralitatDefiningcode getLateralitatDefiningcode() { - return this.lateralitatDefiningcode; - } + public List getMultimedialeDarstellung() { + return this.multimedialeDarstellung ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationClusterContainment.java index aaf46ede1..27ee55e6d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationClusterContainment.java @@ -10,13 +10,13 @@ public class AnatomischeLokalisationClusterContainment extends Containment { public SelectAqlField ANATOMISCHE_LOKALISATION_CLUSTER = new AqlFieldImp(AnatomischeLokalisationCluster.class, "", "AnatomischeLokalisationCluster", AnatomischeLokalisationCluster.class, this); - public ListSelectAqlField ALTERNATIVE_STRUKTUR = new ListAqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0053]", "alternativeStruktur", Cluster.class, this); - public SelectAqlField NAME_DER_KORPERSTELLE_VALUE = new AqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0001]/value|value", "nameDerKorperstelleValue", String.class, this); - public ListSelectAqlField MULTIMEDIALE_DARSTELLUNG = new ListAqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0054]", "multimedialeDarstellung", Cluster.class, this); + public SelectAqlField LATERALITAT_DEFINING_CODE = new AqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0002]/value|defining_code", "lateralitatDefiningCode", LateralitatDefiningCode.class, this); - public SelectAqlField LATERALITAT_DEFININGCODE = new AqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0002]/value|defining_code", "lateralitatDefiningcode", LateralitatDefiningcode.class, this); + public ListSelectAqlField ALTERNATIVE_STRUKTUR = new ListAqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0053]", "alternativeStruktur", Cluster.class, this); + + public ListSelectAqlField MULTIMEDIALE_DARSTELLUNG = new ListAqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0054]", "multimedialeDarstellung", Cluster.class, this); private AnatomischeLokalisationClusterContainment() { super("openEHR-EHR-CLUSTER.anatomical_location.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationDiagnostischeSicherheitDvcodedtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationDiagnostischeSicherheitDvcodedtext.java deleted file mode 100644 index 067c3a90a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationDiagnostischeSicherheitDvcodedtext.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class AnatomischeLokalisationDiagnostischeSicherheitDvcodedtext implements AnatomischeLokalisationDiagnostischeSicherheitChoice { - @Path("|defining_code") - private DiagnostischeSicherheitDefiningcode diagnostischeSicherheitDefiningcode; - - public void setDiagnostischeSicherheitDefiningcode( - DiagnostischeSicherheitDefiningcode diagnostischeSicherheitDefiningcode) { - this.diagnostischeSicherheitDefiningcode = diagnostischeSicherheitDefiningcode; - } - - public DiagnostischeSicherheitDefiningcode getDiagnostischeSicherheitDefiningcode() { - return this.diagnostischeSicherheitDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationDiagnostischeSicherheitDvtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationDiagnostischeSicherheitDvtext.java deleted file mode 100644 index 2c1fc1731..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationDiagnostischeSicherheitDvtext.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class AnatomischeLokalisationDiagnostischeSicherheitDvtext implements AnatomischeLokalisationDiagnostischeSicherheitChoice { - @Path("|value") - private String diagnostischeSicherheitValue; - - public void setDiagnostischeSicherheitValue(String diagnostischeSicherheitValue) { - this.diagnostischeSicherheitValue = diagnostischeSicherheitValue; - } - - public String getDiagnostischeSicherheitValue() { - return this.diagnostischeSicherheitValue; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java index 7ea1d6b48..f0ca7cbe2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java @@ -6,15 +6,15 @@ @Entity public class AtiopathogeneseAtiologieDerKrankheitElement { - @Path("/value") - @Choice - private AtiopathogeneseChoice value; + @Path("/value") + @Choice + private AtiopathogeneseValueChoice value; - public void setValue(AtiopathogeneseChoice value) { - this.value = value; - } + public void setValue(AtiopathogeneseValueChoice value) { + this.value = value; + } - public AtiopathogeneseChoice getValue() { - return this.value; - } + public AtiopathogeneseValueChoice getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java index c4c0d30a1..9c58f8a2f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java @@ -5,14 +5,14 @@ @Entity public class AtiopathogeneseBeschreibungDesEntstehensElement { - @Path("/value|value") - private String value; + @Path("/value|value") + private String value; - public void setValue(String value) { - this.value = value; - } + public void setValue(String value) { + this.value = value; + } - public String getValue() { - return this.value; - } + public String getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java index f0823c84f..fefa9c55b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java @@ -9,27 +9,27 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.etiology.v1") public class AtiopathogeneseCluster { - @Path("/items[at0001]") - private List atiologieDerKrankheit; + @Path("/items[at0001]") + private List atiologieDerKrankheit; - @Path("/items[at0017]") - private List beschreibungDesEntstehens; + @Path("/items[at0017]") + private List beschreibungDesEntstehens; - public void setAtiologieDerKrankheit( - List atiologieDerKrankheit) { - this.atiologieDerKrankheit = atiologieDerKrankheit; - } + public void setAtiologieDerKrankheit( + List atiologieDerKrankheit) { + this.atiologieDerKrankheit = atiologieDerKrankheit; + } - public List getAtiologieDerKrankheit() { - return this.atiologieDerKrankheit; - } + public List getAtiologieDerKrankheit() { + return this.atiologieDerKrankheit ; + } - public void setBeschreibungDesEntstehens( - List beschreibungDesEntstehens) { - this.beschreibungDesEntstehens = beschreibungDesEntstehens; - } + public void setBeschreibungDesEntstehens( + List beschreibungDesEntstehens) { + this.beschreibungDesEntstehens = beschreibungDesEntstehens; + } - public List getBeschreibungDesEntstehens() { - return this.beschreibungDesEntstehens; - } + public List getBeschreibungDesEntstehens() { + return this.beschreibungDesEntstehens ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseClusterContainment.java index 4a1a7fbfb..1537a1842 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseClusterContainment.java @@ -7,17 +7,17 @@ import org.ehrbase.client.aql.field.SelectAqlField; public class AtiopathogeneseClusterContainment extends Containment { - public SelectAqlField ATIOPATHOGENESE_CLUSTER = new AqlFieldImp(AtiopathogeneseCluster.class, "", "AtiopathogeneseCluster", AtiopathogeneseCluster.class, this); + public SelectAqlField ATIOPATHOGENESE_CLUSTER = new AqlFieldImp(AtiopathogeneseCluster.class, "", "AtiopathogeneseCluster", AtiopathogeneseCluster.class, this); - public ListSelectAqlField ATIOLOGIE_DER_KRANKHEIT = new ListAqlFieldImp(AtiopathogeneseCluster.class, "/items[at0001]", "atiologieDerKrankheit", AtiopathogeneseAtiologieDerKrankheitElement.class, this); + public ListSelectAqlField ATIOLOGIE_DER_KRANKHEIT = new ListAqlFieldImp(AtiopathogeneseCluster.class, "/items[at0001]", "atiologieDerKrankheit", AtiopathogeneseAtiologieDerKrankheitElement.class, this); - public ListSelectAqlField BESCHREIBUNG_DES_ENTSTEHENS = new ListAqlFieldImp(AtiopathogeneseCluster.class, "/items[at0017]", "beschreibungDesEntstehens", AtiopathogeneseBeschreibungDesEntstehensElement.class, this); + public ListSelectAqlField BESCHREIBUNG_DES_ENTSTEHENS = new ListAqlFieldImp(AtiopathogeneseCluster.class, "/items[at0017]", "beschreibungDesEntstehens", AtiopathogeneseBeschreibungDesEntstehensElement.class, this); - private AtiopathogeneseClusterContainment() { - super("openEHR-EHR-CLUSTER.etiology.v1"); - } + private AtiopathogeneseClusterContainment() { + super("openEHR-EHR-CLUSTER.etiology.v1"); + } - public static AtiopathogeneseClusterContainment getInstance() { - return new AtiopathogeneseClusterContainment(); - } + public static AtiopathogeneseClusterContainment getInstance() { + return new AtiopathogeneseClusterContainment(); + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseDvcodedtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseDvcodedtext.java deleted file mode 100644 index d43c4c38f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseDvcodedtext.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class AtiopathogeneseDvcodedtext implements AtiopathogeneseChoice { - @Path("|defining_code") - private ValueDefiningcode valueDefiningcode; - - public void setValueDefiningcode(ValueDefiningcode valueDefiningcode) { - this.valueDefiningcode = valueDefiningcode; - } - - public ValueDefiningcode getValueDefiningcode() { - return this.valueDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseDvtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseDvtext.java deleted file mode 100644 index ecf028df3..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseDvtext.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class AtiopathogeneseDvtext implements AtiopathogeneseChoice { - @Path("|value") - private String valueValue; - - public void setValueValue(String valueValue) { - this.valueValue = valueValue; - } - - public String getValueValue() { - return this.valueValue; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseSchweregradDvcodedtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseSchweregradDvcodedtext.java deleted file mode 100644 index 8d54343ac..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseSchweregradDvcodedtext.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class AtiopathogeneseSchweregradDvcodedtext implements AtiopathogeneseSchweregradChoice { - @Path("|defining_code") - private SchweregradDefiningcode schweregradDefiningcode; - - public void setSchweregradDefiningcode(SchweregradDefiningcode schweregradDefiningcode) { - this.schweregradDefiningcode = schweregradDefiningcode; - } - - public SchweregradDefiningcode getSchweregradDefiningcode() { - return this.schweregradDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseSchweregradDvtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseSchweregradDvtext.java deleted file mode 100644 index 5732dc0f7..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseSchweregradDvtext.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class AtiopathogeneseSchweregradDvtext implements AtiopathogeneseSchweregradChoice { - @Path("|value") - private String schweregradValue; - - public void setSchweregradValue(String schweregradValue) { - this.schweregradValue = schweregradValue; - } - - public String getSchweregradValue() { - return this.schweregradValue; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueChoice.java similarity index 65% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseChoice.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueChoice.java index c95ca9615..0d9980666 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueChoice.java @@ -1,4 +1,4 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; -public interface AtiopathogeneseChoice { +public interface AtiopathogeneseValueChoice { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java new file mode 100644 index 000000000..eae7a5b08 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class AtiopathogeneseValueDvCodedText implements AtiopathogeneseValueChoice { + @Path("|defining_code") + private ValueDefiningCode valueDefiningCode; + + public void setValueDefiningCode(ValueDefiningCode valueDefiningCode) { + this.valueDefiningCode = valueDefiningCode; + } + + public ValueDefiningCode getValueDefiningCode() { + return this.valueDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java new file mode 100644 index 000000000..988793a86 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class AtiopathogeneseValueDvText implements AtiopathogeneseValueChoice { + @Path("|value") + private String valueValue; + + public void setValueValue(String valueValue) { + this.valueValue = valueValue; + } + + public String getValueValue() { + return this.valueValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java index 66f973edc..0fae38c79 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java @@ -7,47 +7,47 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.diagnose_details.v0") public class DiagnosedetailsCluster { - @Path("/items[at0001]/value|value") - private String begrundungVonAusnahmenValue; + @Path("/items[at0001]/value|value") + private String begrundungVonAusnahmenValue; - @Path("/items[at0002]/value|value") - private String diagnosetypValue; + @Path("/items[at0002]/value|value") + private String diagnosetypValue; - @Path("/items[at0016]/value|value") - private Boolean vorhandenBeiAufnahmeValue; + @Path("/items[at0016]/value|value") + private Boolean vorhandenBeiAufnahmeValue; - @Path("/items[at0017]/value|value") - private Boolean vorhandenBeiEntlassungValue; + @Path("/items[at0017]/value|value") + private Boolean vorhandenBeiEntlassungValue; - public void setBegrundungVonAusnahmenValue(String begrundungVonAusnahmenValue) { - this.begrundungVonAusnahmenValue = begrundungVonAusnahmenValue; - } + public void setBegrundungVonAusnahmenValue(String begrundungVonAusnahmenValue) { + this.begrundungVonAusnahmenValue = begrundungVonAusnahmenValue; + } - public String getBegrundungVonAusnahmenValue() { - return this.begrundungVonAusnahmenValue; - } + public String getBegrundungVonAusnahmenValue() { + return this.begrundungVonAusnahmenValue ; + } - public void setDiagnosetypValue(String diagnosetypValue) { - this.diagnosetypValue = diagnosetypValue; - } + public void setDiagnosetypValue(String diagnosetypValue) { + this.diagnosetypValue = diagnosetypValue; + } - public String getDiagnosetypValue() { - return this.diagnosetypValue; - } + public String getDiagnosetypValue() { + return this.diagnosetypValue ; + } - public void setVorhandenBeiAufnahmeValue(Boolean vorhandenBeiAufnahmeValue) { - this.vorhandenBeiAufnahmeValue = vorhandenBeiAufnahmeValue; - } + public void setVorhandenBeiAufnahmeValue(Boolean vorhandenBeiAufnahmeValue) { + this.vorhandenBeiAufnahmeValue = vorhandenBeiAufnahmeValue; + } - public Boolean isVorhandenBeiAufnahmeValue() { - return this.vorhandenBeiAufnahmeValue; - } + public Boolean isVorhandenBeiAufnahmeValue() { + return this.vorhandenBeiAufnahmeValue ; + } - public void setVorhandenBeiEntlassungValue(Boolean vorhandenBeiEntlassungValue) { - this.vorhandenBeiEntlassungValue = vorhandenBeiEntlassungValue; - } + public void setVorhandenBeiEntlassungValue(Boolean vorhandenBeiEntlassungValue) { + this.vorhandenBeiEntlassungValue = vorhandenBeiEntlassungValue; + } - public Boolean isVorhandenBeiEntlassungValue() { - return this.vorhandenBeiEntlassungValue; - } + public Boolean isVorhandenBeiEntlassungValue() { + return this.vorhandenBeiEntlassungValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnostischeSicherheitDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnostischeSicherheitDefiningcode.java index d0445cd20..a64b6cf4a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnostischeSicherheitDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnostischeSicherheitDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum DiagnostischeSicherheitDefiningcode implements EnumValueSet { +public enum DiagnostischeSicherheitDefiningCode implements EnumValueSet { WAHRSCHEINLICH("Wahrscheinlich", "Die Diagnose wurde mit einem hohen Maß an Sicherheit gestellt.", "local", "at0075"), VERMUTET("Vermutet", "Die Diagnose wurde mit einem niedrigen Grad an Sicherheit gestellt.", "local", "at0074"), @@ -17,8 +17,8 @@ public enum DiagnostischeSicherheitDefiningcode implements EnumValueSet { private String code; - DiagnostischeSicherheitDefiningcode(String value, String description, String terminologyId, - String code) { + DiagnostischeSicherheitDefiningCode(String value, String description, String terminologyId, + String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -26,18 +26,18 @@ public enum DiagnostischeSicherheitDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java index 1007b7c3b..d14b53458 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java @@ -7,14 +7,14 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.case_identification.v0") public class FallidentifikationCluster { - @Path("/items[at0001]/value|value") - private String fallKennungValue; + @Path("/items[at0001]/value|value") + private String fallKennungValue; - public void setFallKennungValue(String fallKennungValue) { - this.fallKennungValue = fallKennungValue; - } + public void setFallKennungValue(String fallKennungValue) { + this.fallKennungValue = fallKennungValue; + } - public String getFallKennungValue() { - return this.fallKennungValue; - } + public String getFallKennungValue() { + return this.fallKennungValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/LateralitatDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/LateralitatDefiningcode.java index 8a0cbda4b..051c318b4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/LateralitatDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/LateralitatDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum LateralitatDefiningcode implements EnumValueSet { +public enum LateralitatDefiningCode implements EnumValueSet { LINKS_UND_RECHTS("Links und Rechts", "Beide Körperseiten.", "local", "at0086"), LINKS("Links", "Die linke Körperseite.", "local", "at0003"), @@ -17,7 +17,7 @@ public enum LateralitatDefiningcode implements EnumValueSet { private String code; - LateralitatDefiningcode(String value, String description, String terminologyId, String code) { + LateralitatDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -25,18 +25,18 @@ public enum LateralitatDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/NameDesProblemsDerDiagnoseDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/NameDesProblemsDerDiagnoseDefiningcode.java index be73bdd37..6fef53e64 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/NameDesProblemsDerDiagnoseDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/NameDesProblemsDerDiagnoseDefiningcode.java @@ -2,14 +2,14 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum NameDesProblemsDerDiagnoseDefiningcode implements EnumValueSet { - INFEKTION_DURCH_KORONAVIREN_NICHT_NAHER_BEZEICHNETER_LOKALISATION("Infektion durch Koronaviren nicht näher bezeichneter Lokalisation", null, "ICD-10-GM-2020", "B34.2"), +public enum NameDesProblemsDerDiagnoseDefiningCode implements EnumValueSet { + COVID19_VIRUS_NACHGEWIESEN("COVID-19, Virus nachgewiesen", "COVID-19, Virus nachgewiesen", "ICD-10-GM-2020", "U07.1"), - KORONAVIREN_ALS_URSACHE_VON_KRANKHEITEN_DIE_IN_ANDEREN_KAPITELN_KLASSIFIZIERT_SIND("Koronaviren als Ursache von Krankheiten, die in anderen Kapiteln klassifiziert sind", null, "ICD-10-GM-2020", "B97.2"), + INFEKTION_DURCH_KORONAVIREN_NICHT_NAHER_BEZEICHNETER_LOKALISATION("Infektion durch Koronaviren nicht näher bezeichneter Lokalisation", "Infektion durch Koronaviren nicht näher bezeichneter Lokalisation", "ICD-10-GM-2020", "B34.2"), - COVID19_VIRUS_NICHT_NACHGEWIESEN("COVID-19, Virus nicht nachgewiesen", null, "ICD-10-GM-2020", "U07.2"), + KORONAVIREN_ALS_URSACHE_VON_KRANKHEITEN_DIE_IN_ANDEREN_KAPITELN_KLASSIFIZIERT_SIND("Koronaviren als Ursache von Krankheiten, die in anderen Kapiteln klassifiziert sind", "Koronaviren als Ursache von Krankheiten, die in anderen Kapiteln klassifiziert sind", "ICD-10-GM-2020", "B97.2"), - COVID19_VIRUS_NACHGEWIESEN("COVID-19, Virus nachgewiesen", null, "ICD-10-GM-2020", "U07.1"); + COVID19_VIRUS_NICHT_NACHGEWIESEN("COVID-19, Virus nicht nachgewiesen", "COVID-19, Virus nicht nachgewiesen", "ICD-10-GM-2020", "U07.2"); private String value; @@ -19,8 +19,8 @@ public enum NameDesProblemsDerDiagnoseDefiningcode implements EnumValueSet { private String code; - NameDesProblemsDerDiagnoseDefiningcode(String value, String description, String terminologyId, - String code) { + NameDesProblemsDerDiagnoseDefiningCode(String value, String description, String terminologyId, + String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -28,18 +28,18 @@ public enum NameDesProblemsDerDiagnoseDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationDiagnostischeSicherheitChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitChoice.java similarity index 54% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationDiagnostischeSicherheitChoice.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitChoice.java index 4921843db..0315f86e9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationDiagnostischeSicherheitChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitChoice.java @@ -1,4 +1,4 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; -public interface AnatomischeLokalisationDiagnostischeSicherheitChoice { +public interface ProblemDiagnoseDiagnostischeSicherheitChoice { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java new file mode 100644 index 000000000..914e22dd8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class ProblemDiagnoseDiagnostischeSicherheitDvCodedText implements ProblemDiagnoseDiagnostischeSicherheitChoice { + @Path("|defining_code") + private DiagnostischeSicherheitDefiningCode diagnostischeSicherheitDefiningCode; + + public void setDiagnostischeSicherheitDefiningCode( + DiagnostischeSicherheitDefiningCode diagnostischeSicherheitDefiningCode) { + this.diagnostischeSicherheitDefiningCode = diagnostischeSicherheitDefiningCode; + } + + public DiagnostischeSicherheitDefiningCode getDiagnostischeSicherheitDefiningCode() { + return this.diagnostischeSicherheitDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java new file mode 100644 index 000000000..2e51141be --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class ProblemDiagnoseDiagnostischeSicherheitDvText implements ProblemDiagnoseDiagnostischeSicherheitChoice { + @Path("|value") + private String diagnostischeSicherheitValue; + + public void setDiagnostischeSicherheitValue(String diagnostischeSicherheitValue) { + this.diagnostischeSicherheitValue = diagnostischeSicherheitValue; + } + + public String getDiagnostischeSicherheitValue() { + return this.diagnostischeSicherheitValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java index f5495b0a2..3d558a384 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java @@ -6,7 +6,7 @@ import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -14,196 +14,196 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.problem_diagnosis.v1") public class ProblemDiagnoseEvaluation { - @Path("/language") - private Language language; + @Path("/data[at0001]/items[at0002]/value|defining_code") + private NameDesProblemsDerDiagnoseDefiningCode nameDesProblemsDerDiagnoseDefiningCode; - @Path("/protocol[at0032]/items[at0070]/value|value") - private TemporalAccessor letztesDokumentationsdatumValue; + @Path("/data[at0001]/items[at0009 and name/value='Freitextbeschreibung']/value|value") + private String freitextbeschreibungValue; - @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.diagnose_details.v0]") - private DiagnosedetailsCluster diagnosedetails; + @Path("/data[at0001]/items[at0012 and name/value='Lokalisation']/value|value") + private String lokalisationValue; - @Path("/data[at0001]/items[at0046]") - private List status; + @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.anatomical_location.v1]") + private List anatomischeLokalisation; - @Path("/data[at0001]/items[at0077]/value|value") - private TemporalAccessor datumDesAuftretensDerErstdiagnoseValue; + @Path("/data[at0001]/items[at0077 and name/value='Datum des Auftretens/der Erstdiagnose']/value|value") + private TemporalAccessor datumDesAuftretensDerErstdiagnoseValue; - @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.etiology.v1]") - private AtiopathogeneseCluster atiopathogenese; + @Path("/data[at0001]/items[at0003 and name/value='Feststellungsdatum']/value|value") + private TemporalAccessor feststellungsdatumValue; - @Path("/protocol[at0032]/items[at0071]") - private List erweiterung; + @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.diagnose_details.v0]") + private DiagnosedetailsCluster diagnosedetails; - @Path("/data[at0001]/items[at0003]/value|value") - private TemporalAccessor feststellungsdatumValue; + @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.etiology.v1]") + private AtiopathogeneseCluster atiopathogenese; - @Path("/data[at0001]/items[at0005]/value") - @Choice - private AtiopathogeneseSchweregradChoice schweregrad; + @Path("/data[at0001]/items[at0030]/value|value") + private TemporalAccessor datumZeitpunktDerGenesungValue; - @Path("/data[at0001]/items[at0030]/value|value") - private TemporalAccessor datumZeitpunktDerGenesungValue; + @Path("/data[at0001]/items[at0046]") + private List status; - @Path("/data[at0001]/items[at0069]/value|value") - private String diagnoseerlauterungValue; + @Path("/data[at0001]/items[at0069 and name/value='Diagnoseerläuterung']/value|value") + private String diagnoseerlauterungValue; - @Path("/data[at0001]/items[at0002]/value|defining_code") - private NameDesProblemsDerDiagnoseDefiningcode nameDesProblemsDerDiagnoseDefiningcode; + @Path("/protocol[at0032]/items[at0070 and name/value='Letztes Dokumentationsdatum']/value|value") + private TemporalAccessor letztesDokumentationsdatumValue; - @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.anatomical_location.v1]") - private List anatomischeLokalisation; + @Path("/protocol[at0032]/items[at0071]") + private List erweiterung; - @Path("/data[at0001]/items[at0009]/value|value") - private String freitextbeschreibungValue; + @Path("/subject") + private PartyProxy subject; - @Path("/subject") - private PartyProxy subject; + @Path("/language") + private Language language; - @Path("/data[at0001]/items[at0073]/value") - @Choice - private AnatomischeLokalisationDiagnostischeSicherheitChoice diagnostischeSicherheit; + @Path("/data[at0001]/items[at0073]/value") + @Choice + private ProblemDiagnoseDiagnostischeSicherheitChoice diagnostischeSicherheit; - @Path("/data[at0001]/items[at0012]/value|value") - private String lokalisationValue; + @Path("/data[at0001]/items[at0005]/value") + @Choice + private ProblemDiagnoseSchweregradChoice schweregrad; - public void setLanguage(Language language) { - this.language = language; - } + public void setNameDesProblemsDerDiagnoseDefiningCode( + NameDesProblemsDerDiagnoseDefiningCode nameDesProblemsDerDiagnoseDefiningCode) { + this.nameDesProblemsDerDiagnoseDefiningCode = nameDesProblemsDerDiagnoseDefiningCode; + } - public Language getLanguage() { - return this.language; - } + public NameDesProblemsDerDiagnoseDefiningCode getNameDesProblemsDerDiagnoseDefiningCode() { + return this.nameDesProblemsDerDiagnoseDefiningCode ; + } - public void setLetztesDokumentationsdatumValue(TemporalAccessor letztesDokumentationsdatumValue) { - this.letztesDokumentationsdatumValue = letztesDokumentationsdatumValue; - } + public void setFreitextbeschreibungValue(String freitextbeschreibungValue) { + this.freitextbeschreibungValue = freitextbeschreibungValue; + } - public TemporalAccessor getLetztesDokumentationsdatumValue() { - return this.letztesDokumentationsdatumValue; - } + public String getFreitextbeschreibungValue() { + return this.freitextbeschreibungValue ; + } - public void setDiagnosedetails(DiagnosedetailsCluster diagnosedetails) { - this.diagnosedetails = diagnosedetails; - } + public void setLokalisationValue(String lokalisationValue) { + this.lokalisationValue = lokalisationValue; + } - public DiagnosedetailsCluster getDiagnosedetails() { - return this.diagnosedetails; - } + public String getLokalisationValue() { + return this.lokalisationValue ; + } - public void setStatus(List status) { - this.status = status; - } + public void setAnatomischeLokalisation( + List anatomischeLokalisation) { + this.anatomischeLokalisation = anatomischeLokalisation; + } - public List getStatus() { - return this.status; - } + public List getAnatomischeLokalisation() { + return this.anatomischeLokalisation ; + } - public void setDatumDesAuftretensDerErstdiagnoseValue( - TemporalAccessor datumDesAuftretensDerErstdiagnoseValue) { - this.datumDesAuftretensDerErstdiagnoseValue = datumDesAuftretensDerErstdiagnoseValue; - } + public void setDatumDesAuftretensDerErstdiagnoseValue( + TemporalAccessor datumDesAuftretensDerErstdiagnoseValue) { + this.datumDesAuftretensDerErstdiagnoseValue = datumDesAuftretensDerErstdiagnoseValue; + } - public TemporalAccessor getDatumDesAuftretensDerErstdiagnoseValue() { - return this.datumDesAuftretensDerErstdiagnoseValue; - } + public TemporalAccessor getDatumDesAuftretensDerErstdiagnoseValue() { + return this.datumDesAuftretensDerErstdiagnoseValue ; + } - public void setAtiopathogenese(AtiopathogeneseCluster atiopathogenese) { - this.atiopathogenese = atiopathogenese; - } + public void setFeststellungsdatumValue(TemporalAccessor feststellungsdatumValue) { + this.feststellungsdatumValue = feststellungsdatumValue; + } - public AtiopathogeneseCluster getAtiopathogenese() { - return this.atiopathogenese; - } + public TemporalAccessor getFeststellungsdatumValue() { + return this.feststellungsdatumValue ; + } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public void setDiagnosedetails(DiagnosedetailsCluster diagnosedetails) { + this.diagnosedetails = diagnosedetails; + } - public List getErweiterung() { - return this.erweiterung; - } + public DiagnosedetailsCluster getDiagnosedetails() { + return this.diagnosedetails ; + } - public void setFeststellungsdatumValue(TemporalAccessor feststellungsdatumValue) { - this.feststellungsdatumValue = feststellungsdatumValue; - } + public void setAtiopathogenese(AtiopathogeneseCluster atiopathogenese) { + this.atiopathogenese = atiopathogenese; + } - public TemporalAccessor getFeststellungsdatumValue() { - return this.feststellungsdatumValue; - } + public AtiopathogeneseCluster getAtiopathogenese() { + return this.atiopathogenese ; + } - public void setSchweregrad(AtiopathogeneseSchweregradChoice schweregrad) { - this.schweregrad = schweregrad; - } + public void setDatumZeitpunktDerGenesungValue(TemporalAccessor datumZeitpunktDerGenesungValue) { + this.datumZeitpunktDerGenesungValue = datumZeitpunktDerGenesungValue; + } - public AtiopathogeneseSchweregradChoice getSchweregrad() { - return this.schweregrad; - } + public TemporalAccessor getDatumZeitpunktDerGenesungValue() { + return this.datumZeitpunktDerGenesungValue ; + } - public void setDatumZeitpunktDerGenesungValue(TemporalAccessor datumZeitpunktDerGenesungValue) { - this.datumZeitpunktDerGenesungValue = datumZeitpunktDerGenesungValue; - } + public void setStatus(List status) { + this.status = status; + } - public TemporalAccessor getDatumZeitpunktDerGenesungValue() { - return this.datumZeitpunktDerGenesungValue; - } + public List getStatus() { + return this.status ; + } - public void setDiagnoseerlauterungValue(String diagnoseerlauterungValue) { - this.diagnoseerlauterungValue = diagnoseerlauterungValue; - } - - public String getDiagnoseerlauterungValue() { - return this.diagnoseerlauterungValue; - } - - public void setNameDesProblemsDerDiagnoseDefiningcode( - NameDesProblemsDerDiagnoseDefiningcode nameDesProblemsDerDiagnoseDefiningcode) { - this.nameDesProblemsDerDiagnoseDefiningcode = nameDesProblemsDerDiagnoseDefiningcode; - } - - public NameDesProblemsDerDiagnoseDefiningcode getNameDesProblemsDerDiagnoseDefiningcode() { - return this.nameDesProblemsDerDiagnoseDefiningcode; - } - - public void setAnatomischeLokalisation( - List anatomischeLokalisation) { - this.anatomischeLokalisation = anatomischeLokalisation; - } - - public List getAnatomischeLokalisation() { - return this.anatomischeLokalisation; - } - - public void setFreitextbeschreibungValue(String freitextbeschreibungValue) { - this.freitextbeschreibungValue = freitextbeschreibungValue; - } - - public String getFreitextbeschreibungValue() { - return this.freitextbeschreibungValue; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject; - } - - public void setDiagnostischeSicherheit( - AnatomischeLokalisationDiagnostischeSicherheitChoice diagnostischeSicherheit) { - this.diagnostischeSicherheit = diagnostischeSicherheit; - } - - public AnatomischeLokalisationDiagnostischeSicherheitChoice getDiagnostischeSicherheit() { - return this.diagnostischeSicherheit; - } - - public void setLokalisationValue(String lokalisationValue) { - this.lokalisationValue = lokalisationValue; - } - - public String getLokalisationValue() { - return this.lokalisationValue; - } + public void setDiagnoseerlauterungValue(String diagnoseerlauterungValue) { + this.diagnoseerlauterungValue = diagnoseerlauterungValue; + } + + public String getDiagnoseerlauterungValue() { + return this.diagnoseerlauterungValue ; + } + + public void setLetztesDokumentationsdatumValue(TemporalAccessor letztesDokumentationsdatumValue) { + this.letztesDokumentationsdatumValue = letztesDokumentationsdatumValue; + } + + public TemporalAccessor getLetztesDokumentationsdatumValue() { + return this.letztesDokumentationsdatumValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setDiagnostischeSicherheit( + ProblemDiagnoseDiagnostischeSicherheitChoice diagnostischeSicherheit) { + this.diagnostischeSicherheit = diagnostischeSicherheit; + } + + public ProblemDiagnoseDiagnostischeSicherheitChoice getDiagnostischeSicherheit() { + return this.diagnostischeSicherheit ; + } + + public void setSchweregrad(ProblemDiagnoseSchweregradChoice schweregrad) { + this.schweregrad = schweregrad; + } + + public ProblemDiagnoseSchweregradChoice getSchweregrad() { + return this.schweregrad ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluationContainment.java index 9955b25a8..19bc3d6ef 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluationContainment.java @@ -7,46 +7,46 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class ProblemDiagnoseEvaluationContainment extends Containment { public SelectAqlField PROBLEM_DIAGNOSE_EVALUATION = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "", "ProblemDiagnoseEvaluation", ProblemDiagnoseEvaluation.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField NAME_DES_PROBLEMS_DER_DIAGNOSE_DEFINING_CODE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0002]/value|defining_code", "nameDesProblemsDerDiagnoseDefiningCode", NameDesProblemsDerDiagnoseDefiningCode.class, this); - public SelectAqlField LETZTES_DOKUMENTATIONSDATUM_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/protocol[at0032]/items[at0070]/value|value", "letztesDokumentationsdatumValue", TemporalAccessor.class, this); + public SelectAqlField FREITEXTBESCHREIBUNG_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0009]/value|value", "freitextbeschreibungValue", String.class, this); - public SelectAqlField DIAGNOSEDETAILS = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.diagnose_details.v0]", "diagnosedetails", DiagnosedetailsCluster.class, this); + public SelectAqlField LOKALISATION_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0012]/value|value", "lokalisationValue", String.class, this); - public ListSelectAqlField STATUS = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0046]", "status", Cluster.class, this); + public ListSelectAqlField ANATOMISCHE_LOKALISATION = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.anatomical_location.v1]", "anatomischeLokalisation", AnatomischeLokalisationCluster.class, this); public SelectAqlField DATUM_DES_AUFTRETENS_DER_ERSTDIAGNOSE_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0077]/value|value", "datumDesAuftretensDerErstdiagnoseValue", TemporalAccessor.class, this); - public SelectAqlField ATIOPATHOGENESE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.etiology.v1]", "atiopathogenese", AtiopathogeneseCluster.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/protocol[at0032]/items[at0071]", "erweiterung", Cluster.class, this); - public SelectAqlField FESTSTELLUNGSDATUM_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0003]/value|value", "feststellungsdatumValue", TemporalAccessor.class, this); - public SelectAqlField SCHWEREGRAD = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0005]/value", "schweregrad", AtiopathogeneseSchweregradChoice.class, this); + public SelectAqlField DIAGNOSEDETAILS = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.diagnose_details.v0]", "diagnosedetails", DiagnosedetailsCluster.class, this); + + public SelectAqlField ATIOPATHOGENESE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.etiology.v1]", "atiopathogenese", AtiopathogeneseCluster.class, this); public SelectAqlField DATUM_ZEITPUNKT_DER_GENESUNG_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0030]/value|value", "datumZeitpunktDerGenesungValue", TemporalAccessor.class, this); - public SelectAqlField DIAGNOSEERLAUTERUNG_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0069]/value|value", "diagnoseerlauterungValue", String.class, this); + public ListSelectAqlField STATUS = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0046]", "status", Cluster.class, this); - public SelectAqlField NAME_DES_PROBLEMS_DER_DIAGNOSE_DEFININGCODE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0002]/value|defining_code", "nameDesProblemsDerDiagnoseDefiningcode", NameDesProblemsDerDiagnoseDefiningcode.class, this); + public SelectAqlField DIAGNOSEERLAUTERUNG_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0069]/value|value", "diagnoseerlauterungValue", String.class, this); - public ListSelectAqlField ANATOMISCHE_LOKALISATION = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.anatomical_location.v1]", "anatomischeLokalisation", AnatomischeLokalisationCluster.class, this); + public SelectAqlField LETZTES_DOKUMENTATIONSDATUM_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/protocol[at0032]/items[at0070]/value|value", "letztesDokumentationsdatumValue", TemporalAccessor.class, this); - public SelectAqlField FREITEXTBESCHREIBUNG_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0009]/value|value", "freitextbeschreibungValue", String.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/protocol[at0032]/items[at0071]", "erweiterung", Cluster.class, this); public SelectAqlField SUBJECT = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField DIAGNOSTISCHE_SICHERHEIT = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0073]/value", "diagnostischeSicherheit", AnatomischeLokalisationDiagnostischeSicherheitChoice.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/language", "language", Language.class, this); - public SelectAqlField LOKALISATION_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0012]/value|value", "lokalisationValue", String.class, this); + public SelectAqlField DIAGNOSTISCHE_SICHERHEIT = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0073]/value", "diagnostischeSicherheit", ProblemDiagnoseDiagnostischeSicherheitChoice.class, this); + + public SelectAqlField SCHWEREGRAD = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0005]/value", "schweregrad", ProblemDiagnoseSchweregradChoice.class, this); private ProblemDiagnoseEvaluationContainment() { super("openEHR-EHR-EVALUATION.problem_diagnosis.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseSchweregradChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradChoice.java similarity index 62% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseSchweregradChoice.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradChoice.java index 842a628f5..e7ad2f230 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseSchweregradChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradChoice.java @@ -1,4 +1,4 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; -public interface AtiopathogeneseSchweregradChoice { +public interface ProblemDiagnoseSchweregradChoice { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java new file mode 100644 index 000000000..2cd7ab223 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class ProblemDiagnoseSchweregradDvCodedText implements ProblemDiagnoseSchweregradChoice { + @Path("|defining_code") + private SchweregradDefiningCode schweregradDefiningCode; + + public void setSchweregradDefiningCode(SchweregradDefiningCode schweregradDefiningCode) { + this.schweregradDefiningCode = schweregradDefiningCode; + } + + public SchweregradDefiningCode getSchweregradDefiningCode() { + return this.schweregradDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java new file mode 100644 index 000000000..1c3c28390 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class ProblemDiagnoseSchweregradDvText implements ProblemDiagnoseSchweregradChoice { + @Path("|value") + private String schweregradValue; + + public void setSchweregradValue(String schweregradValue) { + this.schweregradValue = schweregradValue; + } + + public String getSchweregradValue() { + return this.schweregradValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/SchweregradDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/SchweregradDefiningcode.java index 4a3ec81d9..9dea6e2ba 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/SchweregradDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/SchweregradDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum SchweregradDefiningcode implements EnumValueSet { +public enum SchweregradDefiningCode implements EnumValueSet { SCHWER("Schwer", "Das Problem oder die Diagnose verhindert die normale Aktivität oder verursacht schwerwiegende gesundheitliche Schäden, falls es nicht behandelt wird.", "local", "at0049"), MASSIG("Mäßig", "Das Problem oder die Diagnose beeinträchtigt die normale Aktivität oder verursacht bleibende gesundheitliche Schäden, falls es nicht behandelt wird.", "local", "at0048"), @@ -17,7 +17,7 @@ public enum SchweregradDefiningcode implements EnumValueSet { private String code; - SchweregradDefiningcode(String value, String description, String terminologyId, String code) { + SchweregradDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -25,18 +25,18 @@ public enum SchweregradDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ValueDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ValueDefiningcode.java index 0ace96ea8..4ad89a89b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ValueDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ValueDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum ValueDefiningcode implements EnumValueSet { +public enum ValueDefiningCode implements EnumValueSet { LEBENSWANDEL_BEZOGENE_FAKTOREN("Lebenswandel-bezogene Faktoren", "z. B. Rauchen, Alkoholismus", "local", "at0013"), GENETISCHE_HERKUNFT("Genetische Herkunft", "z. B Sichelzellenanämie", "local", "at0009"), @@ -37,7 +37,7 @@ public enum ValueDefiningcode implements EnumValueSet { private String code; - ValueDefiningcode(String value, String description, String terminologyId, String code) { + ValueDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -45,18 +45,18 @@ public enum ValueDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java index c6048b236..f2f12fe94 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java @@ -11,10 +11,10 @@ import org.ehrbase.client.annotations.Template; import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.BloodPressureTrainingSampleObservation; import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.DeviceDetailsTrainingSampleCluster; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; import java.time.temporal.TemporalAccessor; @@ -24,159 +24,159 @@ @Archetype("openEHR-EHR-COMPOSITION.sample_encounter.v1") @Template("ehrbase_blood_pressure_simple.de.v0") public class EhrbaseBloodPressureSimpleDeV0Composition { - @Id - private VersionUid versionUid; + @Path("/context/other_context[at0001]/items[at0006]/items[openEHR-EHR-CLUSTER.sample_device.v1]") + private List deviceDetailsTrainingSample; - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; - @Path("/context/participations") - private List participations; + @Path("/context/participations") + private List participations; - @Path("/language") - private Language language; + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; + @Path("/context/location") + private String location; - @Path("/territory") - private Territory territory; + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; - @Path("/context/other_context[at0001]/items[at0006]/items[openEHR-EHR-CLUSTER.sample_device.v1]") - private List deviceDetailsTrainingSample; + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; + @Path("/content[openEHR-EHR-OBSERVATION.sample_blood_pressure.v1]") + private List bloodPressureTrainingSample; - @Path("/composer") - private PartyProxy composer; + @Path("/composer") + private PartyProxy composer; - @Path("/context/setting|defining_code") - private SettingDefiningcode settingDefiningcode; + @Path("/language") + private Language language; - @Path("/feeder_audit") - private FeederAudit feederAudit; + @Path("/feeder_audit") + private FeederAudit feederAudit; - @Path("/content[openEHR-EHR-OBSERVATION.sample_blood_pressure.v1]") - private List bloodPressureTrainingSample; + @Path("/category|defining_code") + private Category categoryDefiningCode; - @Path("/context/location") - private String location; + @Path("/territory") + private Territory territory; - @Path("/category|defining_code") - private CategoryDefiningcode categoryDefiningcode; + @Id + private VersionUid versionUid; - public VersionUid getVersionUid() { - return this.versionUid; - } + public void setDeviceDetailsTrainingSample( + List deviceDetailsTrainingSample) { + this.deviceDetailsTrainingSample = deviceDetailsTrainingSample; + } - public void setVersionUid(VersionUid versionUid) { - this.versionUid = versionUid; - } + public List getDeviceDetailsTrainingSample() { + return this.deviceDetailsTrainingSample ; + } - public void setEndTimeValue(TemporalAccessor endTimeValue) { - this.endTimeValue = endTimeValue; - } + public void setStartTimeValue(TemporalAccessor startTimeValue) { + this.startTimeValue = startTimeValue; + } - public TemporalAccessor getEndTimeValue() { - return this.endTimeValue; - } + public TemporalAccessor getStartTimeValue() { + return this.startTimeValue ; + } - public void setParticipations(List participations) { - this.participations = participations; - } + public void setParticipations(List participations) { + this.participations = participations; + } - public List getParticipations() { - return this.participations; - } + public List getParticipations() { + return this.participations ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setEndTimeValue(TemporalAccessor endTimeValue) { + this.endTimeValue = endTimeValue; + } - public Language getLanguage() { - return this.language; - } + public TemporalAccessor getEndTimeValue() { + return this.endTimeValue ; + } - public void setHealthCareFacility(PartyIdentified healthCareFacility) { - this.healthCareFacility = healthCareFacility; - } + public void setLocation(String location) { + this.location = location; + } - public PartyIdentified getHealthCareFacility() { - return this.healthCareFacility; - } + public String getLocation() { + return this.location ; + } - public void setTerritory(Territory territory) { - this.territory = territory; - } + public void setHealthCareFacility(PartyIdentified healthCareFacility) { + this.healthCareFacility = healthCareFacility; + } - public Territory getTerritory() { - return this.territory; - } + public PartyIdentified getHealthCareFacility() { + return this.healthCareFacility ; + } - public void setDeviceDetailsTrainingSample( - List deviceDetailsTrainingSample) { - this.deviceDetailsTrainingSample = deviceDetailsTrainingSample; - } + public void setSettingDefiningCode(Setting settingDefiningCode) { + this.settingDefiningCode = settingDefiningCode; + } - public List getDeviceDetailsTrainingSample() { - return this.deviceDetailsTrainingSample; - } + public Setting getSettingDefiningCode() { + return this.settingDefiningCode ; + } - public void setStartTimeValue(TemporalAccessor startTimeValue) { - this.startTimeValue = startTimeValue; - } + public void setBloodPressureTrainingSample( + List bloodPressureTrainingSample) { + this.bloodPressureTrainingSample = bloodPressureTrainingSample; + } - public TemporalAccessor getStartTimeValue() { - return this.startTimeValue; - } + public List getBloodPressureTrainingSample() { + return this.bloodPressureTrainingSample ; + } - public void setComposer(PartyProxy composer) { - this.composer = composer; - } + public void setComposer(PartyProxy composer) { + this.composer = composer; + } - public PartyProxy getComposer() { - return this.composer; - } + public PartyProxy getComposer() { + return this.composer ; + } - public void setSettingDefiningcode(SettingDefiningcode settingDefiningcode) { - this.settingDefiningcode = settingDefiningcode; - } + public void setLanguage(Language language) { + this.language = language; + } - public SettingDefiningcode getSettingDefiningcode() { - return this.settingDefiningcode; - } + public Language getLanguage() { + return this.language ; + } - public void setFeederAudit(FeederAudit feederAudit) { - this.feederAudit = feederAudit; - } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } - public FeederAudit getFeederAudit() { - return this.feederAudit; - } + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } - public void setBloodPressureTrainingSample( - List bloodPressureTrainingSample) { - this.bloodPressureTrainingSample = bloodPressureTrainingSample; - } + public void setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } - public List getBloodPressureTrainingSample() { - return this.bloodPressureTrainingSample; - } - - public void setLocation(String location) { - this.location = location; - } - - public String getLocation() { - return this.location; - } - - public void setCategoryDefiningcode(CategoryDefiningcode categoryDefiningcode) { - this.categoryDefiningcode = categoryDefiningcode; - } - - public CategoryDefiningcode getCategoryDefiningcode() { - return this.categoryDefiningcode; - } + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } + + 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java index b16aec69d..f667f8242 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java @@ -11,41 +11,41 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.BloodPressureTrainingSampleObservation; import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.DeviceDetailsTrainingSampleCluster; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import java.time.temporal.TemporalAccessor; public class EhrbaseBloodPressureSimpleDeV0CompositionContainment extends Containment { public SelectAqlField EHRBASE_BLOOD_PRESSURE_SIMPLE_DE_V0_COMPOSITION = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "", "EhrbaseBloodPressureSimpleDeV0Composition", EhrbaseBloodPressureSimpleDeV0Composition.class, this); - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + public ListSelectAqlField DEVICE_DETAILS_TRAINING_SAMPLE = new ListAqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/other_context[at0001]/items[at0006]/items[openEHR-EHR-CLUSTER.sample_device.v1]", "deviceDetailsTrainingSample", DeviceDetailsTrainingSampleCluster.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/participations", "participations", Participation.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/language", "language", Language.class, this); + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + public SelectAqlField LOCATION = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/location", "location", String.class, this); - public SelectAqlField TERRITORY = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/territory", "territory", Territory.class, this); + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - public ListSelectAqlField DEVICE_DETAILS_TRAINING_SAMPLE = new ListAqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/other_context[at0001]/items[at0006]/items[openEHR-EHR-CLUSTER.sample_device.v1]", "deviceDetailsTrainingSample", DeviceDetailsTrainingSampleCluster.class, this); + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + public ListSelectAqlField BLOOD_PRESSURE_TRAINING_SAMPLE = new ListAqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/content[openEHR-EHR-OBSERVATION.sample_blood_pressure.v1]", "bloodPressureTrainingSample", BloodPressureTrainingSampleObservation.class, this); public SelectAqlField COMPOSER = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/composer", "composer", PartyProxy.class, this); - public SelectAqlField SETTING_DEFININGCODE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/setting|defining_code", "settingDefiningcode", SettingDefiningcode.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/language", "language", Language.class, this); public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - public ListSelectAqlField BLOOD_PRESSURE_TRAINING_SAMPLE = new ListAqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/content[openEHR-EHR-OBSERVATION.sample_blood_pressure.v1]", "bloodPressureTrainingSample", BloodPressureTrainingSampleObservation.class, this); - - public SelectAqlField LOCATION = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/location", "location", String.class, this); + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - public SelectAqlField CATEGORY_DEFININGCODE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/category|defining_code", "categoryDefiningcode", CategoryDefiningcode.class, this); + public SelectAqlField TERRITORY = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/territory", "territory", Territory.class, this); private EhrbaseBloodPressureSimpleDeV0CompositionContainment() { super("openEHR-EHR-COMPOSITION.sample_encounter.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java index 04254ad5a..a9d726aa5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,236 +13,236 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.sample_blood_pressure.v1") public class BloodPressureTrainingSampleObservation { - @Path("/protocol[at0011]/items[at1025]") - private List device; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude") + private Double systolicMagnitude; - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units") + private String systolicUnits; - @Path("/data[at0001]/events[at0002]/state[at0007]/items[at1030]") - private List levelOfExertion; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|magnitude") + private Double diastolicMagnitude; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0033]/value|value") - private String commentValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|units") + private String diastolicUnits; - @Path("/protocol[at0011]/items[at0013]/value|defining_code") - private CuffSizeDefiningcode cuffSizeDefiningcode; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|magnitude") + private Double meanArterialPressureMagnitude; - @Path("/protocol[at0011]/items[at1010]/value|defining_code") - private KorotkoffSoundsDefiningcode korotkoffSoundsDefiningcode; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|units") + private String meanArterialPressureUnits; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude") - private Double systolicMagnitude; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|magnitude") + private Double pulsePressureMagnitude; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units") - private String systolicUnits; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|units") + private String pulsePressureUnits; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|magnitude") - private Double diastolicMagnitude; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0033]/value|value") + private String commentValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|units") - private String diastolicUnits; + @Path("/data[at0001]/events[at0002]/state[at0007]/items[at0008]/value|defining_code") + private PositionDefiningCode positionDefiningCode; - @Path("/data[at0001]/events[at0002]/state[at0007]/items[at0008]/value|defining_code") - private PositionDefiningcode positionDefiningcode; + @Path("/data[at0001]/events[at0002]/state[at0007]/items[at1030]") + private List levelOfExertion; - @Path("/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|magnitude") - private Double tiltMagnitude; + @Path("/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|magnitude") + private Double tiltMagnitude; - @Path("/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|units") - private String tiltUnits; + @Path("/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|units") + private String tiltUnits; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|magnitude") - private Double meanArterialPressureMagnitude; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|units") - private String meanArterialPressureUnits; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/protocol[at0011]/items[at0013]/value|defining_code") + private CuffSizeDefiningCode cuffSizeDefiningCode; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0011]/items[at0014]/value|defining_code") + private LocationOfMeasurementDefiningCode locationOfMeasurementDefiningCode; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/protocol[at0011]/items[at1010]/value|defining_code") + private KorotkoffSoundsDefiningCode korotkoffSoundsDefiningCode; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|magnitude") - private Double pulsePressureMagnitude; + @Path("/protocol[at0011]/items[at1025]") + private List device; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|units") - private String pulsePressureUnits; + @Path("/subject") + private PartyProxy subject; - @Path("/protocol[at0011]/items[at0014]/value|defining_code") - private LocationOfMeasurementDefiningcode locationOfMeasurementDefiningcode; + @Path("/language") + private Language language; - public void setDevice(List device) { - this.device = device; - } + public void setSystolicMagnitude(Double systolicMagnitude) { + this.systolicMagnitude = systolicMagnitude; + } - public List getDevice() { - return this.device; - } + public Double getSystolicMagnitude() { + return this.systolicMagnitude ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setSystolicUnits(String systolicUnits) { + this.systolicUnits = systolicUnits; + } - public Language getLanguage() { - return this.language; - } + public String getSystolicUnits() { + return this.systolicUnits ; + } - public void setLevelOfExertion(List levelOfExertion) { - this.levelOfExertion = levelOfExertion; - } + public void setDiastolicMagnitude(Double diastolicMagnitude) { + this.diastolicMagnitude = diastolicMagnitude; + } - public List getLevelOfExertion() { - return this.levelOfExertion; - } + public Double getDiastolicMagnitude() { + return this.diastolicMagnitude ; + } - public void setCommentValue(String commentValue) { - this.commentValue = commentValue; - } + public void setDiastolicUnits(String diastolicUnits) { + this.diastolicUnits = diastolicUnits; + } - public String getCommentValue() { - return this.commentValue; - } + public String getDiastolicUnits() { + return this.diastolicUnits ; + } - public void setCuffSizeDefiningcode(CuffSizeDefiningcode cuffSizeDefiningcode) { - this.cuffSizeDefiningcode = cuffSizeDefiningcode; - } + public void setMeanArterialPressureMagnitude(Double meanArterialPressureMagnitude) { + this.meanArterialPressureMagnitude = meanArterialPressureMagnitude; + } - public CuffSizeDefiningcode getCuffSizeDefiningcode() { - return this.cuffSizeDefiningcode; - } + public Double getMeanArterialPressureMagnitude() { + return this.meanArterialPressureMagnitude ; + } - public void setKorotkoffSoundsDefiningcode( - KorotkoffSoundsDefiningcode korotkoffSoundsDefiningcode) { - this.korotkoffSoundsDefiningcode = korotkoffSoundsDefiningcode; - } + public void setMeanArterialPressureUnits(String meanArterialPressureUnits) { + this.meanArterialPressureUnits = meanArterialPressureUnits; + } - public KorotkoffSoundsDefiningcode getKorotkoffSoundsDefiningcode() { - return this.korotkoffSoundsDefiningcode; - } + public String getMeanArterialPressureUnits() { + return this.meanArterialPressureUnits ; + } - public void setSystolicMagnitude(Double systolicMagnitude) { - this.systolicMagnitude = systolicMagnitude; - } + public void setPulsePressureMagnitude(Double pulsePressureMagnitude) { + this.pulsePressureMagnitude = pulsePressureMagnitude; + } - public Double getSystolicMagnitude() { - return this.systolicMagnitude; - } + public Double getPulsePressureMagnitude() { + return this.pulsePressureMagnitude ; + } - public void setSystolicUnits(String systolicUnits) { - this.systolicUnits = systolicUnits; - } + public void setPulsePressureUnits(String pulsePressureUnits) { + this.pulsePressureUnits = pulsePressureUnits; + } - public String getSystolicUnits() { - return this.systolicUnits; - } + public String getPulsePressureUnits() { + return this.pulsePressureUnits ; + } - public void setDiastolicMagnitude(Double diastolicMagnitude) { - this.diastolicMagnitude = diastolicMagnitude; - } + public void setCommentValue(String commentValue) { + this.commentValue = commentValue; + } - public Double getDiastolicMagnitude() { - return this.diastolicMagnitude; - } + public String getCommentValue() { + return this.commentValue ; + } - public void setDiastolicUnits(String diastolicUnits) { - this.diastolicUnits = diastolicUnits; - } + public void setPositionDefiningCode(PositionDefiningCode positionDefiningCode) { + this.positionDefiningCode = positionDefiningCode; + } - public String getDiastolicUnits() { - return this.diastolicUnits; - } + public PositionDefiningCode getPositionDefiningCode() { + return this.positionDefiningCode ; + } - public void setPositionDefiningcode(PositionDefiningcode positionDefiningcode) { - this.positionDefiningcode = positionDefiningcode; - } + public void setLevelOfExertion(List levelOfExertion) { + this.levelOfExertion = levelOfExertion; + } - public PositionDefiningcode getPositionDefiningcode() { - return this.positionDefiningcode; - } + public List getLevelOfExertion() { + return this.levelOfExertion ; + } - public void setTiltMagnitude(Double tiltMagnitude) { - this.tiltMagnitude = tiltMagnitude; - } + public void setTiltMagnitude(Double tiltMagnitude) { + this.tiltMagnitude = tiltMagnitude; + } - public Double getTiltMagnitude() { - return this.tiltMagnitude; - } + public Double getTiltMagnitude() { + return this.tiltMagnitude ; + } - public void setTiltUnits(String tiltUnits) { - this.tiltUnits = tiltUnits; - } - - public String getTiltUnits() { - return this.tiltUnits; - } - - public void setMeanArterialPressureMagnitude(Double meanArterialPressureMagnitude) { - this.meanArterialPressureMagnitude = meanArterialPressureMagnitude; - } - - public Double getMeanArterialPressureMagnitude() { - return this.meanArterialPressureMagnitude; - } - - public void setMeanArterialPressureUnits(String meanArterialPressureUnits) { - this.meanArterialPressureUnits = meanArterialPressureUnits; - } - - public String getMeanArterialPressureUnits() { - return this.meanArterialPressureUnits; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public void setTiltUnits(String tiltUnits) { + this.tiltUnits = tiltUnits; + } - public void setPulsePressureMagnitude(Double pulsePressureMagnitude) { - this.pulsePressureMagnitude = pulsePressureMagnitude; - } + public String getTiltUnits() { + return this.tiltUnits ; + } - public Double getPulsePressureMagnitude() { - return this.pulsePressureMagnitude; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public void setPulsePressureUnits(String pulsePressureUnits) { - this.pulsePressureUnits = pulsePressureUnits; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public String getPulsePressureUnits() { - return this.pulsePressureUnits; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public void setLocationOfMeasurementDefiningcode( - LocationOfMeasurementDefiningcode locationOfMeasurementDefiningcode) { - this.locationOfMeasurementDefiningcode = locationOfMeasurementDefiningcode; - } - - public LocationOfMeasurementDefiningcode getLocationOfMeasurementDefiningcode() { - return this.locationOfMeasurementDefiningcode; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setCuffSizeDefiningCode(CuffSizeDefiningCode cuffSizeDefiningCode) { + this.cuffSizeDefiningCode = cuffSizeDefiningCode; + } + + public CuffSizeDefiningCode getCuffSizeDefiningCode() { + return this.cuffSizeDefiningCode ; + } + + public void setLocationOfMeasurementDefiningCode( + LocationOfMeasurementDefiningCode locationOfMeasurementDefiningCode) { + this.locationOfMeasurementDefiningCode = locationOfMeasurementDefiningCode; + } + + public LocationOfMeasurementDefiningCode getLocationOfMeasurementDefiningCode() { + return this.locationOfMeasurementDefiningCode ; + } + + public void setKorotkoffSoundsDefiningCode( + KorotkoffSoundsDefiningCode korotkoffSoundsDefiningCode) { + this.korotkoffSoundsDefiningCode = korotkoffSoundsDefiningCode; + } + + public KorotkoffSoundsDefiningCode getKorotkoffSoundsDefiningCode() { + return this.korotkoffSoundsDefiningCode ; + } + + public void setDevice(List device) { + this.device = device; + } + + public List getDevice() { + return this.device ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java index af21def4e..7dd9d179b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java @@ -7,54 +7,54 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class BloodPressureTrainingSampleObservationContainment extends Containment { public SelectAqlField BLOOD_PRESSURE_TRAINING_SAMPLE_OBSERVATION = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "", "BloodPressureTrainingSampleObservation", BloodPressureTrainingSampleObservation.class, this); - public ListSelectAqlField DEVICE = new ListAqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at1025]", "device", Cluster.class, this); + public SelectAqlField SYSTOLIC_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude", "systolicMagnitude", Double.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/language", "language", Language.class, this); + public SelectAqlField SYSTOLIC_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units", "systolicUnits", String.class, this); - public ListSelectAqlField LEVEL_OF_EXERTION = new ListAqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/state[at0007]/items[at1030]", "levelOfExertion", Cluster.class, this); + public SelectAqlField DIASTOLIC_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|magnitude", "diastolicMagnitude", Double.class, this); - public SelectAqlField COMMENT_VALUE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0033]/value|value", "commentValue", String.class, this); + public SelectAqlField DIASTOLIC_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|units", "diastolicUnits", String.class, this); - public SelectAqlField CUFF_SIZE_DEFININGCODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at0013]/value|defining_code", "cuffSizeDefiningcode", CuffSizeDefiningcode.class, this); + public SelectAqlField MEAN_ARTERIAL_PRESSURE_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|magnitude", "meanArterialPressureMagnitude", Double.class, this); - public SelectAqlField KOROTKOFF_SOUNDS_DEFININGCODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at1010]/value|defining_code", "korotkoffSoundsDefiningcode", KorotkoffSoundsDefiningcode.class, this); + public SelectAqlField MEAN_ARTERIAL_PRESSURE_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|units", "meanArterialPressureUnits", String.class, this); - public SelectAqlField SYSTOLIC_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude", "systolicMagnitude", Double.class, this); + public SelectAqlField PULSE_PRESSURE_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|magnitude", "pulsePressureMagnitude", Double.class, this); - public SelectAqlField SYSTOLIC_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units", "systolicUnits", String.class, this); + public SelectAqlField PULSE_PRESSURE_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|units", "pulsePressureUnits", String.class, this); - public SelectAqlField DIASTOLIC_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|magnitude", "diastolicMagnitude", Double.class, this); + public SelectAqlField COMMENT_VALUE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0033]/value|value", "commentValue", String.class, this); - public SelectAqlField DIASTOLIC_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|units", "diastolicUnits", String.class, this); + public SelectAqlField POSITION_DEFINING_CODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/state[at0007]/items[at0008]/value|defining_code", "positionDefiningCode", PositionDefiningCode.class, this); - public SelectAqlField POSITION_DEFININGCODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/state[at0007]/items[at0008]/value|defining_code", "positionDefiningcode", PositionDefiningcode.class, this); + public ListSelectAqlField LEVEL_OF_EXERTION = new ListAqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/state[at0007]/items[at1030]", "levelOfExertion", Cluster.class, this); public SelectAqlField TILT_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|magnitude", "tiltMagnitude", Double.class, this); public SelectAqlField TILT_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|units", "tiltUnits", String.class, this); - public SelectAqlField MEAN_ARTERIAL_PRESSURE_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|magnitude", "meanArterialPressureMagnitude", Double.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - public SelectAqlField MEAN_ARTERIAL_PRESSURE_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|units", "meanArterialPressureUnits", String.class, this); + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + public SelectAqlField CUFF_SIZE_DEFINING_CODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at0013]/value|defining_code", "cuffSizeDefiningCode", CuffSizeDefiningCode.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField LOCATION_OF_MEASUREMENT_DEFINING_CODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at0014]/value|defining_code", "locationOfMeasurementDefiningCode", LocationOfMeasurementDefiningCode.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + public SelectAqlField KOROTKOFF_SOUNDS_DEFINING_CODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at1010]/value|defining_code", "korotkoffSoundsDefiningCode", KorotkoffSoundsDefiningCode.class, this); - public SelectAqlField PULSE_PRESSURE_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|magnitude", "pulsePressureMagnitude", Double.class, this); + public ListSelectAqlField DEVICE = new ListAqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at1025]", "device", Cluster.class, this); - public SelectAqlField PULSE_PRESSURE_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|units", "pulsePressureUnits", String.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField LOCATION_OF_MEASUREMENT_DEFININGCODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at0014]/value|defining_code", "locationOfMeasurementDefiningcode", LocationOfMeasurementDefiningcode.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/language", "language", Language.class, this); private BloodPressureTrainingSampleObservationContainment() { super("openEHR-EHR-OBSERVATION.sample_blood_pressure.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningcode.java index 1672d554c..763d367c4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningcode.java @@ -2,10 +2,10 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum CuffSizeDefiningcode implements EnumValueSet { - CHILD("Paediatric/Child", "A cuff that is appropriate for a child or thin arm - bladder approx 8cm x 21\n" - + " cm\n" - + " ", "local", "at0017"), +public enum CuffSizeDefiningCode implements EnumValueSet { + PAEDIATRIC_CHILD("Paediatric/Child", "A cuff that is appropriate for a child or thin arm - bladder approx 8cm x 21\n" + + " cm\n" + + " ", "local", "at0017"), ADULT_THIGH("Adult Thigh", "A cuff used for an adult thigh - bladder approx 20cm x 42 cm", "local", "at1008"), @@ -27,7 +27,7 @@ public enum CuffSizeDefiningcode implements EnumValueSet { private String code; - CuffSizeDefiningcode(String value, String description, String terminologyId, String code) { + CuffSizeDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -35,18 +35,18 @@ public enum CuffSizeDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java index 1fc17f172..8ed5c285b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java @@ -6,107 +6,106 @@ import org.ehrbase.client.annotations.Path; import java.time.temporal.TemporalAccessor; -import java.util.List; @Entity @Archetype("openEHR-EHR-CLUSTER.sample_device.v1") public class DeviceDetailsTrainingSampleCluster { - @Path("/items[at0004]/items[at0005]/value|value") - private String modelValue; + @Path("/items[at0001]/value|value") + private String nameValue; - @Path("/items[at0004]/items[at0006]/value|value") - private String serialNumberValue; + @Path("/items[at0002]/value|value") + private String descriptionValue; - @Path("/items[at0008]/items[at0009]/value|value") - private TemporalAccessor dateLastServicedValue; + @Path("/items[at0004]/items[at0003]/value|value") + private String manufacturerValue; - @Path("/items[at0008]/items[at0010]/value|value") - private TemporalAccessor dateLastCalibrationValue; + @Path("/items[at0004]/items[at0005]/value|value") + private String modelValue; - @Path("/items[at0001]/value|value") - private String nameValue; + @Path("/items[at0004]/items[at0006]/value|value") + private String serialNumberValue; - @Path("/items[at0002]/value|value") - private String descriptionValue; + @Path("/items[at0007]") + private Cluster components; - @Path("/items[at0007]/items") - private List components; + @Path("/items[at0008]/items[at0009]/value|value") + private TemporalAccessor dateLastServicedValue; - @Path("/items[at0008]/items[at0011]/value|value") - private String servicedByValue; + @Path("/items[at0008]/items[at0010]/value|value") + private TemporalAccessor dateLastCalibrationValue; - @Path("/items[at0004]/items[at0003]/value|value") - private String manufacturerValue; + @Path("/items[at0008]/items[at0011]/value|value") + private String servicedByValue; - public void setModelValue(String modelValue) { - this.modelValue = modelValue; - } + public void setNameValue(String nameValue) { + this.nameValue = nameValue; + } - public String getModelValue() { - return this.modelValue; - } + public String getNameValue() { + return this.nameValue ; + } - public void setSerialNumberValue(String serialNumberValue) { - this.serialNumberValue = serialNumberValue; - } + public void setDescriptionValue(String descriptionValue) { + this.descriptionValue = descriptionValue; + } - public String getSerialNumberValue() { - return this.serialNumberValue; - } + public String getDescriptionValue() { + return this.descriptionValue ; + } - public void setDateLastServicedValue(TemporalAccessor dateLastServicedValue) { - this.dateLastServicedValue = dateLastServicedValue; - } + public void setManufacturerValue(String manufacturerValue) { + this.manufacturerValue = manufacturerValue; + } - public TemporalAccessor getDateLastServicedValue() { - return this.dateLastServicedValue; - } + public String getManufacturerValue() { + return this.manufacturerValue ; + } - public void setDateLastCalibrationValue(TemporalAccessor dateLastCalibrationValue) { - this.dateLastCalibrationValue = dateLastCalibrationValue; - } + public void setModelValue(String modelValue) { + this.modelValue = modelValue; + } - public TemporalAccessor getDateLastCalibrationValue() { - return this.dateLastCalibrationValue; - } + public String getModelValue() { + return this.modelValue ; + } - public void setNameValue(String nameValue) { - this.nameValue = nameValue; - } + public void setSerialNumberValue(String serialNumberValue) { + this.serialNumberValue = serialNumberValue; + } - public String getNameValue() { - return this.nameValue; - } + public String getSerialNumberValue() { + return this.serialNumberValue ; + } - public void setDescriptionValue(String descriptionValue) { - this.descriptionValue = descriptionValue; - } + public void setComponents(Cluster components) { + this.components = components; + } - public String getDescriptionValue() { - return this.descriptionValue; - } + public Cluster getComponents() { + return this.components ; + } - public void setComponents(List components) { - this.components = components; - } + public void setDateLastServicedValue(TemporalAccessor dateLastServicedValue) { + this.dateLastServicedValue = dateLastServicedValue; + } - public List getComponents() { - return this.components; - } + public TemporalAccessor getDateLastServicedValue() { + return this.dateLastServicedValue ; + } - public void setServicedByValue(String servicedByValue) { - this.servicedByValue = servicedByValue; - } + public void setDateLastCalibrationValue(TemporalAccessor dateLastCalibrationValue) { + this.dateLastCalibrationValue = dateLastCalibrationValue; + } - public String getServicedByValue() { - return this.servicedByValue; - } + public TemporalAccessor getDateLastCalibrationValue() { + return this.dateLastCalibrationValue ; + } - public void setManufacturerValue(String manufacturerValue) { - this.manufacturerValue = manufacturerValue; - } + public void setServicedByValue(String servicedByValue) { + this.servicedByValue = servicedByValue; + } - public String getManufacturerValue() { - return this.manufacturerValue; - } + public String getServicedByValue() { + return this.servicedByValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java index 3177a4d22..e0e7a99d1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java @@ -3,8 +3,6 @@ import com.nedap.archie.rm.datastructures.Cluster; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; import java.time.temporal.TemporalAccessor; @@ -12,24 +10,24 @@ public class DeviceDetailsTrainingSampleClusterContainment extends Containment { public SelectAqlField DEVICE_DETAILS_TRAINING_SAMPLE_CLUSTER = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "", "DeviceDetailsTrainingSampleCluster", DeviceDetailsTrainingSampleCluster.class, this); + public SelectAqlField NAME_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0001]/value|value", "nameValue", String.class, this); + + public SelectAqlField DESCRIPTION_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0002]/value|value", "descriptionValue", String.class, this); + + public SelectAqlField MANUFACTURER_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0004]/items[at0003]/value|value", "manufacturerValue", String.class, this); + public SelectAqlField MODEL_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0004]/items[at0005]/value|value", "modelValue", String.class, this); public SelectAqlField SERIAL_NUMBER_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0004]/items[at0006]/value|value", "serialNumberValue", String.class, this); + public SelectAqlField COMPONENTS = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0007]", "components", Cluster.class, this); + public SelectAqlField DATE_LAST_SERVICED_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0008]/items[at0009]/value|value", "dateLastServicedValue", TemporalAccessor.class, this); public SelectAqlField DATE_LAST_CALIBRATION_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0008]/items[at0010]/value|value", "dateLastCalibrationValue", TemporalAccessor.class, this); - public SelectAqlField NAME_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0001]/value|value", "nameValue", String.class, this); - - public SelectAqlField DESCRIPTION_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0002]/value|value", "descriptionValue", String.class, this); - - public ListSelectAqlField COMPONENTS = new ListAqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0007]/items", "components", Cluster.class, this); - public SelectAqlField SERVICED_BY_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0008]/items[at0011]/value|value", "servicedByValue", String.class, this); - public SelectAqlField MANUFACTURER_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0004]/items[at0003]/value|value", "manufacturerValue", String.class, this); - private DeviceDetailsTrainingSampleClusterContainment() { super("openEHR-EHR-CLUSTER.sample_device.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningcode.java index c12a9b66c..4f186f052 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningcode.java @@ -2,13 +2,13 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum KorotkoffSoundsDefiningcode implements EnumValueSet { +public enum KorotkoffSoundsDefiningCode implements EnumValueSet { FIFTH_SOUND("Fifth sound", "The fifth Korotkoff sound is identified by absence of sounds as the cuff\n" - + " pressure drops below the diastolic blood pressure\n" - + " ", "local", "at1012"), + + " pressure drops below the diastolic blood pressure\n" + + " ", "local", "at1012"), FOURTH_SOUND("Fourth sound", "The fourth Korotkoff sound is identified as an abrupt muffling of sounds\n" - + " ", "local", "at1011"); + + " ", "local", "at1011"); private String value; @@ -18,7 +18,7 @@ public enum KorotkoffSoundsDefiningcode implements EnumValueSet { private String code; - KorotkoffSoundsDefiningcode(String value, String description, String terminologyId, String code) { + KorotkoffSoundsDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -26,18 +26,18 @@ public enum KorotkoffSoundsDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningcode.java index 155655060..9b5a1c7ea 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum LocationOfMeasurementDefiningcode implements EnumValueSet { +public enum LocationOfMeasurementDefiningCode implements EnumValueSet { LEFT_THIGH("Left thigh", "The left thigh of the person", "local", "at0028"), INTRA_ARTERIAL("Intra-arterial", "Blood pressure monitored via an intra-arterial line", "local", "at0032"), @@ -31,8 +31,8 @@ public enum LocationOfMeasurementDefiningcode implements EnumValueSet { private String code; - LocationOfMeasurementDefiningcode(String value, String description, String terminologyId, - String code) { + LocationOfMeasurementDefiningCode(String value, String description, String terminologyId, + String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -40,18 +40,18 @@ public enum LocationOfMeasurementDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningcode.java index fbc7f7f9a..d7ce02994 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum PositionDefiningcode implements EnumValueSet { +public enum PositionDefiningCode implements EnumValueSet { STANDING("Standing", "Standing at the time of blood pressure measurement", "local", "at1000"), LYING("Lying", "Lying flat at the time of blood pressure measurement", "local", "at1003"), @@ -10,14 +10,14 @@ public enum PositionDefiningcode implements EnumValueSet { RECLINING("Reclining", "Reclining at the time of blood pressure measurement", "local", "at1002"), TRENDELENBURG("Trendelenburg", "Lying flat on the back (supine position) with the feet higher than the head\n" - + " at the time of blood pressure measurement\n" - + " ", "local", "at1013"), + + " at the time of blood pressure measurement\n" + + " ", "local", "at1013"), LEFT_LATERAL("Left Lateral", "Lying on the left side at the time of blood pressure measurement", "local", "at1014"), SITTING("Sitting", "Sitting (for example on bed or chair) at the time of blood pressure\n" - + " measurement\n" - + " ", "local", "at1001"); + + " measurement\n" + + " ", "local", "at1001"); private String value; @@ -27,7 +27,7 @@ public enum PositionDefiningcode implements EnumValueSet { private String code; - PositionDefiningcode(String value, String description, String terminologyId, String code) { + PositionDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -35,18 +35,18 @@ public enum PositionDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java index b1be88199..58aa09f75 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java @@ -11,10 +11,10 @@ import org.ehrbase.client.annotations.Path; import org.ehrbase.client.annotations.Template; import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureObservation; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; import java.time.temporal.TemporalAccessor; @@ -24,157 +24,157 @@ @Archetype("openEHR-EHR-COMPOSITION.encounter.v1") @Template("ehrbase_multi_occurrence.de.v1") public class EhrbaseMultiOccurrenceDeV1Composition { - @Id - private VersionUid versionUid; + @Path("/context/other_context[at0001]/items[at0002]") + private List extension; - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; - @Path("/context/participations") - private List participations; + @Path("/context/participations") + private List participations; - @Path("/language") - private Language language; + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; + @Path("/context/location") + private String location; - @Path("/territory") - private Territory territory; + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; - @Path("/composer") - private PartyProxy composer; + @Path("/content[openEHR-EHR-OBSERVATION.body_temperature.v2]") + private List bodyTemperature; - @Path("/context/setting|defining_code") - private SettingDefiningcode settingDefiningcode; + @Path("/composer") + private PartyProxy composer; - @Path("/feeder_audit") - private FeederAudit feederAudit; + @Path("/language") + private Language language; - @Path("/content[openEHR-EHR-OBSERVATION.body_temperature.v2]") - private List bodyTemperature; + @Path("/feeder_audit") + private FeederAudit feederAudit; - @Path("/context/location") - private String location; + @Path("/category|defining_code") + private Category categoryDefiningCode; - @Path("/category|defining_code") - private CategoryDefiningcode categoryDefiningcode; + @Path("/territory") + private Territory territory; - @Path("/context/other_context[at0001]/items[at0002]") - private List extension; + @Id + private VersionUid versionUid; - public VersionUid getVersionUid() { - return this.versionUid; - } + public void setExtension(List extension) { + this.extension = extension; + } - public void setVersionUid(VersionUid versionUid) { - this.versionUid = versionUid; - } + public List getExtension() { + return this.extension ; + } - public void setEndTimeValue(TemporalAccessor endTimeValue) { - this.endTimeValue = endTimeValue; - } + public void setStartTimeValue(TemporalAccessor startTimeValue) { + this.startTimeValue = startTimeValue; + } - public TemporalAccessor getEndTimeValue() { - return this.endTimeValue; - } + public TemporalAccessor getStartTimeValue() { + return this.startTimeValue ; + } - public void setParticipations(List participations) { - this.participations = participations; - } + public void setParticipations(List participations) { + this.participations = participations; + } - public List getParticipations() { - return this.participations; - } + public List getParticipations() { + return this.participations ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setEndTimeValue(TemporalAccessor endTimeValue) { + this.endTimeValue = endTimeValue; + } - public Language getLanguage() { - return this.language; - } + public TemporalAccessor getEndTimeValue() { + return this.endTimeValue ; + } - public void setHealthCareFacility(PartyIdentified healthCareFacility) { - this.healthCareFacility = healthCareFacility; - } + public void setLocation(String location) { + this.location = location; + } - public PartyIdentified getHealthCareFacility() { - return this.healthCareFacility; - } + public String getLocation() { + return this.location ; + } - public void setTerritory(Territory territory) { - this.territory = territory; - } + public void setHealthCareFacility(PartyIdentified healthCareFacility) { + this.healthCareFacility = healthCareFacility; + } - public Territory getTerritory() { - return this.territory; - } + public PartyIdentified getHealthCareFacility() { + return this.healthCareFacility ; + } - public void setStartTimeValue(TemporalAccessor startTimeValue) { - this.startTimeValue = startTimeValue; - } + public void setSettingDefiningCode(Setting settingDefiningCode) { + this.settingDefiningCode = settingDefiningCode; + } - public TemporalAccessor getStartTimeValue() { - return this.startTimeValue; - } + public Setting getSettingDefiningCode() { + return this.settingDefiningCode ; + } - public void setComposer(PartyProxy composer) { - this.composer = composer; - } + public void setBodyTemperature(List bodyTemperature) { + this.bodyTemperature = bodyTemperature; + } - public PartyProxy getComposer() { - return this.composer; - } + public List getBodyTemperature() { + return this.bodyTemperature ; + } - public void setSettingDefiningcode(SettingDefiningcode settingDefiningcode) { - this.settingDefiningcode = settingDefiningcode; - } + public void setComposer(PartyProxy composer) { + this.composer = composer; + } - public SettingDefiningcode getSettingDefiningcode() { - return this.settingDefiningcode; - } + public PartyProxy getComposer() { + return this.composer ; + } - public void setFeederAudit(FeederAudit feederAudit) { - this.feederAudit = feederAudit; - } + public void setLanguage(Language language) { + this.language = language; + } - public FeederAudit getFeederAudit() { - return this.feederAudit; - } + public Language getLanguage() { + return this.language ; + } - public void setBodyTemperature(List bodyTemperature) { - this.bodyTemperature = bodyTemperature; - } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } - public List getBodyTemperature() { - return this.bodyTemperature; - } + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } - public void setLocation(String location) { - this.location = location; - } + public void setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } - public String getLocation() { - return this.location; - } + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } - public void setCategoryDefiningcode(CategoryDefiningcode categoryDefiningcode) { - this.categoryDefiningcode = categoryDefiningcode; - } + public void setTerritory(Territory territory) { + this.territory = territory; + } - public CategoryDefiningcode getCategoryDefiningcode() { - return this.categoryDefiningcode; - } + public Territory getTerritory() { + return this.territory ; + } - public void setExtension(List extension) { - this.extension = extension; - } + public VersionUid getVersionUid() { + return this.versionUid ; + } - public List getExtension() { - return this.extension; - } + public void setVersionUid(VersionUid versionUid) { + this.versionUid = versionUid; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1CompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1CompositionContainment.java index 73748ec5a..0894b00b2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1CompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1CompositionContainment.java @@ -11,41 +11,41 @@ import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureObservation; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import java.time.temporal.TemporalAccessor; public class EhrbaseMultiOccurrenceDeV1CompositionContainment extends Containment { public SelectAqlField EHRBASE_MULTI_OCCURRENCE_DE_V1_COMPOSITION = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "", "EhrbaseMultiOccurrenceDeV1Composition", EhrbaseMultiOccurrenceDeV1Composition.class, this); - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/other_context[at0001]/items[at0002]", "extension", Cluster.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/participations", "participations", Participation.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/language", "language", Language.class, this); + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + + public SelectAqlField LOCATION = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/location", "location", String.class, this); public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - public SelectAqlField TERRITORY = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/territory", "territory", Territory.class, this); + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + public ListSelectAqlField BODY_TEMPERATURE = new ListAqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/content[openEHR-EHR-OBSERVATION.body_temperature.v2]", "bodyTemperature", BodyTemperatureObservation.class, this); public SelectAqlField COMPOSER = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/composer", "composer", PartyProxy.class, this); - public SelectAqlField SETTING_DEFININGCODE = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/setting|defining_code", "settingDefiningcode", SettingDefiningcode.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/language", "language", Language.class, this); public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - public ListSelectAqlField BODY_TEMPERATURE = new ListAqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/content[openEHR-EHR-OBSERVATION.body_temperature.v2]", "bodyTemperature", BodyTemperatureObservation.class, this); + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - public SelectAqlField LOCATION = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/location", "location", String.class, this); - - public SelectAqlField CATEGORY_DEFININGCODE = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/category|defining_code", "categoryDefiningcode", CategoryDefiningcode.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/other_context[at0001]/items[at0002]", "extension", Cluster.class, this); + public SelectAqlField TERRITORY = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/territory", "territory", Territory.class, this); private EhrbaseMultiOccurrenceDeV1CompositionContainment() { super("openEHR-EHR-COMPOSITION.encounter.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyExposureDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyExposureDefiningcode.java index 8e2f433ab..550b59850 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyExposureDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyExposureDefiningcode.java @@ -2,10 +2,18 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum BodyExposureDefiningcode implements EnumValueSet { - BEDDING("Appropriate clothing/bedding", "The person is covered by an amount of clothing or bedding deemed appropriate\n" - + " for the environmental circumstances.\n" - + " ", "local", "at0033"), +public enum BodyExposureDefiningCode implements EnumValueSet { + INCREASED_CLOTHING_BEDDING("Increased clothing/bedding", "The person is covered by an increased amount of clothing or bedding than\n" + + " deemed appropriate for the environmental circumstances.\n" + + " ", "local", "at0034"), + + REDUCED_CLOTHING_BEDDING("Reduced clothing/bedding", "The person is covered by a lesser amount of clothing or bedding than deemed\n" + + " appropriate for the environmental circumstances.\n" + + " ", "local", "at0032"), + + APPROPRIATE_CLOTHING_BEDDING("Appropriate clothing/bedding", "The person is covered by an amount of clothing or bedding deemed appropriate\n" + + " for the environmental circumstances.\n" + + " ", "local", "at0033"), NAKED("Naked", "No clothing, bedding or covering.", "local", "at0031"); @@ -17,7 +25,7 @@ public enum BodyExposureDefiningcode implements EnumValueSet { private String code; - BodyExposureDefiningcode(String value, String description, String terminologyId, String code) { + BodyExposureDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -25,18 +33,18 @@ public enum BodyExposureDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java index 657d693a4..a74c1aeae 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.MathFunctionDefiningcode; +import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; @@ -14,114 +14,114 @@ @Entity @OptionFor("INTERVAL_EVENT") public class BodyTemperatureAnyEventIntervalEvent implements BodyTemperatureAnyEventChoice { - @Path("/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/items[at0004]/value|magnitude") + private Double temperatureMagnitude; - @Path("/data[at0001]/items[at0004]/value|magnitude") - private Double temperatureMagnitude; + @Path("/data[at0001]/items[at0004]/value|units") + private String temperatureUnits; - @Path("/data[at0001]/items[at0004]/value|units") - private String temperatureUnits; + @Path("/state[at0029]/items[at0041]/value|value") + private String descriptionOfThermalStressValue; - @Path("/state[at0029]/items[at0041]/value|value") - private String descriptionOfThermalStressValue; + @Path("/state[at0029]/items[at0065]/value|magnitude") + private Long currentDayOfMenstrualCycleMagnitude; - @Path("/state[at0029]/items[at0057]") - private Cluster exertion; + @Path("/state[at0029]/items[at0056]") + private List environmentalConditions; - @Path("/state[at0029]/items[at0065]/value|magnitude") - private Long currentDayOfMenstrualCycleMagnitude; + @Path("/state[at0029]/items[at0057]") + private Cluster exertion; - @Path("/state[at0029]/items[at0056]") - private List environmentalConditions; + @Path("/time|value") + private TemporalAccessor timeValue; - @Path("/width|value") - private TemporalAmount widthValue; + @Path("/width|value") + private TemporalAmount widthValue; - @Path("/state[at0029]/items[at0030]/value") - @Choice - private BodyTemperatureBodyExposureChoice2 bodyExposure; + @Path("/math_function|defining_code") + private MathFunction mathFunctionDefiningCode; - @Path("/math_function|defining_code") - private MathFunctionDefiningcode mathFunctionDefiningcode; + @Path("/state[at0029]/items[at0030]/value") + @Choice + private BodyTemperatureBodyExposureChoice bodyExposure; - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setTemperatureMagnitude(Double temperatureMagnitude) { + this.temperatureMagnitude = temperatureMagnitude; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public Double getTemperatureMagnitude() { + return this.temperatureMagnitude ; + } - public void setTemperatureMagnitude(Double temperatureMagnitude) { - this.temperatureMagnitude = temperatureMagnitude; - } + public void setTemperatureUnits(String temperatureUnits) { + this.temperatureUnits = temperatureUnits; + } - public Double getTemperatureMagnitude() { - return this.temperatureMagnitude; - } + public String getTemperatureUnits() { + return this.temperatureUnits ; + } - public void setTemperatureUnits(String temperatureUnits) { - this.temperatureUnits = temperatureUnits; - } + public void setDescriptionOfThermalStressValue(String descriptionOfThermalStressValue) { + this.descriptionOfThermalStressValue = descriptionOfThermalStressValue; + } - public String getTemperatureUnits() { - return this.temperatureUnits; - } + public String getDescriptionOfThermalStressValue() { + return this.descriptionOfThermalStressValue ; + } - public void setDescriptionOfThermalStressValue(String descriptionOfThermalStressValue) { - this.descriptionOfThermalStressValue = descriptionOfThermalStressValue; - } + public void setCurrentDayOfMenstrualCycleMagnitude(Long currentDayOfMenstrualCycleMagnitude) { + this.currentDayOfMenstrualCycleMagnitude = currentDayOfMenstrualCycleMagnitude; + } - public String getDescriptionOfThermalStressValue() { - return this.descriptionOfThermalStressValue; - } + public Long getCurrentDayOfMenstrualCycleMagnitude() { + return this.currentDayOfMenstrualCycleMagnitude ; + } - public void setExertion(Cluster exertion) { - this.exertion = exertion; - } + public void setEnvironmentalConditions(List environmentalConditions) { + this.environmentalConditions = environmentalConditions; + } - public Cluster getExertion() { - return this.exertion; - } + public List getEnvironmentalConditions() { + return this.environmentalConditions ; + } - public void setCurrentDayOfMenstrualCycleMagnitude(Long currentDayOfMenstrualCycleMagnitude) { - this.currentDayOfMenstrualCycleMagnitude = currentDayOfMenstrualCycleMagnitude; - } + public void setExertion(Cluster exertion) { + this.exertion = exertion; + } - public Long getCurrentDayOfMenstrualCycleMagnitude() { - return this.currentDayOfMenstrualCycleMagnitude; - } + public Cluster getExertion() { + return this.exertion ; + } - public void setEnvironmentalConditions(List environmentalConditions) { - this.environmentalConditions = environmentalConditions; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public List getEnvironmentalConditions() { - return this.environmentalConditions; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setWidthValue(TemporalAmount widthValue) { - this.widthValue = widthValue; - } + public void setWidthValue(TemporalAmount widthValue) { + this.widthValue = widthValue; + } - public TemporalAmount getWidthValue() { - return this.widthValue; - } + public TemporalAmount getWidthValue() { + return this.widthValue ; + } - public void setBodyExposure(BodyTemperatureBodyExposureChoice2 bodyExposure) { - this.bodyExposure = bodyExposure; - } + public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { + this.mathFunctionDefiningCode = mathFunctionDefiningCode; + } - public BodyTemperatureBodyExposureChoice2 getBodyExposure() { - return this.bodyExposure; - } + public MathFunction getMathFunctionDefiningCode() { + return this.mathFunctionDefiningCode ; + } - public void setMathFunctionDefiningcode(MathFunctionDefiningcode mathFunctionDefiningcode) { - this.mathFunctionDefiningcode = mathFunctionDefiningcode; - } + public void setBodyExposure(BodyTemperatureBodyExposureChoice bodyExposure) { + this.bodyExposure = bodyExposure; + } - public MathFunctionDefiningcode getMathFunctionDefiningcode() { - return this.mathFunctionDefiningcode; - } + public BodyTemperatureBodyExposureChoice getBodyExposure() { + return this.bodyExposure ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java index 14d3b5c1f..ca5ccc5bf 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java @@ -12,92 +12,92 @@ @Entity @OptionFor("POINT_EVENT") public class BodyTemperatureAnyEventPointEvent implements BodyTemperatureAnyEventChoice { - @Path("/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/items[at0004]/value|magnitude") + private Double temperatureMagnitude; - @Path("/data[at0001]/items[at0004]/value|magnitude") - private Double temperatureMagnitude; + @Path("/data[at0001]/items[at0004]/value|units") + private String temperatureUnits; - @Path("/data[at0001]/items[at0004]/value|units") - private String temperatureUnits; + @Path("/state[at0029]/items[at0041]/value|value") + private String descriptionOfThermalStressValue; - @Path("/state[at0029]/items[at0041]/value|value") - private String descriptionOfThermalStressValue; + @Path("/state[at0029]/items[at0065]/value|magnitude") + private Long currentDayOfMenstrualCycleMagnitude; - @Path("/state[at0029]/items[at0057]") - private Cluster exertion; + @Path("/state[at0029]/items[at0056]") + private List environmentalConditions; - @Path("/state[at0029]/items[at0065]/value|magnitude") - private Long currentDayOfMenstrualCycleMagnitude; + @Path("/state[at0029]/items[at0057]") + private Cluster exertion; - @Path("/state[at0029]/items[at0056]") - private List environmentalConditions; + @Path("/time|value") + private TemporalAccessor timeValue; - @Path("/state[at0029]/items[at0030]/value") - @Choice - private BodyTemperatureBodyExposureChoice bodyExposure; + @Path("/state[at0029]/items[at0030]/value") + @Choice + private BodyTemperatureBodyExposureChoice bodyExposure; - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setTemperatureMagnitude(Double temperatureMagnitude) { + this.temperatureMagnitude = temperatureMagnitude; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public Double getTemperatureMagnitude() { + return this.temperatureMagnitude ; + } - public void setTemperatureMagnitude(Double temperatureMagnitude) { - this.temperatureMagnitude = temperatureMagnitude; - } + public void setTemperatureUnits(String temperatureUnits) { + this.temperatureUnits = temperatureUnits; + } - public Double getTemperatureMagnitude() { - return this.temperatureMagnitude; - } + public String getTemperatureUnits() { + return this.temperatureUnits ; + } - public void setTemperatureUnits(String temperatureUnits) { - this.temperatureUnits = temperatureUnits; - } + public void setDescriptionOfThermalStressValue(String descriptionOfThermalStressValue) { + this.descriptionOfThermalStressValue = descriptionOfThermalStressValue; + } - public String getTemperatureUnits() { - return this.temperatureUnits; - } + public String getDescriptionOfThermalStressValue() { + return this.descriptionOfThermalStressValue ; + } - public void setDescriptionOfThermalStressValue(String descriptionOfThermalStressValue) { - this.descriptionOfThermalStressValue = descriptionOfThermalStressValue; - } + public void setCurrentDayOfMenstrualCycleMagnitude(Long currentDayOfMenstrualCycleMagnitude) { + this.currentDayOfMenstrualCycleMagnitude = currentDayOfMenstrualCycleMagnitude; + } - public String getDescriptionOfThermalStressValue() { - return this.descriptionOfThermalStressValue; - } + public Long getCurrentDayOfMenstrualCycleMagnitude() { + return this.currentDayOfMenstrualCycleMagnitude ; + } - public void setExertion(Cluster exertion) { - this.exertion = exertion; - } + public void setEnvironmentalConditions(List environmentalConditions) { + this.environmentalConditions = environmentalConditions; + } - public Cluster getExertion() { - return this.exertion; - } + public List getEnvironmentalConditions() { + return this.environmentalConditions ; + } - public void setCurrentDayOfMenstrualCycleMagnitude(Long currentDayOfMenstrualCycleMagnitude) { - this.currentDayOfMenstrualCycleMagnitude = currentDayOfMenstrualCycleMagnitude; - } + public void setExertion(Cluster exertion) { + this.exertion = exertion; + } - public Long getCurrentDayOfMenstrualCycleMagnitude() { - return this.currentDayOfMenstrualCycleMagnitude; - } + public Cluster getExertion() { + return this.exertion ; + } - public void setEnvironmentalConditions(List environmentalConditions) { - this.environmentalConditions = environmentalConditions; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public List getEnvironmentalConditions() { - return this.environmentalConditions; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setBodyExposure(BodyTemperatureBodyExposureChoice bodyExposure) { - this.bodyExposure = bodyExposure; - } + public void setBodyExposure(BodyTemperatureBodyExposureChoice bodyExposure) { + this.bodyExposure = bodyExposure; + } - public BodyTemperatureBodyExposureChoice getBodyExposure() { - return this.bodyExposure; - } + public BodyTemperatureBodyExposureChoice getBodyExposure() { + return this.bodyExposure ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureChoice2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureChoice2.java deleted file mode 100644 index 29447d49e..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureChoice2.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; - -public interface BodyTemperatureBodyExposureChoice2 { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvcodedtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvcodedtext.java index 1538f1705..cd68266c2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvcodedtext.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvcodedtext.java @@ -6,15 +6,15 @@ @Entity @OptionFor("DV_CODED_TEXT") -public class BodyTemperatureBodyExposureDvcodedtext implements BodyTemperatureBodyExposureChoice { - @Path("|defining_code") - private BodyExposureDefiningcode bodyExposureDefiningcode; +public class BodyTemperatureBodyExposureDvCodedText implements BodyTemperatureBodyExposureChoice { + @Path("|defining_code") + private BodyExposureDefiningCode bodyExposureDefiningCode; - public void setBodyExposureDefiningcode(BodyExposureDefiningcode bodyExposureDefiningcode) { - this.bodyExposureDefiningcode = bodyExposureDefiningcode; - } + public void setBodyExposureDefiningCode(BodyExposureDefiningCode bodyExposureDefiningCode) { + this.bodyExposureDefiningCode = bodyExposureDefiningCode; + } - public BodyExposureDefiningcode getBodyExposureDefiningcode() { - return this.bodyExposureDefiningcode; - } + public BodyExposureDefiningCode getBodyExposureDefiningCode() { + return this.bodyExposureDefiningCode ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvcodedtext2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvcodedtext2.java deleted file mode 100644 index bbfc3edf1..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvcodedtext2.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class BodyTemperatureBodyExposureDvcodedtext2 implements BodyTemperatureBodyExposureChoice2 { - @Path("|defining_code") - private BodyExposureDefiningcode bodyExposureDefiningcode; - - public void setBodyExposureDefiningcode(BodyExposureDefiningcode bodyExposureDefiningcode) { - this.bodyExposureDefiningcode = bodyExposureDefiningcode; - } - - public BodyExposureDefiningcode getBodyExposureDefiningcode() { - return this.bodyExposureDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvtext.java index 120473bd4..2a0957aa2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvtext.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvtext.java @@ -6,15 +6,15 @@ @Entity @OptionFor("DV_TEXT") -public class BodyTemperatureBodyExposureDvtext implements BodyTemperatureBodyExposureChoice { - @Path("|value") - private String bodyExposureValue; +public class BodyTemperatureBodyExposureDvText implements BodyTemperatureBodyExposureChoice { + @Path("|value") + private String bodyExposureValue; - public void setBodyExposureValue(String bodyExposureValue) { - this.bodyExposureValue = bodyExposureValue; - } + public void setBodyExposureValue(String bodyExposureValue) { + this.bodyExposureValue = bodyExposureValue; + } - public String getBodyExposureValue() { - return this.bodyExposureValue; - } + public String getBodyExposureValue() { + return this.bodyExposureValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvtext2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvtext2.java deleted file mode 100644 index 220b823a0..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvtext2.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class BodyTemperatureBodyExposureDvtext2 implements BodyTemperatureBodyExposureChoice2 { - @Path("|value") - private String bodyExposureValue; - - public void setBodyExposureValue(String bodyExposureValue) { - this.bodyExposureValue = bodyExposureValue; - } - - public String getBodyExposureValue() { - return this.bodyExposureValue; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvcodedtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvcodedtext.java index 75577af42..dace78986 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvcodedtext.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvcodedtext.java @@ -6,16 +6,16 @@ @Entity @OptionFor("DV_CODED_TEXT") -public class BodyTemperatureLocationOfMeasurementDvcodedtext implements BodyTemperatureLocationOfMeasurementChoice { - @Path("|defining_code") - private LocationOfMeasurementDefiningcode locationOfMeasurementDefiningcode; +public class BodyTemperatureLocationOfMeasurementDvCodedText implements BodyTemperatureLocationOfMeasurementChoice { + @Path("|defining_code") + private LocationOfMeasurementDefiningCode locationOfMeasurementDefiningCode; - public void setLocationOfMeasurementDefiningcode( - LocationOfMeasurementDefiningcode locationOfMeasurementDefiningcode) { - this.locationOfMeasurementDefiningcode = locationOfMeasurementDefiningcode; - } + public void setLocationOfMeasurementDefiningCode( + LocationOfMeasurementDefiningCode locationOfMeasurementDefiningCode) { + this.locationOfMeasurementDefiningCode = locationOfMeasurementDefiningCode; + } - public LocationOfMeasurementDefiningcode getLocationOfMeasurementDefiningcode() { - return this.locationOfMeasurementDefiningcode; - } + public LocationOfMeasurementDefiningCode getLocationOfMeasurementDefiningCode() { + return this.locationOfMeasurementDefiningCode ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvtext.java index 3c045741b..edbbd5ae7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvtext.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvtext.java @@ -6,15 +6,15 @@ @Entity @OptionFor("DV_TEXT") -public class BodyTemperatureLocationOfMeasurementDvtext implements BodyTemperatureLocationOfMeasurementChoice { - @Path("|value") - private String locationOfMeasurementValue; +public class BodyTemperatureLocationOfMeasurementDvText implements BodyTemperatureLocationOfMeasurementChoice { + @Path("|value") + private String locationOfMeasurementValue; - public void setLocationOfMeasurementValue(String locationOfMeasurementValue) { - this.locationOfMeasurementValue = locationOfMeasurementValue; - } + public void setLocationOfMeasurementValue(String locationOfMeasurementValue) { + this.locationOfMeasurementValue = locationOfMeasurementValue; + } - public String getLocationOfMeasurementValue() { - return this.locationOfMeasurementValue; - } + public String getLocationOfMeasurementValue() { + return this.locationOfMeasurementValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java index 443a96500..613930d03 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java @@ -6,7 +6,7 @@ import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -14,94 +14,94 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.body_temperature.v2") public class BodyTemperatureObservation { - @Path("/data[at0002]/events[at0003]") - @Choice - private List anyEvent; + @Path("/data[at0002]/origin|value") + private TemporalAccessor originValue; - @Path("/protocol[at0020]/items[at0062]") - private List extension; + @Path("/protocol[at0020]/items[at0064]") + private List structuredMeasurementLocation; - @Path("/language") - private Language language; + @Path("/protocol[at0020]/items[at0059]") + private Cluster device; - @Path("/protocol[at0020]/items[at0064]") - private List structuredMeasurementLocation; + @Path("/protocol[at0020]/items[at0062]") + private List extension; - @Path("/data[at0002]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - @Path("/protocol[at0020]/items[at0059]") - private Cluster device; + @Path("/language") + private Language language; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0020]/items[at0021]/value") + @Choice + private BodyTemperatureLocationOfMeasurementChoice locationOfMeasurement; - @Path("/protocol[at0020]/items[at0021]/value") - @Choice - private BodyTemperatureLocationOfMeasurementChoice locationOfMeasurement; + @Path("/data[at0002]/events[at0003]") + @Choice + private List anyEvent; - public void setAnyEvent(List anyEvent) { - this.anyEvent = anyEvent; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public List getAnyEvent() { - return this.anyEvent; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setExtension(List extension) { - this.extension = extension; - } + public void setStructuredMeasurementLocation(List structuredMeasurementLocation) { + this.structuredMeasurementLocation = structuredMeasurementLocation; + } - public List getExtension() { - return this.extension; - } + public List getStructuredMeasurementLocation() { + return this.structuredMeasurementLocation ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setDevice(Cluster device) { + this.device = device; + } - public Language getLanguage() { - return this.language; - } + public Cluster getDevice() { + return this.device ; + } - public void setStructuredMeasurementLocation(List structuredMeasurementLocation) { - this.structuredMeasurementLocation = structuredMeasurementLocation; - } + public void setExtension(List extension) { + this.extension = extension; + } - public List getStructuredMeasurementLocation() { - return this.structuredMeasurementLocation; - } + public List getExtension() { + return this.extension ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setDevice(Cluster device) { - this.device = device; - } + public void setLanguage(Language language) { + this.language = language; + } - public Cluster getDevice() { - return this.device; - } + public Language getLanguage() { + return this.language ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setLocationOfMeasurement( + BodyTemperatureLocationOfMeasurementChoice locationOfMeasurement) { + this.locationOfMeasurement = locationOfMeasurement; + } - public PartyProxy getSubject() { - return this.subject; - } + public BodyTemperatureLocationOfMeasurementChoice getLocationOfMeasurement() { + return this.locationOfMeasurement ; + } - public void setLocationOfMeasurement( - BodyTemperatureLocationOfMeasurementChoice locationOfMeasurement) { - this.locationOfMeasurement = locationOfMeasurement; - } + public void setAnyEvent(List anyEvent) { + this.anyEvent = anyEvent; + } - public BodyTemperatureLocationOfMeasurementChoice getLocationOfMeasurement() { - return this.locationOfMeasurement; - } + public List getAnyEvent() { + return this.anyEvent ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservationContainment.java index 19871c2cd..ed8d6b037 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservationContainment.java @@ -7,29 +7,29 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class BodyTemperatureObservationContainment extends Containment { public SelectAqlField BODY_TEMPERATURE_OBSERVATION = new AqlFieldImp(BodyTemperatureObservation.class, "", "BodyTemperatureObservation", BodyTemperatureObservation.class, this); - public ListSelectAqlField ANY_EVENT = new ListAqlFieldImp(BodyTemperatureObservation.class, "/data[at0002]/events[at0003]", "anyEvent", BodyTemperatureAnyEventChoice.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(BodyTemperatureObservation.class, "/protocol[at0020]/items[at0062]", "extension", Cluster.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(BodyTemperatureObservation.class, "/language", "language", Language.class, this); + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(BodyTemperatureObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); public ListSelectAqlField STRUCTURED_MEASUREMENT_LOCATION = new ListAqlFieldImp(BodyTemperatureObservation.class, "/protocol[at0020]/items[at0064]", "structuredMeasurementLocation", Cluster.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(BodyTemperatureObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); - public SelectAqlField DEVICE = new AqlFieldImp(BodyTemperatureObservation.class, "/protocol[at0020]/items[at0059]", "device", Cluster.class, this); + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(BodyTemperatureObservation.class, "/protocol[at0020]/items[at0062]", "extension", Cluster.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(BodyTemperatureObservation.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(BodyTemperatureObservation.class, "/language", "language", Language.class, this); + public SelectAqlField LOCATION_OF_MEASUREMENT = new AqlFieldImp(BodyTemperatureObservation.class, "/protocol[at0020]/items[at0021]/value", "locationOfMeasurement", BodyTemperatureLocationOfMeasurementChoice.class, this); + public ListSelectAqlField ANY_EVENT = new ListAqlFieldImp(BodyTemperatureObservation.class, "/data[at0002]/events[at0003]", "anyEvent", BodyTemperatureAnyEventChoice.class, this); + private BodyTemperatureObservationContainment() { super("openEHR-EHR-OBSERVATION.body_temperature.v2"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/LocationOfMeasurementDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/LocationOfMeasurementDefiningcode.java index dbfa39bb7..c79f8f4dc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/LocationOfMeasurementDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/LocationOfMeasurementDefiningcode.java @@ -2,10 +2,10 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum LocationOfMeasurementDefiningcode implements EnumValueSet { +public enum LocationOfMeasurementDefiningCode implements EnumValueSet { TEMPLE("Temple", "Temperature is measured at the temple, over the superficial temporal\n" - + " artery.\n" - + " ", "local", "at0060"), + + " artery.\n" + + " ", "local", "at0060"), INTRAVASCULAR("Intravascular", "Temperature is measured within the vascular system.", "local", "at0028"), @@ -22,14 +22,14 @@ public enum LocationOfMeasurementDefiningcode implements EnumValueSet { MOUTH("Mouth", "Temperature is measured within the mouth.", "local", "at0022"), AXILLA("Axilla", "Temperature is measured from the skin of the axilla with the arm positioned\n" - + " down by the side.\n" - + " ", "local", "at0024"), + + " down by the side.\n" + + " ", "local", "at0024"), OESOPHAGUS("Oesophagus", "Temperatue is measured within the oesophagus.", "local", "at0054"), INGUINAL_SKIN_CREASE("Inguinal skin crease", "Temperature is measured in the inguinal skin crease between the leg and\n" - + " abdominal wall.\n" - + " ", "local", "at0055"), + + " abdominal wall.\n" + + " ", "local", "at0055"), FOREHEAD("Forehead", "Temperature is measured on the forehead.", "local", "at0061"), @@ -43,8 +43,8 @@ public enum LocationOfMeasurementDefiningcode implements EnumValueSet { private String code; - LocationOfMeasurementDefiningcode(String value, String description, String terminologyId, - String code) { + LocationOfMeasurementDefiningCode(String value, String description, String terminologyId, + String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -52,18 +52,18 @@ public enum LocationOfMeasurementDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java index c19fe0fe0..021dd2995 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java @@ -10,10 +10,10 @@ import org.ehrbase.client.annotations.Path; import org.ehrbase.client.annotations.Template; import org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition.EpisodeofcareAdminEntry; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; import java.time.temporal.TemporalAccessor; @@ -23,146 +23,146 @@ @Archetype("openEHR-EHR-COMPOSITION.versorgungsfall.v0") @Template("EpisodeOfCare") public class EpisodeOfCareComposition { - @Id - private VersionUid versionUid; + @Path("/content[openEHR-EHR-ADMIN_ENTRY.episodeofcare.v0]") + private List episodeofcare; - @Path("/content[openEHR-EHR-ADMIN_ENTRY.episodeofcare.v0]") - private List episodeofcare; + @Path("/composer") + private PartyProxy composer; - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; + @Path("/language") + private Language language; - @Path("/context/participations") - private List participations; + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; - @Path("/language") - private Language language; + @Path("/context/participations") + private List participations; - @Path("/context/health_care_facility") - private PartyIdentified healthcarefacility; + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; - @Path("/composer") - private PartyProxy composer; + @Path("/context/location") + private String location; - @Path("/context/setting|defining_code") - private SettingDefiningcode settingDefiningcode; + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; - @Path("/territory") - private Territory territory; + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; - @Path("/feeder_audit") - private FeederAudit feederAudit; + @Path("/feeder_audit") + private FeederAudit feederAudit; - @Path("/context/location") - private String location; + @Path("/category|defining_code") + private Category categoryDefiningCode; - @Path("/category|defining_code") - private CategoryDefiningcode categoryDefiningcode; + @Path("/territory") + private Territory territory; - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; + @Id + private VersionUid versionUid; - public VersionUid getVersionUid() { - return this.versionUid; - } + public void setEpisodeofcare(List episodeofcare) { + this.episodeofcare = episodeofcare; + } - public void setVersionUid(VersionUid versionUid) { - this.versionUid = versionUid; - } + public List getEpisodeofcare() { + return this.episodeofcare ; + } - public void setEpisodeofcare(List episodeofcare) { - this.episodeofcare = episodeofcare; - } + public void setComposer(PartyProxy composer) { + this.composer = composer; + } - public List getEpisodeofcare() { - return this.episodeofcare; - } + public PartyProxy getComposer() { + return this.composer ; + } - public void setEndTimeValue(TemporalAccessor endTimeValue) { - this.endTimeValue = endTimeValue; - } + public void setLanguage(Language language) { + this.language = language; + } - public TemporalAccessor getEndTimeValue() { - return this.endTimeValue; - } + public Language getLanguage() { + return this.language ; + } - public void setParticipations(List participations) { - this.participations = participations; - } + public void setStartTimeValue(TemporalAccessor startTimeValue) { + this.startTimeValue = startTimeValue; + } - public List getParticipations() { - return this.participations; - } + public TemporalAccessor getStartTimeValue() { + return this.startTimeValue ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setParticipations(List participations) { + this.participations = participations; + } - public Language getLanguage() { - return this.language; - } + public List getParticipations() { + return this.participations ; + } - public void setHealthcarefacility(PartyIdentified healthcarefacility) { - this.healthcarefacility = healthcarefacility; - } + public void setEndTimeValue(TemporalAccessor endTimeValue) { + this.endTimeValue = endTimeValue; + } - public PartyIdentified getHealthcarefacility() { - return this.healthcarefacility; - } + public TemporalAccessor getEndTimeValue() { + return this.endTimeValue ; + } - public void setComposer(PartyProxy composer) { - this.composer = composer; - } + public void setLocation(String location) { + this.location = location; + } - public PartyProxy getComposer() { - return this.composer; - } + public String getLocation() { + return this.location ; + } - public void setSettingDefiningcode(SettingDefiningcode settingDefiningcode) { - this.settingDefiningcode = settingDefiningcode; - } + public void setHealthCareFacility(PartyIdentified healthCareFacility) { + this.healthCareFacility = healthCareFacility; + } - public SettingDefiningcode getSettingDefiningcode() { - return this.settingDefiningcode; - } + public PartyIdentified getHealthCareFacility() { + return this.healthCareFacility ; + } - public void setTerritory(Territory territory) { - this.territory = territory; - } + public void setSettingDefiningCode(Setting settingDefiningCode) { + this.settingDefiningCode = settingDefiningCode; + } - public Territory getTerritory() { - return this.territory; - } + public Setting getSettingDefiningCode() { + return this.settingDefiningCode ; + } - public void setFeederAudit(FeederAudit feederAudit) { - this.feederAudit = feederAudit; - } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } - public FeederAudit getFeederAudit() { - return this.feederAudit; - } + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } - public void setLocation(String location) { - this.location = location; - } + public void setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } - public String getLocation() { - return this.location; - } + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } - public void setCategoryDefiningcode(CategoryDefiningcode categoryDefiningcode) { - this.categoryDefiningcode = categoryDefiningcode; - } + public void setTerritory(Territory territory) { + this.territory = territory; + } - public CategoryDefiningcode getCategoryDefiningcode() { - return this.categoryDefiningcode; - } + public Territory getTerritory() { + return this.territory ; + } - public void setStartTimeValue(TemporalAccessor startTimeValue) { - this.startTimeValue = startTimeValue; - } + public VersionUid getVersionUid() { + return this.versionUid ; + } - public TemporalAccessor getStartTimeValue() { - return this.startTimeValue; - } + public void setVersionUid(VersionUid versionUid) { + this.versionUid = versionUid; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareCompositionContainment.java index b73e9c0f5..8533df57f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareCompositionContainment.java @@ -10,10 +10,10 @@ import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition.EpisodeofcareAdminEntry; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import java.time.temporal.TemporalAccessor; @@ -22,27 +22,27 @@ public class EpisodeOfCareCompositionContainment extends Containment { public ListSelectAqlField EPISODEOFCARE = new ListAqlFieldImp(EpisodeOfCareComposition.class, "/content[openEHR-EHR-ADMIN_ENTRY.episodeofcare.v0]", "episodeofcare", EpisodeofcareAdminEntry.class, this); - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(EpisodeOfCareComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(EpisodeOfCareComposition.class, "/context/participations", "participations", Participation.class, this); + public SelectAqlField COMPOSER = new AqlFieldImp(EpisodeOfCareComposition.class, "/composer", "composer", PartyProxy.class, this); public SelectAqlField LANGUAGE = new AqlFieldImp(EpisodeOfCareComposition.class, "/language", "language", Language.class, this); - public SelectAqlField HEALTHCAREFACILITY = new AqlFieldImp(EpisodeOfCareComposition.class, "/context/health_care_facility", "healthcarefacility", PartyIdentified.class, this); + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(EpisodeOfCareComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - public SelectAqlField COMPOSER = new AqlFieldImp(EpisodeOfCareComposition.class, "/composer", "composer", PartyProxy.class, this); + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(EpisodeOfCareComposition.class, "/context/participations", "participations", Participation.class, this); + + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(EpisodeOfCareComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - public SelectAqlField SETTING_DEFININGCODE = new AqlFieldImp(EpisodeOfCareComposition.class, "/context/setting|defining_code", "settingDefiningcode", SettingDefiningcode.class, this); + public SelectAqlField LOCATION = new AqlFieldImp(EpisodeOfCareComposition.class, "/context/location", "location", String.class, this); - public SelectAqlField TERRITORY = new AqlFieldImp(EpisodeOfCareComposition.class, "/territory", "territory", Territory.class, this); + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(EpisodeOfCareComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(EpisodeOfCareComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(EpisodeOfCareComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - public SelectAqlField LOCATION = new AqlFieldImp(EpisodeOfCareComposition.class, "/context/location", "location", String.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(EpisodeOfCareComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - public SelectAqlField CATEGORY_DEFININGCODE = new AqlFieldImp(EpisodeOfCareComposition.class, "/category|defining_code", "categoryDefiningcode", CategoryDefiningcode.class, this); + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(EpisodeOfCareComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(EpisodeOfCareComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + public SelectAqlField TERRITORY = new AqlFieldImp(EpisodeOfCareComposition.class, "/territory", "territory", Territory.class, this); private EpisodeOfCareCompositionContainment() { super("openEHR-EHR-COMPOSITION.versorgungsfall.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java index 9a9db164e..1ee8dd1a9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java @@ -1,125 +1,158 @@ package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; -import com.nedap.archie.rm.datavalues.quantity.DvInterval; import com.nedap.archie.rm.generic.PartyProxy; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.net.URI; +import java.time.temporal.TemporalAccessor; import java.util.List; @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.episodeofcare.v0") public class EpisodeofcareAdminEntry { - @Path("/data[at0001]/items[at0002]") - private List identifier; + @Path("/data[at0001]/items[at0002]") + private List identifier; - @Path("/data[at0001]/items[at0013]") - private List team; + @Path("/data[at0001]/items[at0003]/value|defining_code") + private StatusDefiningCode statusDefiningCode; - @Path("/data[at0001]/items[at0003]/value|defining_code") - private StatusDefiningcode statusDefiningcode; + @Path("/data[at0001]/items[at0011]/value|value") + private String typeValue; - @Path("/language") - private Language language; + @Path("/data[at0001]/items[at0014]/value/upper|value") + private TemporalAccessor upperValue; - @Path("/data[at0001]/items[at0018]") - private List diagnosis; + @Path("/data[at0001]/items[at0014]/value/lower|value") + private TemporalAccessor lowerValue; - @Path("/subject") - private PartyProxy subject; + @Path("/data[at0001]/items[at0014]/value/lower_included") + private Boolean lowerIncluded; - @Path("/data[at0001]/items[at0017]/value|value") - private URI managingOrganizationValue; + @Path("/data[at0001]/items[at0014]/value/upper_included") + private Boolean upperIncluded; - @Path("/data[at0001]/items[at0011]/value|value") - private String typeValue; + @Path("/data[at0001]/items[at0018]") + private List diagnosis; - @Path("/data[at0001]/items[at0014]/value") - private DvInterval period; + @Path("/data[at0001]/items[at0012]/value|value") + private URI careManagerValue; - @Path("/data[at0001]/items[at0012]/value|value") - private URI careManagerValue; + @Path("/data[at0001]/items[at0017]/value|value") + private URI managingOrganizationValue; - public void setIdentifier(List identifier) { - this.identifier = identifier; - } + @Path("/data[at0001]/items[at0013]") + private List team; - public List getIdentifier() { - return this.identifier; - } + @Path("/subject") + private PartyProxy subject; - public void setTeam(List team) { - this.team = team; - } + @Path("/language") + private Language language; - public List getTeam() { - return this.team; - } + public void setIdentifier(List identifier) { + this.identifier = identifier; + } - public void setStatusDefiningcode(StatusDefiningcode statusDefiningcode) { - this.statusDefiningcode = statusDefiningcode; - } + public List getIdentifier() { + return this.identifier ; + } - public StatusDefiningcode getStatusDefiningcode() { - return this.statusDefiningcode; - } + public void setStatusDefiningCode(StatusDefiningCode statusDefiningCode) { + this.statusDefiningCode = statusDefiningCode; + } - public void setLanguage(Language language) { - this.language = language; - } + public StatusDefiningCode getStatusDefiningCode() { + return this.statusDefiningCode ; + } - public Language getLanguage() { - return this.language; - } + public void setTypeValue(String typeValue) { + this.typeValue = typeValue; + } - public void setDiagnosis(List diagnosis) { - this.diagnosis = diagnosis; - } + public String getTypeValue() { + return this.typeValue ; + } - public List getDiagnosis() { - return this.diagnosis; - } + public void setUpperValue(TemporalAccessor upperValue) { + this.upperValue = upperValue; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public TemporalAccessor getUpperValue() { + return this.upperValue ; + } - public PartyProxy getSubject() { - return this.subject; - } + public void setLowerValue(TemporalAccessor lowerValue) { + this.lowerValue = lowerValue; + } - public void setManagingOrganizationValue(URI managingOrganizationValue) { - this.managingOrganizationValue = managingOrganizationValue; - } + public TemporalAccessor getLowerValue() { + return this.lowerValue ; + } - public URI getManagingOrganizationValue() { - return this.managingOrganizationValue; - } + public void setLowerIncluded(Boolean lowerIncluded) { + this.lowerIncluded = lowerIncluded; + } - public void setTypeValue(String typeValue) { - this.typeValue = typeValue; - } + public Boolean isLowerIncluded() { + return this.lowerIncluded ; + } - public String getTypeValue() { - return this.typeValue; - } + public void setUpperIncluded(Boolean upperIncluded) { + this.upperIncluded = upperIncluded; + } - public void setPeriod(DvInterval period) { - this.period = period; - } + public Boolean isUpperIncluded() { + return this.upperIncluded ; + } - public DvInterval getPeriod() { - return this.period; - } + public void setDiagnosis(List diagnosis) { + this.diagnosis = diagnosis; + } - public void setCareManagerValue(URI careManagerValue) { - this.careManagerValue = careManagerValue; - } + public List getDiagnosis() { + return this.diagnosis ; + } - public URI getCareManagerValue() { - return this.careManagerValue; - } + public void setCareManagerValue(URI careManagerValue) { + this.careManagerValue = careManagerValue; + } + + public URI getCareManagerValue() { + return this.careManagerValue ; + } + + public void setManagingOrganizationValue(URI managingOrganizationValue) { + this.managingOrganizationValue = managingOrganizationValue; + } + + public URI getManagingOrganizationValue() { + return this.managingOrganizationValue ; + } + + public void setTeam(List team) { + this.team = team; + } + + public List getTeam() { + return this.team ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntryContainment.java index b97ae5163..183291d5f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntryContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntryContainment.java @@ -1,38 +1,44 @@ package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; -import com.nedap.archie.rm.datavalues.quantity.DvInterval; import com.nedap.archie.rm.generic.PartyProxy; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.net.URI; +import java.time.temporal.TemporalAccessor; public class EpisodeofcareAdminEntryContainment extends Containment { public SelectAqlField EPISODEOFCARE_ADMIN_ENTRY = new AqlFieldImp(EpisodeofcareAdminEntry.class, "", "EpisodeofcareAdminEntry", EpisodeofcareAdminEntry.class, this); public ListSelectAqlField IDENTIFIER = new ListAqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0002]", "identifier", EpisodeofcareIdentifierElement.class, this); - public ListSelectAqlField TEAM = new ListAqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0013]", "team", EpisodeofcareTeamElement.class, this); + public SelectAqlField STATUS_DEFINING_CODE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0003]/value|defining_code", "statusDefiningCode", StatusDefiningCode.class, this); + + public SelectAqlField TYPE_VALUE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0011]/value|value", "typeValue", String.class, this); - public SelectAqlField STATUS_DEFININGCODE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0003]/value|defining_code", "statusDefiningcode", StatusDefiningcode.class, this); + public SelectAqlField UPPER_VALUE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0014]/value/upper|value", "upperValue", TemporalAccessor.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/language", "language", Language.class, this); + public SelectAqlField LOWER_VALUE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0014]/value/lower|value", "lowerValue", TemporalAccessor.class, this); + + public SelectAqlField LOWER_INCLUDED = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0014]/value/lower_included", "lowerIncluded", Boolean.class, this); + + public SelectAqlField UPPER_INCLUDED = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0014]/value/upper_included", "upperIncluded", Boolean.class, this); public ListSelectAqlField DIAGNOSIS = new ListAqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0018]", "diagnosis", EpisodeofcareDiagnosisCluster.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField CARE_MANAGER_VALUE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0012]/value|value", "careManagerValue", URI.class, this); public SelectAqlField MANAGING_ORGANIZATION_VALUE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0017]/value|value", "managingOrganizationValue", URI.class, this); - public SelectAqlField TYPE_VALUE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0011]/value|value", "typeValue", String.class, this); + public ListSelectAqlField TEAM = new ListAqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0013]", "team", EpisodeofcareTeamElement.class, this); - public SelectAqlField PERIOD = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0014]/value", "period", DvInterval.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField CARE_MANAGER_VALUE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0012]/value|value", "careManagerValue", URI.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/language", "language", Language.class, this); private EpisodeofcareAdminEntryContainment() { super("openEHR-EHR-ADMIN_ENTRY.episodeofcare.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java index 680495f06..94a658f84 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java @@ -6,36 +6,36 @@ @Entity public class EpisodeofcareDiagnosisCluster { - @Path("/items[at0021]/value|magnitude") - private Long rankMagnitude; + @Path("/items[at0019]/value") + private DvEHRURI diagnosisEntry; - @Path("/items[at0020]/value|value") - private String roleValue; + @Path("/items[at0020]/value|value") + private String roleValue; - @Path("/items[at0019]/value") - private DvEHRURI diagnosisEntry; + @Path("/items[at0021]/value|magnitude") + private Long rankMagnitude; - public void setRankMagnitude(Long rankMagnitude) { - this.rankMagnitude = rankMagnitude; - } + public void setDiagnosisEntry(DvEHRURI diagnosisEntry) { + this.diagnosisEntry = diagnosisEntry; + } - public Long getRankMagnitude() { - return this.rankMagnitude; - } + public DvEHRURI getDiagnosisEntry() { + return this.diagnosisEntry ; + } - public void setRoleValue(String roleValue) { - this.roleValue = roleValue; - } + public void setRoleValue(String roleValue) { + this.roleValue = roleValue; + } - public String getRoleValue() { - return this.roleValue; - } + public String getRoleValue() { + return this.roleValue ; + } - public void setDiagnosisEntry(DvEHRURI diagnosisEntry) { - this.diagnosisEntry = diagnosisEntry; - } + public void setRankMagnitude(Long rankMagnitude) { + this.rankMagnitude = rankMagnitude; + } - public DvEHRURI getDiagnosisEntry() { - return this.diagnosisEntry; - } + public Long getRankMagnitude() { + return this.rankMagnitude ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java index 325b1512a..ec1c16347 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java @@ -6,14 +6,14 @@ @Entity public class EpisodeofcareIdentifierElement { - @Path("/value") - private DvIdentifier value; + @Path("/value") + private DvIdentifier value; - public void setValue(DvIdentifier value) { - this.value = value; - } + public void setValue(DvIdentifier value) { + this.value = value; + } - public DvIdentifier getValue() { - return this.value; - } + public DvIdentifier getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java index 93a4827b3..c4a7179f7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java @@ -7,14 +7,14 @@ @Entity public class EpisodeofcareTeamElement { - @Path("/value|value") - private URI value; + @Path("/value|value") + private URI value; - public void setValue(URI value) { - this.value = value; - } + public void setValue(URI value) { + this.value = value; + } - public URI getValue() { - return this.value; - } + public URI getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/StatusDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/StatusDefiningcode.java index 19694a15b..9edea0607 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/StatusDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/StatusDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum StatusDefiningcode implements EnumValueSet { +public enum StatusDefiningCode implements EnumValueSet { WAITLIST("waitlist", "*", "local", "at0005"), CANCELLED("cancelled", "*", "local", "at0009"), @@ -25,7 +25,7 @@ public enum StatusDefiningcode implements EnumValueSet { private String code; - StatusDefiningcode(String value, String description, String terminologyId, String code) { + StatusDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -33,18 +33,18 @@ public enum StatusDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java index 97caecefc..9431212e5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java @@ -14,10 +14,10 @@ import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.BackgroundSection; import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.ResponseSection; import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.SituationSection; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; import java.time.temporal.TemporalAccessor; @@ -27,190 +27,190 @@ @Archetype("openEHR-EHR-COMPOSITION.encounter.v1") @Template("open_eREACT-Care") public class OpenEREACTCareComposition { - @Id - private VersionUid versionUid; + @Path("/context/other_context[at0001]/items[at0002]") + private List extension; - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; - @Path("/context/participations") - private List participations; + @Path("/context/participations") + private List participations; - @Path("/language") - private Language language; + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; + @Path("/context/location") + private String location; - @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Response']") - private ResponseSection response; + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; - @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Assessment']") - private AssessmentSection assessment; + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; - @Path("/territory") - private Territory territory; + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Situation']") + private SituationSection situation; - @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Background']") - private BackgroundSection background; + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Background']") + private BackgroundSection background; - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Assessment']") + private AssessmentSection assessment; - @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Situation']") - private SituationSection situation; + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Response']") + private ResponseSection response; - @Path("/composer") - private PartyProxy composer; + @Path("/composer") + private PartyProxy composer; - @Path("/context/setting|defining_code") - private SettingDefiningcode settingDefiningcode; + @Path("/language") + private Language language; - @Path("/feeder_audit") - private FeederAudit feederAudit; + @Path("/feeder_audit") + private FeederAudit feederAudit; - @Path("/context/location") - private String location; + @Path("/category|defining_code") + private Category categoryDefiningCode; - @Path("/category|defining_code") - private CategoryDefiningcode categoryDefiningcode; + @Path("/territory") + private Territory territory; - @Path("/context/other_context[at0001]/items[at0002]") - private List extension; + @Id + private VersionUid versionUid; - public VersionUid getVersionUid() { - return this.versionUid; - } + public void setExtension(List extension) { + this.extension = extension; + } - public void setVersionUid(VersionUid versionUid) { - this.versionUid = versionUid; - } + public List getExtension() { + return this.extension ; + } - public void setEndTimeValue(TemporalAccessor endTimeValue) { - this.endTimeValue = endTimeValue; - } + public void setStartTimeValue(TemporalAccessor startTimeValue) { + this.startTimeValue = startTimeValue; + } - public TemporalAccessor getEndTimeValue() { - return this.endTimeValue; - } + public TemporalAccessor getStartTimeValue() { + return this.startTimeValue ; + } - public void setParticipations(List participations) { - this.participations = participations; - } + public void setParticipations(List participations) { + this.participations = participations; + } - public List getParticipations() { - return this.participations; - } + public List getParticipations() { + return this.participations ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setEndTimeValue(TemporalAccessor endTimeValue) { + this.endTimeValue = endTimeValue; + } - public Language getLanguage() { - return this.language; - } + public TemporalAccessor getEndTimeValue() { + return this.endTimeValue ; + } - public void setHealthCareFacility(PartyIdentified healthCareFacility) { - this.healthCareFacility = healthCareFacility; - } + public void setLocation(String location) { + this.location = location; + } - public PartyIdentified getHealthCareFacility() { - return this.healthCareFacility; - } + public String getLocation() { + return this.location ; + } - public void setResponse(ResponseSection response) { - this.response = response; - } + public void setHealthCareFacility(PartyIdentified healthCareFacility) { + this.healthCareFacility = healthCareFacility; + } - public ResponseSection getResponse() { - return this.response; - } + public PartyIdentified getHealthCareFacility() { + return this.healthCareFacility ; + } - public void setAssessment(AssessmentSection assessment) { - this.assessment = assessment; - } + public void setSettingDefiningCode(Setting settingDefiningCode) { + this.settingDefiningCode = settingDefiningCode; + } - public AssessmentSection getAssessment() { - return this.assessment; - } + public Setting getSettingDefiningCode() { + return this.settingDefiningCode ; + } - public void setTerritory(Territory territory) { - this.territory = territory; - } + public void setSituation(SituationSection situation) { + this.situation = situation; + } - public Territory getTerritory() { - return this.territory; - } + public SituationSection getSituation() { + return this.situation ; + } - public void setBackground(BackgroundSection background) { - this.background = background; - } + public void setBackground(BackgroundSection background) { + this.background = background; + } - public BackgroundSection getBackground() { - return this.background; - } + public BackgroundSection getBackground() { + return this.background ; + } - public void setStartTimeValue(TemporalAccessor startTimeValue) { - this.startTimeValue = startTimeValue; - } + public void setAssessment(AssessmentSection assessment) { + this.assessment = assessment; + } - public TemporalAccessor getStartTimeValue() { - return this.startTimeValue; - } + public AssessmentSection getAssessment() { + return this.assessment ; + } - public void setSituation(SituationSection situation) { - this.situation = situation; - } + public void setResponse(ResponseSection response) { + this.response = response; + } - public SituationSection getSituation() { - return this.situation; - } + public ResponseSection getResponse() { + return this.response ; + } - public void setComposer(PartyProxy composer) { - this.composer = composer; - } + public void setComposer(PartyProxy composer) { + this.composer = composer; + } - public PartyProxy getComposer() { - return this.composer; - } + public PartyProxy getComposer() { + return this.composer ; + } - public void setSettingDefiningcode(SettingDefiningcode settingDefiningcode) { - this.settingDefiningcode = settingDefiningcode; - } + public void setLanguage(Language language) { + this.language = language; + } - public SettingDefiningcode getSettingDefiningcode() { - return this.settingDefiningcode; - } + public Language getLanguage() { + return this.language ; + } - public void setFeederAudit(FeederAudit feederAudit) { - this.feederAudit = feederAudit; - } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } - public FeederAudit getFeederAudit() { - return this.feederAudit; - } + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } - public void setLocation(String location) { - this.location = location; - } + public void setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } - public String getLocation() { - return this.location; - } + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } - public void setCategoryDefiningcode(CategoryDefiningcode categoryDefiningcode) { - this.categoryDefiningcode = categoryDefiningcode; - } + public void setTerritory(Territory territory) { + this.territory = territory; + } - public CategoryDefiningcode getCategoryDefiningcode() { - return this.categoryDefiningcode; - } + public Territory getTerritory() { + return this.territory ; + } - public void setExtension(List extension) { - this.extension = extension; - } + public VersionUid getVersionUid() { + return this.versionUid ; + } - public List getExtension() { - return this.extension; - } + public void setVersionUid(VersionUid versionUid) { + this.versionUid = versionUid; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareCompositionContainment.java index 3c8052794..f5ee2c2d2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareCompositionContainment.java @@ -14,47 +14,47 @@ import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.BackgroundSection; import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.ResponseSection; import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.SituationSection; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import java.time.temporal.TemporalAccessor; public class OpenEREACTCareCompositionContainment extends Containment { public SelectAqlField OPEN_E_R_E_A_C_T_CARE_COMPOSITION = new AqlFieldImp(OpenEREACTCareComposition.class, "", "OpenEREACTCareComposition", OpenEREACTCareComposition.class, this); - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(OpenEREACTCareComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(OpenEREACTCareComposition.class, "/context/other_context[at0001]/items[at0002]", "extension", Cluster.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(OpenEREACTCareComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(OpenEREACTCareComposition.class, "/context/participations", "participations", Participation.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(OpenEREACTCareComposition.class, "/language", "language", Language.class, this); + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(OpenEREACTCareComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(OpenEREACTCareComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + public SelectAqlField LOCATION = new AqlFieldImp(OpenEREACTCareComposition.class, "/context/location", "location", String.class, this); - public SelectAqlField RESPONSE = new AqlFieldImp(OpenEREACTCareComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Response']", "response", ResponseSection.class, this); + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(OpenEREACTCareComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - public SelectAqlField ASSESSMENT = new AqlFieldImp(OpenEREACTCareComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Assessment']", "assessment", AssessmentSection.class, this); + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(OpenEREACTCareComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - public SelectAqlField TERRITORY = new AqlFieldImp(OpenEREACTCareComposition.class, "/territory", "territory", Territory.class, this); + public SelectAqlField SITUATION = new AqlFieldImp(OpenEREACTCareComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "situation", SituationSection.class, this); - public SelectAqlField BACKGROUND = new AqlFieldImp(OpenEREACTCareComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Background']", "background", BackgroundSection.class, this); + public SelectAqlField BACKGROUND = new AqlFieldImp(OpenEREACTCareComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "background", BackgroundSection.class, this); - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(OpenEREACTCareComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + public SelectAqlField ASSESSMENT = new AqlFieldImp(OpenEREACTCareComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "assessment", AssessmentSection.class, this); - public SelectAqlField SITUATION = new AqlFieldImp(OpenEREACTCareComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Situation']", "situation", SituationSection.class, this); + public SelectAqlField RESPONSE = new AqlFieldImp(OpenEREACTCareComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "response", ResponseSection.class, this); public SelectAqlField COMPOSER = new AqlFieldImp(OpenEREACTCareComposition.class, "/composer", "composer", PartyProxy.class, this); - public SelectAqlField SETTING_DEFININGCODE = new AqlFieldImp(OpenEREACTCareComposition.class, "/context/setting|defining_code", "settingDefiningcode", SettingDefiningcode.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(OpenEREACTCareComposition.class, "/language", "language", Language.class, this); public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(OpenEREACTCareComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - public SelectAqlField LOCATION = new AqlFieldImp(OpenEREACTCareComposition.class, "/context/location", "location", String.class, this); - - public SelectAqlField CATEGORY_DEFININGCODE = new AqlFieldImp(OpenEREACTCareComposition.class, "/category|defining_code", "categoryDefiningcode", CategoryDefiningcode.class, this); + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(OpenEREACTCareComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(OpenEREACTCareComposition.class, "/context/other_context[at0001]/items[at0002]", "extension", Cluster.class, this); + public SelectAqlField TERRITORY = new AqlFieldImp(OpenEREACTCareComposition.class, "/territory", "territory", Territory.class, this); private OpenEREACTCareCompositionContainment() { super("openEHR-EHR-COMPOSITION.encounter.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java index 46ba0f2e3..1b241caf7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -10,70 +11,69 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") public class AbdomenSymptomCluster { - @Path("/items[at0063]") - private List sign; + @Path("/items[at0001.1]/value|defining_code") + private CodePhrase symptomSignNameDefiningCode; - @Path("/items[at0153]") - private List specificDetails; + @Path("/items[at0147]") + private List structuredBodySite; - @Path("/items[at0001.1]/value|defining_code") - private SymptomSignNameDefiningcode4 symptomSignNameDefiningcode; + @Path("/items[at0153]") + private List specificDetails; - @Path("/items[at0146]") - private List previousEpisodes; + @Path("/items[at0146]") + private List previousEpisodes; - @Path("/items[at0.1]/value|defining_code") - private PresenceDefiningcode presenceDefiningcode; + @Path("/items[at0063]") + private List associatedSymptomSign; - @Path("/items[at0147]") - private List structuredBodySite; + @Path("/items[at0.1 and name/value='Presence']/value|defining_code") + private PresenceDefiningCode presenceDefiningCode; - public void setSign(List sign) { - this.sign = sign; - } + public void setSymptomSignNameDefiningCode(CodePhrase symptomSignNameDefiningCode) { + this.symptomSignNameDefiningCode = symptomSignNameDefiningCode; + } - public List getSign() { - return this.sign; - } + public CodePhrase getSymptomSignNameDefiningCode() { + return this.symptomSignNameDefiningCode ; + } - public void setSpecificDetails(List specificDetails) { - this.specificDetails = specificDetails; - } + public void setStructuredBodySite(List structuredBodySite) { + this.structuredBodySite = structuredBodySite; + } - public List getSpecificDetails() { - return this.specificDetails; - } + public List getStructuredBodySite() { + return this.structuredBodySite ; + } - public void setSymptomSignNameDefiningcode( - SymptomSignNameDefiningcode4 symptomSignNameDefiningcode) { - this.symptomSignNameDefiningcode = symptomSignNameDefiningcode; - } + public void setSpecificDetails(List specificDetails) { + this.specificDetails = specificDetails; + } - public SymptomSignNameDefiningcode4 getSymptomSignNameDefiningcode() { - return this.symptomSignNameDefiningcode; - } + public List getSpecificDetails() { + return this.specificDetails ; + } - public void setPreviousEpisodes(List previousEpisodes) { - this.previousEpisodes = previousEpisodes; - } + public void setPreviousEpisodes(List previousEpisodes) { + this.previousEpisodes = previousEpisodes; + } - public List getPreviousEpisodes() { - return this.previousEpisodes; - } + public List getPreviousEpisodes() { + return this.previousEpisodes ; + } - public void setPresenceDefiningcode(PresenceDefiningcode presenceDefiningcode) { - this.presenceDefiningcode = presenceDefiningcode; - } + public void setAssociatedSymptomSign(List associatedSymptomSign) { + this.associatedSymptomSign = associatedSymptomSign; + } - public PresenceDefiningcode getPresenceDefiningcode() { - return this.presenceDefiningcode; - } + public List getAssociatedSymptomSign() { + return this.associatedSymptomSign ; + } - public void setStructuredBodySite(List structuredBodySite) { - this.structuredBodySite = structuredBodySite; - } + public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { + this.presenceDefiningCode = presenceDefiningCode; + } - public List getStructuredBodySite() { - return this.structuredBodySite; - } + public PresenceDefiningCode getPresenceDefiningCode() { + return this.presenceDefiningCode ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomClusterContainment.java index bf2f49c37..2b0da992d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomClusterContainment.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -10,23 +11,23 @@ public class AbdomenSymptomClusterContainment extends Containment { public SelectAqlField ABDOMEN_SYMPTOM_CLUSTER = new AqlFieldImp(AbdomenSymptomCluster.class, "", "AbdomenSymptomCluster", AbdomenSymptomCluster.class, this); - public ListSelectAqlField SIGN = new ListAqlFieldImp(AbdomenSymptomCluster.class, "/items[at0063]", "sign", Cluster.class, this); + public SelectAqlField SYMPTOM_SIGN_NAME_DEFINING_CODE = new AqlFieldImp(AbdomenSymptomCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningCode", CodePhrase.class, this); - public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(AbdomenSymptomCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); + public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(AbdomenSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); - public SelectAqlField SYMPTOM_SIGN_NAME_DEFININGCODE = new AqlFieldImp(AbdomenSymptomCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningcode", SymptomSignNameDefiningcode4.class, this); + public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(AbdomenSymptomCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); - public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(AbdomenSymptomCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); + public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(AbdomenSymptomCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); - public SelectAqlField PRESENCE_DEFININGCODE = new AqlFieldImp(AbdomenSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningcode", PresenceDefiningcode.class, this); + public ListSelectAqlField ASSOCIATED_SYMPTOM_SIGN = new ListAqlFieldImp(AbdomenSymptomCluster.class, "/items[at0063]", "associatedSymptomSign", Cluster.class, this); - public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(AbdomenSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); + public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(AbdomenSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); - private AbdomenSymptomClusterContainment() { - super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); - } + private AbdomenSymptomClusterContainment() { + super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); + } - public static AbdomenSymptomClusterContainment getInstance() { - return new AbdomenSymptomClusterContainment(); - } + public static AbdomenSymptomClusterContainment getInstance() { + return new AbdomenSymptomClusterContainment(); + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuDefiningcode.java index 7f5a022d5..baac947bb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum AcvpuDefiningcode implements EnumValueSet { +public enum AcvpuDefiningCode implements EnumValueSet { CONFUSION("Confusion", "A new onset or worsening confusion, delirium or any other altered mentation.", "local", "at0015"), UNRESPONSIVE("Unresponsive", "No response to voice or pain stimuli.", "local", "at0008"), @@ -21,7 +21,7 @@ public enum AcvpuDefiningcode implements EnumValueSet { private String code; - AcvpuDefiningcode(String value, String description, String terminologyId, String code) { + AcvpuDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -29,18 +29,18 @@ public enum AcvpuDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java index 424d2d8ce..ac8d78fbf 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java @@ -1,11 +1,12 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.generic.PartyProxy; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,69 +14,80 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.acvpu.v0") public class AcvpuScaleObservation { - @Path("/protocol[at0009]/items[at0011]") - private List extension; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|defining_code") + private AcvpuDefiningCode acvpuDefiningCode; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/events[at0002]/state[at0013]") + private ItemTree tree; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|defining_code") - private AcvpuDefiningcode acvpuDefiningcode; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/subject") - private PartyProxy subject; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/protocol[at0009]/items[at0011]") + private List extension; - @Path("/language") - private Language language; + @Path("/subject") + private PartyProxy subject; - public void setExtension(List extension) { - this.extension = extension; - } + @Path("/language") + private Language language; - public List getExtension() { - return this.extension; - } + public void setAcvpuDefiningCode(AcvpuDefiningCode acvpuDefiningCode) { + this.acvpuDefiningCode = acvpuDefiningCode; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public AcvpuDefiningCode getAcvpuDefiningCode() { + return this.acvpuDefiningCode ; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public void setTree(ItemTree tree) { + this.tree = tree; + } - public void setAcvpuDefiningcode(AcvpuDefiningcode acvpuDefiningcode) { - this.acvpuDefiningcode = acvpuDefiningcode; - } + public ItemTree getTree() { + return this.tree ; + } - public AcvpuDefiningcode getAcvpuDefiningcode() { - return this.acvpuDefiningcode; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public PartyProxy getSubject() { - return this.subject; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public void setExtension(List extension) { + this.extension = extension; + } - public void setLanguage(Language language) { - this.language = language; - } + public List getExtension() { + return this.extension ; + } - public Language getLanguage() { - return this.language; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservationContainment.java index ea0e4c894..cf3aa81de 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservationContainment.java @@ -1,28 +1,31 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.generic.PartyProxy; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class AcvpuScaleObservationContainment extends Containment { public SelectAqlField ACVPU_SCALE_OBSERVATION = new AqlFieldImp(AcvpuScaleObservation.class, "", "AcvpuScaleObservation", AcvpuScaleObservation.class, this); - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(AcvpuScaleObservation.class, "/protocol[at0009]/items[at0011]", "extension", Cluster.class, this); + public SelectAqlField ACVPU_DEFINING_CODE = new AqlFieldImp(AcvpuScaleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|defining_code", "acvpuDefiningCode", AcvpuDefiningCode.class, this); + + public SelectAqlField TREE = new AqlFieldImp(AcvpuScaleObservation.class, "/data[at0001]/events[at0002]/state[at0013]", "tree", ItemTree.class, this); public SelectAqlField TIME_VALUE = new AqlFieldImp(AcvpuScaleObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - public SelectAqlField ACVPU_DEFININGCODE = new AqlFieldImp(AcvpuScaleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|defining_code", "acvpuDefiningcode", AcvpuDefiningcode.class, this); + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(AcvpuScaleObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(AcvpuScaleObservation.class, "/subject", "subject", PartyProxy.class, this); + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(AcvpuScaleObservation.class, "/protocol[at0009]/items[at0011]", "extension", Cluster.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(AcvpuScaleObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(AcvpuScaleObservation.class, "/subject", "subject", PartyProxy.class, this); public SelectAqlField LANGUAGE = new AqlFieldImp(AcvpuScaleObservation.class, "/language", "language", Language.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java index 6b7ceaa97..07d07f8e6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java @@ -5,54 +5,54 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.util.List; @Entity @Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") public class AllergiesEvaluation { - @Path("/subject") - private PartyProxy subject; + @Path("/data[at0001]/items[at0002]/value|value") + private String synopsisValue; - @Path("/data[at0001]/items[at0002]/value|value") - private String synopsisValue; + @Path("/protocol[at0003]/items[at0004]") + private List extension; - @Path("/language") - private Language language; + @Path("/subject") + private PartyProxy subject; - @Path("/protocol[at0003]/items[at0004]") - private List extension; + @Path("/language") + private Language language; - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setSynopsisValue(String synopsisValue) { + this.synopsisValue = synopsisValue; + } - public PartyProxy getSubject() { - return this.subject; - } + public String getSynopsisValue() { + return this.synopsisValue ; + } - public void setSynopsisValue(String synopsisValue) { - this.synopsisValue = synopsisValue; - } + public void setExtension(List extension) { + this.extension = extension; + } - public String getSynopsisValue() { - return this.synopsisValue; - } + public List getExtension() { + return this.extension ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public Language getLanguage() { - return this.language; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setExtension(List extension) { - this.extension = extension; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getExtension() { - return this.extension; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluationContainment.java index e766dacb8..701361e1b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluationContainment.java @@ -7,19 +7,19 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; public class AllergiesEvaluationContainment extends Containment { public SelectAqlField ALLERGIES_EVALUATION = new AqlFieldImp(AllergiesEvaluation.class, "", "AllergiesEvaluation", AllergiesEvaluation.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(AllergiesEvaluation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField SYNOPSIS_VALUE = new AqlFieldImp(AllergiesEvaluation.class, "/data[at0001]/items[at0002]/value|value", "synopsisValue", String.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(AllergiesEvaluation.class, "/language", "language", Language.class, this); - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(AllergiesEvaluation.class, "/protocol[at0003]/items[at0004]", "extension", Cluster.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(AllergiesEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(AllergiesEvaluation.class, "/language", "language", Language.class, this); + private AllergiesEvaluationContainment() { super("openEHR-EHR-EVALUATION.clinical_synopsis.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Definingcode5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AmberFlagAcuteDefiningCode.java similarity index 76% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Definingcode5.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AmberFlagAcuteDefiningCode.java index 61a8db622..a3712d8c6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Definingcode5.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AmberFlagAcuteDefiningCode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum Definingcode5 implements EnumValueSet { +public enum AmberFlagAcuteDefiningCode implements EnumValueSet { ACUTE_DETERIORATION_IN_FUNCTIONAL_ABILITY("Acute deterioration in functional ability", "Acute deterioration in functional ability", "local", "at0091"), HEART_RATE91130_OR_NEW_DYSRHYTHMIA("Heart rate 91-130 or new dysrhythmia", "Heart rate 91-130 or new dysrhythmia", "local", "at0095"), @@ -17,7 +17,7 @@ public enum Definingcode5 implements EnumValueSet { RESPIRATORY_RATE2124("Respiratory rate 21-24", "Respiratory rate 21-24", "local", "at0093"), - PROCEDURE_IN_LAST8_WEEKS("Trauma / surgery / procedure in last 8 weeks", "Trauma / surgery / procedure in last 8 weeks", "local", "at0092"); + TRAUMA_SURGERY_PROCEDURE_IN_LAST8_WEEKS("Trauma / surgery / procedure in last 8 weeks", "Trauma / surgery / procedure in last 8 weeks", "local", "at0092"); private String value; @@ -27,7 +27,7 @@ public enum Definingcode5 implements EnumValueSet { private String code; - Definingcode5(String value, String description, String terminologyId, String code) { + AmberFlagAcuteDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -35,18 +35,18 @@ public enum Definingcode5 implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java index 1b00b1c34..2a36077f6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java @@ -7,47 +7,47 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class AssessmentSection { - @Path("/items[openEHR-EHR-SECTION.adhoc.v1 and name/value='Sepsis']") - private SepsisSection sepsis; + @Path("/items[openEHR-EHR-OBSERVATION.denwis.v0]") + private DenwisObservation denwis; - @Path("/items[openEHR-EHR-OBSERVATION.denwis.v0]") - private DenwisObservation denwis; + @Path("/items[openEHR-EHR-SECTION.adhoc.v1 and name/value='Sepsis']") + private SepsisSection sepsis; - @Path("/items[openEHR-EHR-SECTION.adhoc.v1 and name/value='NEWS2']") - private News2Section news2; + @Path("/items[openEHR-EHR-SECTION.adhoc.v1 and name/value='Covid']") + private CovidSection covid; - @Path("/items[openEHR-EHR-SECTION.adhoc.v1 and name/value='Covid']") - private CovidSection covid; + @Path("/items[openEHR-EHR-SECTION.adhoc.v1 and name/value='NEWS2']") + private News2Section news2; - public void setSepsis(SepsisSection sepsis) { - this.sepsis = sepsis; - } + public void setDenwis(DenwisObservation denwis) { + this.denwis = denwis; + } - public SepsisSection getSepsis() { - return this.sepsis; - } + public DenwisObservation getDenwis() { + return this.denwis ; + } - public void setDenwis(DenwisObservation denwis) { - this.denwis = denwis; - } + public void setSepsis(SepsisSection sepsis) { + this.sepsis = sepsis; + } - public DenwisObservation getDenwis() { - return this.denwis; - } + public SepsisSection getSepsis() { + return this.sepsis ; + } - public void setNews2(News2Section news2) { - this.news2 = news2; - } + public void setCovid(CovidSection covid) { + this.covid = covid; + } - public News2Section getNews2() { - return this.news2; - } + public CovidSection getCovid() { + return this.covid ; + } - public void setCovid(CovidSection covid) { - this.covid = covid; - } + public void setNews2(News2Section news2) { + this.news2 = news2; + } - public CovidSection getCovid() { - return this.covid; - } + public News2Section getNews2() { + return this.news2 ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSectionContainment.java index e0b5e0ff6..6ec7c205e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSectionContainment.java @@ -5,21 +5,21 @@ import org.ehrbase.client.aql.field.SelectAqlField; public class AssessmentSectionContainment extends Containment { - public SelectAqlField ASSESSMENT_SECTION = new AqlFieldImp(AssessmentSection.class, "", "AssessmentSection", AssessmentSection.class, this); + public SelectAqlField ASSESSMENT_SECTION = new AqlFieldImp(AssessmentSection.class, "", "AssessmentSection", AssessmentSection.class, this); - public SelectAqlField SEPSIS = new AqlFieldImp(AssessmentSection.class, "/items[openEHR-EHR-SECTION.adhoc.v1 and name/value='Sepsis']", "sepsis", SepsisSection.class, this); + public SelectAqlField DENWIS = new AqlFieldImp(AssessmentSection.class, "/items[openEHR-EHR-OBSERVATION.denwis.v0]", "denwis", DenwisObservation.class, this); - public SelectAqlField DENWIS = new AqlFieldImp(AssessmentSection.class, "/items[openEHR-EHR-OBSERVATION.denwis.v0]", "denwis", DenwisObservation.class, this); + public SelectAqlField SEPSIS = new AqlFieldImp(AssessmentSection.class, "/items[openEHR-EHR-SECTION.adhoc.v1]", "sepsis", SepsisSection.class, this); - public SelectAqlField NEWS2 = new AqlFieldImp(AssessmentSection.class, "/items[openEHR-EHR-SECTION.adhoc.v1 and name/value='NEWS2']", "news2", News2Section.class, this); + public SelectAqlField COVID = new AqlFieldImp(AssessmentSection.class, "/items[openEHR-EHR-SECTION.adhoc.v1]", "covid", CovidSection.class, this); - public SelectAqlField COVID = new AqlFieldImp(AssessmentSection.class, "/items[openEHR-EHR-SECTION.adhoc.v1 and name/value='Covid']", "covid", CovidSection.class, this); + public SelectAqlField NEWS2 = new AqlFieldImp(AssessmentSection.class, "/items[openEHR-EHR-SECTION.adhoc.v1]", "news2", News2Section.class, this); - private AssessmentSectionContainment() { - super("openEHR-EHR-SECTION.adhoc.v1"); - } + private AssessmentSectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } - public static AssessmentSectionContainment getInstance() { - return new AssessmentSectionContainment(); - } + public static AssessmentSectionContainment getInstance() { + return new AssessmentSectionContainment(); + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java index 653c389a3..7799a5574 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java @@ -7,69 +7,69 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class BackgroundSection { - @Path("/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Medication']") - private MedicationEvaluation medication; + @Path("/items[openEHR-EHR-OBSERVATION.height.v2 and name/value='Height']") + private HeightObservation height; - @Path("/items[openEHR-EHR-OBSERVATION.body_weight.v2 and name/value='Weight']") - private WeightObservation weight; + @Path("/items[openEHR-EHR-OBSERVATION.body_weight.v2 and name/value='Weight']") + private WeightObservation weight; - @Path("/items[openEHR-EHR-OBSERVATION.clinical_frailty_scale.v1 and name/value='Frailty']") - private FrailtyObservation frailty; + @Path("/items[openEHR-EHR-OBSERVATION.clinical_frailty_scale.v1 and name/value='Frailty']") + private FrailtyObservation frailty; - @Path("/items[openEHR-EHR-OBSERVATION.height.v2 and name/value='Height']") - private HeightObservation height; + @Path("/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Past history']") + private PastHistoryEvaluation pastHistory; - @Path("/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Allergies']") - private AllergiesEvaluation allergies; + @Path("/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Medication']") + private MedicationEvaluation medication; - @Path("/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Past history']") - private PastHistoryEvaluation pastHistory; + @Path("/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Allergies']") + private AllergiesEvaluation allergies; - public void setMedication(MedicationEvaluation medication) { - this.medication = medication; - } + public void setHeight(HeightObservation height) { + this.height = height; + } - public MedicationEvaluation getMedication() { - return this.medication; - } + public HeightObservation getHeight() { + return this.height ; + } - public void setWeight(WeightObservation weight) { - this.weight = weight; - } + public void setWeight(WeightObservation weight) { + this.weight = weight; + } - public WeightObservation getWeight() { - return this.weight; - } + public WeightObservation getWeight() { + return this.weight ; + } - public void setFrailty(FrailtyObservation frailty) { - this.frailty = frailty; - } + public void setFrailty(FrailtyObservation frailty) { + this.frailty = frailty; + } - public FrailtyObservation getFrailty() { - return this.frailty; - } + public FrailtyObservation getFrailty() { + return this.frailty ; + } - public void setHeight(HeightObservation height) { - this.height = height; - } + public void setPastHistory(PastHistoryEvaluation pastHistory) { + this.pastHistory = pastHistory; + } - public HeightObservation getHeight() { - return this.height; - } + public PastHistoryEvaluation getPastHistory() { + return this.pastHistory ; + } - public void setAllergies(AllergiesEvaluation allergies) { - this.allergies = allergies; - } + public void setMedication(MedicationEvaluation medication) { + this.medication = medication; + } - public AllergiesEvaluation getAllergies() { - return this.allergies; - } + public MedicationEvaluation getMedication() { + return this.medication ; + } - public void setPastHistory(PastHistoryEvaluation pastHistory) { - this.pastHistory = pastHistory; - } + public void setAllergies(AllergiesEvaluation allergies) { + this.allergies = allergies; + } - public PastHistoryEvaluation getPastHistory() { - return this.pastHistory; - } + public AllergiesEvaluation getAllergies() { + return this.allergies ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSectionContainment.java index cc42c2591..30369facf 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSectionContainment.java @@ -7,23 +7,23 @@ public class BackgroundSectionContainment extends Containment { public SelectAqlField BACKGROUND_SECTION = new AqlFieldImp(BackgroundSection.class, "", "BackgroundSection", BackgroundSection.class, this); - public SelectAqlField MEDICATION = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Medication']", "medication", MedicationEvaluation.class, this); + public SelectAqlField HEIGHT = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-OBSERVATION.height.v2]", "height", HeightObservation.class, this); - public SelectAqlField WEIGHT = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-OBSERVATION.body_weight.v2 and name/value='Weight']", "weight", WeightObservation.class, this); + public SelectAqlField WEIGHT = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-OBSERVATION.body_weight.v2]", "weight", WeightObservation.class, this); - public SelectAqlField FRAILTY = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-OBSERVATION.clinical_frailty_scale.v1 and name/value='Frailty']", "frailty", FrailtyObservation.class, this); + public SelectAqlField FRAILTY = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-OBSERVATION.clinical_frailty_scale.v1]", "frailty", FrailtyObservation.class, this); - public SelectAqlField HEIGHT = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-OBSERVATION.height.v2 and name/value='Height']", "height", HeightObservation.class, this); + public SelectAqlField PAST_HISTORY = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1]", "pastHistory", PastHistoryEvaluation.class, this); - public SelectAqlField ALLERGIES = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Allergies']", "allergies", AllergiesEvaluation.class, this); + public SelectAqlField MEDICATION = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1]", "medication", MedicationEvaluation.class, this); - public SelectAqlField PAST_HISTORY = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Past history']", "pastHistory", PastHistoryEvaluation.class, this); + public SelectAqlField ALLERGIES = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1]", "allergies", AllergiesEvaluation.class, this); - private BackgroundSectionContainment() { - super("openEHR-EHR-SECTION.adhoc.v1"); - } + private BackgroundSectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } - public static BackgroundSectionContainment getInstance() { - return new BackgroundSectionContainment(); - } + public static BackgroundSectionContainment getInstance() { + return new BackgroundSectionContainment(); + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java index c2673643a..57b8f1bd5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,135 +13,135 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.blood_pressure.v2") public class BloodPressureObservation { - @Path("/data[at0001]/events[at0006]/data[at0003]/items[at0004]/value|magnitude") - private Double systolicMagnitude; + @Path("/data[at0001]/events[at0006]/data[at0003]/items[at0004]/value|magnitude") + private Double systolicMagnitude; - @Path("/data[at0001]/events[at0006]/data[at0003]/items[at0004]/value|units") - private String systolicUnits; + @Path("/data[at0001]/events[at0006]/data[at0003]/items[at0004]/value|units") + private String systolicUnits; - @Path("/data[at0001]/events[at0006]/state[at0007]/items[at1030]") - private Cluster exertion; + @Path("/data[at0001]/events[at0006]/data[at0003]/items[at0005]/value|magnitude") + private Double diastolicMagnitude; - @Path("/protocol[at0011]/items[at1057]") - private List structuredMeasurementLocation; + @Path("/data[at0001]/events[at0006]/data[at0003]/items[at0005]/value|units") + private String diastolicUnits; - @Path("/protocol[at0011]/items[at1025]") - private Cluster device; + @Path("/data[at0001]/events[at0006]/state[at0007]/items[at1030]") + private Cluster exertion; - @Path("/protocol[at0011]/items[at1058]") - private List extension; + @Path("/data[at0001]/events[at0006]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0001]/events[at0006]/data[at0003]/items[at0005]/value|magnitude") - private Double diastolicMagnitude; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/data[at0001]/events[at0006]/data[at0003]/items[at0005]/value|units") - private String diastolicUnits; + @Path("/protocol[at0011]/items[at1057]") + private List structuredMeasurementLocation; - @Path("/language") - private Language language; + @Path("/protocol[at0011]/items[at1025]") + private Cluster device; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0011]/items[at1058]") + private List extension; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/events[at0006]/time|value") - private TemporalAccessor timeValue; + @Path("/language") + private Language language; - public void setSystolicMagnitude(Double systolicMagnitude) { - this.systolicMagnitude = systolicMagnitude; - } + public void setSystolicMagnitude(Double systolicMagnitude) { + this.systolicMagnitude = systolicMagnitude; + } - public Double getSystolicMagnitude() { - return this.systolicMagnitude; - } + public Double getSystolicMagnitude() { + return this.systolicMagnitude ; + } - public void setSystolicUnits(String systolicUnits) { - this.systolicUnits = systolicUnits; - } + public void setSystolicUnits(String systolicUnits) { + this.systolicUnits = systolicUnits; + } - public String getSystolicUnits() { - return this.systolicUnits; - } + public String getSystolicUnits() { + return this.systolicUnits ; + } - public void setExertion(Cluster exertion) { - this.exertion = exertion; - } + public void setDiastolicMagnitude(Double diastolicMagnitude) { + this.diastolicMagnitude = diastolicMagnitude; + } - public Cluster getExertion() { - return this.exertion; - } + public Double getDiastolicMagnitude() { + return this.diastolicMagnitude ; + } - public void setStructuredMeasurementLocation(List structuredMeasurementLocation) { - this.structuredMeasurementLocation = structuredMeasurementLocation; - } + public void setDiastolicUnits(String diastolicUnits) { + this.diastolicUnits = diastolicUnits; + } - public List getStructuredMeasurementLocation() { - return this.structuredMeasurementLocation; - } + public String getDiastolicUnits() { + return this.diastolicUnits ; + } - public void setDevice(Cluster device) { - this.device = device; - } + public void setExertion(Cluster exertion) { + this.exertion = exertion; + } - public Cluster getDevice() { - return this.device; - } + public Cluster getExertion() { + return this.exertion ; + } - public void setExtension(List extension) { - this.extension = extension; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public List getExtension() { - return this.extension; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setDiastolicMagnitude(Double diastolicMagnitude) { - this.diastolicMagnitude = diastolicMagnitude; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public Double getDiastolicMagnitude() { - return this.diastolicMagnitude; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setDiastolicUnits(String diastolicUnits) { - this.diastolicUnits = diastolicUnits; - } + public void setStructuredMeasurementLocation(List structuredMeasurementLocation) { + this.structuredMeasurementLocation = structuredMeasurementLocation; + } - public String getDiastolicUnits() { - return this.diastolicUnits; - } + public List getStructuredMeasurementLocation() { + return this.structuredMeasurementLocation ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setDevice(Cluster device) { + this.device = device; + } - public Language getLanguage() { - return this.language; - } + public Cluster getDevice() { + return this.device ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setExtension(List extension) { + this.extension = extension; + } - public PartyProxy getSubject() { - return this.subject; - } + public List getExtension() { + return this.extension ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setLanguage(Language language) { + this.language = language; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservationContainment.java index 97cb532db..b45856828 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservationContainment.java @@ -7,7 +7,7 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; @@ -18,25 +18,25 @@ public class BloodPressureObservationContainment extends Containment { public SelectAqlField SYSTOLIC_UNITS = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/events[at0006]/data[at0003]/items[at0004]/value|units", "systolicUnits", String.class, this); + public SelectAqlField DIASTOLIC_MAGNITUDE = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/events[at0006]/data[at0003]/items[at0005]/value|magnitude", "diastolicMagnitude", Double.class, this); + + public SelectAqlField DIASTOLIC_UNITS = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/events[at0006]/data[at0003]/items[at0005]/value|units", "diastolicUnits", String.class, this); + public SelectAqlField EXERTION = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/events[at0006]/state[at0007]/items[at1030]", "exertion", Cluster.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/events[at0006]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + public ListSelectAqlField STRUCTURED_MEASUREMENT_LOCATION = new ListAqlFieldImp(BloodPressureObservation.class, "/protocol[at0011]/items[at1057]", "structuredMeasurementLocation", Cluster.class, this); public SelectAqlField DEVICE = new AqlFieldImp(BloodPressureObservation.class, "/protocol[at0011]/items[at1025]", "device", Cluster.class, this); public ListSelectAqlField EXTENSION = new ListAqlFieldImp(BloodPressureObservation.class, "/protocol[at0011]/items[at1058]", "extension", Cluster.class, this); - public SelectAqlField DIASTOLIC_MAGNITUDE = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/events[at0006]/data[at0003]/items[at0005]/value|magnitude", "diastolicMagnitude", Double.class, this); - - public SelectAqlField DIASTOLIC_UNITS = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/events[at0006]/data[at0003]/items[at0005]/value|units", "diastolicUnits", String.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(BloodPressureObservation.class, "/language", "language", Language.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(BloodPressureObservation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/events[at0006]/time|value", "timeValue", TemporalAccessor.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(BloodPressureObservation.class, "/language", "language", Language.class, this); private BloodPressureObservationContainment() { super("openEHR-EHR-OBSERVATION.blood_pressure.v2"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Definingcode7.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BreathingIndicatorDefiningCode.java similarity index 75% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Definingcode7.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BreathingIndicatorDefiningCode.java index ed1043b4a..163f42900 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Definingcode7.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BreathingIndicatorDefiningCode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum Definingcode7 implements EnumValueSet { +public enum BreathingIndicatorDefiningCode implements EnumValueSet { UNABLE_TO_SPEAK_FULL_SENTENCES("Unable to speak full sentences", "Unable to speak in full sentences.", "local", "at0069"), NOISY_BREATHING("Noisy breathing", "Noisy breathing.", "local", "at0067"), @@ -19,7 +19,8 @@ public enum Definingcode7 implements EnumValueSet { private String code; - Definingcode7(String value, String description, String terminologyId, String code) { + BreathingIndicatorDefiningCode(String value, String description, String terminologyId, + String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -27,18 +28,18 @@ public enum Definingcode7 implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServicePlannedDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CareflowStepDefiningCode.java similarity index 65% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServicePlannedDefiningcode.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CareflowStepDefiningCode.java index 758adcd31..4ee4330ba 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServicePlannedDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CareflowStepDefiningCode.java @@ -2,8 +2,8 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum ServicePlannedDefiningcode implements EnumValueSet { - SERVICE_PLANNED("Service planned", "Service request to healthcare provider is planned.", "local", "at0002"); +public enum CareflowStepDefiningCode implements EnumValueSet { + SERVICE_PLANNED("Service planned", "Service request to healthcare provider is planned.", null, "at0002"); private String value; @@ -13,7 +13,7 @@ public enum ServicePlannedDefiningcode implements EnumValueSet { private String code; - ServicePlannedDefiningcode(String value, String description, String terminologyId, String code) { + CareflowStepDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -21,18 +21,18 @@ public enum ServicePlannedDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java index 9dd44fb25..4a8d1188c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -10,70 +11,69 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") public class ChestSymptomCluster { - @Path("/items[at0063]") - private List sign; + @Path("/items[at0001.1]/value|defining_code") + private CodePhrase symptomSignNameDefiningCode; - @Path("/items[at0153]") - private List specificDetails; + @Path("/items[at0147]") + private List structuredBodySite; - @Path("/items[at0001.1]/value|defining_code") - private SymptomSignNameDefiningcode2 symptomSignNameDefiningcode; + @Path("/items[at0153]") + private List specificDetails; - @Path("/items[at0146]") - private List previousEpisodes; + @Path("/items[at0146]") + private List previousEpisodes; - @Path("/items[at0.1]/value|defining_code") - private PresenceDefiningcode presenceDefiningcode; + @Path("/items[at0063]") + private List associatedSymptomSign; - @Path("/items[at0147]") - private List structuredBodySite; + @Path("/items[at0.1 and name/value='Presence']/value|defining_code") + private PresenceDefiningCode presenceDefiningCode; - public void setSign(List sign) { - this.sign = sign; - } + public void setSymptomSignNameDefiningCode(CodePhrase symptomSignNameDefiningCode) { + this.symptomSignNameDefiningCode = symptomSignNameDefiningCode; + } - public List getSign() { - return this.sign; - } + public CodePhrase getSymptomSignNameDefiningCode() { + return this.symptomSignNameDefiningCode ; + } - public void setSpecificDetails(List specificDetails) { - this.specificDetails = specificDetails; - } + public void setStructuredBodySite(List structuredBodySite) { + this.structuredBodySite = structuredBodySite; + } - public List getSpecificDetails() { - return this.specificDetails; - } + public List getStructuredBodySite() { + return this.structuredBodySite ; + } - public void setSymptomSignNameDefiningcode( - SymptomSignNameDefiningcode2 symptomSignNameDefiningcode) { - this.symptomSignNameDefiningcode = symptomSignNameDefiningcode; - } + public void setSpecificDetails(List specificDetails) { + this.specificDetails = specificDetails; + } - public SymptomSignNameDefiningcode2 getSymptomSignNameDefiningcode() { - return this.symptomSignNameDefiningcode; - } + public List getSpecificDetails() { + return this.specificDetails ; + } - public void setPreviousEpisodes(List previousEpisodes) { - this.previousEpisodes = previousEpisodes; - } + public void setPreviousEpisodes(List previousEpisodes) { + this.previousEpisodes = previousEpisodes; + } - public List getPreviousEpisodes() { - return this.previousEpisodes; - } + public List getPreviousEpisodes() { + return this.previousEpisodes ; + } - public void setPresenceDefiningcode(PresenceDefiningcode presenceDefiningcode) { - this.presenceDefiningcode = presenceDefiningcode; - } + public void setAssociatedSymptomSign(List associatedSymptomSign) { + this.associatedSymptomSign = associatedSymptomSign; + } - public PresenceDefiningcode getPresenceDefiningcode() { - return this.presenceDefiningcode; - } + public List getAssociatedSymptomSign() { + return this.associatedSymptomSign ; + } - public void setStructuredBodySite(List structuredBodySite) { - this.structuredBodySite = structuredBodySite; - } + public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { + this.presenceDefiningCode = presenceDefiningCode; + } - public List getStructuredBodySite() { - return this.structuredBodySite; - } + public PresenceDefiningCode getPresenceDefiningCode() { + return this.presenceDefiningCode ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomClusterContainment.java index c8e0515d3..c899af271 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomClusterContainment.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -10,23 +11,23 @@ public class ChestSymptomClusterContainment extends Containment { public SelectAqlField CHEST_SYMPTOM_CLUSTER = new AqlFieldImp(ChestSymptomCluster.class, "", "ChestSymptomCluster", ChestSymptomCluster.class, this); - public ListSelectAqlField SIGN = new ListAqlFieldImp(ChestSymptomCluster.class, "/items[at0063]", "sign", Cluster.class, this); + public SelectAqlField SYMPTOM_SIGN_NAME_DEFINING_CODE = new AqlFieldImp(ChestSymptomCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningCode", CodePhrase.class, this); - public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(ChestSymptomCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); + public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(ChestSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); - public SelectAqlField SYMPTOM_SIGN_NAME_DEFININGCODE = new AqlFieldImp(ChestSymptomCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningcode", SymptomSignNameDefiningcode2.class, this); + public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(ChestSymptomCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); - public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(ChestSymptomCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); + public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(ChestSymptomCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); - public SelectAqlField PRESENCE_DEFININGCODE = new AqlFieldImp(ChestSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningcode", PresenceDefiningcode.class, this); + public ListSelectAqlField ASSOCIATED_SYMPTOM_SIGN = new ListAqlFieldImp(ChestSymptomCluster.class, "/items[at0063]", "associatedSymptomSign", Cluster.class, this); - public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(ChestSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); + public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(ChestSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); - private ChestSymptomClusterContainment() { - super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); - } + private ChestSymptomClusterContainment() { + super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); + } - public static ChestSymptomClusterContainment getInstance() { - return new ChestSymptomClusterContainment(); - } + public static ChestSymptomClusterContainment getInstance() { + return new ChestSymptomClusterContainment(); + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Definingcode6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CirculationIndicatorDefiningCode.java similarity index 68% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Definingcode6.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CirculationIndicatorDefiningCode.java index af1769ae9..b7609bd08 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Definingcode6.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CirculationIndicatorDefiningCode.java @@ -2,12 +2,12 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum Definingcode6 implements EnumValueSet { +public enum CirculationIndicatorDefiningCode implements EnumValueSet { COLDNESS("Coldness", "Coldness.", "local", "at0098"), IMPAIRED_PERFUSION("Impaired perfusion", "Impaired perfusion.", "local", "at0099"), - CLAMMY("Sweaty/clammy", "Sweaty/clammy.", "local", "at0097"), + SWEATY_CLAMMY("Sweaty/clammy", "Sweaty/clammy.", "local", "at0097"), COLOUR_CHANGES_PALE_GREY("Colour changes: pale, grey", "Colour changes: pale, grey.", "local", "at0096"); @@ -19,7 +19,8 @@ public enum Definingcode6 implements EnumValueSet { private String code; - Definingcode6(String value, String description, String terminologyId, String code) { + CirculationIndicatorDefiningCode(String value, String description, String terminologyId, + String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -27,18 +28,18 @@ public enum Definingcode6 implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ClinicalRiskCategoryDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ClinicalRiskCategoryDefiningcode.java index c84b79d0b..31c520746 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ClinicalRiskCategoryDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ClinicalRiskCategoryDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum ClinicalRiskCategoryDefiningcode implements EnumValueSet { +public enum ClinicalRiskCategoryDefiningCode implements EnumValueSet { MEDIUM("Medium", "Key threshold for urgent response.", "local", "at0059"), LOW("Low", "Ward-based response.", "local", "at0057"), @@ -19,8 +19,8 @@ public enum ClinicalRiskCategoryDefiningcode implements EnumValueSet { private String code; - ClinicalRiskCategoryDefiningcode(String value, String description, String terminologyId, - String code) { + ClinicalRiskCategoryDefiningCode(String value, String description, String terminologyId, + String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -28,18 +28,18 @@ public enum ClinicalRiskCategoryDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposureDetailClusterCareHomeHasSuspectedConfirmedCovid19.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposureDetailClusterCareHomeHasSuspectedConfirmedCovid19.java deleted file mode 100644 index 57c9ea513..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposureDetailClusterCareHomeHasSuspectedConfirmedCovid19.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -import java.util.List; - -@Entity -@OptionFor("CLUSTER") -public class Covid19ExposureCovid19ExposureDetailClusterCareHomeHasSuspectedConfirmedCovid19 implements Covid19ExposureDetailChoice { - @Path("") - private List detail; - - public void setDetail(List detail) { - this.detail = detail; - } - - public List getDetail() { - return this.detail; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposureDetailClusterCareHomeHasSuspectedConfirmedCovid192.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposureDetailClusterCareHomeHasSuspectedConfirmedCovid192.java deleted file mode 100644 index e4349a5b2..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposureDetailClusterCareHomeHasSuspectedConfirmedCovid192.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -import java.util.List; - -@Entity -@OptionFor("CLUSTER") -public class Covid19ExposureCovid19ExposureDetailClusterCareHomeHasSuspectedConfirmedCovid192 implements Covid19ExposureDetailChoice { - @Path("") - private List detail; - - public void setDetail(List detail) { - this.detail = detail; - } - - public List getDetail() { - return this.detail; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposurePresenceDvcodedtextCareHomeHasSuspectedConfirmedC_.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposurePresenceDvcodedtextCareHomeHasSuspectedConfirmedC_.java deleted file mode 100644 index dc947094e..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposurePresenceDvcodedtextCareHomeHasSuspectedConfirmedC_.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class Covid19ExposureCovid19ExposurePresenceDvcodedtextCareHomeHasSuspectedConfirmedC_ implements Covid19ExposurePresenceChoice { - @Path("|defining_code") - private PresenceDefiningcodeCareHomeHasSuspectedConfirmedCovid19 presenceDefiningcode; - - public void setPresenceDefiningcode( - PresenceDefiningcodeCareHomeHasSuspectedConfirmedCovid19 presenceDefiningcode) { - this.presenceDefiningcode = presenceDefiningcode; - } - - public PresenceDefiningcodeCareHomeHasSuspectedConfirmedCovid19 getPresenceDefiningcode() { - return this.presenceDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposurePresenceDvcodedtextCareHomeHasSuspectedConfirmedC_2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposurePresenceDvcodedtextCareHomeHasSuspectedConfirmedC_2.java deleted file mode 100644 index eba31b938..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposurePresenceDvcodedtextCareHomeHasSuspectedConfirmedC_2.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class Covid19ExposureCovid19ExposurePresenceDvcodedtextCareHomeHasSuspectedConfirmedC_2 implements Covid19ExposurePresenceChoice { - @Path("|defining_code") - private PresenceDefiningcodeCareHomeHasSuspectedConfirmedCovid19 presenceDefiningcode; - - public void setPresenceDefiningcode( - PresenceDefiningcodeCareHomeHasSuspectedConfirmedCovid19 presenceDefiningcode) { - this.presenceDefiningcode = presenceDefiningcode; - } - - public PresenceDefiningcodeCareHomeHasSuspectedConfirmedCovid19 getPresenceDefiningcode() { - return this.presenceDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposureRiskFactorDvcodedtextCareHomeHasSuspectedConfirme_.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposureRiskFactorDvcodedtextCareHomeHasSuspectedConfirme_.java deleted file mode 100644 index 567947833..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposureRiskFactorDvcodedtextCareHomeHasSuspectedConfirme_.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class Covid19ExposureCovid19ExposureRiskFactorDvcodedtextCareHomeHasSuspectedConfirme_ implements Covid19ExposureRiskFactorChoice { - @Path("|defining_code") - private RiskFactorDefiningcodeContactWithConfirmedCase riskFactorDefiningcode; - - public void setRiskFactorDefiningcode( - RiskFactorDefiningcodeContactWithConfirmedCase riskFactorDefiningcode) { - this.riskFactorDefiningcode = riskFactorDefiningcode; - } - - public RiskFactorDefiningcodeContactWithConfirmedCase getRiskFactorDefiningcode() { - return this.riskFactorDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposureRiskFactorDvcodedtextCareHomeHasSuspectedConfirme_2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposureRiskFactorDvcodedtextCareHomeHasSuspectedConfirme_2.java deleted file mode 100644 index 940043fa4..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureCovid19ExposureRiskFactorDvcodedtextCareHomeHasSuspectedConfirme_2.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class Covid19ExposureCovid19ExposureRiskFactorDvcodedtextCareHomeHasSuspectedConfirme_2 implements Covid19ExposureRiskFactorChoice { - @Path("|defining_code") - private RiskFactorDefiningcodeOtherResidentsHouseholdMembersUnwell riskFactorDefiningcode; - - public void setRiskFactorDefiningcode( - RiskFactorDefiningcodeOtherResidentsHouseholdMembersUnwell riskFactorDefiningcode) { - this.riskFactorDefiningcode = riskFactorDefiningcode; - } - - public RiskFactorDefiningcodeOtherResidentsHouseholdMembersUnwell getRiskFactorDefiningcode() { - return this.riskFactorDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureDetailChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureDetailChoice.java deleted file mode 100644 index a77f2ff3b..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureDetailChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -public interface Covid19ExposureDetailChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureDetailCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureDetailCluster.java deleted file mode 100644 index d8d318030..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureDetailCluster.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -import java.util.List; - -@Entity -@OptionFor("CLUSTER") -public class Covid19ExposureDetailCluster implements Covid19ExposureDetailChoice { - @Path("") - private List detail; - - public void setDetail(List detail) { - this.detail = detail; - } - - public List getDetail() { - return this.detail; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java index 4c38d254b..970b8e825 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java @@ -3,104 +3,168 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; 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.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.util.List; @Entity @Archetype("openEHR-EHR-EVALUATION.health_risk-covid.v0") public class Covid19ExposureEvaluation { - @Path("/data[at0001]/items[at0016]/items[at0013.1]/value") - @Choice - private Covid19ExposureRiskFactorChoice riskFactor; + @Path("/data[at0001]/items[at0002.1]/value|defining_code") + private HealthRiskDefiningCode healthRiskDefiningCode; - @Path("/data[at0001]/items[at0016]/items[at0027.1]") - @Choice - private Covid19ExposureDetailChoice detail; + @Path("/data[at0001]/items[at0016 and name/value='Care home has suspected/confirmed Covid-19']/items[at0013.1]/value|defining_code") + private RiskFactorDefiningCode riskFactorDefiningCode; - @Path("/data[at0001]/items[at0002.1]/value|defining_code") - private HealthRiskDefiningcode healthRiskDefiningcode; + @Path("/data[at0001]/items[at0016 and name/value='Care home has suspected/confirmed Covid-19']/items[at0017.1]/value|defining_code") + private PresenceDefiningCode2 presenceDefiningCode; - @Path("/protocol[at0010]/items[at0011]") - private List extension; + @Path("/data[at0001]/items[at0016 and name/value='Care home has suspected/confirmed Covid-19']/items[at0027.1]") + private List careHomeHasSuspectedConfirmedCovid19Detail; - @Path("/language") - private Language language; + @Path("/data[at0001]/items[at0016 and name/value='Contact with confirmed case']/items[at0013.1]/value|defining_code") + private RiskFactorDefiningCode2 riskFactorDefiningCode2; - @Path("/subject") - private PartyProxy subject; + @Path("/data[at0001]/items[at0016 and name/value='Contact with confirmed case']/items[at0017.1]/value|defining_code") + private PresenceDefiningCode2 presenceDefiningCode2; - @Path("/data[at0001]/items[at0003.1]/value|defining_code") - private RiskAssessmentDefiningcode riskAssessmentDefiningcode; + @Path("/data[at0001]/items[at0016 and name/value='Contact with confirmed case']/items[at0027.1]") + private List contactWithConfirmedCaseDetail; - @Path("/data[at0001]/items[at0016]/items[at0017.1]/value") - @Choice - private Covid19ExposurePresenceChoice presence; + @Path("/data[at0001]/items[at0016 and name/value='Other residents/household members unwell']/items[at0013.1]/value|defining_code") + private RiskFactorDefiningCode3 riskFactorDefiningCode3; - public void setRiskFactor(Covid19ExposureRiskFactorChoice riskFactor) { - this.riskFactor = riskFactor; - } + @Path("/data[at0001]/items[at0016 and name/value='Other residents/household members unwell']/items[at0017.1]/value|defining_code") + private PresenceDefiningCode2 presenceDefiningCode3; - public Covid19ExposureRiskFactorChoice getRiskFactor() { - return this.riskFactor; - } + @Path("/data[at0001]/items[at0016 and name/value='Other residents/household members unwell']/items[at0027.1]") + private List otherResidentsHouseholdMembersUnwellDetail; - public void setDetail(Covid19ExposureDetailChoice detail) { - this.detail = detail; - } + @Path("/data[at0001]/items[at0003.1]/value|defining_code") + private RiskAssessmentDefiningCode riskAssessmentDefiningCode; - public Covid19ExposureDetailChoice getDetail() { - return this.detail; - } + @Path("/protocol[at0010]/items[at0011]") + private List extension; - public void setHealthRiskDefiningcode(HealthRiskDefiningcode healthRiskDefiningcode) { - this.healthRiskDefiningcode = healthRiskDefiningcode; - } + @Path("/subject") + private PartyProxy subject; - public HealthRiskDefiningcode getHealthRiskDefiningcode() { - return this.healthRiskDefiningcode; - } + @Path("/language") + private Language language; - public void setExtension(List extension) { - this.extension = extension; - } + public void setHealthRiskDefiningCode(HealthRiskDefiningCode healthRiskDefiningCode) { + this.healthRiskDefiningCode = healthRiskDefiningCode; + } - public List getExtension() { - return this.extension; - } + public HealthRiskDefiningCode getHealthRiskDefiningCode() { + return this.healthRiskDefiningCode ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setRiskFactorDefiningCode(RiskFactorDefiningCode riskFactorDefiningCode) { + this.riskFactorDefiningCode = riskFactorDefiningCode; + } - public Language getLanguage() { - return this.language; - } + public RiskFactorDefiningCode getRiskFactorDefiningCode() { + return this.riskFactorDefiningCode ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setPresenceDefiningCode(PresenceDefiningCode2 presenceDefiningCode) { + this.presenceDefiningCode = presenceDefiningCode; + } - public PartyProxy getSubject() { - return this.subject; - } + public PresenceDefiningCode2 getPresenceDefiningCode() { + return this.presenceDefiningCode ; + } - public void setRiskAssessmentDefiningcode(RiskAssessmentDefiningcode riskAssessmentDefiningcode) { - this.riskAssessmentDefiningcode = riskAssessmentDefiningcode; - } + public void setCareHomeHasSuspectedConfirmedCovid19Detail( + List careHomeHasSuspectedConfirmedCovid19Detail) { + this.careHomeHasSuspectedConfirmedCovid19Detail = careHomeHasSuspectedConfirmedCovid19Detail; + } - public RiskAssessmentDefiningcode getRiskAssessmentDefiningcode() { - return this.riskAssessmentDefiningcode; - } + public List getCareHomeHasSuspectedConfirmedCovid19Detail() { + return this.careHomeHasSuspectedConfirmedCovid19Detail ; + } - public void setPresence(Covid19ExposurePresenceChoice presence) { - this.presence = presence; - } + public void setRiskFactorDefiningCode2(RiskFactorDefiningCode2 riskFactorDefiningCode2) { + this.riskFactorDefiningCode2 = riskFactorDefiningCode2; + } - public Covid19ExposurePresenceChoice getPresence() { - return this.presence; - } + public RiskFactorDefiningCode2 getRiskFactorDefiningCode2() { + return this.riskFactorDefiningCode2 ; + } + + public void setPresenceDefiningCode2(PresenceDefiningCode2 presenceDefiningCode2) { + this.presenceDefiningCode2 = presenceDefiningCode2; + } + + public PresenceDefiningCode2 getPresenceDefiningCode2() { + return this.presenceDefiningCode2 ; + } + + public void setContactWithConfirmedCaseDetail(List contactWithConfirmedCaseDetail) { + this.contactWithConfirmedCaseDetail = contactWithConfirmedCaseDetail; + } + + public List getContactWithConfirmedCaseDetail() { + return this.contactWithConfirmedCaseDetail ; + } + + public void setRiskFactorDefiningCode3(RiskFactorDefiningCode3 riskFactorDefiningCode3) { + this.riskFactorDefiningCode3 = riskFactorDefiningCode3; + } + + public RiskFactorDefiningCode3 getRiskFactorDefiningCode3() { + return this.riskFactorDefiningCode3 ; + } + + public void setPresenceDefiningCode3(PresenceDefiningCode2 presenceDefiningCode3) { + this.presenceDefiningCode3 = presenceDefiningCode3; + } + + public PresenceDefiningCode2 getPresenceDefiningCode3() { + return this.presenceDefiningCode3 ; + } + + public void setOtherResidentsHouseholdMembersUnwellDetail( + List otherResidentsHouseholdMembersUnwellDetail) { + this.otherResidentsHouseholdMembersUnwellDetail = otherResidentsHouseholdMembersUnwellDetail; + } + + public List getOtherResidentsHouseholdMembersUnwellDetail() { + return this.otherResidentsHouseholdMembersUnwellDetail ; + } + + public void setRiskAssessmentDefiningCode(RiskAssessmentDefiningCode riskAssessmentDefiningCode) { + this.riskAssessmentDefiningCode = riskAssessmentDefiningCode; + } + + public RiskAssessmentDefiningCode getRiskAssessmentDefiningCode() { + return this.riskAssessmentDefiningCode ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluationContainment.java index 264411b2e..90021c0a1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluationContainment.java @@ -7,32 +7,44 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; public class Covid19ExposureEvaluationContainment extends Containment { public SelectAqlField COVID19_EXPOSURE_EVALUATION = new AqlFieldImp(Covid19ExposureEvaluation.class, "", "Covid19ExposureEvaluation", Covid19ExposureEvaluation.class, this); - public SelectAqlField RISK_FACTOR = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0013.1]/value", "riskFactor", Covid19ExposureRiskFactorChoice.class, this); + public SelectAqlField HEALTH_RISK_DEFINING_CODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0002.1]/value|defining_code", "healthRiskDefiningCode", HealthRiskDefiningCode.class, this); - public SelectAqlField DETAIL = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0027.1]", "detail", Covid19ExposureDetailChoice.class, this); + public SelectAqlField RISK_FACTOR_DEFINING_CODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0013.1]/value|defining_code", "riskFactorDefiningCode", RiskFactorDefiningCode.class, this); - public SelectAqlField HEALTH_RISK_DEFININGCODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0002.1]/value|defining_code", "healthRiskDefiningcode", HealthRiskDefiningcode.class, this); + public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0017.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode2.class, this); - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(Covid19ExposureEvaluation.class, "/protocol[at0010]/items[at0011]", "extension", Cluster.class, this); + public ListSelectAqlField CARE_HOME_HAS_SUSPECTED_CONFIRMED_COVID19_DETAIL = new ListAqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0027.1]", "careHomeHasSuspectedConfirmedCovid19Detail", Cluster.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField RISK_FACTOR_DEFINING_CODE2 = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0013.1]/value|defining_code", "riskFactorDefiningCode2", RiskFactorDefiningCode2.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(Covid19ExposureEvaluation.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField PRESENCE_DEFINING_CODE2 = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0017.1]/value|defining_code", "presenceDefiningCode2", PresenceDefiningCode2.class, this); - public SelectAqlField RISK_ASSESSMENT_DEFININGCODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0003.1]/value|defining_code", "riskAssessmentDefiningcode", RiskAssessmentDefiningcode.class, this); + public ListSelectAqlField CONTACT_WITH_CONFIRMED_CASE_DETAIL = new ListAqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0027.1]", "contactWithConfirmedCaseDetail", Cluster.class, this); - public SelectAqlField PRESENCE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0017.1]/value", "presence", Covid19ExposurePresenceChoice.class, this); + public SelectAqlField RISK_FACTOR_DEFINING_CODE3 = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0013.1]/value|defining_code", "riskFactorDefiningCode3", RiskFactorDefiningCode3.class, this); - private Covid19ExposureEvaluationContainment() { - super("openEHR-EHR-EVALUATION.health_risk-covid.v0"); - } + public SelectAqlField PRESENCE_DEFINING_CODE3 = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0017.1]/value|defining_code", "presenceDefiningCode3", PresenceDefiningCode2.class, this); - public static Covid19ExposureEvaluationContainment getInstance() { - return new Covid19ExposureEvaluationContainment(); - } + public ListSelectAqlField OTHER_RESIDENTS_HOUSEHOLD_MEMBERS_UNWELL_DETAIL = new ListAqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0027.1]", "otherResidentsHouseholdMembersUnwellDetail", Cluster.class, this); + + public SelectAqlField RISK_ASSESSMENT_DEFINING_CODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0003.1]/value|defining_code", "riskAssessmentDefiningCode", RiskAssessmentDefiningCode.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(Covid19ExposureEvaluation.class, "/protocol[at0010]/items[at0011]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(Covid19ExposureEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/language", "language", Language.class, this); + + private Covid19ExposureEvaluationContainment() { + super("openEHR-EHR-EVALUATION.health_risk-covid.v0"); + } + + public static Covid19ExposureEvaluationContainment getInstance() { + return new Covid19ExposureEvaluationContainment(); + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposurePresenceChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposurePresenceChoice.java deleted file mode 100644 index dc26a23e0..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposurePresenceChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -public interface Covid19ExposurePresenceChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposurePresenceDvcodedtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposurePresenceDvcodedtext.java deleted file mode 100644 index e5f2d789d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposurePresenceDvcodedtext.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class Covid19ExposurePresenceDvcodedtext implements Covid19ExposurePresenceChoice { - @Path("|defining_code") - private PresenceDefiningcodeCareHomeHasSuspectedConfirmedCovid19 presenceDefiningcode; - - public void setPresenceDefiningcode( - PresenceDefiningcodeCareHomeHasSuspectedConfirmedCovid19 presenceDefiningcode) { - this.presenceDefiningcode = presenceDefiningcode; - } - - public PresenceDefiningcodeCareHomeHasSuspectedConfirmedCovid19 getPresenceDefiningcode() { - return this.presenceDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureRiskFactorChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureRiskFactorChoice.java deleted file mode 100644 index 4e27c9d31..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureRiskFactorChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -public interface Covid19ExposureRiskFactorChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureRiskFactorDvcodedtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureRiskFactorDvcodedtext.java deleted file mode 100644 index d0fe19181..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureRiskFactorDvcodedtext.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class Covid19ExposureRiskFactorDvcodedtext implements Covid19ExposureRiskFactorChoice { - @Path("|defining_code") - private RiskFactorDefiningcode riskFactorDefiningcode; - - public void setRiskFactorDefiningcode(RiskFactorDefiningcode riskFactorDefiningcode) { - this.riskFactorDefiningcode = riskFactorDefiningcode; - } - - public RiskFactorDefiningcode getRiskFactorDefiningcode() { - return this.riskFactorDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java index b56764e65..975e6605f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java @@ -5,54 +5,54 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.util.List; @Entity @Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") public class CovidNotesEvaluation { - @Path("/subject") - private PartyProxy subject; + @Path("/data[at0001]/items[at0002]/value|value") + private String synopsisValue; - @Path("/data[at0001]/items[at0002]/value|value") - private String synopsisValue; + @Path("/protocol[at0003]/items[at0004]") + private List extension; - @Path("/language") - private Language language; + @Path("/subject") + private PartyProxy subject; - @Path("/protocol[at0003]/items[at0004]") - private List extension; + @Path("/language") + private Language language; - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setSynopsisValue(String synopsisValue) { + this.synopsisValue = synopsisValue; + } - public PartyProxy getSubject() { - return this.subject; - } + public String getSynopsisValue() { + return this.synopsisValue ; + } - public void setSynopsisValue(String synopsisValue) { - this.synopsisValue = synopsisValue; - } + public void setExtension(List extension) { + this.extension = extension; + } - public String getSynopsisValue() { - return this.synopsisValue; - } + public List getExtension() { + return this.extension ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public Language getLanguage() { - return this.language; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setExtension(List extension) { - this.extension = extension; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getExtension() { - return this.extension; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluationContainment.java index 513b94cc0..d906cba3d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluationContainment.java @@ -7,19 +7,19 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; public class CovidNotesEvaluationContainment extends Containment { public SelectAqlField COVID_NOTES_EVALUATION = new AqlFieldImp(CovidNotesEvaluation.class, "", "CovidNotesEvaluation", CovidNotesEvaluation.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(CovidNotesEvaluation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField SYNOPSIS_VALUE = new AqlFieldImp(CovidNotesEvaluation.class, "/data[at0001]/items[at0002]/value|value", "synopsisValue", String.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(CovidNotesEvaluation.class, "/language", "language", Language.class, this); - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(CovidNotesEvaluation.class, "/protocol[at0003]/items[at0004]", "extension", Cluster.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(CovidNotesEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(CovidNotesEvaluation.class, "/language", "language", Language.class, this); + private CovidNotesEvaluationContainment() { super("openEHR-EHR-EVALUATION.clinical_synopsis.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java index 7da421bed..da4c76b4a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java @@ -7,47 +7,47 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class CovidSection { - @Path("/items[openEHR-EHR-OBSERVATION.story.v1 and name/value='Covid symptoms']") - private CovidSymptomsObservation covidSymptoms; + @Path("/items[openEHR-EHR-OBSERVATION.story.v1 and name/value='Covid symptoms']") + private CovidSymptomsObservation covidSymptoms; - @Path("/items[openEHR-EHR-OBSERVATION.laboratory_test_result.v1 and name/value='Latest Covid-19 test']") - private LatestCovid19TestObservation latestCovid19Test; + @Path("/items[openEHR-EHR-EVALUATION.health_risk-covid.v0 and name/value='Covid-19 exposure']") + private Covid19ExposureEvaluation covid19Exposure; - @Path("/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Covid notes']") - private CovidNotesEvaluation covidNotes; + @Path("/items[openEHR-EHR-OBSERVATION.laboratory_test_result.v1 and name/value='Latest Covid-19 test']") + private LatestCovid19TestObservation latestCovid19Test; - @Path("/items[openEHR-EHR-EVALUATION.health_risk-covid.v0 and name/value='Covid-19 exposure']") - private Covid19ExposureEvaluation covid19Exposure; + @Path("/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Covid notes']") + private CovidNotesEvaluation covidNotes; - public void setCovidSymptoms(CovidSymptomsObservation covidSymptoms) { - this.covidSymptoms = covidSymptoms; - } + public void setCovidSymptoms(CovidSymptomsObservation covidSymptoms) { + this.covidSymptoms = covidSymptoms; + } - public CovidSymptomsObservation getCovidSymptoms() { - return this.covidSymptoms; - } + public CovidSymptomsObservation getCovidSymptoms() { + return this.covidSymptoms ; + } - public void setLatestCovid19Test(LatestCovid19TestObservation latestCovid19Test) { - this.latestCovid19Test = latestCovid19Test; - } + public void setCovid19Exposure(Covid19ExposureEvaluation covid19Exposure) { + this.covid19Exposure = covid19Exposure; + } - public LatestCovid19TestObservation getLatestCovid19Test() { - return this.latestCovid19Test; - } + public Covid19ExposureEvaluation getCovid19Exposure() { + return this.covid19Exposure ; + } - public void setCovidNotes(CovidNotesEvaluation covidNotes) { - this.covidNotes = covidNotes; - } + public void setLatestCovid19Test(LatestCovid19TestObservation latestCovid19Test) { + this.latestCovid19Test = latestCovid19Test; + } - public CovidNotesEvaluation getCovidNotes() { - return this.covidNotes; - } + public LatestCovid19TestObservation getLatestCovid19Test() { + return this.latestCovid19Test ; + } - public void setCovid19Exposure(Covid19ExposureEvaluation covid19Exposure) { - this.covid19Exposure = covid19Exposure; - } + public void setCovidNotes(CovidNotesEvaluation covidNotes) { + this.covidNotes = covidNotes; + } - public Covid19ExposureEvaluation getCovid19Exposure() { - return this.covid19Exposure; - } + public CovidNotesEvaluation getCovidNotes() { + return this.covidNotes ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSectionContainment.java index 32f22d826..8449d844e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSectionContainment.java @@ -5,21 +5,21 @@ import org.ehrbase.client.aql.field.SelectAqlField; public class CovidSectionContainment extends Containment { - public SelectAqlField COVID_SECTION = new AqlFieldImp(CovidSection.class, "", "CovidSection", CovidSection.class, this); + public SelectAqlField COVID_SECTION = new AqlFieldImp(CovidSection.class, "", "CovidSection", CovidSection.class, this); - public SelectAqlField COVID_SYMPTOMS = new AqlFieldImp(CovidSection.class, "/items[openEHR-EHR-OBSERVATION.story.v1 and name/value='Covid symptoms']", "covidSymptoms", CovidSymptomsObservation.class, this); + public SelectAqlField COVID_SYMPTOMS = new AqlFieldImp(CovidSection.class, "/items[openEHR-EHR-OBSERVATION.story.v1]", "covidSymptoms", CovidSymptomsObservation.class, this); - public SelectAqlField LATEST_COVID19_TEST = new AqlFieldImp(CovidSection.class, "/items[openEHR-EHR-OBSERVATION.laboratory_test_result.v1 and name/value='Latest Covid-19 test']", "latestCovid19Test", LatestCovid19TestObservation.class, this); + public SelectAqlField COVID19_EXPOSURE = new AqlFieldImp(CovidSection.class, "/items[openEHR-EHR-EVALUATION.health_risk-covid.v0]", "covid19Exposure", Covid19ExposureEvaluation.class, this); - public SelectAqlField COVID_NOTES = new AqlFieldImp(CovidSection.class, "/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Covid notes']", "covidNotes", CovidNotesEvaluation.class, this); + public SelectAqlField LATEST_COVID19_TEST = new AqlFieldImp(CovidSection.class, "/items[openEHR-EHR-OBSERVATION.laboratory_test_result.v1]", "latestCovid19Test", LatestCovid19TestObservation.class, this); - public SelectAqlField COVID19_EXPOSURE = new AqlFieldImp(CovidSection.class, "/items[openEHR-EHR-EVALUATION.health_risk-covid.v0 and name/value='Covid-19 exposure']", "covid19Exposure", Covid19ExposureEvaluation.class, this); + public SelectAqlField COVID_NOTES = new AqlFieldImp(CovidSection.class, "/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1]", "covidNotes", CovidNotesEvaluation.class, this); - private CovidSectionContainment() { - super("openEHR-EHR-SECTION.adhoc.v1"); - } + private CovidSectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } - public static CovidSectionContainment getInstance() { - return new CovidSectionContainment(); - } + public static CovidSectionContainment getInstance() { + return new CovidSectionContainment(); + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java index 95e68fd16..b8faf7853 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,135 +13,135 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.story.v1") public class CovidSymptomsObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value") - private String storyValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value") + private String storyValue; - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='First symptoms']") + private FirstSymptomsCluster firstSymptoms; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Other symptom']") - private List otherSymptom; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Key Covid symptom']") + private List keyCovidSymptom; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Neuro symptom']") - private List neuroSymptom; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Chest symptom']") + private List chestSymptom; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Chest symptom']") - private List chestSymptom; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Abdomen symptom']") + private List abdomenSymptom; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Neuro symptom']") + private List neuroSymptom; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Key Covid symptom']") - private List keyCovidSymptom; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Other symptom']") + private List otherSymptom; - @Path("/subject") - private PartyProxy subject; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Abdomen symptom']") - private List abdomenSymptom; + @Path("/protocol[at0007]/items[at0008]") + private List extension; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='First symptoms']") - private FirstSymptomsCluster firstSymptoms; + @Path("/subject") + private PartyProxy subject; - @Path("/protocol[at0007]/items[at0008]") - private List extension; + @Path("/language") + private Language language; - public void setStoryValue(String storyValue) { - this.storyValue = storyValue; - } + public void setStoryValue(String storyValue) { + this.storyValue = storyValue; + } - public String getStoryValue() { - return this.storyValue; - } + public String getStoryValue() { + return this.storyValue ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setFirstSymptoms(FirstSymptomsCluster firstSymptoms) { + this.firstSymptoms = firstSymptoms; + } - public Language getLanguage() { - return this.language; - } + public FirstSymptomsCluster getFirstSymptoms() { + return this.firstSymptoms ; + } - public void setOtherSymptom(List otherSymptom) { - this.otherSymptom = otherSymptom; - } + public void setKeyCovidSymptom(List keyCovidSymptom) { + this.keyCovidSymptom = keyCovidSymptom; + } - public List getOtherSymptom() { - return this.otherSymptom; - } + public List getKeyCovidSymptom() { + return this.keyCovidSymptom ; + } - public void setNeuroSymptom(List neuroSymptom) { - this.neuroSymptom = neuroSymptom; - } + public void setChestSymptom(List chestSymptom) { + this.chestSymptom = chestSymptom; + } - public List getNeuroSymptom() { - return this.neuroSymptom; - } + public List getChestSymptom() { + return this.chestSymptom ; + } - public void setChestSymptom(List chestSymptom) { - this.chestSymptom = chestSymptom; - } + public void setAbdomenSymptom(List abdomenSymptom) { + this.abdomenSymptom = abdomenSymptom; + } - public List getChestSymptom() { - return this.chestSymptom; - } + public List getAbdomenSymptom() { + return this.abdomenSymptom ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setNeuroSymptom(List neuroSymptom) { + this.neuroSymptom = neuroSymptom; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public List getNeuroSymptom() { + return this.neuroSymptom ; + } - public void setKeyCovidSymptom(List keyCovidSymptom) { - this.keyCovidSymptom = keyCovidSymptom; - } + public void setOtherSymptom(List otherSymptom) { + this.otherSymptom = otherSymptom; + } - public List getKeyCovidSymptom() { - return this.keyCovidSymptom; - } + public List getOtherSymptom() { + return this.otherSymptom ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public PartyProxy getSubject() { - return this.subject; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setAbdomenSymptom(List abdomenSymptom) { - this.abdomenSymptom = abdomenSymptom; - } + public void setExtension(List extension) { + this.extension = extension; + } - public List getAbdomenSymptom() { - return this.abdomenSymptom; - } + public List getExtension() { + return this.extension ; + } - public void setFirstSymptoms(FirstSymptomsCluster firstSymptoms) { - this.firstSymptoms = firstSymptoms; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public FirstSymptomsCluster getFirstSymptoms() { - return this.firstSymptoms; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setExtension(List extension) { - this.extension = extension; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getExtension() { - return this.extension; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservationContainment.java index 65cfceccc..2916d591c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservationContainment.java @@ -7,7 +7,7 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; @@ -16,27 +16,27 @@ public class CovidSymptomsObservationContainment extends Containment { public SelectAqlField STORY_VALUE = new AqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value", "storyValue", String.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(CovidSymptomsObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FIRST_SYMPTOMS = new AqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0]", "firstSymptoms", FirstSymptomsCluster.class, this); - public ListSelectAqlField OTHER_SYMPTOM = new ListAqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Other symptom']", "otherSymptom", OtherSymptomCluster.class, this); + public ListSelectAqlField KEY_COVID_SYMPTOM = new ListAqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0]", "keyCovidSymptom", KeyCovidSymptomCluster.class, this); - public ListSelectAqlField NEURO_SYMPTOM = new ListAqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Neuro symptom']", "neuroSymptom", NeuroSymptomCluster.class, this); + public ListSelectAqlField CHEST_SYMPTOM = new ListAqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0]", "chestSymptom", ChestSymptomCluster.class, this); - public ListSelectAqlField CHEST_SYMPTOM = new ListAqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Chest symptom']", "chestSymptom", ChestSymptomCluster.class, this); + public ListSelectAqlField ABDOMEN_SYMPTOM = new ListAqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0]", "abdomenSymptom", AbdomenSymptomCluster.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + public ListSelectAqlField NEURO_SYMPTOM = new ListAqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0]", "neuroSymptom", NeuroSymptomCluster.class, this); - public ListSelectAqlField KEY_COVID_SYMPTOM = new ListAqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Key Covid symptom']", "keyCovidSymptom", KeyCovidSymptomCluster.class, this); + public ListSelectAqlField OTHER_SYMPTOM = new ListAqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0]", "otherSymptom", OtherSymptomCluster.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(CovidSymptomsObservation.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public ListSelectAqlField ABDOMEN_SYMPTOM = new ListAqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Abdomen symptom']", "abdomenSymptom", AbdomenSymptomCluster.class, this); + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(CovidSymptomsObservation.class, "/protocol[at0007]/items[at0008]", "extension", Cluster.class, this); - public SelectAqlField FIRST_SYMPTOMS = new AqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='First symptoms']", "firstSymptoms", FirstSymptomsCluster.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(CovidSymptomsObservation.class, "/subject", "subject", PartyProxy.class, this); - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(CovidSymptomsObservation.class, "/protocol[at0007]/items[at0008]", "extension", Cluster.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(CovidSymptomsObservation.class, "/language", "language", Language.class, this); private CovidSymptomsObservationContainment() { super("openEHR-EHR-OBSERVATION.story.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode8.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CurrentStateDefiningCode.java similarity index 62% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode8.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CurrentStateDefiningCode.java index 962c55c7e..be31724bf 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode8.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CurrentStateDefiningCode.java @@ -2,8 +2,8 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum ValueDefiningcode8 implements EnumValueSet { - RIGORS("Rigors", "Rigors.", "local", "at0100"); +public enum CurrentStateDefiningCode implements EnumValueSet { + PLANNED("planned", "planned", null, "526"); private String value; @@ -13,7 +13,7 @@ public enum ValueDefiningcode8 implements EnumValueSet { private String code; - ValueDefiningcode8(String value, String description, String terminologyId, String code) { + CurrentStateDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -21,18 +21,18 @@ public enum ValueDefiningcode8 implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Definingcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Definingcode.java deleted file mode 100644 index 460a1eb14..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Definingcode.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum Definingcode implements EnumValueSet { - N840544004("840544004", "840544004", "SNOMED-CT", "840544004"), - - N840539006("840539006", "840539006", "SNOMED-CT", "840539006"), - - N840546002("840546002", "840546002", "SNOMED-CT", "840546002"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - Definingcode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java index d789a853f..8a0fbe296 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java @@ -6,15 +6,15 @@ @Entity public class DenwisAgitationIndicatorElement { - @Path("/value") - @Choice - private DenwisChoice3 value; + @Path("/value") + @Choice + private DenwisValueChoice2 value; - public void setValue(DenwisChoice3 value) { - this.value = value; - } + public void setValue(DenwisValueChoice2 value) { + this.value = value; + } - public DenwisChoice3 getValue() { - return this.value; - } + public DenwisValueChoice2 getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java index 5e7e5d701..196ef822a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java @@ -5,14 +5,14 @@ @Entity public class DenwisBreathingIndicatorElement { - @Path("/value|defining_code") - private Definingcode7 definingcode; + @Path("/value|defining_code") + private BreathingIndicatorDefiningCode value; - public void setDefiningcode(Definingcode7 definingcode) { - this.definingcode = definingcode; - } + public void setValue(BreathingIndicatorDefiningCode value) { + this.value = value; + } - public Definingcode7 getDefiningcode() { - return this.definingcode; - } + public BreathingIndicatorDefiningCode getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice5.java deleted file mode 100644 index b0d51900b..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice5.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -public interface DenwisChoice5 { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice6.java deleted file mode 100644 index d74b5cb2f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice6.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -public interface DenwisChoice6 { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice7.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice7.java deleted file mode 100644 index 0989723b2..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice7.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -public interface DenwisChoice7 { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java index d2e83aa7d..4f9dd4bd5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java @@ -5,14 +5,14 @@ @Entity public class DenwisCirculationIndicatorElement { - @Path("/value|defining_code") - private Definingcode6 definingcode; + @Path("/value|defining_code") + private CirculationIndicatorDefiningCode value; - public void setDefiningcode(Definingcode6 definingcode) { - this.definingcode = definingcode; - } + public void setValue(CirculationIndicatorDefiningCode value) { + this.value = value; + } - public Definingcode6 getDefiningcode() { - return this.definingcode; - } + public CirculationIndicatorDefiningCode getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext.java deleted file mode 100644 index 93eac161c..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class DenwisDvcodedtext implements DenwisChoice { - @Path("|defining_code") - private ValueDefiningcode2 valueDefiningcode; - - public void setValueDefiningcode(ValueDefiningcode2 valueDefiningcode) { - this.valueDefiningcode = valueDefiningcode; - } - - public ValueDefiningcode2 getValueDefiningcode() { - return this.valueDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext2.java deleted file mode 100644 index 63712e488..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext2.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class DenwisDvcodedtext2 implements DenwisChoice2 { - @Path("|defining_code") - private ValueDefiningcode3 valueDefiningcode; - - public void setValueDefiningcode(ValueDefiningcode3 valueDefiningcode) { - this.valueDefiningcode = valueDefiningcode; - } - - public ValueDefiningcode3 getValueDefiningcode() { - return this.valueDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext3.java deleted file mode 100644 index 358129f87..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext3.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class DenwisDvcodedtext3 implements DenwisChoice3 { - @Path("|defining_code") - private ValueDefiningcode4 valueDefiningcode; - - public void setValueDefiningcode(ValueDefiningcode4 valueDefiningcode) { - this.valueDefiningcode = valueDefiningcode; - } - - public ValueDefiningcode4 getValueDefiningcode() { - return this.valueDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext4.java deleted file mode 100644 index 92b5caece..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext4.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class DenwisDvcodedtext4 implements DenwisChoice4 { - @Path("|defining_code") - private ValueDefiningcode5 valueDefiningcode; - - public void setValueDefiningcode(ValueDefiningcode5 valueDefiningcode) { - this.valueDefiningcode = valueDefiningcode; - } - - public ValueDefiningcode5 getValueDefiningcode() { - return this.valueDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext5.java deleted file mode 100644 index f1e81bfb3..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext5.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class DenwisDvcodedtext5 implements DenwisChoice5 { - @Path("|defining_code") - private ValueDefiningcode6 valueDefiningcode; - - public void setValueDefiningcode(ValueDefiningcode6 valueDefiningcode) { - this.valueDefiningcode = valueDefiningcode; - } - - public ValueDefiningcode6 getValueDefiningcode() { - return this.valueDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext6.java deleted file mode 100644 index 5479932fe..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext6.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class DenwisDvcodedtext6 implements DenwisChoice6 { - @Path("|defining_code") - private ValueDefiningcode7 valueDefiningcode; - - public void setValueDefiningcode(ValueDefiningcode7 valueDefiningcode) { - this.valueDefiningcode = valueDefiningcode; - } - - public ValueDefiningcode7 getValueDefiningcode() { - return this.valueDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext7.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext7.java deleted file mode 100644 index eeea7a321..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvcodedtext7.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class DenwisDvcodedtext7 implements DenwisChoice7 { - @Path("|defining_code") - private ValueDefiningcode8 valueDefiningcode; - - public void setValueDefiningcode(ValueDefiningcode8 valueDefiningcode) { - this.valueDefiningcode = valueDefiningcode; - } - - public ValueDefiningcode8 getValueDefiningcode() { - return this.valueDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext.java deleted file mode 100644 index e012f9436..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class DenwisDvtext implements DenwisChoice { - @Path("|value") - private String valueValue; - - public void setValueValue(String valueValue) { - this.valueValue = valueValue; - } - - public String getValueValue() { - return this.valueValue; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext2.java deleted file mode 100644 index 1d5e6f371..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext2.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class DenwisDvtext2 implements DenwisChoice2 { - @Path("|value") - private String valueValue; - - public void setValueValue(String valueValue) { - this.valueValue = valueValue; - } - - public String getValueValue() { - return this.valueValue; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext3.java deleted file mode 100644 index 94a3f920a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext3.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class DenwisDvtext3 implements DenwisChoice3 { - @Path("|value") - private String valueValue; - - public void setValueValue(String valueValue) { - this.valueValue = valueValue; - } - - public String getValueValue() { - return this.valueValue; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext4.java deleted file mode 100644 index 2dbf9cf27..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext4.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class DenwisDvtext4 implements DenwisChoice4 { - @Path("|value") - private String valueValue; - - public void setValueValue(String valueValue) { - this.valueValue = valueValue; - } - - public String getValueValue() { - return this.valueValue; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext5.java deleted file mode 100644 index 78a69c21c..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext5.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class DenwisDvtext5 implements DenwisChoice5 { - @Path("|value") - private String valueValue; - - public void setValueValue(String valueValue) { - this.valueValue = valueValue; - } - - public String getValueValue() { - return this.valueValue; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext6.java deleted file mode 100644 index dc3d832da..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext6.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class DenwisDvtext6 implements DenwisChoice6 { - @Path("|value") - private String valueValue; - - public void setValueValue(String valueValue) { - this.valueValue = valueValue; - } - - public String getValueValue() { - return this.valueValue; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext7.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext7.java deleted file mode 100644 index f3cdcd778..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisDvtext7.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class DenwisDvtext7 implements DenwisChoice7 { - @Path("|value") - private String valueValue; - - public void setValueValue(String valueValue) { - this.valueValue = valueValue; - } - - public String getValueValue() { - return this.valueValue; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java index a6f846c35..d363466c0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java @@ -6,15 +6,15 @@ @Entity public class DenwisMentationIndicatorElement { - @Path("/value") - @Choice - private DenwisChoice5 value; + @Path("/value") + @Choice + private DenwisValueChoice2 value; - public void setValue(DenwisChoice5 value) { - this.value = value; - } + public void setValue(DenwisValueChoice2 value) { + this.value = value; + } - public DenwisChoice5 getValue() { - return this.value; - } + public DenwisValueChoice2 getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java index fa6d06861..a1a43f8f3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java @@ -6,15 +6,15 @@ @Entity public class DenwisNurseSubjectiveIndicatorElement { - @Path("/value") - @Choice - private DenwisChoice4 value; + @Path("/value") + @Choice + private DenwisValueChoice6 value; - public void setValue(DenwisChoice4 value) { - this.value = value; - } + public void setValue(DenwisValueChoice6 value) { + this.value = value; + } - public DenwisChoice4 getValue() { - return this.value; - } + public DenwisValueChoice6 getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java index 070b02c74..f92c1659a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java @@ -1,12 +1,13 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; import com.nedap.archie.rm.generic.PartyProxy; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -14,281 +15,292 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.denwis.v0") public class DenwisObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0090]") - private List patientIndicator; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0028]/value") + private DvOrdinal q1Breathing; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0059]/value") - private DvOrdinal q9NurseSubjective; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0062]") + private List breathingIndicator; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0087]") - private List trajectoryIndicator; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0033]/value") + private DvOrdinal q2Circulation; - @Path("/subject") - private PartyProxy subject; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0071]") + private List circulationIndicator; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0038]/value") + private DvOrdinal q3Temperature; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0081]") - private List agitationIndicator; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0076]") + private List temperatureIndicator; - @Path("/protocol[at0004]/items[at0005]") - private List extension; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0043]/value") + private DvOrdinal q4Mentation; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0071]") - private List circulationIndicator; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0078]") + private List mentationIndicator; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0093]") - private List nurseSubjectiveIndicator; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0047]/value") + private DvOrdinal q5Agitation; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0028]/value") - private DvOrdinal q1Breathing; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0081]") + private List agitationIndicator; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0053]/value") - private DvOrdinal q7Trajectory; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0050]/value") + private DvOrdinal q6Pain; - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0084]") + private List painIndicator; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0056]/value") - private DvOrdinal q8PatientSubjective; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0053]/value") + private DvOrdinal q7Trajectory; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0027]/value|value") - private String q10OtherCommentValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0087]") + private List trajectoryIndicator; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0050]/value") - private DvOrdinal q6Pain; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0056]/value") + private DvOrdinal q8PatientSubjective; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0033]/value") - private DvOrdinal q2Circulation; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0090]") + private List patientIndicator; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0038]/value") - private DvOrdinal q3Temperature; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0059]/value") + private DvOrdinal q9NurseSubjective; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0043]/value") - private DvOrdinal q4Mentation; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0093]") + private List nurseSubjectiveIndicator; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0047]/value") - private DvOrdinal q5Agitation; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0027]/value|value") + private String q10OtherCommentValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0078]") - private List mentationIndicator; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|magnitude") + private Long totalScoreMagnitude; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0062]") - private List breathingIndicator; + @Path("/data[at0001]/events[at0002]/state[at0006]") + private ItemTree tree; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0084]") - private List painIndicator; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0076]") - private List temperatureIndicator; + @Path("/protocol[at0004]/items[at0005]") + private List extension; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|magnitude") - private Long totalScoreMagnitude; + @Path("/subject") + private PartyProxy subject; - public void setPatientIndicator(List patientIndicator) { - this.patientIndicator = patientIndicator; - } + @Path("/language") + private Language language; - public List getPatientIndicator() { - return this.patientIndicator; - } + public void setQ1Breathing(DvOrdinal q1Breathing) { + this.q1Breathing = q1Breathing; + } - public void setQ9NurseSubjective(DvOrdinal q9NurseSubjective) { - this.q9NurseSubjective = q9NurseSubjective; - } + public DvOrdinal getQ1Breathing() { + return this.q1Breathing ; + } - public DvOrdinal getQ9NurseSubjective() { - return this.q9NurseSubjective; - } + public void setBreathingIndicator(List breathingIndicator) { + this.breathingIndicator = breathingIndicator; + } - public void setTrajectoryIndicator(List trajectoryIndicator) { - this.trajectoryIndicator = trajectoryIndicator; - } + public List getBreathingIndicator() { + return this.breathingIndicator ; + } - public List getTrajectoryIndicator() { - return this.trajectoryIndicator; - } + public void setQ2Circulation(DvOrdinal q2Circulation) { + this.q2Circulation = q2Circulation; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public DvOrdinal getQ2Circulation() { + return this.q2Circulation ; + } - public PartyProxy getSubject() { - return this.subject; - } + public void setCirculationIndicator( + List circulationIndicator) { + this.circulationIndicator = circulationIndicator; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public List getCirculationIndicator() { + return this.circulationIndicator ; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public void setQ3Temperature(DvOrdinal q3Temperature) { + this.q3Temperature = q3Temperature; + } - public void setAgitationIndicator(List agitationIndicator) { - this.agitationIndicator = agitationIndicator; - } + public DvOrdinal getQ3Temperature() { + return this.q3Temperature ; + } - public List getAgitationIndicator() { - return this.agitationIndicator; - } + public void setTemperatureIndicator( + List temperatureIndicator) { + this.temperatureIndicator = temperatureIndicator; + } - public void setExtension(List extension) { - this.extension = extension; - } + public List getTemperatureIndicator() { + return this.temperatureIndicator ; + } - public List getExtension() { - return this.extension; - } + public void setQ4Mentation(DvOrdinal q4Mentation) { + this.q4Mentation = q4Mentation; + } - public void setCirculationIndicator( - List circulationIndicator) { - this.circulationIndicator = circulationIndicator; - } + public DvOrdinal getQ4Mentation() { + return this.q4Mentation ; + } - public List getCirculationIndicator() { - return this.circulationIndicator; - } + public void setMentationIndicator(List mentationIndicator) { + this.mentationIndicator = mentationIndicator; + } - public void setNurseSubjectiveIndicator( - List nurseSubjectiveIndicator) { - this.nurseSubjectiveIndicator = nurseSubjectiveIndicator; - } + public List getMentationIndicator() { + return this.mentationIndicator ; + } - public List getNurseSubjectiveIndicator() { - return this.nurseSubjectiveIndicator; - } + public void setQ5Agitation(DvOrdinal q5Agitation) { + this.q5Agitation = q5Agitation; + } - public void setQ1Breathing(DvOrdinal q1Breathing) { - this.q1Breathing = q1Breathing; - } + public DvOrdinal getQ5Agitation() { + return this.q5Agitation ; + } - public DvOrdinal getQ1Breathing() { - return this.q1Breathing; - } + public void setAgitationIndicator(List agitationIndicator) { + this.agitationIndicator = agitationIndicator; + } - public void setQ7Trajectory(DvOrdinal q7Trajectory) { - this.q7Trajectory = q7Trajectory; - } + public List getAgitationIndicator() { + return this.agitationIndicator ; + } - public DvOrdinal getQ7Trajectory() { - return this.q7Trajectory; - } + public void setQ6Pain(DvOrdinal q6Pain) { + this.q6Pain = q6Pain; + } - public void setLanguage(Language language) { - this.language = language; - } + public DvOrdinal getQ6Pain() { + return this.q6Pain ; + } - public Language getLanguage() { - return this.language; - } - - public void setQ8PatientSubjective(DvOrdinal q8PatientSubjective) { - this.q8PatientSubjective = q8PatientSubjective; - } - - public DvOrdinal getQ8PatientSubjective() { - return this.q8PatientSubjective; - } - - public void setQ10OtherCommentValue(String q10OtherCommentValue) { - this.q10OtherCommentValue = q10OtherCommentValue; - } - - public String getQ10OtherCommentValue() { - return this.q10OtherCommentValue; - } - - public void setQ6Pain(DvOrdinal q6Pain) { - this.q6Pain = q6Pain; - } - - public DvOrdinal getQ6Pain() { - return this.q6Pain; - } - - public void setQ2Circulation(DvOrdinal q2Circulation) { - this.q2Circulation = q2Circulation; - } - - public DvOrdinal getQ2Circulation() { - return this.q2Circulation; - } - - public void setQ3Temperature(DvOrdinal q3Temperature) { - this.q3Temperature = q3Temperature; - } - - public DvOrdinal getQ3Temperature() { - return this.q3Temperature; - } - - public void setQ4Mentation(DvOrdinal q4Mentation) { - this.q4Mentation = q4Mentation; - } - - public DvOrdinal getQ4Mentation() { - return this.q4Mentation; - } - - public void setQ5Agitation(DvOrdinal q5Agitation) { - this.q5Agitation = q5Agitation; - } - - public DvOrdinal getQ5Agitation() { - return this.q5Agitation; - } - - public void setMentationIndicator(List mentationIndicator) { - this.mentationIndicator = mentationIndicator; - } - - public List getMentationIndicator() { - return this.mentationIndicator; - } - - public void setBreathingIndicator(List breathingIndicator) { - this.breathingIndicator = breathingIndicator; - } - - public List getBreathingIndicator() { - return this.breathingIndicator; - } + public void setPainIndicator(List painIndicator) { + this.painIndicator = painIndicator; + } - public void setPainIndicator(List painIndicator) { - this.painIndicator = painIndicator; - } - - public List getPainIndicator() { - return this.painIndicator; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue; - } - - public void setTemperatureIndicator( - List temperatureIndicator) { - this.temperatureIndicator = temperatureIndicator; - } - - public List getTemperatureIndicator() { - return this.temperatureIndicator; - } - - public void setTotalScoreMagnitude(Long totalScoreMagnitude) { - this.totalScoreMagnitude = totalScoreMagnitude; - } - - public Long getTotalScoreMagnitude() { - return this.totalScoreMagnitude; - } + public List getPainIndicator() { + return this.painIndicator ; + } + + public void setQ7Trajectory(DvOrdinal q7Trajectory) { + this.q7Trajectory = q7Trajectory; + } + + public DvOrdinal getQ7Trajectory() { + return this.q7Trajectory ; + } + + public void setTrajectoryIndicator(List trajectoryIndicator) { + this.trajectoryIndicator = trajectoryIndicator; + } + + public List getTrajectoryIndicator() { + return this.trajectoryIndicator ; + } + + public void setQ8PatientSubjective(DvOrdinal q8PatientSubjective) { + this.q8PatientSubjective = q8PatientSubjective; + } + + public DvOrdinal getQ8PatientSubjective() { + return this.q8PatientSubjective ; + } + + public void setPatientIndicator(List patientIndicator) { + this.patientIndicator = patientIndicator; + } + + public List getPatientIndicator() { + return this.patientIndicator ; + } + + public void setQ9NurseSubjective(DvOrdinal q9NurseSubjective) { + this.q9NurseSubjective = q9NurseSubjective; + } + + public DvOrdinal getQ9NurseSubjective() { + return this.q9NurseSubjective ; + } + + public void setNurseSubjectiveIndicator( + List nurseSubjectiveIndicator) { + this.nurseSubjectiveIndicator = nurseSubjectiveIndicator; + } + + public List getNurseSubjectiveIndicator() { + return this.nurseSubjectiveIndicator ; + } + + public void setQ10OtherCommentValue(String q10OtherCommentValue) { + this.q10OtherCommentValue = q10OtherCommentValue; + } + + public String getQ10OtherCommentValue() { + return this.q10OtherCommentValue ; + } + + public void setTotalScoreMagnitude(Long totalScoreMagnitude) { + this.totalScoreMagnitude = totalScoreMagnitude; + } + + public Long getTotalScoreMagnitude() { + return this.totalScoreMagnitude ; + } + + public void setTree(ItemTree tree) { + this.tree = tree; + } + + public ItemTree getTree() { + return this.tree ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservationContainment.java index 7bf16a8dc..be841c7e6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservationContainment.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; import com.nedap.archie.rm.generic.PartyProxy; import org.ehrbase.client.aql.containment.Containment; @@ -8,62 +9,64 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class DenwisObservationContainment extends Containment { public SelectAqlField DENWIS_OBSERVATION = new AqlFieldImp(DenwisObservation.class, "", "DenwisObservation", DenwisObservation.class, this); - public ListSelectAqlField PATIENT_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0090]", "patientIndicator", DenwisPatientIndicatorElement.class, this); + public SelectAqlField Q1_BREATHING = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0028]/value", "q1Breathing", DvOrdinal.class, this); - public SelectAqlField Q9_NURSE_SUBJECTIVE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0059]/value", "q9NurseSubjective", DvOrdinal.class, this); + public ListSelectAqlField BREATHING_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0062]", "breathingIndicator", DenwisBreathingIndicatorElement.class, this); - public ListSelectAqlField TRAJECTORY_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0087]", "trajectoryIndicator", DenwisTrajectoryIndicatorElement.class, this); + public SelectAqlField Q2_CIRCULATION = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0033]/value", "q2Circulation", DvOrdinal.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(DenwisObservation.class, "/subject", "subject", PartyProxy.class, this); + public ListSelectAqlField CIRCULATION_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0071]", "circulationIndicator", DenwisCirculationIndicatorElement.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + public SelectAqlField Q3_TEMPERATURE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0038]/value", "q3Temperature", DvOrdinal.class, this); - public ListSelectAqlField AGITATION_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0081]", "agitationIndicator", DenwisAgitationIndicatorElement.class, this); + public ListSelectAqlField TEMPERATURE_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0076]", "temperatureIndicator", DenwisTemperatureIndicatorElement.class, this); - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(DenwisObservation.class, "/protocol[at0004]/items[at0005]", "extension", Cluster.class, this); + public SelectAqlField Q4_MENTATION = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0043]/value", "q4Mentation", DvOrdinal.class, this); - public ListSelectAqlField CIRCULATION_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0071]", "circulationIndicator", DenwisCirculationIndicatorElement.class, this); + public ListSelectAqlField MENTATION_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0078]", "mentationIndicator", DenwisMentationIndicatorElement.class, this); - public ListSelectAqlField NURSE_SUBJECTIVE_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0093]", "nurseSubjectiveIndicator", DenwisNurseSubjectiveIndicatorElement.class, this); + public SelectAqlField Q5_AGITATION = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0047]/value", "q5Agitation", DvOrdinal.class, this); - public SelectAqlField Q1_BREATHING = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0028]/value", "q1Breathing", DvOrdinal.class, this); + public ListSelectAqlField AGITATION_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0081]", "agitationIndicator", DenwisAgitationIndicatorElement.class, this); + + public SelectAqlField Q6_PAIN = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0050]/value", "q6Pain", DvOrdinal.class, this); + + public ListSelectAqlField PAIN_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0084]", "painIndicator", DenwisPainIndicatorElement.class, this); public SelectAqlField Q7_TRAJECTORY = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0053]/value", "q7Trajectory", DvOrdinal.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(DenwisObservation.class, "/language", "language", Language.class, this); + public ListSelectAqlField TRAJECTORY_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0087]", "trajectoryIndicator", DenwisTrajectoryIndicatorElement.class, this); public SelectAqlField Q8_PATIENT_SUBJECTIVE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0056]/value", "q8PatientSubjective", DvOrdinal.class, this); - public SelectAqlField Q10_OTHER_COMMENT_VALUE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0027]/value|value", "q10OtherCommentValue", String.class, this); - - public SelectAqlField Q6_PAIN = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0050]/value", "q6Pain", DvOrdinal.class, this); + public ListSelectAqlField PATIENT_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0090]", "patientIndicator", DenwisPatientIndicatorElement.class, this); - public SelectAqlField Q2_CIRCULATION = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0033]/value", "q2Circulation", DvOrdinal.class, this); + public SelectAqlField Q9_NURSE_SUBJECTIVE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0059]/value", "q9NurseSubjective", DvOrdinal.class, this); - public SelectAqlField Q3_TEMPERATURE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0038]/value", "q3Temperature", DvOrdinal.class, this); + public ListSelectAqlField NURSE_SUBJECTIVE_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0093]", "nurseSubjectiveIndicator", DenwisNurseSubjectiveIndicatorElement.class, this); - public SelectAqlField Q4_MENTATION = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0043]/value", "q4Mentation", DvOrdinal.class, this); + public SelectAqlField Q10_OTHER_COMMENT_VALUE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0027]/value|value", "q10OtherCommentValue", String.class, this); - public SelectAqlField Q5_AGITATION = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0047]/value", "q5Agitation", DvOrdinal.class, this); + public SelectAqlField TOTAL_SCORE_MAGNITUDE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|magnitude", "totalScoreMagnitude", Long.class, this); - public ListSelectAqlField MENTATION_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0078]", "mentationIndicator", DenwisMentationIndicatorElement.class, this); + public SelectAqlField TREE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/state[at0006]", "tree", ItemTree.class, this); - public ListSelectAqlField BREATHING_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0062]", "breathingIndicator", DenwisBreathingIndicatorElement.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - public ListSelectAqlField PAIN_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0084]", "painIndicator", DenwisPainIndicatorElement.class, this); + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(DenwisObservation.class, "/protocol[at0004]/items[at0005]", "extension", Cluster.class, this); - public ListSelectAqlField TEMPERATURE_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0076]", "temperatureIndicator", DenwisTemperatureIndicatorElement.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(DenwisObservation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField TOTAL_SCORE_MAGNITUDE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|magnitude", "totalScoreMagnitude", Long.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(DenwisObservation.class, "/language", "language", Language.class, this); private DenwisObservationContainment() { super("openEHR-EHR-OBSERVATION.denwis.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java index 83115dfd6..9957e73d7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java @@ -6,15 +6,15 @@ @Entity public class DenwisPainIndicatorElement { - @Path("/value") - @Choice - private DenwisChoice6 value; + @Path("/value") + @Choice + private DenwisValueChoice3 value; - public void setValue(DenwisChoice6 value) { - this.value = value; - } + public void setValue(DenwisValueChoice3 value) { + this.value = value; + } - public DenwisChoice6 getValue() { - return this.value; - } + public DenwisValueChoice3 getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java index 6073bc3f0..7db2a5e7f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java @@ -6,15 +6,15 @@ @Entity public class DenwisPatientIndicatorElement { - @Path("/value") - @Choice - private DenwisChoice value; + @Path("/value") + @Choice + private DenwisValueChoice5 value; - public void setValue(DenwisChoice value) { - this.value = value; - } + public void setValue(DenwisValueChoice5 value) { + this.value = value; + } - public DenwisChoice getValue() { - return this.value; - } + public DenwisValueChoice5 getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java index 1246ef459..1546423c3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java @@ -6,15 +6,15 @@ @Entity public class DenwisTemperatureIndicatorElement { - @Path("/value") - @Choice - private DenwisChoice7 value; + @Path("/value") + @Choice + private DenwisValueChoice value; - public void setValue(DenwisChoice7 value) { - this.value = value; - } + public void setValue(DenwisValueChoice value) { + this.value = value; + } - public DenwisChoice7 getValue() { - return this.value; - } + public DenwisValueChoice getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java index 28234e8e2..a786771a8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java @@ -6,15 +6,15 @@ @Entity public class DenwisTrajectoryIndicatorElement { - @Path("/value") - @Choice - private DenwisChoice2 value; + @Path("/value") + @Choice + private DenwisValueChoice4 value; - public void setValue(DenwisChoice2 value) { - this.value = value; - } + public void setValue(DenwisValueChoice4 value) { + this.value = value; + } - public DenwisChoice2 getValue() { - return this.value; - } + public DenwisValueChoice4 getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice.java similarity index 71% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice3.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice.java index 2c18091ae..f5090eda1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice3.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice.java @@ -1,4 +1,4 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; -public interface DenwisChoice3 { +public interface DenwisValueChoice { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice2.java similarity index 70% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice4.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice2.java index 3b1779d70..7811059ec 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice4.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice2.java @@ -1,4 +1,4 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; -public interface DenwisChoice4 { +public interface DenwisValueChoice2 { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice3.java similarity index 70% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice3.java index 957a7f362..dec67cc7d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice3.java @@ -1,4 +1,4 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; -public interface DenwisChoice { +public interface DenwisValueChoice3 { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice4.java similarity index 70% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice2.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice4.java index 80ed2c0c0..5f32501e4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisChoice2.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice4.java @@ -1,4 +1,4 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; -public interface DenwisChoice2 { +public interface DenwisValueChoice4 { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice5.java new file mode 100644 index 000000000..188762530 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice5.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +public interface DenwisValueChoice5 { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice6.java new file mode 100644 index 000000000..b58b44c78 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice6.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +public interface DenwisValueChoice6 { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java new file mode 100644 index 000000000..ebe18d0cb --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class DenwisValueDvCodedText implements DenwisValueChoice { + @Path("|defining_code") + private ValueDefiningCode valueDefiningCode; + + public void setValueDefiningCode(ValueDefiningCode valueDefiningCode) { + this.valueDefiningCode = valueDefiningCode; + } + + public ValueDefiningCode getValueDefiningCode() { + return this.valueDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java new file mode 100644 index 000000000..1621d836e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class DenwisValueDvCodedText2 implements DenwisValueChoice2 { + @Path("|defining_code") + private ValueDefiningCode2 valueDefiningCode; + + public void setValueDefiningCode(ValueDefiningCode2 valueDefiningCode) { + this.valueDefiningCode = valueDefiningCode; + } + + public ValueDefiningCode2 getValueDefiningCode() { + return this.valueDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java new file mode 100644 index 000000000..0be21a1ac --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class DenwisValueDvCodedText3 implements DenwisValueChoice3 { + @Path("|defining_code") + private ValueDefiningCode3 valueDefiningCode; + + public void setValueDefiningCode(ValueDefiningCode3 valueDefiningCode) { + this.valueDefiningCode = valueDefiningCode; + } + + public ValueDefiningCode3 getValueDefiningCode() { + return this.valueDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java new file mode 100644 index 000000000..ceec297ae --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class DenwisValueDvCodedText4 implements DenwisValueChoice4 { + @Path("|defining_code") + private ValueDefiningCode4 valueDefiningCode; + + public void setValueDefiningCode(ValueDefiningCode4 valueDefiningCode) { + this.valueDefiningCode = valueDefiningCode; + } + + public ValueDefiningCode4 getValueDefiningCode() { + return this.valueDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java new file mode 100644 index 000000000..45d52851d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class DenwisValueDvCodedText5 implements DenwisValueChoice5 { + @Path("|defining_code") + private ValueDefiningCode5 valueDefiningCode; + + public void setValueDefiningCode(ValueDefiningCode5 valueDefiningCode) { + this.valueDefiningCode = valueDefiningCode; + } + + public ValueDefiningCode5 getValueDefiningCode() { + return this.valueDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java new file mode 100644 index 000000000..b8ec39f42 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class DenwisValueDvCodedText6 implements DenwisValueChoice6 { + @Path("|defining_code") + private ValueDefiningCode6 valueDefiningCode; + + public void setValueDefiningCode(ValueDefiningCode6 valueDefiningCode) { + this.valueDefiningCode = valueDefiningCode; + } + + public ValueDefiningCode6 getValueDefiningCode() { + return this.valueDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java new file mode 100644 index 000000000..2a781362f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class DenwisValueDvText implements DenwisValueChoice { + @Path("|value") + private String valueValue; + + public void setValueValue(String valueValue) { + this.valueValue = valueValue; + } + + public String getValueValue() { + return this.valueValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java new file mode 100644 index 000000000..c1ceabfd1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class DenwisValueDvText2 implements DenwisValueChoice2 { + @Path("|value") + private String valueValue; + + public void setValueValue(String valueValue) { + this.valueValue = valueValue; + } + + public String getValueValue() { + return this.valueValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java new file mode 100644 index 000000000..3c3fecff1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class DenwisValueDvText3 implements DenwisValueChoice3 { + @Path("|value") + private String valueValue; + + public void setValueValue(String valueValue) { + this.valueValue = valueValue; + } + + public String getValueValue() { + return this.valueValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java new file mode 100644 index 000000000..5d51c7967 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class DenwisValueDvText4 implements DenwisValueChoice4 { + @Path("|value") + private String valueValue; + + public void setValueValue(String valueValue) { + this.valueValue = valueValue; + } + + public String getValueValue() { + return this.valueValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java new file mode 100644 index 000000000..5268bc95f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class DenwisValueDvText5 implements DenwisValueChoice5 { + @Path("|value") + private String valueValue; + + public void setValueValue(String valueValue) { + this.valueValue = valueValue; + } + + public String getValueValue() { + return this.valueValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java new file mode 100644 index 000000000..b4ca6f129 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class DenwisValueDvText6 implements DenwisValueChoice6 { + @Path("|value") + private String valueValue; + + public void setValueValue(String valueValue) { + this.valueValue = valueValue; + } + + public String getValueValue() { + return this.valueValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java index 401186eef..9b5dd8af0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -12,114 +13,113 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") public class FirstSymptomsCluster { - @Path("/items[at0028]/value|value") - private TemporalAmount durationValue; + @Path("/items[at0001.1]/value|defining_code") + private CodePhrase symptomSignNameDefiningCode; - @Path("/items[at0063]") - private List sign; + @Path("/items[at0147]") + private List structuredBodySite; - @Path("/items[at0153]") - private List specificDetails; + @Path("/items[at0152 and name/value='Date of onset of first symptoms']/value|value") + private TemporalAccessor dateOfOnsetOfFirstSymptomsValue; - @Path("/items[at0001.1]/value|defining_code") - private SymptomSignNameDefiningcode5 symptomSignNameDefiningcode; + @Path("/items[at0028]/value|value") + private TemporalAmount durationValue; - @Path("/items[at0180]/value|defining_code") - private TrendDefiningcode trendDefiningcode; + @Path("/items[at0180 and name/value='Trend']/value|defining_code") + private TrendDefiningCode trendDefiningCode; - @Path("/items[at0146]") - private List previousEpisodes; + @Path("/items[at0155]/value|value") + private String impactValue; - @Path("/items[at0.1]/value|defining_code") - private PresenceDefiningcode presenceDefiningcode; + @Path("/items[at0153]") + private List specificDetails; - @Path("/items[at0147]") - private List structuredBodySite; + @Path("/items[at0146]") + private List previousEpisodes; - @Path("/items[at0152]/value|value") - private TemporalAccessor dateOfOnsetOfFirstSymptomsValue; + @Path("/items[at0063]") + private List associatedSymptomSign; - @Path("/items[at0155]/value|value") - private String impactValue; + @Path("/items[at0.1]/value|defining_code") + private PresenceDefiningCode presenceDefiningCode; - public void setDurationValue(TemporalAmount durationValue) { - this.durationValue = durationValue; - } + public void setSymptomSignNameDefiningCode(CodePhrase symptomSignNameDefiningCode) { + this.symptomSignNameDefiningCode = symptomSignNameDefiningCode; + } - public TemporalAmount getDurationValue() { - return this.durationValue; - } + public CodePhrase getSymptomSignNameDefiningCode() { + return this.symptomSignNameDefiningCode ; + } - public void setSign(List sign) { - this.sign = sign; - } + public void setStructuredBodySite(List structuredBodySite) { + this.structuredBodySite = structuredBodySite; + } - public List getSign() { - return this.sign; - } + public List getStructuredBodySite() { + return this.structuredBodySite ; + } - public void setSpecificDetails(List specificDetails) { - this.specificDetails = specificDetails; - } + public void setDateOfOnsetOfFirstSymptomsValue(TemporalAccessor dateOfOnsetOfFirstSymptomsValue) { + this.dateOfOnsetOfFirstSymptomsValue = dateOfOnsetOfFirstSymptomsValue; + } - public List getSpecificDetails() { - return this.specificDetails; - } + public TemporalAccessor getDateOfOnsetOfFirstSymptomsValue() { + return this.dateOfOnsetOfFirstSymptomsValue ; + } - public void setSymptomSignNameDefiningcode( - SymptomSignNameDefiningcode5 symptomSignNameDefiningcode) { - this.symptomSignNameDefiningcode = symptomSignNameDefiningcode; - } + public void setDurationValue(TemporalAmount durationValue) { + this.durationValue = durationValue; + } - public SymptomSignNameDefiningcode5 getSymptomSignNameDefiningcode() { - return this.symptomSignNameDefiningcode; - } + public TemporalAmount getDurationValue() { + return this.durationValue ; + } - public void setTrendDefiningcode(TrendDefiningcode trendDefiningcode) { - this.trendDefiningcode = trendDefiningcode; - } + public void setTrendDefiningCode(TrendDefiningCode trendDefiningCode) { + this.trendDefiningCode = trendDefiningCode; + } - public TrendDefiningcode getTrendDefiningcode() { - return this.trendDefiningcode; - } + public TrendDefiningCode getTrendDefiningCode() { + return this.trendDefiningCode ; + } - public void setPreviousEpisodes(List previousEpisodes) { - this.previousEpisodes = previousEpisodes; - } + public void setImpactValue(String impactValue) { + this.impactValue = impactValue; + } - public List getPreviousEpisodes() { - return this.previousEpisodes; - } + public String getImpactValue() { + return this.impactValue ; + } - public void setPresenceDefiningcode(PresenceDefiningcode presenceDefiningcode) { - this.presenceDefiningcode = presenceDefiningcode; - } + public void setSpecificDetails(List specificDetails) { + this.specificDetails = specificDetails; + } - public PresenceDefiningcode getPresenceDefiningcode() { - return this.presenceDefiningcode; - } + public List getSpecificDetails() { + return this.specificDetails ; + } - public void setStructuredBodySite(List structuredBodySite) { - this.structuredBodySite = structuredBodySite; - } + public void setPreviousEpisodes(List previousEpisodes) { + this.previousEpisodes = previousEpisodes; + } - public List getStructuredBodySite() { - return this.structuredBodySite; - } + public List getPreviousEpisodes() { + return this.previousEpisodes ; + } - public void setDateOfOnsetOfFirstSymptomsValue(TemporalAccessor dateOfOnsetOfFirstSymptomsValue) { - this.dateOfOnsetOfFirstSymptomsValue = dateOfOnsetOfFirstSymptomsValue; - } + public void setAssociatedSymptomSign(List associatedSymptomSign) { + this.associatedSymptomSign = associatedSymptomSign; + } - public TemporalAccessor getDateOfOnsetOfFirstSymptomsValue() { - return this.dateOfOnsetOfFirstSymptomsValue; - } + public List getAssociatedSymptomSign() { + return this.associatedSymptomSign ; + } - public void setImpactValue(String impactValue) { - this.impactValue = impactValue; - } + public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { + this.presenceDefiningCode = presenceDefiningCode; + } - public String getImpactValue() { - return this.impactValue; - } + public PresenceDefiningCode getPresenceDefiningCode() { + return this.presenceDefiningCode ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java index ce48fb9ab..46abaa2e1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -13,25 +14,25 @@ public class FirstSymptomsClusterContainment extends Containment { public SelectAqlField FIRST_SYMPTOMS_CLUSTER = new AqlFieldImp(FirstSymptomsCluster.class, "", "FirstSymptomsCluster", FirstSymptomsCluster.class, this); - public SelectAqlField DURATION_VALUE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0028]/value|value", "durationValue", TemporalAmount.class, this); + public SelectAqlField SYMPTOM_SIGN_NAME_DEFINING_CODE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningCode", CodePhrase.class, this); - public ListSelectAqlField SIGN = new ListAqlFieldImp(FirstSymptomsCluster.class, "/items[at0063]", "sign", Cluster.class, this); + public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(FirstSymptomsCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); - public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(FirstSymptomsCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); + public SelectAqlField DATE_OF_ONSET_OF_FIRST_SYMPTOMS_VALUE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0152]/value|value", "dateOfOnsetOfFirstSymptomsValue", TemporalAccessor.class, this); - public SelectAqlField SYMPTOM_SIGN_NAME_DEFININGCODE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningcode", SymptomSignNameDefiningcode5.class, this); + public SelectAqlField DURATION_VALUE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0028]/value|value", "durationValue", TemporalAmount.class, this); - public SelectAqlField TREND_DEFININGCODE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0180]/value|defining_code", "trendDefiningcode", TrendDefiningcode.class, this); + public SelectAqlField TREND_DEFINING_CODE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0180]/value|defining_code", "trendDefiningCode", TrendDefiningCode.class, this); - public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(FirstSymptomsCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); + public SelectAqlField IMPACT_VALUE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0155]/value|value", "impactValue", String.class, this); - public SelectAqlField PRESENCE_DEFININGCODE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningcode", PresenceDefiningcode.class, this); + public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(FirstSymptomsCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); - public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(FirstSymptomsCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); + public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(FirstSymptomsCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); - public SelectAqlField DATE_OF_ONSET_OF_FIRST_SYMPTOMS_VALUE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0152]/value|value", "dateOfOnsetOfFirstSymptomsValue", TemporalAccessor.class, this); + public ListSelectAqlField ASSOCIATED_SYMPTOM_SIGN = new ListAqlFieldImp(FirstSymptomsCluster.class, "/items[at0063]", "associatedSymptomSign", Cluster.class, this); - public SelectAqlField IMPACT_VALUE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0155]/value|value", "impactValue", String.class, this); + public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); private FirstSymptomsClusterContainment() { super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java index 2cf45e5ee..f648da0a1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java @@ -6,7 +6,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -14,69 +14,69 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.clinical_frailty_scale.v1") public class FrailtyObservation { - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value") + private DvOrdinal assessment; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value") - private DvOrdinal assessment; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/protocol[at0014]/items[at0015]") - private List extension; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0014]/items[at0015]") + private List extension; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - @Path("/language") - private Language language; + @Path("/language") + private Language language; - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setAssessment(DvOrdinal assessment) { + this.assessment = assessment; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public DvOrdinal getAssessment() { + return this.assessment ; + } - public void setAssessment(DvOrdinal assessment) { - this.assessment = assessment; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public DvOrdinal getAssessment() { - return this.assessment; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setExtension(List extension) { - this.extension = extension; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public List getExtension() { - return this.extension; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setExtension(List extension) { + this.extension = extension; + } - public PartyProxy getSubject() { - return this.subject; - } + public List getExtension() { + return this.extension ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setLanguage(Language language) { + this.language = language; + } - public Language getLanguage() { - return this.language; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservationContainment.java index 6ce545937..01355d700 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservationContainment.java @@ -8,23 +8,23 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class FrailtyObservationContainment extends Containment { public SelectAqlField FRAILTY_OBSERVATION = new AqlFieldImp(FrailtyObservation.class, "", "FrailtyObservation", FrailtyObservation.class, this); + public SelectAqlField ASSESSMENT = new AqlFieldImp(FrailtyObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value", "assessment", DvOrdinal.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(FrailtyObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - public SelectAqlField ASSESSMENT = new AqlFieldImp(FrailtyObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value", "assessment", DvOrdinal.class, this); + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(FrailtyObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); public ListSelectAqlField EXTENSION = new ListAqlFieldImp(FrailtyObservation.class, "/protocol[at0014]/items[at0015]", "extension", Cluster.class, this); public SelectAqlField SUBJECT = new AqlFieldImp(FrailtyObservation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(FrailtyObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(FrailtyObservation.class, "/language", "language", Language.class, this); private FrailtyObservationContainment() { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HealthRiskDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HealthRiskDefiningcode.java index 250107d1a..cb2de7515 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HealthRiskDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HealthRiskDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum HealthRiskDefiningcode implements EnumValueSet { +public enum HealthRiskDefiningCode implements EnumValueSet { COVID19_RISK_ASSESSMENT("COVID-19 Risk assessment", "Assessment of risk of COVID-19 infection.", "local", "at0.1"); private String value; @@ -13,7 +13,7 @@ public enum HealthRiskDefiningcode implements EnumValueSet { private String code; - HealthRiskDefiningcode(String value, String description, String terminologyId, String code) { + HealthRiskDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -21,18 +21,18 @@ public enum HealthRiskDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java index 1a827c77e..55bce1229 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java @@ -1,11 +1,12 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.generic.PartyProxy; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,91 +14,102 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.height.v2") public class HeightObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude") - private Double heightLengthMagnitude; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude") + private Double heightLengthMagnitude; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units") - private String heightLengthUnits; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units") + private String heightLengthUnits; - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/state[at0013]") + private ItemTree tree; - @Path("/protocol[at0007]/items[at0011]") - private Cluster device; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/protocol[at0007]/items[at0022]") - private List extension; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/protocol[at0007]/items[at0011]") + private Cluster device; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0007]/items[at0022]") + private List extension; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - public void setHeightLengthMagnitude(Double heightLengthMagnitude) { - this.heightLengthMagnitude = heightLengthMagnitude; - } + @Path("/language") + private Language language; - public Double getHeightLengthMagnitude() { - return this.heightLengthMagnitude; - } + public void setHeightLengthMagnitude(Double heightLengthMagnitude) { + this.heightLengthMagnitude = heightLengthMagnitude; + } - public void setHeightLengthUnits(String heightLengthUnits) { - this.heightLengthUnits = heightLengthUnits; - } + public Double getHeightLengthMagnitude() { + return this.heightLengthMagnitude ; + } - public String getHeightLengthUnits() { - return this.heightLengthUnits; - } + public void setHeightLengthUnits(String heightLengthUnits) { + this.heightLengthUnits = heightLengthUnits; + } - public void setLanguage(Language language) { - this.language = language; - } + public String getHeightLengthUnits() { + return this.heightLengthUnits ; + } - public Language getLanguage() { - return this.language; - } + public void setTree(ItemTree tree) { + this.tree = tree; + } - public void setDevice(Cluster device) { - this.device = device; - } + public ItemTree getTree() { + return this.tree ; + } - public Cluster getDevice() { - return this.device; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public void setExtension(List extension) { - this.extension = extension; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public List getExtension() { - return this.extension; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public void setDevice(Cluster device) { + this.device = device; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public Cluster getDevice() { + return this.device ; + } - public PartyProxy getSubject() { - return this.subject; - } + public void setExtension(List extension) { + this.extension = extension; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public List getExtension() { + return this.extension ; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservationContainment.java index 358fc671a..529b55dc6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservationContainment.java @@ -1,13 +1,14 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.generic.PartyProxy; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; @@ -18,17 +19,19 @@ public class HeightObservationContainment extends Containment { public SelectAqlField HEIGHT_LENGTH_UNITS = new AqlFieldImp(HeightObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units", "heightLengthUnits", String.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(HeightObservation.class, "/language", "language", Language.class, this); + public SelectAqlField TREE = new AqlFieldImp(HeightObservation.class, "/data[at0001]/events[at0002]/state[at0013]", "tree", ItemTree.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(HeightObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(HeightObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); public SelectAqlField DEVICE = new AqlFieldImp(HeightObservation.class, "/protocol[at0007]/items[at0011]", "device", Cluster.class, this); public ListSelectAqlField EXTENSION = new ListAqlFieldImp(HeightObservation.class, "/protocol[at0007]/items[at0022]", "extension", Cluster.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(HeightObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(HeightObservation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(HeightObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(HeightObservation.class, "/language", "language", Language.class, this); private HeightObservationContainment() { super("openEHR-EHR-OBSERVATION.height.v2"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java index 6b1be7a1e..e2e86a0ba 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -10,70 +11,69 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") public class KeyCovidSymptomCluster { - @Path("/items[at0063]") - private List sign; + @Path("/items[at0001.1]/value|defining_code") + private CodePhrase symptomSignNameDefiningCode; - @Path("/items[at0153]") - private List specificDetails; + @Path("/items[at0147]") + private List structuredBodySite; - @Path("/items[at0001.1]/value|defining_code") - private SymptomSignNameDefiningcode3 symptomSignNameDefiningcode; + @Path("/items[at0153]") + private List specificDetails; - @Path("/items[at0146]") - private List previousEpisodes; + @Path("/items[at0146]") + private List previousEpisodes; - @Path("/items[at0.1]/value|defining_code") - private PresenceDefiningcode presenceDefiningcode; + @Path("/items[at0063]") + private List associatedSymptomSign; - @Path("/items[at0147]") - private List structuredBodySite; + @Path("/items[at0.1 and name/value='Presence']/value|defining_code") + private PresenceDefiningCode presenceDefiningCode; - public void setSign(List sign) { - this.sign = sign; - } + public void setSymptomSignNameDefiningCode(CodePhrase symptomSignNameDefiningCode) { + this.symptomSignNameDefiningCode = symptomSignNameDefiningCode; + } - public List getSign() { - return this.sign; - } + public CodePhrase getSymptomSignNameDefiningCode() { + return this.symptomSignNameDefiningCode ; + } - public void setSpecificDetails(List specificDetails) { - this.specificDetails = specificDetails; - } + public void setStructuredBodySite(List structuredBodySite) { + this.structuredBodySite = structuredBodySite; + } - public List getSpecificDetails() { - return this.specificDetails; - } + public List getStructuredBodySite() { + return this.structuredBodySite ; + } - public void setSymptomSignNameDefiningcode( - SymptomSignNameDefiningcode3 symptomSignNameDefiningcode) { - this.symptomSignNameDefiningcode = symptomSignNameDefiningcode; - } + public void setSpecificDetails(List specificDetails) { + this.specificDetails = specificDetails; + } - public SymptomSignNameDefiningcode3 getSymptomSignNameDefiningcode() { - return this.symptomSignNameDefiningcode; - } + public List getSpecificDetails() { + return this.specificDetails ; + } - public void setPreviousEpisodes(List previousEpisodes) { - this.previousEpisodes = previousEpisodes; - } + public void setPreviousEpisodes(List previousEpisodes) { + this.previousEpisodes = previousEpisodes; + } - public List getPreviousEpisodes() { - return this.previousEpisodes; - } + public List getPreviousEpisodes() { + return this.previousEpisodes ; + } - public void setPresenceDefiningcode(PresenceDefiningcode presenceDefiningcode) { - this.presenceDefiningcode = presenceDefiningcode; - } + public void setAssociatedSymptomSign(List associatedSymptomSign) { + this.associatedSymptomSign = associatedSymptomSign; + } - public PresenceDefiningcode getPresenceDefiningcode() { - return this.presenceDefiningcode; - } + public List getAssociatedSymptomSign() { + return this.associatedSymptomSign ; + } - public void setStructuredBodySite(List structuredBodySite) { - this.structuredBodySite = structuredBodySite; - } + public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { + this.presenceDefiningCode = presenceDefiningCode; + } - public List getStructuredBodySite() { - return this.structuredBodySite; - } + public PresenceDefiningCode getPresenceDefiningCode() { + return this.presenceDefiningCode ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomClusterContainment.java index 0e9791561..f072031f2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomClusterContainment.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -10,23 +11,23 @@ public class KeyCovidSymptomClusterContainment extends Containment { public SelectAqlField KEY_COVID_SYMPTOM_CLUSTER = new AqlFieldImp(KeyCovidSymptomCluster.class, "", "KeyCovidSymptomCluster", KeyCovidSymptomCluster.class, this); - public ListSelectAqlField SIGN = new ListAqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0063]", "sign", Cluster.class, this); + public SelectAqlField SYMPTOM_SIGN_NAME_DEFINING_CODE = new AqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningCode", CodePhrase.class, this); - public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); + public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); - public SelectAqlField SYMPTOM_SIGN_NAME_DEFININGCODE = new AqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningcode", SymptomSignNameDefiningcode3.class, this); + public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); - public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); + public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); - public SelectAqlField PRESENCE_DEFININGCODE = new AqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningcode", PresenceDefiningcode.class, this); + public ListSelectAqlField ASSOCIATED_SYMPTOM_SIGN = new ListAqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0063]", "associatedSymptomSign", Cluster.class, this); - public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); + public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); - private KeyCovidSymptomClusterContainment() { - super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); - } + private KeyCovidSymptomClusterContainment() { + super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); + } - public static KeyCovidSymptomClusterContainment getInstance() { - return new KeyCovidSymptomClusterContainment(); - } + public static KeyCovidSymptomClusterContainment getInstance() { + return new KeyCovidSymptomClusterContainment(); + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java index d55929ed4..b6f4c13d3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java @@ -6,7 +6,7 @@ import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -14,181 +14,181 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.laboratory_test_result.v1") public class LatestCovid19TestObservation { - @Path("/protocol[at0004]/items[at0110]") - private List testingDetails; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value") + private String testNameValue; - @Path("/protocol[at0004]/items[at0094]") - private List testRequestDetails; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0065]") + private List specimenDetail; - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0097]") + private List testResult; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0098]/value|value") - private String testDiagnosisValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0098]/value|value") + private String testDiagnosisValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0118]") - private List multimediaRepresentation; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0122]") + private List structuredTestDiagnosis; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value") - private String testNameValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0118]") + private List multimediaRepresentation; - @Path("/data[at0001]/events[at0002]/state[at0112]/items[at0114]") - private List structuredConfoundingFactors; + @Path("/data[at0001]/events[at0002]/state[at0112]/items[at0114]") + private List structuredConfoundingFactors; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0122]") - private List structuredTestDiagnosis; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/protocol[at0004]/items[at0117]") - private List extension; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/protocol[at0004]/items[at0017]") + private Cluster receivingLaboratory; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0065]") - private List specimenDetail; + @Path("/protocol[at0004]/items[at0094]") + private List testRequestDetails; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0097]") - private List testResult; + @Path("/protocol[at0004]/items[at0110]") + private List testingDetails; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0004]/items[at0117]") + private List extension; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0073]/value") - @Choice - private LatestCovid19TestOverallTestStatusChoice overallTestStatus; + @Path("/language") + private Language language; - @Path("/protocol[at0004]/items[at0017]") - private Cluster receivingLaboratory; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0073]/value") + @Choice + private LatestCovid19TestOverallTestStatusChoice overallTestStatus; - public void setTestingDetails(List testingDetails) { - this.testingDetails = testingDetails; - } + public void setTestNameValue(String testNameValue) { + this.testNameValue = testNameValue; + } - public List getTestingDetails() { - return this.testingDetails; - } + public String getTestNameValue() { + return this.testNameValue ; + } - public void setTestRequestDetails( - List testRequestDetails) { - this.testRequestDetails = testRequestDetails; - } + public void setSpecimenDetail(List specimenDetail) { + this.specimenDetail = specimenDetail; + } - public List getTestRequestDetails() { - return this.testRequestDetails; - } + public List getSpecimenDetail() { + return this.specimenDetail ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setTestResult(List testResult) { + this.testResult = testResult; + } - public Language getLanguage() { - return this.language; - } + public List getTestResult() { + return this.testResult ; + } - public void setTestDiagnosisValue(String testDiagnosisValue) { - this.testDiagnosisValue = testDiagnosisValue; - } + public void setTestDiagnosisValue(String testDiagnosisValue) { + this.testDiagnosisValue = testDiagnosisValue; + } - public String getTestDiagnosisValue() { - return this.testDiagnosisValue; - } + public String getTestDiagnosisValue() { + return this.testDiagnosisValue ; + } - public void setMultimediaRepresentation(List multimediaRepresentation) { - this.multimediaRepresentation = multimediaRepresentation; - } + public void setStructuredTestDiagnosis(List structuredTestDiagnosis) { + this.structuredTestDiagnosis = structuredTestDiagnosis; + } - public List getMultimediaRepresentation() { - return this.multimediaRepresentation; - } + public List getStructuredTestDiagnosis() { + return this.structuredTestDiagnosis ; + } - public void setTestNameValue(String testNameValue) { - this.testNameValue = testNameValue; - } + public void setMultimediaRepresentation(List multimediaRepresentation) { + this.multimediaRepresentation = multimediaRepresentation; + } - public String getTestNameValue() { - return this.testNameValue; - } + public List getMultimediaRepresentation() { + return this.multimediaRepresentation ; + } - public void setStructuredConfoundingFactors(List structuredConfoundingFactors) { - this.structuredConfoundingFactors = structuredConfoundingFactors; - } + public void setStructuredConfoundingFactors(List structuredConfoundingFactors) { + this.structuredConfoundingFactors = structuredConfoundingFactors; + } - public List getStructuredConfoundingFactors() { - return this.structuredConfoundingFactors; - } + public List getStructuredConfoundingFactors() { + return this.structuredConfoundingFactors ; + } - public void setStructuredTestDiagnosis(List structuredTestDiagnosis) { - this.structuredTestDiagnosis = structuredTestDiagnosis; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public List getStructuredTestDiagnosis() { - return this.structuredTestDiagnosis; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setExtension(List extension) { - this.extension = extension; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public List getExtension() { - return this.extension; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setReceivingLaboratory(Cluster receivingLaboratory) { + this.receivingLaboratory = receivingLaboratory; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public Cluster getReceivingLaboratory() { + return this.receivingLaboratory ; + } - public void setSpecimenDetail(List specimenDetail) { - this.specimenDetail = specimenDetail; - } + public void setTestRequestDetails( + List testRequestDetails) { + this.testRequestDetails = testRequestDetails; + } - public List getSpecimenDetail() { - return this.specimenDetail; - } + public List getTestRequestDetails() { + return this.testRequestDetails ; + } - public void setTestResult(List testResult) { - this.testResult = testResult; - } + public void setTestingDetails(List testingDetails) { + this.testingDetails = testingDetails; + } - public List getTestResult() { - return this.testResult; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue; - } - - public void setOverallTestStatus(LatestCovid19TestOverallTestStatusChoice overallTestStatus) { - this.overallTestStatus = overallTestStatus; - } - - public LatestCovid19TestOverallTestStatusChoice getOverallTestStatus() { - return this.overallTestStatus; - } - - public void setReceivingLaboratory(Cluster receivingLaboratory) { - this.receivingLaboratory = receivingLaboratory; - } - - public Cluster getReceivingLaboratory() { - return this.receivingLaboratory; - } + public List getTestingDetails() { + return this.testingDetails ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setOverallTestStatus(LatestCovid19TestOverallTestStatusChoice overallTestStatus) { + this.overallTestStatus = overallTestStatus; + } + + public LatestCovid19TestOverallTestStatusChoice getOverallTestStatus() { + return this.overallTestStatus ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservationContainment.java index ecca62353..03516fa76 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservationContainment.java @@ -7,45 +7,45 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class LatestCovid19TestObservationContainment extends Containment { public SelectAqlField LATEST_COVID19_TEST_OBSERVATION = new AqlFieldImp(LatestCovid19TestObservation.class, "", "LatestCovid19TestObservation", LatestCovid19TestObservation.class, this); - public ListSelectAqlField TESTING_DETAILS = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/protocol[at0004]/items[at0110]", "testingDetails", Cluster.class, this); + public SelectAqlField TEST_NAME_VALUE = new AqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value", "testNameValue", String.class, this); - public ListSelectAqlField TEST_REQUEST_DETAILS = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/protocol[at0004]/items[at0094]", "testRequestDetails", LatestCovid19TestTestRequestDetailsCluster.class, this); + public ListSelectAqlField SPECIMEN_DETAIL = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0065]", "specimenDetail", Cluster.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(LatestCovid19TestObservation.class, "/language", "language", Language.class, this); + public ListSelectAqlField TEST_RESULT = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0097]", "testResult", Cluster.class, this); public SelectAqlField TEST_DIAGNOSIS_VALUE = new AqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0098]/value|value", "testDiagnosisValue", String.class, this); - public ListSelectAqlField MULTIMEDIA_REPRESENTATION = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0118]", "multimediaRepresentation", Cluster.class, this); + public ListSelectAqlField STRUCTURED_TEST_DIAGNOSIS = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0122]", "structuredTestDiagnosis", Cluster.class, this); - public SelectAqlField TEST_NAME_VALUE = new AqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value", "testNameValue", String.class, this); + public ListSelectAqlField MULTIMEDIA_REPRESENTATION = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0118]", "multimediaRepresentation", Cluster.class, this); public ListSelectAqlField STRUCTURED_CONFOUNDING_FACTORS = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/state[at0112]/items[at0114]", "structuredConfoundingFactors", Cluster.class, this); - public ListSelectAqlField STRUCTURED_TEST_DIAGNOSIS = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0122]", "structuredTestDiagnosis", Cluster.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/protocol[at0004]/items[at0117]", "extension", Cluster.class, this); + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + public SelectAqlField RECEIVING_LABORATORY = new AqlFieldImp(LatestCovid19TestObservation.class, "/protocol[at0004]/items[at0017]", "receivingLaboratory", Cluster.class, this); - public ListSelectAqlField SPECIMEN_DETAIL = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0065]", "specimenDetail", Cluster.class, this); + public ListSelectAqlField TEST_REQUEST_DETAILS = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/protocol[at0004]/items[at0094]", "testRequestDetails", LatestCovid19TestTestRequestDetailsCluster.class, this); - public ListSelectAqlField TEST_RESULT = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0097]", "testResult", Cluster.class, this); + public ListSelectAqlField TESTING_DETAILS = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/protocol[at0004]/items[at0110]", "testingDetails", Cluster.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/protocol[at0004]/items[at0117]", "extension", Cluster.class, this); public SelectAqlField SUBJECT = new AqlFieldImp(LatestCovid19TestObservation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(LatestCovid19TestObservation.class, "/language", "language", Language.class, this); public SelectAqlField OVERALL_TEST_STATUS = new AqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0073]/value", "overallTestStatus", LatestCovid19TestOverallTestStatusChoice.class, this); - public SelectAqlField RECEIVING_LABORATORY = new AqlFieldImp(LatestCovid19TestObservation.class, "/protocol[at0004]/items[at0017]", "receivingLaboratory", Cluster.class, this); - private LatestCovid19TestObservationContainment() { super("openEHR-EHR-OBSERVATION.laboratory_test_result.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvcodedtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvcodedtext.java index 00e58c78b..22c633880 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvcodedtext.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvcodedtext.java @@ -6,16 +6,16 @@ @Entity @OptionFor("DV_CODED_TEXT") -public class LatestCovid19TestOverallTestStatusDvcodedtext implements LatestCovid19TestOverallTestStatusChoice { - @Path("|defining_code") - private OverallTestStatusDefiningcode overallTestStatusDefiningcode; +public class LatestCovid19TestOverallTestStatusDvCodedText implements LatestCovid19TestOverallTestStatusChoice { + @Path("|defining_code") + private OverallTestStatusDefiningCode overallTestStatusDefiningCode; - public void setOverallTestStatusDefiningcode( - OverallTestStatusDefiningcode overallTestStatusDefiningcode) { - this.overallTestStatusDefiningcode = overallTestStatusDefiningcode; - } + public void setOverallTestStatusDefiningCode( + OverallTestStatusDefiningCode overallTestStatusDefiningCode) { + this.overallTestStatusDefiningCode = overallTestStatusDefiningCode; + } - public OverallTestStatusDefiningcode getOverallTestStatusDefiningcode() { - return this.overallTestStatusDefiningcode; - } + public OverallTestStatusDefiningCode getOverallTestStatusDefiningCode() { + return this.overallTestStatusDefiningCode ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvtext.java index 160bf58bb..556753e42 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvtext.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvtext.java @@ -6,15 +6,15 @@ @Entity @OptionFor("DV_TEXT") -public class LatestCovid19TestOverallTestStatusDvtext implements LatestCovid19TestOverallTestStatusChoice { - @Path("|value") - private String overallTestStatusValue; +public class LatestCovid19TestOverallTestStatusDvText implements LatestCovid19TestOverallTestStatusChoice { + @Path("|value") + private String overallTestStatusValue; - public void setOverallTestStatusValue(String overallTestStatusValue) { - this.overallTestStatusValue = overallTestStatusValue; - } + public void setOverallTestStatusValue(String overallTestStatusValue) { + this.overallTestStatusValue = overallTestStatusValue; + } - public String getOverallTestStatusValue() { - return this.overallTestStatusValue; - } + public String getOverallTestStatusValue() { + return this.overallTestStatusValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java index aa727d8e6..7b5e0476e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java @@ -8,25 +8,25 @@ @Entity public class LatestCovid19TestTestRequestDetailsCluster { - @Path("/items[at0035]") - private List distributionList; + @Path("/items[at0090]") + private Cluster requester; - @Path("/items[at0090]") - private Cluster requester; + @Path("/items[at0035]") + private List distributionList; - public void setDistributionList(List distributionList) { - this.distributionList = distributionList; - } + public void setRequester(Cluster requester) { + this.requester = requester; + } - public List getDistributionList() { - return this.distributionList; - } + public Cluster getRequester() { + return this.requester ; + } - public void setRequester(Cluster requester) { - this.requester = requester; - } + public void setDistributionList(List distributionList) { + this.distributionList = distributionList; + } - public Cluster getRequester() { - return this.requester; - } + public List getDistributionList() { + return this.distributionList ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java index fb627bb9d..ad812b248 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java @@ -5,54 +5,54 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.util.List; @Entity @Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") public class MedicationEvaluation { - @Path("/subject") - private PartyProxy subject; + @Path("/data[at0001]/items[at0002]/value|value") + private String synopsisValue; - @Path("/data[at0001]/items[at0002]/value|value") - private String synopsisValue; + @Path("/protocol[at0003]/items[at0004]") + private List extension; - @Path("/language") - private Language language; + @Path("/subject") + private PartyProxy subject; - @Path("/protocol[at0003]/items[at0004]") - private List extension; + @Path("/language") + private Language language; - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setSynopsisValue(String synopsisValue) { + this.synopsisValue = synopsisValue; + } - public PartyProxy getSubject() { - return this.subject; - } + public String getSynopsisValue() { + return this.synopsisValue ; + } - public void setSynopsisValue(String synopsisValue) { - this.synopsisValue = synopsisValue; - } + public void setExtension(List extension) { + this.extension = extension; + } - public String getSynopsisValue() { - return this.synopsisValue; - } + public List getExtension() { + return this.extension ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public Language getLanguage() { - return this.language; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setExtension(List extension) { - this.extension = extension; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getExtension() { - return this.extension; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluationContainment.java index 986b90fe4..141f96b86 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluationContainment.java @@ -7,19 +7,19 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; public class MedicationEvaluationContainment extends Containment { public SelectAqlField MEDICATION_EVALUATION = new AqlFieldImp(MedicationEvaluation.class, "", "MedicationEvaluation", MedicationEvaluation.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(MedicationEvaluation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField SYNOPSIS_VALUE = new AqlFieldImp(MedicationEvaluation.class, "/data[at0001]/items[at0002]/value|value", "synopsisValue", String.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(MedicationEvaluation.class, "/language", "language", Language.class, this); - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(MedicationEvaluation.class, "/protocol[at0003]/items[at0004]", "extension", Cluster.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(MedicationEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(MedicationEvaluation.class, "/language", "language", Language.class, this); + private MedicationEvaluationContainment() { super("openEHR-EHR-EVALUATION.clinical_synopsis.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Definingcode4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/N999FlagDefiningCode.java similarity index 76% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Definingcode4.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/N999FlagDefiningCode.java index 848a5083b..e184d53f8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Definingcode4.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/N999FlagDefiningCode.java @@ -2,8 +2,8 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum Definingcode4 implements EnumValueSet { - I_FEEL_I_MIGHT_DIE("‘I feel I might die’", "The patient stated ‘I feel I might die’.", "local", "at0041"), +public enum N999FlagDefiningCode implements EnumValueSet { + N_I_FEEL_I_MIGHT_DIE("‘I feel I might die’", "The patient stated ‘I feel I might die’.", "local", "at0041"), EXTREME_SHIVERING_OR_MUSCLE_PAIN("Extreme shivering or muscle pain", "The patient has extreme shivering or muscle pain.", "local", "at0038"), @@ -23,7 +23,7 @@ public enum Definingcode4 implements EnumValueSet { private String code; - Definingcode4(String value, String description, String terminologyId, String code) { + N999FlagDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -31,18 +31,18 @@ public enum Definingcode4 implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java index 788832bd7..c2c8ec1f6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -10,70 +11,69 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") public class NeuroSymptomCluster { - @Path("/items[at0063]") - private List sign; + @Path("/items[at0001.1]/value|defining_code") + private CodePhrase symptomSignNameDefiningCode; - @Path("/items[at0153]") - private List specificDetails; + @Path("/items[at0147]") + private List structuredBodySite; - @Path("/items[at0001.1]/value|defining_code") - private SymptomSignNameDefiningcode symptomSignNameDefiningcode; + @Path("/items[at0153]") + private List specificDetails; - @Path("/items[at0146]") - private List previousEpisodes; + @Path("/items[at0146]") + private List previousEpisodes; - @Path("/items[at0.1]/value|defining_code") - private PresenceDefiningcode presenceDefiningcode; + @Path("/items[at0063]") + private List associatedSymptomSign; - @Path("/items[at0147]") - private List structuredBodySite; + @Path("/items[at0.1 and name/value='Presence']/value|defining_code") + private PresenceDefiningCode presenceDefiningCode; - public void setSign(List sign) { - this.sign = sign; - } + public void setSymptomSignNameDefiningCode(CodePhrase symptomSignNameDefiningCode) { + this.symptomSignNameDefiningCode = symptomSignNameDefiningCode; + } - public List getSign() { - return this.sign; - } + public CodePhrase getSymptomSignNameDefiningCode() { + return this.symptomSignNameDefiningCode ; + } - public void setSpecificDetails(List specificDetails) { - this.specificDetails = specificDetails; - } + public void setStructuredBodySite(List structuredBodySite) { + this.structuredBodySite = structuredBodySite; + } - public List getSpecificDetails() { - return this.specificDetails; - } + public List getStructuredBodySite() { + return this.structuredBodySite ; + } - public void setSymptomSignNameDefiningcode( - SymptomSignNameDefiningcode symptomSignNameDefiningcode) { - this.symptomSignNameDefiningcode = symptomSignNameDefiningcode; - } + public void setSpecificDetails(List specificDetails) { + this.specificDetails = specificDetails; + } - public SymptomSignNameDefiningcode getSymptomSignNameDefiningcode() { - return this.symptomSignNameDefiningcode; - } + public List getSpecificDetails() { + return this.specificDetails ; + } - public void setPreviousEpisodes(List previousEpisodes) { - this.previousEpisodes = previousEpisodes; - } + public void setPreviousEpisodes(List previousEpisodes) { + this.previousEpisodes = previousEpisodes; + } - public List getPreviousEpisodes() { - return this.previousEpisodes; - } + public List getPreviousEpisodes() { + return this.previousEpisodes ; + } - public void setPresenceDefiningcode(PresenceDefiningcode presenceDefiningcode) { - this.presenceDefiningcode = presenceDefiningcode; - } + public void setAssociatedSymptomSign(List associatedSymptomSign) { + this.associatedSymptomSign = associatedSymptomSign; + } - public PresenceDefiningcode getPresenceDefiningcode() { - return this.presenceDefiningcode; - } + public List getAssociatedSymptomSign() { + return this.associatedSymptomSign ; + } - public void setStructuredBodySite(List structuredBodySite) { - this.structuredBodySite = structuredBodySite; - } + public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { + this.presenceDefiningCode = presenceDefiningCode; + } - public List getStructuredBodySite() { - return this.structuredBodySite; - } + public PresenceDefiningCode getPresenceDefiningCode() { + return this.presenceDefiningCode ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomClusterContainment.java index 1ddc83063..f73d095b8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomClusterContainment.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -10,23 +11,23 @@ public class NeuroSymptomClusterContainment extends Containment { public SelectAqlField NEURO_SYMPTOM_CLUSTER = new AqlFieldImp(NeuroSymptomCluster.class, "", "NeuroSymptomCluster", NeuroSymptomCluster.class, this); - public ListSelectAqlField SIGN = new ListAqlFieldImp(NeuroSymptomCluster.class, "/items[at0063]", "sign", Cluster.class, this); + public SelectAqlField SYMPTOM_SIGN_NAME_DEFINING_CODE = new AqlFieldImp(NeuroSymptomCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningCode", CodePhrase.class, this); - public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(NeuroSymptomCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); + public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(NeuroSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); - public SelectAqlField SYMPTOM_SIGN_NAME_DEFININGCODE = new AqlFieldImp(NeuroSymptomCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningcode", SymptomSignNameDefiningcode.class, this); + public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(NeuroSymptomCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); - public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(NeuroSymptomCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); + public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(NeuroSymptomCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); - public SelectAqlField PRESENCE_DEFININGCODE = new AqlFieldImp(NeuroSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningcode", PresenceDefiningcode.class, this); + public ListSelectAqlField ASSOCIATED_SYMPTOM_SIGN = new ListAqlFieldImp(NeuroSymptomCluster.class, "/items[at0063]", "associatedSymptomSign", Cluster.class, this); - public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(NeuroSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); + public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(NeuroSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); - private NeuroSymptomClusterContainment() { - super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); - } + private NeuroSymptomClusterContainment() { + super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); + } - public static NeuroSymptomClusterContainment getInstance() { - return new NeuroSymptomClusterContainment(); - } + public static NeuroSymptomClusterContainment getInstance() { + return new NeuroSymptomClusterContainment(); + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java index 90fa4a726..b9b29d100 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java @@ -6,7 +6,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -14,169 +14,169 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.news2.v1") public class News2ScoreObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0028]/value|magnitude") - private Long totalScoreMagnitude; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value") + private DvOrdinal respirationRate; - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0029]/value") + private DvOrdinal spoScale1; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0029]/value") - private DvOrdinal spoScale1; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0047]/value") + private DvOrdinal spoScale2; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0056]/value|defining_code") - private ClinicalRiskCategoryDefiningcode clinicalRiskCategoryDefiningcode; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0034]/value") + private DvOrdinal airOrOxygen; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0034]/value") - private DvOrdinal airOrOxygen; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value") + private DvOrdinal systolicBloodPressure; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0047]/value") - private DvOrdinal spoScale2; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value") + private DvOrdinal pulse; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value") - private DvOrdinal systolicBloodPressure; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value") + private DvOrdinal consciousness; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value") - private DvOrdinal pulse; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value") + private DvOrdinal temperature; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0028]/value|magnitude") + private Long totalScoreMagnitude; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value") - private DvOrdinal respirationRate; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0056]/value|defining_code") + private ClinicalRiskCategoryDefiningCode clinicalRiskCategoryDefiningCode; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value") - private DvOrdinal consciousness; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value") - private DvOrdinal temperature; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0045]/items[at0046]") + private List extension; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - @Path("/protocol[at0045]/items[at0046]") - private List extension; + @Path("/language") + private Language language; - public void setTotalScoreMagnitude(Long totalScoreMagnitude) { - this.totalScoreMagnitude = totalScoreMagnitude; - } + public void setRespirationRate(DvOrdinal respirationRate) { + this.respirationRate = respirationRate; + } - public Long getTotalScoreMagnitude() { - return this.totalScoreMagnitude; - } + public DvOrdinal getRespirationRate() { + return this.respirationRate ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setSpoScale1(DvOrdinal spoScale1) { + this.spoScale1 = spoScale1; + } - public Language getLanguage() { - return this.language; - } + public DvOrdinal getSpoScale1() { + return this.spoScale1 ; + } - public void setSpoScale1(DvOrdinal spoScale1) { - this.spoScale1 = spoScale1; - } + public void setSpoScale2(DvOrdinal spoScale2) { + this.spoScale2 = spoScale2; + } - public DvOrdinal getSpoScale1() { - return this.spoScale1; - } + public DvOrdinal getSpoScale2() { + return this.spoScale2 ; + } - public void setClinicalRiskCategoryDefiningcode( - ClinicalRiskCategoryDefiningcode clinicalRiskCategoryDefiningcode) { - this.clinicalRiskCategoryDefiningcode = clinicalRiskCategoryDefiningcode; - } + public void setAirOrOxygen(DvOrdinal airOrOxygen) { + this.airOrOxygen = airOrOxygen; + } - public ClinicalRiskCategoryDefiningcode getClinicalRiskCategoryDefiningcode() { - return this.clinicalRiskCategoryDefiningcode; - } + public DvOrdinal getAirOrOxygen() { + return this.airOrOxygen ; + } - public void setAirOrOxygen(DvOrdinal airOrOxygen) { - this.airOrOxygen = airOrOxygen; - } + public void setSystolicBloodPressure(DvOrdinal systolicBloodPressure) { + this.systolicBloodPressure = systolicBloodPressure; + } - public DvOrdinal getAirOrOxygen() { - return this.airOrOxygen; - } + public DvOrdinal getSystolicBloodPressure() { + return this.systolicBloodPressure ; + } - public void setSpoScale2(DvOrdinal spoScale2) { - this.spoScale2 = spoScale2; - } + public void setPulse(DvOrdinal pulse) { + this.pulse = pulse; + } - public DvOrdinal getSpoScale2() { - return this.spoScale2; - } + public DvOrdinal getPulse() { + return this.pulse ; + } - public void setSystolicBloodPressure(DvOrdinal systolicBloodPressure) { - this.systolicBloodPressure = systolicBloodPressure; - } + public void setConsciousness(DvOrdinal consciousness) { + this.consciousness = consciousness; + } - public DvOrdinal getSystolicBloodPressure() { - return this.systolicBloodPressure; - } + public DvOrdinal getConsciousness() { + return this.consciousness ; + } - public void setPulse(DvOrdinal pulse) { - this.pulse = pulse; - } + public void setTemperature(DvOrdinal temperature) { + this.temperature = temperature; + } - public DvOrdinal getPulse() { - return this.pulse; - } + public DvOrdinal getTemperature() { + return this.temperature ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setTotalScoreMagnitude(Long totalScoreMagnitude) { + this.totalScoreMagnitude = totalScoreMagnitude; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public Long getTotalScoreMagnitude() { + return this.totalScoreMagnitude ; + } - public void setRespirationRate(DvOrdinal respirationRate) { - this.respirationRate = respirationRate; - } + public void setClinicalRiskCategoryDefiningCode( + ClinicalRiskCategoryDefiningCode clinicalRiskCategoryDefiningCode) { + this.clinicalRiskCategoryDefiningCode = clinicalRiskCategoryDefiningCode; + } - public DvOrdinal getRespirationRate() { - return this.respirationRate; - } + public ClinicalRiskCategoryDefiningCode getClinicalRiskCategoryDefiningCode() { + return this.clinicalRiskCategoryDefiningCode ; + } - public void setConsciousness(DvOrdinal consciousness) { - this.consciousness = consciousness; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public DvOrdinal getConsciousness() { - return this.consciousness; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setTemperature(DvOrdinal temperature) { - this.temperature = temperature; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public DvOrdinal getTemperature() { - return this.temperature; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension; - } + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservationContainment.java index 9470e84f6..20f1305bf 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservationContainment.java @@ -8,43 +8,43 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class News2ScoreObservationContainment extends Containment { public SelectAqlField NEWS2_SCORE_OBSERVATION = new AqlFieldImp(News2ScoreObservation.class, "", "News2ScoreObservation", News2ScoreObservation.class, this); - public SelectAqlField TOTAL_SCORE_MAGNITUDE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0028]/value|magnitude", "totalScoreMagnitude", Long.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(News2ScoreObservation.class, "/language", "language", Language.class, this); + public SelectAqlField RESPIRATION_RATE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value", "respirationRate", DvOrdinal.class, this); public SelectAqlField SPO_SCALE1 = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0029]/value", "spoScale1", DvOrdinal.class, this); - public SelectAqlField CLINICAL_RISK_CATEGORY_DEFININGCODE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0056]/value|defining_code", "clinicalRiskCategoryDefiningcode", ClinicalRiskCategoryDefiningcode.class, this); + public SelectAqlField SPO_SCALE2 = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0047]/value", "spoScale2", DvOrdinal.class, this); public SelectAqlField AIR_OR_OXYGEN = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0034]/value", "airOrOxygen", DvOrdinal.class, this); - public SelectAqlField SPO_SCALE2 = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0047]/value", "spoScale2", DvOrdinal.class, this); - public SelectAqlField SYSTOLIC_BLOOD_PRESSURE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value", "systolicBloodPressure", DvOrdinal.class, this); public SelectAqlField PULSE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value", "pulse", DvOrdinal.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField RESPIRATION_RATE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value", "respirationRate", DvOrdinal.class, this); - public SelectAqlField CONSCIOUSNESS = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value", "consciousness", DvOrdinal.class, this); public SelectAqlField TEMPERATURE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value", "temperature", DvOrdinal.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(News2ScoreObservation.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField TOTAL_SCORE_MAGNITUDE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0028]/value|magnitude", "totalScoreMagnitude", Long.class, this); + + public SelectAqlField CLINICAL_RISK_CATEGORY_DEFINING_CODE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0056]/value|defining_code", "clinicalRiskCategoryDefiningCode", ClinicalRiskCategoryDefiningCode.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); public ListSelectAqlField EXTENSION = new ListAqlFieldImp(News2ScoreObservation.class, "/protocol[at0045]/items[at0046]", "extension", Cluster.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(News2ScoreObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(News2ScoreObservation.class, "/language", "language", Language.class, this); + private News2ScoreObservationContainment() { super("openEHR-EHR-OBSERVATION.news2.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java index 53083b8eb..ff28009d6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java @@ -7,80 +7,80 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class News2Section { - @Path("/items[openEHR-EHR-OBSERVATION.pulse_oximetry.v1]") - private PulseOximetryObservation pulseOximetry; + @Path("/items[openEHR-EHR-OBSERVATION.body_temperature.v1 and name/value='Temperature']") + private TemperatureObservation temperature; - @Path("/items[openEHR-EHR-OBSERVATION.acvpu.v0]") - private AcvpuScaleObservation acvpuScale; + @Path("/items[openEHR-EHR-OBSERVATION.pulse_oximetry.v1]") + private PulseOximetryObservation pulseOximetry; - @Path("/items[openEHR-EHR-OBSERVATION.blood_pressure.v2]") - private BloodPressureObservation bloodPressure; + @Path("/items[openEHR-EHR-OBSERVATION.pulse.v1 and name/value='Pulse']") + private PulseObservation pulse; - @Path("/items[openEHR-EHR-OBSERVATION.body_temperature.v1 and name/value='Temperature']") - private TemperatureObservation temperature; + @Path("/items[openEHR-EHR-OBSERVATION.respiration.v1]") + private RespirationsObservation respirations; - @Path("/items[openEHR-EHR-OBSERVATION.respiration.v1]") - private RespirationsObservation respirations; + @Path("/items[openEHR-EHR-OBSERVATION.acvpu.v0]") + private AcvpuScaleObservation acvpuScale; - @Path("/items[openEHR-EHR-OBSERVATION.pulse.v1 and name/value='Pulse']") - private PulseObservation pulse; + @Path("/items[openEHR-EHR-OBSERVATION.blood_pressure.v2]") + private BloodPressureObservation bloodPressure; - @Path("/items[openEHR-EHR-OBSERVATION.news2.v1]") - private News2ScoreObservation news2Score; + @Path("/items[openEHR-EHR-OBSERVATION.news2.v1]") + private News2ScoreObservation news2Score; - public void setPulseOximetry(PulseOximetryObservation pulseOximetry) { - this.pulseOximetry = pulseOximetry; - } + public void setTemperature(TemperatureObservation temperature) { + this.temperature = temperature; + } - public PulseOximetryObservation getPulseOximetry() { - return this.pulseOximetry; - } + public TemperatureObservation getTemperature() { + return this.temperature ; + } - public void setAcvpuScale(AcvpuScaleObservation acvpuScale) { - this.acvpuScale = acvpuScale; - } + public void setPulseOximetry(PulseOximetryObservation pulseOximetry) { + this.pulseOximetry = pulseOximetry; + } - public AcvpuScaleObservation getAcvpuScale() { - return this.acvpuScale; - } + public PulseOximetryObservation getPulseOximetry() { + return this.pulseOximetry ; + } - public void setBloodPressure(BloodPressureObservation bloodPressure) { - this.bloodPressure = bloodPressure; - } + public void setPulse(PulseObservation pulse) { + this.pulse = pulse; + } - public BloodPressureObservation getBloodPressure() { - return this.bloodPressure; - } + public PulseObservation getPulse() { + return this.pulse ; + } - public void setTemperature(TemperatureObservation temperature) { - this.temperature = temperature; - } + public void setRespirations(RespirationsObservation respirations) { + this.respirations = respirations; + } - public TemperatureObservation getTemperature() { - return this.temperature; - } + public RespirationsObservation getRespirations() { + return this.respirations ; + } - public void setRespirations(RespirationsObservation respirations) { - this.respirations = respirations; - } + public void setAcvpuScale(AcvpuScaleObservation acvpuScale) { + this.acvpuScale = acvpuScale; + } - public RespirationsObservation getRespirations() { - return this.respirations; - } + public AcvpuScaleObservation getAcvpuScale() { + return this.acvpuScale ; + } - public void setPulse(PulseObservation pulse) { - this.pulse = pulse; - } + public void setBloodPressure(BloodPressureObservation bloodPressure) { + this.bloodPressure = bloodPressure; + } - public PulseObservation getPulse() { - return this.pulse; - } + public BloodPressureObservation getBloodPressure() { + return this.bloodPressure ; + } - public void setNews2Score(News2ScoreObservation news2Score) { - this.news2Score = news2Score; - } + public void setNews2Score(News2ScoreObservation news2Score) { + this.news2Score = news2Score; + } - public News2ScoreObservation getNews2Score() { - return this.news2Score; - } + public News2ScoreObservation getNews2Score() { + return this.news2Score ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2SectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2SectionContainment.java index 065561ac6..b33bbc2f5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2SectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2SectionContainment.java @@ -7,25 +7,25 @@ public class News2SectionContainment extends Containment { public SelectAqlField NEWS2_SECTION = new AqlFieldImp(News2Section.class, "", "News2Section", News2Section.class, this); - public SelectAqlField PULSE_OXIMETRY = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.pulse_oximetry.v1]", "pulseOximetry", PulseOximetryObservation.class, this); + public SelectAqlField TEMPERATURE = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.body_temperature.v1]", "temperature", TemperatureObservation.class, this); - public SelectAqlField ACVPU_SCALE = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.acvpu.v0]", "acvpuScale", AcvpuScaleObservation.class, this); + public SelectAqlField PULSE_OXIMETRY = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.pulse_oximetry.v1]", "pulseOximetry", PulseOximetryObservation.class, this); - public SelectAqlField BLOOD_PRESSURE = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.blood_pressure.v2]", "bloodPressure", BloodPressureObservation.class, this); + public SelectAqlField PULSE = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.pulse.v1]", "pulse", PulseObservation.class, this); - public SelectAqlField TEMPERATURE = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.body_temperature.v1 and name/value='Temperature']", "temperature", TemperatureObservation.class, this); + public SelectAqlField RESPIRATIONS = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.respiration.v1]", "respirations", RespirationsObservation.class, this); - public SelectAqlField RESPIRATIONS = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.respiration.v1]", "respirations", RespirationsObservation.class, this); + public SelectAqlField ACVPU_SCALE = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.acvpu.v0]", "acvpuScale", AcvpuScaleObservation.class, this); - public SelectAqlField PULSE = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.pulse.v1 and name/value='Pulse']", "pulse", PulseObservation.class, this); + public SelectAqlField BLOOD_PRESSURE = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.blood_pressure.v2]", "bloodPressure", BloodPressureObservation.class, this); - public SelectAqlField NEWS2_SCORE = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.news2.v1]", "news2Score", News2ScoreObservation.class, this); + public SelectAqlField NEWS2_SCORE = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.news2.v1]", "news2Score", News2ScoreObservation.class, this); - private News2SectionContainment() { - super("openEHR-EHR-SECTION.adhoc.v1"); - } + private News2SectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } - public static News2SectionContainment getInstance() { - return new News2SectionContainment(); - } + public static News2SectionContainment getInstance() { + return new News2SectionContainment(); + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java index 22546714c..44c779406 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java @@ -10,69 +10,69 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") public class OtherSymptomCluster { - @Path("/items[at0063]") - private List sign; + @Path("/items[at0001.1]/value|value") + private String symptomSignNameValue; - @Path("/items[at0153]") - private List specificDetails; + @Path("/items[at0147]") + private List structuredBodySite; - @Path("/items[at0001.1]/value|value") - private String symptomSignNameValue; + @Path("/items[at0153]") + private List specificDetails; - @Path("/items[at0146]") - private List previousEpisodes; + @Path("/items[at0146]") + private List previousEpisodes; - @Path("/items[at0.1]/value|defining_code") - private PresenceDefiningcode presenceDefiningcode; + @Path("/items[at0063]") + private List associatedSymptomSign; - @Path("/items[at0147]") - private List structuredBodySite; + @Path("/items[at0.1 and name/value='Presence']/value|defining_code") + private PresenceDefiningCode presenceDefiningCode; - public void setSign(List sign) { - this.sign = sign; - } + public void setSymptomSignNameValue(String symptomSignNameValue) { + this.symptomSignNameValue = symptomSignNameValue; + } - public List getSign() { - return this.sign; - } + public String getSymptomSignNameValue() { + return this.symptomSignNameValue ; + } - public void setSpecificDetails(List specificDetails) { - this.specificDetails = specificDetails; - } + public void setStructuredBodySite(List structuredBodySite) { + this.structuredBodySite = structuredBodySite; + } - public List getSpecificDetails() { - return this.specificDetails; - } + public List getStructuredBodySite() { + return this.structuredBodySite ; + } - public void setSymptomSignNameValue(String symptomSignNameValue) { - this.symptomSignNameValue = symptomSignNameValue; - } + public void setSpecificDetails(List specificDetails) { + this.specificDetails = specificDetails; + } - public String getSymptomSignNameValue() { - return this.symptomSignNameValue; - } + public List getSpecificDetails() { + return this.specificDetails ; + } - public void setPreviousEpisodes(List previousEpisodes) { - this.previousEpisodes = previousEpisodes; - } + public void setPreviousEpisodes(List previousEpisodes) { + this.previousEpisodes = previousEpisodes; + } - public List getPreviousEpisodes() { - return this.previousEpisodes; - } + public List getPreviousEpisodes() { + return this.previousEpisodes ; + } - public void setPresenceDefiningcode(PresenceDefiningcode presenceDefiningcode) { - this.presenceDefiningcode = presenceDefiningcode; - } + public void setAssociatedSymptomSign(List associatedSymptomSign) { + this.associatedSymptomSign = associatedSymptomSign; + } - public PresenceDefiningcode getPresenceDefiningcode() { - return this.presenceDefiningcode; - } + public List getAssociatedSymptomSign() { + return this.associatedSymptomSign ; + } - public void setStructuredBodySite(List structuredBodySite) { - this.structuredBodySite = structuredBodySite; - } + public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { + this.presenceDefiningCode = presenceDefiningCode; + } - public List getStructuredBodySite() { - return this.structuredBodySite; - } + public PresenceDefiningCode getPresenceDefiningCode() { + return this.presenceDefiningCode ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomClusterContainment.java index c4aff9fc4..3d0ac81b4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomClusterContainment.java @@ -10,17 +10,17 @@ public class OtherSymptomClusterContainment extends Containment { public SelectAqlField OTHER_SYMPTOM_CLUSTER = new AqlFieldImp(OtherSymptomCluster.class, "", "OtherSymptomCluster", OtherSymptomCluster.class, this); - public ListSelectAqlField SIGN = new ListAqlFieldImp(OtherSymptomCluster.class, "/items[at0063]", "sign", Cluster.class, this); + public SelectAqlField SYMPTOM_SIGN_NAME_VALUE = new AqlFieldImp(OtherSymptomCluster.class, "/items[at0001.1]/value|value", "symptomSignNameValue", String.class, this); - public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(OtherSymptomCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); + public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(OtherSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); - public SelectAqlField SYMPTOM_SIGN_NAME_VALUE = new AqlFieldImp(OtherSymptomCluster.class, "/items[at0001.1]/value|value", "symptomSignNameValue", String.class, this); + public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(OtherSymptomCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(OtherSymptomCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); - public SelectAqlField PRESENCE_DEFININGCODE = new AqlFieldImp(OtherSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningcode", PresenceDefiningcode.class, this); + public ListSelectAqlField ASSOCIATED_SYMPTOM_SIGN = new ListAqlFieldImp(OtherSymptomCluster.class, "/items[at0063]", "associatedSymptomSign", Cluster.class, this); - public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(OtherSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); + public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(OtherSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); private OtherSymptomClusterContainment() { super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OverallTestStatusDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OverallTestStatusDefiningcode.java index b2cc2c9a9..b41c3a322 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OverallTestStatusDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OverallTestStatusDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum OverallTestStatusDefiningcode implements EnumValueSet { +public enum OverallTestStatusDefiningCode implements EnumValueSet { AMENDED("Amended", "The result has been modified subsequent to being Final, and is complete and verified by the responsible pathologist, and result data has been changed.", "local", "at0040"), PRELIMINARY("Preliminary", "Verified early results are available, but not all results are final. This is a sub-category of 'Partial'.", "local", "at0120"), @@ -27,8 +27,8 @@ public enum OverallTestStatusDefiningcode implements EnumValueSet { private String code; - OverallTestStatusDefiningcode(String value, String description, String terminologyId, - String code) { + OverallTestStatusDefiningCode(String value, String description, String terminologyId, + String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -36,18 +36,18 @@ public enum OverallTestStatusDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java index e587195bd..ca4607fd7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java @@ -5,54 +5,54 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.util.List; @Entity @Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") public class PastHistoryEvaluation { - @Path("/subject") - private PartyProxy subject; + @Path("/data[at0001]/items[at0002]/value|value") + private String synopsisValue; - @Path("/data[at0001]/items[at0002]/value|value") - private String synopsisValue; + @Path("/protocol[at0003]/items[at0004]") + private List extension; - @Path("/language") - private Language language; + @Path("/subject") + private PartyProxy subject; - @Path("/protocol[at0003]/items[at0004]") - private List extension; + @Path("/language") + private Language language; - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setSynopsisValue(String synopsisValue) { + this.synopsisValue = synopsisValue; + } - public PartyProxy getSubject() { - return this.subject; - } + public String getSynopsisValue() { + return this.synopsisValue ; + } - public void setSynopsisValue(String synopsisValue) { - this.synopsisValue = synopsisValue; - } + public void setExtension(List extension) { + this.extension = extension; + } - public String getSynopsisValue() { - return this.synopsisValue; - } + public List getExtension() { + return this.extension ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public Language getLanguage() { - return this.language; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setExtension(List extension) { - this.extension = extension; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getExtension() { - return this.extension; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluationContainment.java index 243e25f45..b2ad285b3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluationContainment.java @@ -7,19 +7,19 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; public class PastHistoryEvaluationContainment extends Containment { public SelectAqlField PAST_HISTORY_EVALUATION = new AqlFieldImp(PastHistoryEvaluation.class, "", "PastHistoryEvaluation", PastHistoryEvaluation.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(PastHistoryEvaluation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField SYNOPSIS_VALUE = new AqlFieldImp(PastHistoryEvaluation.class, "/data[at0001]/items[at0002]/value|value", "synopsisValue", String.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(PastHistoryEvaluation.class, "/language", "language", Language.class, this); - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(PastHistoryEvaluation.class, "/protocol[at0003]/items[at0004]", "extension", Cluster.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(PastHistoryEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(PastHistoryEvaluation.class, "/language", "language", Language.class, this); + private PastHistoryEvaluationContainment() { super("openEHR-EHR-EVALUATION.clinical_synopsis.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningcodeCareHomeHasSuspectedConfirmedCovid19.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningCode2.java similarity index 68% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningcodeCareHomeHasSuspectedConfirmedCovid19.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningCode2.java index 6629fcc70..539e0fabb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningcodeCareHomeHasSuspectedConfirmedCovid19.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningCode2.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum PresenceDefiningcodeCareHomeHasSuspectedConfirmedCovid19 implements EnumValueSet { +public enum PresenceDefiningCode2 implements EnumValueSet { PRESENT("Present", "The risk factor has been identified for this individual.", "local", "at0018"), UNKNOWN("Unknown", "No information is available for this risk factor.", "local", "at0.15"), @@ -17,8 +17,7 @@ public enum PresenceDefiningcodeCareHomeHasSuspectedConfirmedCovid19 implements private String code; - PresenceDefiningcodeCareHomeHasSuspectedConfirmedCovid19(String value, String description, - String terminologyId, String code) { + PresenceDefiningCode2(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -26,18 +25,18 @@ public enum PresenceDefiningcodeCareHomeHasSuspectedConfirmedCovid19 implements } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningcode.java index 3d1724270..3a22dfb93 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum PresenceDefiningcode implements EnumValueSet { +public enum PresenceDefiningCode implements EnumValueSet { UNKNOWN("Unknown", "It is not known if the symptom is present.", "local", "at0.4"), ABSENT("Absent", "The symptom is absent.", "local", "at0.3"), @@ -17,7 +17,7 @@ public enum PresenceDefiningcode implements EnumValueSet { private String code; - PresenceDefiningcode(String value, String description, String terminologyId, String code) { + PresenceDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -25,18 +25,18 @@ public enum PresenceDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java index a280c58e4..d32370c5c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,102 +13,102 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.pulse.v1") public class PulseObservation { - @Path("/protocol[at0010]/items[at1056]") - private List extension; + @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004 and name/value='Pulse Rate']/value|magnitude") + private Double pulseRateMagnitude; - @Path("/language") - private Language language; + @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004 and name/value='Pulse Rate']/value|units") + private String pulseRateUnits; - @Path("/protocol[at0010]/items[at1013]") - private Cluster device; + @Path("/data[at0002]/events[at0003]/state[at0012]/items[at1017]") + private List exertion; - @Path("/data[at0002]/origin|value") - private TemporalAccessor originValue; + @Path("/data[at0002]/events[at0003]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0002]/events[at0003]/state[at0012]/items[at1017]") - private List exertion; + @Path("/data[at0002]/origin|value") + private TemporalAccessor originValue; - @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude") - private Double pulseRateMagnitude; + @Path("/protocol[at0010]/items[at1013]") + private Cluster device; - @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units") - private String pulseRateUnits; + @Path("/protocol[at0010]/items[at1056]") + private List extension; - @Path("/subject") - private PartyProxy subject; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0002]/events[at0003]/time|value") - private TemporalAccessor timeValue; + @Path("/language") + private Language language; - public void setExtension(List extension) { - this.extension = extension; - } + public void setPulseRateMagnitude(Double pulseRateMagnitude) { + this.pulseRateMagnitude = pulseRateMagnitude; + } - public List getExtension() { - return this.extension; - } + public Double getPulseRateMagnitude() { + return this.pulseRateMagnitude ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setPulseRateUnits(String pulseRateUnits) { + this.pulseRateUnits = pulseRateUnits; + } - public Language getLanguage() { - return this.language; - } + public String getPulseRateUnits() { + return this.pulseRateUnits ; + } - public void setDevice(Cluster device) { - this.device = device; - } + public void setExertion(List exertion) { + this.exertion = exertion; + } - public Cluster getDevice() { - return this.device; - } + public List getExertion() { + return this.exertion ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setExertion(List exertion) { - this.exertion = exertion; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public List getExertion() { - return this.exertion; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setPulseRateMagnitude(Double pulseRateMagnitude) { - this.pulseRateMagnitude = pulseRateMagnitude; - } + public void setDevice(Cluster device) { + this.device = device; + } - public Double getPulseRateMagnitude() { - return this.pulseRateMagnitude; - } + public Cluster getDevice() { + return this.device ; + } - public void setPulseRateUnits(String pulseRateUnits) { - this.pulseRateUnits = pulseRateUnits; - } + public void setExtension(List extension) { + this.extension = extension; + } - public String getPulseRateUnits() { - return this.pulseRateUnits; - } + public List getExtension() { + return this.extension ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public PartyProxy getSubject() { - return this.subject; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setLanguage(Language language) { + this.language = language; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservationContainment.java index 7ab60a9af..de9dc9f32 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservationContainment.java @@ -7,30 +7,30 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class PulseObservationContainment extends Containment { public SelectAqlField PULSE_OBSERVATION = new AqlFieldImp(PulseObservation.class, "", "PulseObservation", PulseObservation.class, this); - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(PulseObservation.class, "/protocol[at0010]/items[at1056]", "extension", Cluster.class, this); + public SelectAqlField PULSE_RATE_MAGNITUDE = new AqlFieldImp(PulseObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude", "pulseRateMagnitude", Double.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(PulseObservation.class, "/language", "language", Language.class, this); + public SelectAqlField PULSE_RATE_UNITS = new AqlFieldImp(PulseObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units", "pulseRateUnits", String.class, this); - public SelectAqlField DEVICE = new AqlFieldImp(PulseObservation.class, "/protocol[at0010]/items[at1013]", "device", Cluster.class, this); + public ListSelectAqlField EXERTION = new ListAqlFieldImp(PulseObservation.class, "/data[at0002]/events[at0003]/state[at0012]/items[at1017]", "exertion", Cluster.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(PulseObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(PulseObservation.class, "/data[at0002]/events[at0003]/time|value", "timeValue", TemporalAccessor.class, this); - public ListSelectAqlField EXERTION = new ListAqlFieldImp(PulseObservation.class, "/data[at0002]/events[at0003]/state[at0012]/items[at1017]", "exertion", Cluster.class, this); + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(PulseObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); - public SelectAqlField PULSE_RATE_MAGNITUDE = new AqlFieldImp(PulseObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude", "pulseRateMagnitude", Double.class, this); + public SelectAqlField DEVICE = new AqlFieldImp(PulseObservation.class, "/protocol[at0010]/items[at1013]", "device", Cluster.class, this); - public SelectAqlField PULSE_RATE_UNITS = new AqlFieldImp(PulseObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units", "pulseRateUnits", String.class, this); + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(PulseObservation.class, "/protocol[at0010]/items[at1056]", "extension", Cluster.class, this); public SelectAqlField SUBJECT = new AqlFieldImp(PulseObservation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(PulseObservation.class, "/data[at0002]/events[at0003]/time|value", "timeValue", TemporalAccessor.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(PulseObservation.class, "/language", "language", Language.class, this); private PulseObservationContainment() { super("openEHR-EHR-OBSERVATION.pulse.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java index f4f1c0584..0e2e86ead 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java @@ -6,7 +6,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -14,124 +14,124 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.pulse_oximetry.v1") public class PulseOximetryObservation { - @Path("/data[at0001]/events[at0002]/state[at0014]/items[at0034]") - private Cluster exertion; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value") + private DvProportion spo; - @Path("/protocol[at0007]/items[at0018]") - private Cluster oximetryDevice; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0054]") + private List waveform; - @Path("/data[at0001]/events[at0002]/state[at0014]/items[at0015]") - private Cluster inspiredOxygen; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0060]") + private List multimediaImage; - @Path("/protocol[at0007]/items[at0059]") - private List extension; + @Path("/data[at0001]/events[at0002]/state[at0014]/items[at0034]") + private Cluster exertion; - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/state[at0014]/items[at0015]") + private Cluster inspiredOxygen; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0054]") - private List waveform; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value") - private DvProportion spo; + @Path("/protocol[at0007]/items[at0018]") + private Cluster oximetryDevice; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0007]/items[at0059]") + private List extension; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0060]") - private List multimediaImage; + @Path("/language") + private Language language; - public void setExertion(Cluster exertion) { - this.exertion = exertion; - } + public void setSpo(DvProportion spo) { + this.spo = spo; + } - public Cluster getExertion() { - return this.exertion; - } + public DvProportion getSpo() { + return this.spo ; + } - public void setOximetryDevice(Cluster oximetryDevice) { - this.oximetryDevice = oximetryDevice; - } + public void setWaveform(List waveform) { + this.waveform = waveform; + } - public Cluster getOximetryDevice() { - return this.oximetryDevice; - } + public List getWaveform() { + return this.waveform ; + } - public void setInspiredOxygen(Cluster inspiredOxygen) { - this.inspiredOxygen = inspiredOxygen; - } + public void setMultimediaImage(List multimediaImage) { + this.multimediaImage = multimediaImage; + } - public Cluster getInspiredOxygen() { - return this.inspiredOxygen; - } + public List getMultimediaImage() { + return this.multimediaImage ; + } - public void setExtension(List extension) { - this.extension = extension; - } + public void setExertion(Cluster exertion) { + this.exertion = exertion; + } - public List getExtension() { - return this.extension; - } + public Cluster getExertion() { + return this.exertion ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setInspiredOxygen(Cluster inspiredOxygen) { + this.inspiredOxygen = inspiredOxygen; + } - public Language getLanguage() { - return this.language; - } + public Cluster getInspiredOxygen() { + return this.inspiredOxygen ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setWaveform(List waveform) { - this.waveform = waveform; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public List getWaveform() { - return this.waveform; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setSpo(DvProportion spo) { - this.spo = spo; - } + public void setOximetryDevice(Cluster oximetryDevice) { + this.oximetryDevice = oximetryDevice; + } - public DvProportion getSpo() { - return this.spo; - } + public Cluster getOximetryDevice() { + return this.oximetryDevice ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setExtension(List extension) { + this.extension = extension; + } - public PartyProxy getSubject() { - return this.subject; - } + public List getExtension() { + return this.extension ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setMultimediaImage(List multimediaImage) { - this.multimediaImage = multimediaImage; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getMultimediaImage() { - return this.multimediaImage; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservationContainment.java index 796ea5814..686c151a2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservationContainment.java @@ -8,34 +8,34 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class PulseOximetryObservationContainment extends Containment { public SelectAqlField PULSE_OXIMETRY_OBSERVATION = new AqlFieldImp(PulseOximetryObservation.class, "", "PulseOximetryObservation", PulseOximetryObservation.class, this); - public SelectAqlField EXERTION = new AqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/state[at0014]/items[at0034]", "exertion", Cluster.class, this); + public SelectAqlField SPO = new AqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value", "spo", DvProportion.class, this); - public SelectAqlField OXIMETRY_DEVICE = new AqlFieldImp(PulseOximetryObservation.class, "/protocol[at0007]/items[at0018]", "oximetryDevice", Cluster.class, this); + public ListSelectAqlField WAVEFORM = new ListAqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0054]", "waveform", Cluster.class, this); - public SelectAqlField INSPIRED_OXYGEN = new AqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/state[at0014]/items[at0015]", "inspiredOxygen", Cluster.class, this); + public ListSelectAqlField MULTIMEDIA_IMAGE = new ListAqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0060]", "multimediaImage", Cluster.class, this); - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(PulseOximetryObservation.class, "/protocol[at0007]/items[at0059]", "extension", Cluster.class, this); + public SelectAqlField EXERTION = new AqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/state[at0014]/items[at0034]", "exertion", Cluster.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(PulseOximetryObservation.class, "/language", "language", Language.class, this); + public SelectAqlField INSPIRED_OXYGEN = new AqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/state[at0014]/items[at0015]", "inspiredOxygen", Cluster.class, this); public SelectAqlField TIME_VALUE = new AqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - public ListSelectAqlField WAVEFORM = new ListAqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0054]", "waveform", Cluster.class, this); + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public SelectAqlField SPO = new AqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value", "spo", DvProportion.class, this); + public SelectAqlField OXIMETRY_DEVICE = new AqlFieldImp(PulseOximetryObservation.class, "/protocol[at0007]/items[at0018]", "oximetryDevice", Cluster.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(PulseOximetryObservation.class, "/subject", "subject", PartyProxy.class, this); + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(PulseOximetryObservation.class, "/protocol[at0007]/items[at0059]", "extension", Cluster.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(PulseOximetryObservation.class, "/subject", "subject", PartyProxy.class, this); - public ListSelectAqlField MULTIMEDIA_IMAGE = new ListAqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0060]", "multimediaImage", Cluster.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(PulseOximetryObservation.class, "/language", "language", Language.class, this); private PulseOximetryObservationContainment() { super("openEHR-EHR-OBSERVATION.pulse_oximetry.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java index 21d015cc1..bf92c61e9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java @@ -5,54 +5,54 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.util.List; @Entity @Archetype("openEHR-EHR-EVALUATION.recommendation.v1") public class RecommendationEvaluation { - @Path("/data[at0001]/items[at0002]") - private List recommendation; + @Path("/data[at0001]/items[at0002]") + private List recommendation; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0004]/items[at0005]") + private List extension; - @Path("/language") - private Language language; + @Path("/subject") + private PartyProxy subject; - @Path("/protocol[at0004]/items[at0005]") - private List extension; + @Path("/language") + private Language language; - public void setRecommendation(List recommendation) { - this.recommendation = recommendation; - } + public void setRecommendation(List recommendation) { + this.recommendation = recommendation; + } - public List getRecommendation() { - return this.recommendation; - } + public List getRecommendation() { + return this.recommendation ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setExtension(List extension) { + this.extension = extension; + } - public PartyProxy getSubject() { - return this.subject; - } + public List getExtension() { + return this.extension ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public Language getLanguage() { - return this.language; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setExtension(List extension) { - this.extension = extension; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getExtension() { - return this.extension; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluationContainment.java index 2427b1fa6..ebfa5a3bd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluationContainment.java @@ -7,24 +7,24 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; public class RecommendationEvaluationContainment extends Containment { - public SelectAqlField RECOMMENDATION_EVALUATION = new AqlFieldImp(RecommendationEvaluation.class, "", "RecommendationEvaluation", RecommendationEvaluation.class, this); + public SelectAqlField RECOMMENDATION_EVALUATION = new AqlFieldImp(RecommendationEvaluation.class, "", "RecommendationEvaluation", RecommendationEvaluation.class, this); - public ListSelectAqlField RECOMMENDATION = new ListAqlFieldImp(RecommendationEvaluation.class, "/data[at0001]/items[at0002]", "recommendation", RecommendationRecommendationElement.class, this); + public ListSelectAqlField RECOMMENDATION = new ListAqlFieldImp(RecommendationEvaluation.class, "/data[at0001]/items[at0002]", "recommendation", RecommendationRecommendationElement.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(RecommendationEvaluation.class, "/subject", "subject", PartyProxy.class, this); + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(RecommendationEvaluation.class, "/protocol[at0004]/items[at0005]", "extension", Cluster.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(RecommendationEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(RecommendationEvaluation.class, "/subject", "subject", PartyProxy.class, this); - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(RecommendationEvaluation.class, "/protocol[at0004]/items[at0005]", "extension", Cluster.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(RecommendationEvaluation.class, "/language", "language", Language.class, this); - private RecommendationEvaluationContainment() { - super("openEHR-EHR-EVALUATION.recommendation.v1"); - } + private RecommendationEvaluationContainment() { + super("openEHR-EHR-EVALUATION.recommendation.v1"); + } - public static RecommendationEvaluationContainment getInstance() { - return new RecommendationEvaluationContainment(); - } + public static RecommendationEvaluationContainment getInstance() { + return new RecommendationEvaluationContainment(); + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java index 528bbe637..47ef08c06 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java @@ -5,14 +5,14 @@ @Entity public class RecommendationRecommendationElement { - @Path("/value|value") - private String value; + @Path("/value|value") + private String value; - public void setValue(String value) { - this.value = value; - } + public void setValue(String value) { + this.value = value; + } - public String getValue() { - return this.value; - } + public String getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Definingcode3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RedFlagAcuteDefiningCode.java similarity index 65% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Definingcode3.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RedFlagAcuteDefiningCode.java index 0db87eecd..400896377 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Definingcode3.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RedFlagAcuteDefiningCode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum Definingcode3 implements EnumValueSet { +public enum RedFlagAcuteDefiningCode implements EnumValueSet { RESPIRATORY_RATE25_PER_MINUTE("Respiratory rate ≥ 25 per minute", "Respiratory rate ≥ 25 per minute", "local", "at0077"), SYSTOLIC_BP90_MMHG_OR_DROP_OF40_FROM_NORMAL("Systolic BP ≤ 90 mmHg (or drop of >40 from normal)", "Systolic BP ≤ 90 mmHg (or drop of >40 from normal)", "local", "at0075"), @@ -11,15 +11,15 @@ public enum Definingcode3 implements EnumValueSet { RECENT_CHEMOTHERAPY("Recent chemotherapy", "Recent chemotherapy", "local", "at0081"), - HR_IF_CATHETERISED("Not passed urine in 18 hours (<0.5ml/kg/hr if catheterised)", "Not passed urine in 18 hours (<0.5ml/kg/hr if catheterised)", "local", "at0082"), + NOT_PASSED_URINE_IN18_HOURS05ML_KG_HR_IF_CATHETERISED("Not passed urine in 18 hours (<0.5ml/kg/hr if catheterised)", "Not passed urine in 18 hours (<0.5ml/kg/hr if catheterised)", "local", "at0082"), HEART_RATE130_PER_MINUTE("Heart rate ≥ 130 per minute", "Heart rate ≥ 130 per minute", "local", "at0076"), - L("Lactate ≥ 2 mmol/l", "Lactate ≥ 2 mmol/l", "local", "at0080"), + LACTATE2_MMOL_L("Lactate ≥ 2 mmol/l", "Lactate ≥ 2 mmol/l", "local", "at0080"), OBJECTIVE_EVIDENCE_OF_NEW_OR_ALTERED_MENTAL_STATE("Objective evidence of new or altered mental state", "Objective evidence of new or altered mental state", "local", "at0074"), - CYANOTIC("Non-blanching rash / mottled / ashen / cyanotic", "Non-blanching rash / mottled / ashen / cyanotic", "local", "at0079"); + NON_BLANCHING_RASH_MOTTLED_ASHEN_CYANOTIC("Non-blanching rash / mottled / ashen / cyanotic", "Non-blanching rash / mottled / ashen / cyanotic", "local", "at0079"); private String value; @@ -29,7 +29,7 @@ public enum Definingcode3 implements EnumValueSet { private String code; - Definingcode3(String value, String description, String terminologyId, String code) { + RedFlagAcuteDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -37,18 +37,18 @@ public enum Definingcode3 implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java index 5ba715601..2a2c71c6a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,102 +13,102 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.respiration.v1") public class RespirationsObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude") - private Double rateMagnitude; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude") + private Double rateMagnitude; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units") - private String rateUnits; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units") + private String rateUnits; - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/state[at0022]/items[at0055]") + private Cluster inspiredOxygen; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/events[at0002]/state[at0022]/items[at0037]") + private Cluster exertion; - @Path("/data[at0001]/events[at0002]/state[at0022]/items[at0037]") - private Cluster exertion; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/protocol[at0057]/items[at0058]") - private List extension; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0057]/items[at0058]") + private List extension; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/events[at0002]/state[at0022]/items[at0055]") - private Cluster inspiredOxygen; + @Path("/language") + private Language language; - public void setRateMagnitude(Double rateMagnitude) { - this.rateMagnitude = rateMagnitude; - } + public void setRateMagnitude(Double rateMagnitude) { + this.rateMagnitude = rateMagnitude; + } - public Double getRateMagnitude() { - return this.rateMagnitude; - } + public Double getRateMagnitude() { + return this.rateMagnitude ; + } - public void setRateUnits(String rateUnits) { - this.rateUnits = rateUnits; - } + public void setRateUnits(String rateUnits) { + this.rateUnits = rateUnits; + } - public String getRateUnits() { - return this.rateUnits; - } + public String getRateUnits() { + return this.rateUnits ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setInspiredOxygen(Cluster inspiredOxygen) { + this.inspiredOxygen = inspiredOxygen; + } - public Language getLanguage() { - return this.language; - } + public Cluster getInspiredOxygen() { + return this.inspiredOxygen ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setExertion(Cluster exertion) { + this.exertion = exertion; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public Cluster getExertion() { + return this.exertion ; + } - public void setExertion(Cluster exertion) { - this.exertion = exertion; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public Cluster getExertion() { - return this.exertion; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setExtension(List extension) { - this.extension = extension; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public List getExtension() { - return this.extension; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setExtension(List extension) { + this.extension = extension; + } - public PartyProxy getSubject() { - return this.subject; - } + public List getExtension() { + return this.extension ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setInspiredOxygen(Cluster inspiredOxygen) { - this.inspiredOxygen = inspiredOxygen; - } + public void setLanguage(Language language) { + this.language = language; + } - public Cluster getInspiredOxygen() { - return this.inspiredOxygen; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservationContainment.java index 03ba3e46c..737f04eea 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservationContainment.java @@ -7,7 +7,7 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; @@ -18,19 +18,19 @@ public class RespirationsObservationContainment extends Containment { public SelectAqlField RATE_UNITS = new AqlFieldImp(RespirationsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units", "rateUnits", String.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(RespirationsObservation.class, "/language", "language", Language.class, this); + public SelectAqlField INSPIRED_OXYGEN = new AqlFieldImp(RespirationsObservation.class, "/data[at0001]/events[at0002]/state[at0022]/items[at0055]", "inspiredOxygen", Cluster.class, this); + + public SelectAqlField EXERTION = new AqlFieldImp(RespirationsObservation.class, "/data[at0001]/events[at0002]/state[at0022]/items[at0037]", "exertion", Cluster.class, this); public SelectAqlField TIME_VALUE = new AqlFieldImp(RespirationsObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - public SelectAqlField EXERTION = new AqlFieldImp(RespirationsObservation.class, "/data[at0001]/events[at0002]/state[at0022]/items[at0037]", "exertion", Cluster.class, this); + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(RespirationsObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); public ListSelectAqlField EXTENSION = new ListAqlFieldImp(RespirationsObservation.class, "/protocol[at0057]/items[at0058]", "extension", Cluster.class, this); public SelectAqlField SUBJECT = new AqlFieldImp(RespirationsObservation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(RespirationsObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public SelectAqlField INSPIRED_OXYGEN = new AqlFieldImp(RespirationsObservation.class, "/data[at0001]/events[at0002]/state[at0022]/items[at0055]", "inspiredOxygen", Cluster.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(RespirationsObservation.class, "/language", "language", Language.class, this); private RespirationsObservationContainment() { super("openEHR-EHR-OBSERVATION.respiration.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java index 520302f5a..dc4155923 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java @@ -9,36 +9,36 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class ResponseSection { - @Path("/items[openEHR-EHR-ACTION.service.v0]") - private List service; + @Path("/items[openEHR-EHR-EVALUATION.recommendation.v1]") + private RecommendationEvaluation recommendation; - @Path("/items[openEHR-EHR-INSTRUCTION.service_request.v1]") - private List serviceRequest; + @Path("/items[openEHR-EHR-INSTRUCTION.service_request.v1]") + private List serviceRequest; - @Path("/items[openEHR-EHR-EVALUATION.recommendation.v1]") - private RecommendationEvaluation recommendation; + @Path("/items[openEHR-EHR-ACTION.service.v0]") + private List service; - public void setService(List service) { - this.service = service; - } + public void setRecommendation(RecommendationEvaluation recommendation) { + this.recommendation = recommendation; + } - public List getService() { - return this.service; - } + public RecommendationEvaluation getRecommendation() { + return this.recommendation ; + } - public void setServiceRequest(List serviceRequest) { - this.serviceRequest = serviceRequest; - } + public void setServiceRequest(List serviceRequest) { + this.serviceRequest = serviceRequest; + } - public List getServiceRequest() { - return this.serviceRequest; - } + public List getServiceRequest() { + return this.serviceRequest ; + } - public void setRecommendation(RecommendationEvaluation recommendation) { - this.recommendation = recommendation; - } + public void setService(List service) { + this.service = service; + } - public RecommendationEvaluation getRecommendation() { - return this.recommendation; - } + public List getService() { + return this.service ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSectionContainment.java index f98e20e4a..b382f757e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSectionContainment.java @@ -7,19 +7,19 @@ import org.ehrbase.client.aql.field.SelectAqlField; public class ResponseSectionContainment extends Containment { - public SelectAqlField RESPONSE_SECTION = new AqlFieldImp(ResponseSection.class, "", "ResponseSection", ResponseSection.class, this); + public SelectAqlField RESPONSE_SECTION = new AqlFieldImp(ResponseSection.class, "", "ResponseSection", ResponseSection.class, this); - public ListSelectAqlField SERVICE = new ListAqlFieldImp(ResponseSection.class, "/items[openEHR-EHR-ACTION.service.v0]", "service", ServiceAction.class, this); + public SelectAqlField RECOMMENDATION = new AqlFieldImp(ResponseSection.class, "/items[openEHR-EHR-EVALUATION.recommendation.v1]", "recommendation", RecommendationEvaluation.class, this); - public ListSelectAqlField SERVICE_REQUEST = new ListAqlFieldImp(ResponseSection.class, "/items[openEHR-EHR-INSTRUCTION.service_request.v1]", "serviceRequest", ServiceRequestInstruction.class, this); + public ListSelectAqlField SERVICE_REQUEST = new ListAqlFieldImp(ResponseSection.class, "/items[openEHR-EHR-INSTRUCTION.service_request.v1]", "serviceRequest", ServiceRequestInstruction.class, this); - public SelectAqlField RECOMMENDATION = new AqlFieldImp(ResponseSection.class, "/items[openEHR-EHR-EVALUATION.recommendation.v1]", "recommendation", RecommendationEvaluation.class, this); + public ListSelectAqlField SERVICE = new ListAqlFieldImp(ResponseSection.class, "/items[openEHR-EHR-ACTION.service.v0]", "service", ServiceAction.class, this); - private ResponseSectionContainment() { - super("openEHR-EHR-SECTION.adhoc.v1"); - } + private ResponseSectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } - public static ResponseSectionContainment getInstance() { - return new ResponseSectionContainment(); - } + public static ResponseSectionContainment getInstance() { + return new ResponseSectionContainment(); + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskAssessmentDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskAssessmentDefiningcode.java index 9230289f5..7845a4175 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskAssessmentDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskAssessmentDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum RiskAssessmentDefiningcode implements EnumValueSet { +public enum RiskAssessmentDefiningCode implements EnumValueSet { LOW_RISK("Low risk", "The risk of the a patient having a Covid-19 infection is assessed to be low.", "local", "at0.16"), HIGH_RISK("High risk", "The risk of the a patient having a Covid-19 infection is assessed to be high.", "local", "at0.17"); @@ -15,7 +15,7 @@ public enum RiskAssessmentDefiningcode implements EnumValueSet { private String code; - RiskAssessmentDefiningcode(String value, String description, String terminologyId, String code) { + RiskAssessmentDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -23,18 +23,18 @@ public enum RiskAssessmentDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningcodeContactWithConfirmedCase.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode2.java similarity index 66% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningcodeContactWithConfirmedCase.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode2.java index a16f52a6f..03bf745b1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningcodeContactWithConfirmedCase.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode2.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum RiskFactorDefiningcodeContactWithConfirmedCase implements EnumValueSet { +public enum RiskFactorDefiningCode2 implements EnumValueSet { CONTACT_WITH_CONFIRMED_COVID19_CASE("Contact with confirmed Covid-19 case", "Contact with confirmed Covid-19 case within 14 days before symptom onset.", "local", "at0.9"); private String value; @@ -13,8 +13,7 @@ public enum RiskFactorDefiningcodeContactWithConfirmedCase implements EnumValueS private String code; - RiskFactorDefiningcodeContactWithConfirmedCase(String value, String description, - String terminologyId, String code) { + RiskFactorDefiningCode2(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -22,18 +21,18 @@ public enum RiskFactorDefiningcodeContactWithConfirmedCase implements EnumValueS } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningcodeOtherResidentsHouseholdMembersUnwell.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode3.java similarity index 63% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningcodeOtherResidentsHouseholdMembersUnwell.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode3.java index 60b78241e..dbe1d9c26 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningcodeOtherResidentsHouseholdMembersUnwell.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode3.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum RiskFactorDefiningcodeOtherResidentsHouseholdMembersUnwell implements EnumValueSet { +public enum RiskFactorDefiningCode3 implements EnumValueSet { OTHER_HOUSEHOLD_MEMBERS_ARE_ILL("Other household members are ill", "The patient is in a house with other household members who are ill", "local", "at0.19"); private String value; @@ -13,8 +13,7 @@ public enum RiskFactorDefiningcodeOtherResidentsHouseholdMembersUnwell implement private String code; - RiskFactorDefiningcodeOtherResidentsHouseholdMembersUnwell(String value, String description, - String terminologyId, String code) { + RiskFactorDefiningCode3(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -22,18 +21,18 @@ public enum RiskFactorDefiningcodeOtherResidentsHouseholdMembersUnwell implement } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningcode.java index ef278926c..4d7e400e3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum RiskFactorDefiningcode implements EnumValueSet { +public enum RiskFactorDefiningCode implements EnumValueSet { POTENTIAL_CONTACT_EXPOSURE_BASED_ON_LOCATION("Potential contact exposure based on location", "Potential contact exposure based on location.", "local", "at0.14"); private String value; @@ -13,7 +13,7 @@ public enum RiskFactorDefiningcode implements EnumValueSet { private String code; - RiskFactorDefiningcode(String value, String description, String terminologyId, String code) { + RiskFactorDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -21,18 +21,18 @@ public enum RiskFactorDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Definingcode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorsForSepsisDefiningCode.java similarity index 55% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Definingcode2.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorsForSepsisDefiningCode.java index 95eeb0504..fd3e6e624 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Definingcode2.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorsForSepsisDefiningCode.java @@ -2,14 +2,14 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum Definingcode2 implements EnumValueSet { +public enum RiskFactorsForSepsisDefiningCode implements EnumValueSet { AGE_OVER75("Age over 75", "Patient is over 75.", "local", "at0007"), IMPAIRED_IMMUNITY_E_G_DIABETES_STEROIDS_CHEMOTHERAPY("Impaired immunity (e.g diabetes, steroids, chemotherapy)", "Patient has impaired immunity.", "local", "at0008"), - BROKEN_SKIN("Indwelling lines / IVDU / broken skin", "Patient has indwelling lines, IVDU or broken skin.", "local", "at0010"), + INDWELLING_LINES_IVDU_BROKEN_SKIN("Indwelling lines / IVDU / broken skin", "Patient has indwelling lines, IVDU or broken skin.", "local", "at0010"), - INVASIVE_PROCEDURE("Recent trauma / surgery / invasive procedure", "Patient has had recent trauma, surgery or an invasive procedure.", "local", "at0009"); + RECENT_TRAUMA_SURGERY_INVASIVE_PROCEDURE("Recent trauma / surgery / invasive procedure", "Patient has had recent trauma, surgery or an invasive procedure.", "local", "at0009"); private String value; @@ -19,7 +19,8 @@ public enum Definingcode2 implements EnumValueSet { private String code; - Definingcode2(String value, String description, String terminologyId, String code) { + RiskFactorsForSepsisDefiningCode(String value, String description, String terminologyId, + String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -27,18 +28,18 @@ public enum Definingcode2 implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java new file mode 100644 index 000000000..f05d2a319 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java @@ -0,0 +1,18 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class SepsisScreening999FlagElement { + @Path("/value|defining_code") + private N999FlagDefiningCode value; + + public void setValue(N999FlagDefiningCode value) { + this.value = value; + } + + public N999FlagDefiningCode getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningA999FlagElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningA999FlagElement.java deleted file mode 100644 index 924490cb1..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningA999FlagElement.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class SepsisScreeningA999FlagElement { - @Path("/value|defining_code") - private Definingcode4 definingcode; - - public void setDefiningcode(Definingcode4 definingcode) { - this.definingcode = definingcode; - } - - public Definingcode4 getDefiningcode() { - return this.definingcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java index 6e81976bb..bc2f981b2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java @@ -5,14 +5,14 @@ @Entity public class SepsisScreeningAmberFlagAcuteElement { - @Path("/value|defining_code") - private Definingcode5 definingcode; + @Path("/value|defining_code") + private AmberFlagAcuteDefiningCode value; - public void setDefiningcode(Definingcode5 definingcode) { - this.definingcode = definingcode; - } + public void setValue(AmberFlagAcuteDefiningCode value) { + this.value = value; + } - public Definingcode5 getDefiningcode() { - return this.definingcode; - } + public AmberFlagAcuteDefiningCode getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningChoice.java deleted file mode 100644 index c1423c0b2..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -public interface SepsisScreeningChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningDvcodedtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningDvcodedtext.java deleted file mode 100644 index 32278aed6..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningDvcodedtext.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class SepsisScreeningDvcodedtext implements SepsisScreeningChoice { - @Path("|defining_code") - private ValueDefiningcode valueDefiningcode; - - public void setValueDefiningcode(ValueDefiningcode valueDefiningcode) { - this.valueDefiningcode = valueDefiningcode; - } - - public ValueDefiningcode getValueDefiningcode() { - return this.valueDefiningcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningDvtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningDvtext.java deleted file mode 100644 index 73509ad38..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningDvtext.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class SepsisScreeningDvtext implements SepsisScreeningChoice { - @Path("|value") - private String valueValue; - - public void setValueValue(String valueValue) { - this.valueValue = valueValue; - } - - public String getValueValue() { - return this.valueValue; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java index 117cbf84b..58bbab93c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java @@ -6,15 +6,15 @@ @Entity public class SepsisScreeningLikelySourceOfInfectionElement { - @Path("/value") - @Choice - private SepsisScreeningChoice value; + @Path("/value") + @Choice + private SepsisScreeningValueChoice value; - public void setValue(SepsisScreeningChoice value) { - this.value = value; - } + public void setValue(SepsisScreeningValueChoice value) { + this.value = value; + } - public SepsisScreeningChoice getValue() { - return this.value; - } + public SepsisScreeningValueChoice getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java index a0cc5d9c8..476325026 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,115 +13,115 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.sepsis_screening_tool.v0") public class SepsisScreeningObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]") - private List riskFactorsForSepsis; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]") + private List riskFactorsForSepsis; - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0011]") + private List likelySourceOfInfection; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0011]") - private List likelySourceOfInfection; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0058]") + private List redFlagAcute; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0058]") - private List redFlagAcute; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0083]") + private List amberFlagAcute; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0036]") - private List a999Flag; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0036]") + private List N999Flag; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/subject") - private PartyProxy subject; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/protocol[at0004]/items[at0005]") + private List extension; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0083]") - private List amberFlagAcute; + @Path("/subject") + private PartyProxy subject; - @Path("/protocol[at0004]/items[at0005]") - private List extension; + @Path("/language") + private Language language; - public void setRiskFactorsForSepsis( - List riskFactorsForSepsis) { - this.riskFactorsForSepsis = riskFactorsForSepsis; - } + public void setRiskFactorsForSepsis( + List riskFactorsForSepsis) { + this.riskFactorsForSepsis = riskFactorsForSepsis; + } - public List getRiskFactorsForSepsis() { - return this.riskFactorsForSepsis; - } + public List getRiskFactorsForSepsis() { + return this.riskFactorsForSepsis ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setLikelySourceOfInfection( + List likelySourceOfInfection) { + this.likelySourceOfInfection = likelySourceOfInfection; + } - public Language getLanguage() { - return this.language; - } + public List getLikelySourceOfInfection() { + return this.likelySourceOfInfection ; + } - public void setLikelySourceOfInfection( - List likelySourceOfInfection) { - this.likelySourceOfInfection = likelySourceOfInfection; - } + public void setRedFlagAcute(List redFlagAcute) { + this.redFlagAcute = redFlagAcute; + } - public List getLikelySourceOfInfection() { - return this.likelySourceOfInfection; - } + public List getRedFlagAcute() { + return this.redFlagAcute ; + } - public void setRedFlagAcute(List redFlagAcute) { - this.redFlagAcute = redFlagAcute; - } + public void setAmberFlagAcute(List amberFlagAcute) { + this.amberFlagAcute = amberFlagAcute; + } - public List getRedFlagAcute() { - return this.redFlagAcute; - } + public List getAmberFlagAcute() { + return this.amberFlagAcute ; + } - public void setA999Flag(List a999Flag) { - this.a999Flag = a999Flag; - } + public void setN999Flag(List N999Flag) { + this.N999Flag = N999Flag; + } - public List getA999Flag() { - return this.a999Flag; - } + public List getN999Flag() { + return this.N999Flag ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public PartyProxy getSubject() { - return this.subject; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setExtension(List extension) { + this.extension = extension; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public List getExtension() { + return this.extension ; + } - public void setAmberFlagAcute(List amberFlagAcute) { - this.amberFlagAcute = amberFlagAcute; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public List getAmberFlagAcute() { - return this.amberFlagAcute; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setExtension(List extension) { - this.extension = extension; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getExtension() { - return this.extension; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservationContainment.java index 0a69a8fd4..6e085634b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservationContainment.java @@ -7,7 +7,7 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; @@ -16,24 +16,24 @@ public class SepsisScreeningObservationContainment extends Containment { public ListSelectAqlField RISK_FACTORS_FOR_SEPSIS = new ListAqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]", "riskFactorsForSepsis", SepsisScreeningRiskFactorsForSepsisElement.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(SepsisScreeningObservation.class, "/language", "language", Language.class, this); - public ListSelectAqlField LIKELY_SOURCE_OF_INFECTION = new ListAqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0011]", "likelySourceOfInfection", SepsisScreeningLikelySourceOfInfectionElement.class, this); public ListSelectAqlField RED_FLAG_ACUTE = new ListAqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0058]", "redFlagAcute", SepsisScreeningRedFlagAcuteElement.class, this); - public ListSelectAqlField A999_FLAG = new ListAqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0036]", "a999Flag", SepsisScreeningA999FlagElement.class, this); + public ListSelectAqlField AMBER_FLAG_ACUTE = new ListAqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0083]", "amberFlagAcute", SepsisScreeningAmberFlagAcuteElement.class, this); + + public ListSelectAqlField N999_FLAG = new ListAqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0036]", "N999Flag", SepsisScreening999FlagElement.class, this); public SelectAqlField TIME_VALUE = new AqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(SepsisScreeningObservation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public ListSelectAqlField AMBER_FLAG_ACUTE = new ListAqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0083]", "amberFlagAcute", SepsisScreeningAmberFlagAcuteElement.class, this); - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(SepsisScreeningObservation.class, "/protocol[at0004]/items[at0005]", "extension", Cluster.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(SepsisScreeningObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(SepsisScreeningObservation.class, "/language", "language", Language.class, this); + private SepsisScreeningObservationContainment() { super("openEHR-EHR-OBSERVATION.sepsis_screening_tool.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java index b60cdf082..1bd91c293 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java @@ -5,14 +5,14 @@ @Entity public class SepsisScreeningRedFlagAcuteElement { - @Path("/value|defining_code") - private Definingcode3 definingcode; + @Path("/value|defining_code") + private RedFlagAcuteDefiningCode value; - public void setDefiningcode(Definingcode3 definingcode) { - this.definingcode = definingcode; - } + public void setValue(RedFlagAcuteDefiningCode value) { + this.value = value; + } - public Definingcode3 getDefiningcode() { - return this.definingcode; - } + public RedFlagAcuteDefiningCode getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java index b1cf154e0..48134e9c0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java @@ -5,14 +5,14 @@ @Entity public class SepsisScreeningRiskFactorsForSepsisElement { - @Path("/value|defining_code") - private Definingcode2 definingcode; + @Path("/value|defining_code") + private RiskFactorsForSepsisDefiningCode value; - public void setDefiningcode(Definingcode2 definingcode) { - this.definingcode = definingcode; - } + public void setValue(RiskFactorsForSepsisDefiningCode value) { + this.value = value; + } - public Definingcode2 getDefiningcode() { - return this.definingcode; - } + public RiskFactorsForSepsisDefiningCode getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueChoice.java new file mode 100644 index 000000000..d6637e372 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +public interface SepsisScreeningValueChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java new file mode 100644 index 000000000..d33a51fe8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class SepsisScreeningValueDvCodedText implements SepsisScreeningValueChoice { + @Path("|defining_code") + private ValueDefiningCode7 valueDefiningCode; + + public void setValueDefiningCode(ValueDefiningCode7 valueDefiningCode) { + this.valueDefiningCode = valueDefiningCode; + } + + public ValueDefiningCode7 getValueDefiningCode() { + return this.valueDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java new file mode 100644 index 000000000..31c152d10 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class SepsisScreeningValueDvText implements SepsisScreeningValueChoice { + @Path("|value") + private String valueValue; + + public void setValueValue(String valueValue) { + this.valueValue = valueValue; + } + + public String getValueValue() { + return this.valueValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java index a8434b728..86eb4cb31 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java @@ -7,14 +7,14 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class SepsisSection { - @Path("/items[openEHR-EHR-OBSERVATION.sepsis_screening_tool.v0 and name/value='Sepsis screening']") - private SepsisScreeningObservation sepsisScreening; + @Path("/items[openEHR-EHR-OBSERVATION.sepsis_screening_tool.v0 and name/value='Sepsis screening']") + private SepsisScreeningObservation sepsisScreening; - public void setSepsisScreening(SepsisScreeningObservation sepsisScreening) { - this.sepsisScreening = sepsisScreening; - } + public void setSepsisScreening(SepsisScreeningObservation sepsisScreening) { + this.sepsisScreening = sepsisScreening; + } - public SepsisScreeningObservation getSepsisScreening() { - return this.sepsisScreening; - } + public SepsisScreeningObservation getSepsisScreening() { + return this.sepsisScreening ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSectionContainment.java index 0d45f6587..20516876a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSectionContainment.java @@ -5,15 +5,15 @@ import org.ehrbase.client.aql.field.SelectAqlField; public class SepsisSectionContainment extends Containment { - public SelectAqlField SEPSIS_SECTION = new AqlFieldImp(SepsisSection.class, "", "SepsisSection", SepsisSection.class, this); + public SelectAqlField SEPSIS_SECTION = new AqlFieldImp(SepsisSection.class, "", "SepsisSection", SepsisSection.class, this); - public SelectAqlField SEPSIS_SCREENING = new AqlFieldImp(SepsisSection.class, "/items[openEHR-EHR-OBSERVATION.sepsis_screening_tool.v0 and name/value='Sepsis screening']", "sepsisScreening", SepsisScreeningObservation.class, this); + public SelectAqlField SEPSIS_SCREENING = new AqlFieldImp(SepsisSection.class, "/items[openEHR-EHR-OBSERVATION.sepsis_screening_tool.v0]", "sepsisScreening", SepsisScreeningObservation.class, this); - private SepsisSectionContainment() { - super("openEHR-EHR-SECTION.adhoc.v1"); - } + private SepsisSectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } - public static SepsisSectionContainment getInstance() { - return new SepsisSectionContainment(); - } + public static SepsisSectionContainment getInstance() { + return new SepsisSectionContainment(); + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java index f31e57920..8d1d55dfe 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java @@ -1,12 +1,12 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; import com.nedap.archie.rm.generic.PartyProxy; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.TransitionDefiningcode; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -14,136 +14,135 @@ @Entity @Archetype("openEHR-EHR-ACTION.service.v0") public class ServiceAction { - @Path("/time|value") - private TemporalAccessor timeValue; + @Path("/description[at0001]/items[at0011]/value|defining_code") + private CodePhrase serviceNameDefiningCode; - @Path("/protocol[at0015]/items[at0017]") - private List requestor; + @Path("/description[at0001]/items[at0013]/value|value") + private String descriptionValue; - @Path("/ism_transition[at0002]/careflow_step|defining_code") - private ServicePlannedDefiningcode servicePlannedDefiningcode; + @Path("/description[at0001]/items[at0027]") + private List serviceDetail; - @Path("/protocol[at0015]/items[at0019]") - private List receiver; + @Path("/description[at0001]/items[at0029]") + private List multimedia; - @Path("/language") - private Language language; + @Path("/protocol[at0015]/items[at0017]") + private List requestor; - @Path("/ism_transition[at0002]/current_state|defining_code") - private ServicePlannedDefiningcode2 servicePlannedDefiningcodeCurrentState; + @Path("/protocol[at0015]/items[at0019]") + private List receiver; - @Path("/ism_transition[at0002]/transition|defining_code") - private TransitionDefiningcode transitionDefiningcode; + @Path("/subject") + private PartyProxy subject; - @Path("/subject") - private PartyProxy subject; + @Path("/language") + private Language language; - @Path("/description[at0001]/items[at0011]/value|defining_code") - private ServiceNameDefiningcode serviceNameDefiningcode; + @Path("/time|value") + private TemporalAccessor timeValue; - @Path("/description[at0001]/items[at0027]") - private List serviceDetail; + @Path("/ism_transition/careflow_step|defining_code") + private CareflowStepDefiningCode careflowStepDefiningCode; - @Path("/description[at0001]/items[at0029]") - private List multimedia; + @Path("/ism_transition/current_state|defining_code") + private CurrentStateDefiningCode currentStateDefiningCode; - @Path("/description[at0001]/items[at0013]/value|value") - private String descriptionValue; + @Path("/ism_transition/transition|defining_code") + private CodePhrase transitionDefiningCode; - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setServiceNameDefiningCode(CodePhrase serviceNameDefiningCode) { + this.serviceNameDefiningCode = serviceNameDefiningCode; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public CodePhrase getServiceNameDefiningCode() { + return this.serviceNameDefiningCode ; + } - public void setRequestor(List requestor) { - this.requestor = requestor; - } + public void setDescriptionValue(String descriptionValue) { + this.descriptionValue = descriptionValue; + } - public List getRequestor() { - return this.requestor; - } + public String getDescriptionValue() { + return this.descriptionValue ; + } - public void setServicePlannedDefiningcode(ServicePlannedDefiningcode servicePlannedDefiningcode) { - this.servicePlannedDefiningcode = servicePlannedDefiningcode; - } + public void setServiceDetail(List serviceDetail) { + this.serviceDetail = serviceDetail; + } - public ServicePlannedDefiningcode getServicePlannedDefiningcode() { - return this.servicePlannedDefiningcode; - } + public List getServiceDetail() { + return this.serviceDetail ; + } - public void setReceiver(List receiver) { - this.receiver = receiver; - } + public void setMultimedia(List multimedia) { + this.multimedia = multimedia; + } - public List getReceiver() { - return this.receiver; - } + public List getMultimedia() { + return this.multimedia ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setRequestor(List requestor) { + this.requestor = requestor; + } - public Language getLanguage() { - return this.language; - } + public List getRequestor() { + return this.requestor ; + } - public void setServicePlannedDefiningcodeCurrentState( - ServicePlannedDefiningcode2 servicePlannedDefiningcodeCurrentState) { - this.servicePlannedDefiningcodeCurrentState = servicePlannedDefiningcodeCurrentState; - } + public void setReceiver(List receiver) { + this.receiver = receiver; + } - public ServicePlannedDefiningcode2 getServicePlannedDefiningcodeCurrentState() { - return this.servicePlannedDefiningcodeCurrentState; - } + public List getReceiver() { + return this.receiver ; + } - public void setTransitionDefiningcode(TransitionDefiningcode transitionDefiningcode) { - this.transitionDefiningcode = transitionDefiningcode; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public TransitionDefiningcode getTransitionDefiningcode() { - return this.transitionDefiningcode; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setLanguage(Language language) { + this.language = language; + } - public PartyProxy getSubject() { - return this.subject; - } + public Language getLanguage() { + return this.language ; + } - public void setServiceNameDefiningcode(ServiceNameDefiningcode serviceNameDefiningcode) { - this.serviceNameDefiningcode = serviceNameDefiningcode; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public ServiceNameDefiningcode getServiceNameDefiningcode() { - return this.serviceNameDefiningcode; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setServiceDetail(List serviceDetail) { - this.serviceDetail = serviceDetail; - } + public void setCareflowStepDefiningCode(CareflowStepDefiningCode careflowStepDefiningCode) { + this.careflowStepDefiningCode = careflowStepDefiningCode; + } - public List getServiceDetail() { - return this.serviceDetail; - } + public CareflowStepDefiningCode getCareflowStepDefiningCode() { + return this.careflowStepDefiningCode ; + } - public void setMultimedia(List multimedia) { - this.multimedia = multimedia; - } + public void setCurrentStateDefiningCode(CurrentStateDefiningCode currentStateDefiningCode) { + this.currentStateDefiningCode = currentStateDefiningCode; + } - public List getMultimedia() { - return this.multimedia; - } + public CurrentStateDefiningCode getCurrentStateDefiningCode() { + return this.currentStateDefiningCode ; + } - public void setDescriptionValue(String descriptionValue) { - this.descriptionValue = descriptionValue; - } + public void setTransitionDefiningCode(CodePhrase transitionDefiningCode) { + this.transitionDefiningCode = transitionDefiningCode; + } - public String getDescriptionValue() { - return this.descriptionValue; - } + public CodePhrase getTransitionDefiningCode() { + return this.transitionDefiningCode ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java index 48728a6d7..3a67ed0c2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java @@ -1,43 +1,43 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; import com.nedap.archie.rm.generic.PartyProxy; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.TransitionDefiningcode; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class ServiceActionContainment extends Containment { public SelectAqlField SERVICE_ACTION = new AqlFieldImp(ServiceAction.class, "", "ServiceAction", ServiceAction.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(ServiceAction.class, "/time|value", "timeValue", TemporalAccessor.class, this); - - public ListSelectAqlField REQUESTOR = new ListAqlFieldImp(ServiceAction.class, "/protocol[at0015]/items[at0017]", "requestor", Cluster.class, this); + public SelectAqlField SERVICE_NAME_DEFINING_CODE = new AqlFieldImp(ServiceAction.class, "/description[at0001]/items[at0011]/value|defining_code", "serviceNameDefiningCode", CodePhrase.class, this); - public SelectAqlField SERVICE_PLANNED_DEFININGCODE = new AqlFieldImp(ServiceAction.class, "/ism_transition[at0002]/careflow_step|defining_code", "servicePlannedDefiningcode", ServicePlannedDefiningcode.class, this); + public SelectAqlField DESCRIPTION_VALUE = new AqlFieldImp(ServiceAction.class, "/description[at0001]/items[at0013]/value|value", "descriptionValue", String.class, this); - public ListSelectAqlField RECEIVER = new ListAqlFieldImp(ServiceAction.class, "/protocol[at0015]/items[at0019]", "receiver", Cluster.class, this); + public ListSelectAqlField SERVICE_DETAIL = new ListAqlFieldImp(ServiceAction.class, "/description[at0001]/items[at0027]", "serviceDetail", Cluster.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(ServiceAction.class, "/language", "language", Language.class, this); + public ListSelectAqlField MULTIMEDIA = new ListAqlFieldImp(ServiceAction.class, "/description[at0001]/items[at0029]", "multimedia", Cluster.class, this); - public SelectAqlField SERVICE_PLANNED_DEFININGCODE_CURRENT_STATE = new AqlFieldImp(ServiceAction.class, "/ism_transition[at0002]/current_state|defining_code", "servicePlannedDefiningcodeCurrentState", ServicePlannedDefiningcode2.class, this); + public ListSelectAqlField REQUESTOR = new ListAqlFieldImp(ServiceAction.class, "/protocol[at0015]/items[at0017]", "requestor", Cluster.class, this); - public SelectAqlField TRANSITION_DEFININGCODE = new AqlFieldImp(ServiceAction.class, "/ism_transition[at0002]/transition|defining_code", "transitionDefiningcode", TransitionDefiningcode.class, this); + public ListSelectAqlField RECEIVER = new ListAqlFieldImp(ServiceAction.class, "/protocol[at0015]/items[at0019]", "receiver", Cluster.class, this); public SelectAqlField SUBJECT = new AqlFieldImp(ServiceAction.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField SERVICE_NAME_DEFININGCODE = new AqlFieldImp(ServiceAction.class, "/description[at0001]/items[at0011]/value|defining_code", "serviceNameDefiningcode", ServiceNameDefiningcode.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(ServiceAction.class, "/language", "language", Language.class, this); - public ListSelectAqlField SERVICE_DETAIL = new ListAqlFieldImp(ServiceAction.class, "/description[at0001]/items[at0027]", "serviceDetail", Cluster.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(ServiceAction.class, "/time|value", "timeValue", TemporalAccessor.class, this); - public ListSelectAqlField MULTIMEDIA = new ListAqlFieldImp(ServiceAction.class, "/description[at0001]/items[at0029]", "multimedia", Cluster.class, this); + public SelectAqlField CAREFLOW_STEP_DEFINING_CODE = new AqlFieldImp(ServiceAction.class, "/ism_transition/careflow_step|defining_code", "careflowStepDefiningCode", CareflowStepDefiningCode.class, this); - public SelectAqlField DESCRIPTION_VALUE = new AqlFieldImp(ServiceAction.class, "/description[at0001]/items[at0013]/value|value", "descriptionValue", String.class, this); + public SelectAqlField CURRENT_STATE_DEFINING_CODE = new AqlFieldImp(ServiceAction.class, "/ism_transition/current_state|defining_code", "currentStateDefiningCode", CurrentStateDefiningCode.class, this); + + public SelectAqlField TRANSITION_DEFINING_CODE = new AqlFieldImp(ServiceAction.class, "/ism_transition/transition|defining_code", "transitionDefiningCode", CodePhrase.class, this); private ServiceActionContainment() { super("openEHR-EHR-ACTION.service.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceNameDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceNameDefiningcode.java deleted file mode 100644 index 97ca9c454..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceNameDefiningcode.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum ServiceNameDefiningcode implements EnumValueSet { - N170499009("170499009", "170499009", "SNOMED-CT", "170499009"), - - N225368008("225368008", "225368008", "SNOMED-CT", "225368008"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - ServiceNameDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServicePlannedDefiningcode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServicePlannedDefiningcode2.java deleted file mode 100644 index 80210fd56..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServicePlannedDefiningcode2.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum ServicePlannedDefiningcode2 implements EnumValueSet { - PLANNED("planned", "planned", "openehr", "526"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - ServicePlannedDefiningcode2(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java index 421146950..a2e6e45dc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java @@ -1,7 +1,8 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datastructures.ItemStructure; +import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -10,113 +11,113 @@ @Entity public class ServiceRequestCurrentActivityActivity { - @Path("/description[at0009]/items[at0149]") - private List supportingInformation; + @Path("/description[at0009]/items[at0121]/value|defining_code") + private CodePhrase serviceNameDefiningCode; - @Path("/description[at0009]/items[at0116]") - private List patientRequirements; + @Path("/description[at0009]/items[at0062]") + private List reasonForRequest; - @Path("/description[at0009]/items[at0121]/value|defining_code") - private ServiceNameDefiningcode serviceNameDefiningcode; + @Path("/description[at0009]/items[at0064 and name/value='Reason for isolation']/value|value") + private String reasonForIsolationValue; - @Path("/description[at0009]/items[at0145]/value|value") - private TemporalAccessor dateIsolationDueToStartValue; + @Path("/description[at0009]/items[at0151]") + private List complexTiming; - @Path("/description[at0009]/items[at0132]") - private List specificDetails; + @Path("/description[at0009]/items[at0145 and name/value='Date isolation due to start']/value|value") + private TemporalAccessor dateIsolationDueToStartValue; - @Path("/description[at0009]/items[at0151]") - private List complexTiming; + @Path("/description[at0009]/items[at0144 and name/value='Date isolation due to end']/value|value") + private TemporalAccessor dateIsolationDueToEndValue; - @Path("/description[at0009]/items[at0144]/value|value") - private TemporalAccessor dateIsolationDueToEndValue; + @Path("/description[at0009]/items[at0132]") + private List specificDetails; - @Path("/description[at0009]/items[at0062]") - private List reasonForRequest; + @Path("/description[at0009]/items[at0149]") + private List supportingInformation; - @Path("/description[at0009]/items[at0064]/value|value") - private String reasonForIsolationValue; + @Path("/description[at0009]/items[at0116]") + private List patientRequirements; - @Path("/description") - private ItemStructure description; + @Path("/timing") + private DvParsable timing; - public void setSupportingInformation(List supportingInformation) { - this.supportingInformation = supportingInformation; - } + public void setServiceNameDefiningCode(CodePhrase serviceNameDefiningCode) { + this.serviceNameDefiningCode = serviceNameDefiningCode; + } - public List getSupportingInformation() { - return this.supportingInformation; - } + public CodePhrase getServiceNameDefiningCode() { + return this.serviceNameDefiningCode ; + } - public void setPatientRequirements(List patientRequirements) { - this.patientRequirements = patientRequirements; - } + public void setReasonForRequest(List reasonForRequest) { + this.reasonForRequest = reasonForRequest; + } - public List getPatientRequirements() { - return this.patientRequirements; - } + public List getReasonForRequest() { + return this.reasonForRequest ; + } - public void setServiceNameDefiningcode(ServiceNameDefiningcode serviceNameDefiningcode) { - this.serviceNameDefiningcode = serviceNameDefiningcode; - } + public void setReasonForIsolationValue(String reasonForIsolationValue) { + this.reasonForIsolationValue = reasonForIsolationValue; + } - public ServiceNameDefiningcode getServiceNameDefiningcode() { - return this.serviceNameDefiningcode; - } + public String getReasonForIsolationValue() { + return this.reasonForIsolationValue ; + } - public void setDateIsolationDueToStartValue(TemporalAccessor dateIsolationDueToStartValue) { - this.dateIsolationDueToStartValue = dateIsolationDueToStartValue; - } + public void setComplexTiming(List complexTiming) { + this.complexTiming = complexTiming; + } - public TemporalAccessor getDateIsolationDueToStartValue() { - return this.dateIsolationDueToStartValue; - } + public List getComplexTiming() { + return this.complexTiming ; + } - public void setSpecificDetails(List specificDetails) { - this.specificDetails = specificDetails; - } + public void setDateIsolationDueToStartValue(TemporalAccessor dateIsolationDueToStartValue) { + this.dateIsolationDueToStartValue = dateIsolationDueToStartValue; + } - public List getSpecificDetails() { - return this.specificDetails; - } + public TemporalAccessor getDateIsolationDueToStartValue() { + return this.dateIsolationDueToStartValue ; + } - public void setComplexTiming(List complexTiming) { - this.complexTiming = complexTiming; - } + public void setDateIsolationDueToEndValue(TemporalAccessor dateIsolationDueToEndValue) { + this.dateIsolationDueToEndValue = dateIsolationDueToEndValue; + } - public List getComplexTiming() { - return this.complexTiming; - } + public TemporalAccessor getDateIsolationDueToEndValue() { + return this.dateIsolationDueToEndValue ; + } - public void setDateIsolationDueToEndValue(TemporalAccessor dateIsolationDueToEndValue) { - this.dateIsolationDueToEndValue = dateIsolationDueToEndValue; - } + public void setSpecificDetails(List specificDetails) { + this.specificDetails = specificDetails; + } - public TemporalAccessor getDateIsolationDueToEndValue() { - return this.dateIsolationDueToEndValue; - } + public List getSpecificDetails() { + return this.specificDetails ; + } - public void setReasonForRequest(List reasonForRequest) { - this.reasonForRequest = reasonForRequest; - } + public void setSupportingInformation(List supportingInformation) { + this.supportingInformation = supportingInformation; + } - public List getReasonForRequest() { - return this.reasonForRequest; - } + public List getSupportingInformation() { + return this.supportingInformation ; + } - public void setReasonForIsolationValue(String reasonForIsolationValue) { - this.reasonForIsolationValue = reasonForIsolationValue; - } + public void setPatientRequirements(List patientRequirements) { + this.patientRequirements = patientRequirements; + } - public String getReasonForIsolationValue() { - return this.reasonForIsolationValue; - } + public List getPatientRequirements() { + return this.patientRequirements ; + } - public void setDescription(ItemStructure description) { - this.description = description; - } + public void setTiming(DvParsable timing) { + this.timing = timing; + } - public ItemStructure getDescription() { - return this.description; - } + public DvParsable getTiming() { + return this.timing ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java index 829287054..56a00b240 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java @@ -5,98 +5,110 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import java.time.temporal.TemporalAccessor; import java.util.List; @Entity @Archetype("openEHR-EHR-INSTRUCTION.service_request.v1") public class ServiceRequestInstruction { - @Path("/narrative|value") - private String narrativeValue; + @Path("/activities[at0001]") + private List currentActivity; - @Path("/language") - private Language language; + @Path("/protocol[at0008]/items[at0141]") + private Cluster requester; - @Path("/protocol[at0008]/items[at0142]") - private Cluster receiver; + @Path("/protocol[at0008]/items[at0142]") + private Cluster receiver; - @Path("/protocol[at0008]/items[at0112]") - private List extension; + @Path("/protocol[at0008]/items[at0128]") + private List distributionList; - @Path("/protocol[at0008]/items[at0141]") - private Cluster requester; + @Path("/protocol[at0008]/items[at0112]") + private List extension; - @Path("/subject") - private PartyProxy subject; + @Path("/subject") + private PartyProxy subject; - @Path("/activities[at0001]") - private List currentActivity; + @Path("/narrative|value") + private String narrativeValue; - @Path("/protocol[at0008]/items[at0128]") - private List distributionList; + @Path("/language") + private Language language; - public void setNarrativeValue(String narrativeValue) { - this.narrativeValue = narrativeValue; - } + @Path("/expiry_time|value") + private TemporalAccessor expiryTimeValue; - public String getNarrativeValue() { - return this.narrativeValue; - } + public void setCurrentActivity(List currentActivity) { + this.currentActivity = currentActivity; + } - public void setLanguage(Language language) { - this.language = language; - } + public List getCurrentActivity() { + return this.currentActivity ; + } - public Language getLanguage() { - return this.language; - } + public void setRequester(Cluster requester) { + this.requester = requester; + } - public void setReceiver(Cluster receiver) { - this.receiver = receiver; - } + public Cluster getRequester() { + return this.requester ; + } - public Cluster getReceiver() { - return this.receiver; - } + public void setReceiver(Cluster receiver) { + this.receiver = receiver; + } - public void setExtension(List extension) { - this.extension = extension; - } + public Cluster getReceiver() { + return this.receiver ; + } - public List getExtension() { - return this.extension; - } + public void setDistributionList(List distributionList) { + this.distributionList = distributionList; + } - public void setRequester(Cluster requester) { - this.requester = requester; - } + public List getDistributionList() { + return this.distributionList ; + } - public Cluster getRequester() { - return this.requester; - } + public void setExtension(List extension) { + this.extension = extension; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public List getExtension() { + return this.extension ; + } - public PartyProxy getSubject() { - return this.subject; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public void setCurrentActivity(List currentActivity) { - this.currentActivity = currentActivity; - } + public PartyProxy getSubject() { + return this.subject ; + } - public List getCurrentActivity() { - return this.currentActivity; - } + public void setNarrativeValue(String narrativeValue) { + this.narrativeValue = narrativeValue; + } - public void setDistributionList(List distributionList) { - this.distributionList = distributionList; - } + public String getNarrativeValue() { + return this.narrativeValue ; + } - public List getDistributionList() { - return this.distributionList; - } + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setExpiryTimeValue(TemporalAccessor expiryTimeValue) { + this.expiryTimeValue = expiryTimeValue; + } + + public TemporalAccessor getExpiryTimeValue() { + return this.expiryTimeValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstructionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstructionContainment.java index ddb36a994..ccbd766e3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstructionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstructionContainment.java @@ -7,26 +7,30 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; public class ServiceRequestInstructionContainment extends Containment { public SelectAqlField SERVICE_REQUEST_INSTRUCTION = new AqlFieldImp(ServiceRequestInstruction.class, "", "ServiceRequestInstruction", ServiceRequestInstruction.class, this); - public SelectAqlField NARRATIVE_VALUE = new AqlFieldImp(ServiceRequestInstruction.class, "/narrative|value", "narrativeValue", String.class, this); + public ListSelectAqlField CURRENT_ACTIVITY = new ListAqlFieldImp(ServiceRequestInstruction.class, "/activities[at0001]", "currentActivity", ServiceRequestCurrentActivityActivity.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(ServiceRequestInstruction.class, "/language", "language", Language.class, this); + public SelectAqlField REQUESTER = new AqlFieldImp(ServiceRequestInstruction.class, "/protocol[at0008]/items[at0141]", "requester", Cluster.class, this); public SelectAqlField RECEIVER = new AqlFieldImp(ServiceRequestInstruction.class, "/protocol[at0008]/items[at0142]", "receiver", Cluster.class, this); - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(ServiceRequestInstruction.class, "/protocol[at0008]/items[at0112]", "extension", Cluster.class, this); + public ListSelectAqlField DISTRIBUTION_LIST = new ListAqlFieldImp(ServiceRequestInstruction.class, "/protocol[at0008]/items[at0128]", "distributionList", Cluster.class, this); - public SelectAqlField REQUESTER = new AqlFieldImp(ServiceRequestInstruction.class, "/protocol[at0008]/items[at0141]", "requester", Cluster.class, this); + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(ServiceRequestInstruction.class, "/protocol[at0008]/items[at0112]", "extension", Cluster.class, this); public SelectAqlField SUBJECT = new AqlFieldImp(ServiceRequestInstruction.class, "/subject", "subject", PartyProxy.class, this); - public ListSelectAqlField CURRENT_ACTIVITY = new ListAqlFieldImp(ServiceRequestInstruction.class, "/activities[at0001]", "currentActivity", ServiceRequestCurrentActivityActivity.class, this); + public SelectAqlField NARRATIVE_VALUE = new AqlFieldImp(ServiceRequestInstruction.class, "/narrative|value", "narrativeValue", String.class, this); - public ListSelectAqlField DISTRIBUTION_LIST = new ListAqlFieldImp(ServiceRequestInstruction.class, "/protocol[at0008]/items[at0128]", "distributionList", Cluster.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(ServiceRequestInstruction.class, "/language", "language", Language.class, this); + + public SelectAqlField EXPIRY_TIME_VALUE = new AqlFieldImp(ServiceRequestInstruction.class, "/expiry_time|value", "expiryTimeValue", TemporalAccessor.class, this); private ServiceRequestInstructionContainment() { super("openEHR-EHR-INSTRUCTION.service_request.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java index 3cfacd8fa..3db324ab5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java @@ -1,18 +1,19 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.datatypes.CodePhrase; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @Entity public class ServiceRequestReasonForRequestElement { - @Path("/value|defining_code") - private Definingcode definingcode; + @Path("/value|defining_code") + private CodePhrase value; - public void setDefiningcode(Definingcode definingcode) { - this.definingcode = definingcode; - } + public void setValue(CodePhrase value) { + this.value = value; + } - public Definingcode getDefiningcode() { - return this.definingcode; - } + public CodePhrase getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java index 9a296f444..299642f88 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java @@ -7,14 +7,14 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class SituationSection { - @Path("/items[openEHR-EHR-OBSERVATION.story.v1]") - private StoryHistoryObservation storyHistory; + @Path("/items[openEHR-EHR-OBSERVATION.story.v1]") + private StoryHistoryObservation storyHistory; - public void setStoryHistory(StoryHistoryObservation storyHistory) { - this.storyHistory = storyHistory; - } + public void setStoryHistory(StoryHistoryObservation storyHistory) { + this.storyHistory = storyHistory; + } - public StoryHistoryObservation getStoryHistory() { - return this.storyHistory; - } + public StoryHistoryObservation getStoryHistory() { + return this.storyHistory ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSectionContainment.java index 1b61f0d83..dbbc9ec4f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSectionContainment.java @@ -5,15 +5,15 @@ import org.ehrbase.client.aql.field.SelectAqlField; public class SituationSectionContainment extends Containment { - public SelectAqlField SITUATION_SECTION = new AqlFieldImp(SituationSection.class, "", "SituationSection", SituationSection.class, this); + public SelectAqlField SITUATION_SECTION = new AqlFieldImp(SituationSection.class, "", "SituationSection", SituationSection.class, this); - public SelectAqlField STORY_HISTORY = new AqlFieldImp(SituationSection.class, "/items[openEHR-EHR-OBSERVATION.story.v1]", "storyHistory", StoryHistoryObservation.class, this); + public SelectAqlField STORY_HISTORY = new AqlFieldImp(SituationSection.class, "/items[openEHR-EHR-OBSERVATION.story.v1]", "storyHistory", StoryHistoryObservation.class, this); - private SituationSectionContainment() { - super("openEHR-EHR-SECTION.adhoc.v1"); - } + private SituationSectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } - public static SituationSectionContainment getInstance() { - return new SituationSectionContainment(); - } + public static SituationSectionContainment getInstance() { + return new SituationSectionContainment(); + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java index b1b3134b3..4d8c76193 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,91 +13,91 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.story.v1") public class StoryHistoryObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]") - private List softSigns; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004 and name/value='Soft signs']") + private List softSigns; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value") - private String notesValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004 and name/value='Notes']/value|value") + private String notesValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]") - private List structuredDetail; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]") + private List structuredDetail; - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0007]/items[at0008]") + private List extension; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - @Path("/protocol[at0007]/items[at0008]") - private List extension; + @Path("/language") + private Language language; - public void setSoftSigns(List softSigns) { - this.softSigns = softSigns; - } + public void setSoftSigns(List softSigns) { + this.softSigns = softSigns; + } - public List getSoftSigns() { - return this.softSigns; - } + public List getSoftSigns() { + return this.softSigns ; + } - public void setNotesValue(String notesValue) { - this.notesValue = notesValue; - } + public void setNotesValue(String notesValue) { + this.notesValue = notesValue; + } - public String getNotesValue() { - return this.notesValue; - } + public String getNotesValue() { + return this.notesValue ; + } - public void setStructuredDetail(List structuredDetail) { - this.structuredDetail = structuredDetail; - } + public void setStructuredDetail(List structuredDetail) { + this.structuredDetail = structuredDetail; + } - public List getStructuredDetail() { - return this.structuredDetail; - } + public List getStructuredDetail() { + return this.structuredDetail ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public Language getLanguage() { - return this.language; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setExtension(List extension) { + this.extension = extension; + } - public PartyProxy getSubject() { - return this.subject; - } + public List getExtension() { + return this.extension ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setExtension(List extension) { - this.extension = extension; - } + public void setLanguage(Language language) { + this.language = language; + } - public List getExtension() { - return this.extension; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservationContainment.java index bb17045a0..e391a7436 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservationContainment.java @@ -7,7 +7,7 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; @@ -20,16 +20,16 @@ public class StoryHistoryObservationContainment extends Containment { public ListSelectAqlField STRUCTURED_DETAIL = new ListAqlFieldImp(StoryHistoryObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]", "structuredDetail", Cluster.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(StoryHistoryObservation.class, "/language", "language", Language.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(StoryHistoryObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(StoryHistoryObservation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(StoryHistoryObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); public ListSelectAqlField EXTENSION = new ListAqlFieldImp(StoryHistoryObservation.class, "/protocol[at0007]/items[at0008]", "extension", Cluster.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(StoryHistoryObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(StoryHistoryObservation.class, "/language", "language", Language.class, this); + private StoryHistoryObservationContainment() { super("openEHR-EHR-OBSERVATION.story.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java index 00cc9b575..1493e9f6b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java @@ -5,14 +5,14 @@ @Entity public class StoryHistorySoftSignsElement { - @Path("/value|value") - private String value; + @Path("/value|value") + private String value; - public void setValue(String value) { - this.value = value; - } + public void setValue(String value) { + this.value = value; + } - public String getValue() { - return this.value; - } + public String getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SymptomSignNameDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SymptomSignNameDefiningcode.java deleted file mode 100644 index cada3ea4e..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SymptomSignNameDefiningcode.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum SymptomSignNameDefiningcode implements EnumValueSet { - N25064002("25064002", "25064002", "SNOMED-CT", "25064002"), - - N3006004("3006004", "3006004", "SNOMED-CT", "3006004"), - - N91175000("91175000", "91175000", "SNOMED-CT", "91175000"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - SymptomSignNameDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SymptomSignNameDefiningcode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SymptomSignNameDefiningcode2.java deleted file mode 100644 index b7bb8c63c..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SymptomSignNameDefiningcode2.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum SymptomSignNameDefiningcode2 implements EnumValueSet { - N29857009("29857009", "29857009", "SNOMED-CT", "29857009"), - - N267036007("267036007", "267036007", "SNOMED-CT", "267036007"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - SymptomSignNameDefiningcode2(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SymptomSignNameDefiningcode3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SymptomSignNameDefiningcode3.java deleted file mode 100644 index 615839e16..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SymptomSignNameDefiningcode3.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum SymptomSignNameDefiningcode3 implements EnumValueSet { - N49727002("49727002", "49727002", "SNOMED-CT", "49727002"), - - N68962001("68962001", "68962001", "SNOMED-CT", "68962001"), - - N84229001("84229001", "84229001", "SNOMED-CT", "84229001"), - - N64531003("64531003", "64531003", "SNOMED-CT", "64531003"), - - N16001004("16001004", "16001004", "SNOMED-CT", "16001004"), - - N162397003("162397003", "162397003", "SNOMED-CT", "162397003"), - - N272028008("272028008", "272028008", "SNOMED-CT", "272028008"), - - N386661006("386661006", "386661006", "SNOMED-CT", "386661006"), - - N57676002("57676002", "57676002", "SNOMED-CT", "57676002"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - SymptomSignNameDefiningcode3(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SymptomSignNameDefiningcode4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SymptomSignNameDefiningcode4.java deleted file mode 100644 index abbdf2a23..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SymptomSignNameDefiningcode4.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum SymptomSignNameDefiningcode4 implements EnumValueSet { - N74474003("74474003", "74474003", "SNOMED-CT", "74474003"), - - N16932000("16932000", "16932000", "SNOMED-CT", "16932000"), - - N62315008("62315008", "62315008", "SNOMED-CT", "62315008"), - - N21522001("21522001", "21522001", "SNOMED-CT", "21522001"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - SymptomSignNameDefiningcode4(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SymptomSignNameDefiningcode5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SymptomSignNameDefiningcode5.java deleted file mode 100644 index caed870f4..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SymptomSignNameDefiningcode5.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum SymptomSignNameDefiningcode5 implements EnumValueSet { - N315642008("315642008", "315642008", "SNOMED-CT", "315642008"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - SymptomSignNameDefiningcode5(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java index 2b655faaa..976fd55f6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java @@ -6,120 +6,120 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; @Entity @Archetype("openEHR-EHR-OBSERVATION.body_temperature.v1") public class TemperatureObservation { - @Path("/language") - private Language language; + @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude") + private Double temperatureMagnitude; - @Path("/data[at0002]/origin|value") - private TemporalAccessor originValue; + @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units") + private String temperatureUnits; - @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0058]") - private Element menstrualCycle; + @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0056]") + private Cluster environmentalConditions; - @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0057]") - private Cluster exertion; + @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0057]") + private Cluster exertion; - @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude") - private Double temperatureMagnitude; + @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0058]") + private Element menstrualCycle; - @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units") - private String temperatureUnits; + @Path("/data[at0002]/events[at0003]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0056]") - private Cluster environmentalConditions; + @Path("/data[at0002]/origin|value") + private TemporalAccessor originValue; - @Path("/protocol[at0020]/items[at0059]") - private Cluster device; + @Path("/protocol[at0020]/items[at0059]") + private Cluster device; - @Path("/subject") - private PartyProxy subject; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0002]/events[at0003]/time|value") - private TemporalAccessor timeValue; + @Path("/language") + private Language language; - public void setLanguage(Language language) { - this.language = language; - } + public void setTemperatureMagnitude(Double temperatureMagnitude) { + this.temperatureMagnitude = temperatureMagnitude; + } - public Language getLanguage() { - return this.language; - } + public Double getTemperatureMagnitude() { + return this.temperatureMagnitude ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setTemperatureUnits(String temperatureUnits) { + this.temperatureUnits = temperatureUnits; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public String getTemperatureUnits() { + return this.temperatureUnits ; + } - public void setMenstrualCycle(Element menstrualCycle) { - this.menstrualCycle = menstrualCycle; - } + public void setEnvironmentalConditions(Cluster environmentalConditions) { + this.environmentalConditions = environmentalConditions; + } - public Element getMenstrualCycle() { - return this.menstrualCycle; - } + public Cluster getEnvironmentalConditions() { + return this.environmentalConditions ; + } - public void setExertion(Cluster exertion) { - this.exertion = exertion; - } + public void setExertion(Cluster exertion) { + this.exertion = exertion; + } - public Cluster getExertion() { - return this.exertion; - } + public Cluster getExertion() { + return this.exertion ; + } - public void setTemperatureMagnitude(Double temperatureMagnitude) { - this.temperatureMagnitude = temperatureMagnitude; - } + public void setMenstrualCycle(Element menstrualCycle) { + this.menstrualCycle = menstrualCycle; + } - public Double getTemperatureMagnitude() { - return this.temperatureMagnitude; - } + public Element getMenstrualCycle() { + return this.menstrualCycle ; + } - public void setTemperatureUnits(String temperatureUnits) { - this.temperatureUnits = temperatureUnits; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public String getTemperatureUnits() { - return this.temperatureUnits; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setEnvironmentalConditions(Cluster environmentalConditions) { - this.environmentalConditions = environmentalConditions; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public Cluster getEnvironmentalConditions() { - return this.environmentalConditions; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setDevice(Cluster device) { - this.device = device; - } + public void setDevice(Cluster device) { + this.device = device; + } - public Cluster getDevice() { - return this.device; - } + public Cluster getDevice() { + return this.device ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public PartyProxy getSubject() { - return this.subject; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setLanguage(Language language) { + this.language = language; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservationContainment.java index 88d3c3895..537f830b6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservationContainment.java @@ -6,32 +6,32 @@ import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class TemperatureObservationContainment extends Containment { public SelectAqlField TEMPERATURE_OBSERVATION = new AqlFieldImp(TemperatureObservation.class, "", "TemperatureObservation", TemperatureObservation.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(TemperatureObservation.class, "/language", "language", Language.class, this); + public SelectAqlField TEMPERATURE_MAGNITUDE = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude", "temperatureMagnitude", Double.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); + public SelectAqlField TEMPERATURE_UNITS = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units", "temperatureUnits", String.class, this); - public SelectAqlField MENSTRUAL_CYCLE = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0058]", "menstrualCycle", Element.class, this); + public SelectAqlField ENVIRONMENTAL_CONDITIONS = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0056]", "environmentalConditions", Cluster.class, this); public SelectAqlField EXERTION = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0057]", "exertion", Cluster.class, this); - public SelectAqlField TEMPERATURE_MAGNITUDE = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude", "temperatureMagnitude", Double.class, this); + public SelectAqlField MENSTRUAL_CYCLE = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0058]", "menstrualCycle", Element.class, this); - public SelectAqlField TEMPERATURE_UNITS = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units", "temperatureUnits", String.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/time|value", "timeValue", TemporalAccessor.class, this); - public SelectAqlField ENVIRONMENTAL_CONDITIONS = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0056]", "environmentalConditions", Cluster.class, this); + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); public SelectAqlField DEVICE = new AqlFieldImp(TemperatureObservation.class, "/protocol[at0020]/items[at0059]", "device", Cluster.class, this); public SelectAqlField SUBJECT = new AqlFieldImp(TemperatureObservation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/time|value", "timeValue", TemporalAccessor.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(TemperatureObservation.class, "/language", "language", Language.class, this); private TemperatureObservationContainment() { super("openEHR-EHR-OBSERVATION.body_temperature.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TrendDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TrendDefiningcode.java index cb21c3ce4..75a1df563 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TrendDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TrendDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum TrendDefiningcode implements EnumValueSet { +public enum TrendDefiningCode implements EnumValueSet { WORSENING("Worsening", "The severity of the symptom or sign has worsened overall during this episode.", "local", "at0183"), IMPROVING("Improving", "The severity of the symptom or sign has improved overall during this episode.", "local", "at0181"), @@ -17,7 +17,7 @@ public enum TrendDefiningcode implements EnumValueSet { private String code; - TrendDefiningcode(String value, String description, String terminologyId, String code) { + TrendDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -25,18 +25,18 @@ public enum TrendDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode.java index 067b8adea..576f7a53b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode.java @@ -2,18 +2,8 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum ValueDefiningcode implements EnumValueSet { - WOUND("Skin / joint/ wound", "The likely source of infection is skin, joint or wound.", "local", "at0026"), - - URINE("Urine", "The likely source of infection is urine.", "local", "at0014"), - - INDWELLING_DEVICE("Indwelling device", "The likely source of infection is an indwelling device.", "local", "at0027"), - - RESPIRATORY("Respiratory", "The likely source of infection is respiratory.", "local", "at0012"), - - SURGICAL("Surgical", "The likely source of infection is surgical.", "local", "at0015"), - - BRAIN("Brain", "The likely source of infection is brain.", "local", "at0013"); +public enum ValueDefiningCode implements EnumValueSet { + RIGORS("Rigors", "Rigors.", "local", "at0100"); private String value; @@ -23,7 +13,7 @@ public enum ValueDefiningcode implements EnumValueSet { private String code; - ValueDefiningcode(String value, String description, String terminologyId, String code) { + ValueDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -31,18 +21,18 @@ public enum ValueDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode2.java index 2c8d6a93f..e3e7bad1f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode2.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode2.java @@ -2,10 +2,10 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum ValueDefiningcode2 implements EnumValueSet { - FEELING_OF_IMPENDING_DOOM("Feeling of impending doom", "Feeling of impending doom.", "local", "at0111"), +public enum ValueDefiningCode2 implements EnumValueSet { + LETHARGIC("Lethargic", "Lethargic.", "local", "at0101"), - NOT_FEELING_WELL("Not feeling well", "Not feeling well.", "local", "at0110"); + CONFUSED("Confused", "Confused.", "local", "at0102"); private String value; @@ -15,7 +15,7 @@ public enum ValueDefiningcode2 implements EnumValueSet { private String code; - ValueDefiningcode2(String value, String description, String terminologyId, String code) { + ValueDefiningCode2(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -23,18 +23,18 @@ public enum ValueDefiningcode2 implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode3.java index 79bd68e1b..65bb52daf 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode3.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode3.java @@ -2,10 +2,10 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum ValueDefiningcode3 implements EnumValueSet { - BLEEDING("Abdominal distension/nausea/bleeding", "Abdominal distension/nausea/bleeding.", "local", "at0109"), +public enum ValueDefiningCode3 implements EnumValueSet { + NEW_PAIN("New pain", "New pain.", "local", "at0106"), - NO_PROGRESS("No progress", "No progress.", "local", "at0108"); + INCREASING_OR_CONSISTING_PAIN("Increasing or consisting pain", "Increasing or consisting pain.", "local", "at0107"); private String value; @@ -15,7 +15,7 @@ public enum ValueDefiningcode3 implements EnumValueSet { private String code; - ValueDefiningcode3(String value, String description, String terminologyId, String code) { + ValueDefiningCode3(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -23,18 +23,18 @@ public enum ValueDefiningcode3 implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode4.java index eb5f19b34..d6d62612b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode4.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode4.java @@ -2,10 +2,10 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum ValueDefiningcode4 implements EnumValueSet { - RESTLESS("Restless", "Restless.", "local", "at0103"), +public enum ValueDefiningCode4 implements EnumValueSet { + ABDOMINAL_DISTENSION_NAUSEA_BLEEDING("Abdominal distension/nausea/bleeding", "Abdominal distension/nausea/bleeding.", "local", "at0109"), - ANXIOUS("Anxious", "Anxious.", "local", "at0104"); + NO_PROGRESS("No progress", "No progress.", "local", "at0108"); private String value; @@ -15,7 +15,7 @@ public enum ValueDefiningcode4 implements EnumValueSet { private String code; - ValueDefiningcode4(String value, String description, String terminologyId, String code) { + ValueDefiningCode4(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -23,18 +23,18 @@ public enum ValueDefiningcode4 implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode5.java index 4a9112505..14c40436b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode5.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode5.java @@ -2,10 +2,10 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum ValueDefiningcode5 implements EnumValueSet { - DOESN_T_LOOK_GOOD("Doesn't look good", "Doesn't look good.", "local", "at0113"), +public enum ValueDefiningCode5 implements EnumValueSet { + FEELING_OF_IMPENDING_DOOM("Feeling of impending doom", "Feeling of impending doom.", "local", "at0111"), - CHANGE_IN_BEHAVIOUR("Change in behaviour", "Change in behaviour.", "local", "at0112"); + NOT_FEELING_WELL("Not feeling well", "Not feeling well.", "local", "at0110"); private String value; @@ -15,7 +15,7 @@ public enum ValueDefiningcode5 implements EnumValueSet { private String code; - ValueDefiningcode5(String value, String description, String terminologyId, String code) { + ValueDefiningCode5(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -23,18 +23,18 @@ public enum ValueDefiningcode5 implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode6.java index bed389d36..556d7a1ef 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode6.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode6.java @@ -2,10 +2,10 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum ValueDefiningcode6 implements EnumValueSet { - LETHARGIC("Lethargic", "Lethargic.", "local", "at0101"), +public enum ValueDefiningCode6 implements EnumValueSet { + DOESN_T_LOOK_GOOD("Doesn't look good", "Doesn't look good.", "local", "at0113"), - CONFUSED("Confused", "Confused.", "local", "at0102"); + CHANGE_IN_BEHAVIOUR("Change in behaviour", "Change in behaviour.", "local", "at0112"); private String value; @@ -15,7 +15,7 @@ public enum ValueDefiningcode6 implements EnumValueSet { private String code; - ValueDefiningcode6(String value, String description, String terminologyId, String code) { + ValueDefiningCode6(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -23,18 +23,18 @@ public enum ValueDefiningcode6 implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode7.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode7.java index 63aadca83..e857555d2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode7.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode7.java @@ -2,10 +2,18 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum ValueDefiningcode7 implements EnumValueSet { - NEW_PAIN("New pain", "New pain.", "local", "at0106"), +public enum ValueDefiningCode7 implements EnumValueSet { + SKIN_JOINT_WOUND("Skin / joint/ wound", "The likely source of infection is skin, joint or wound.", "local", "at0026"), - INCREASING_OR_CONSISTING_PAIN("Increasing or consisting pain", "Increasing or consisting pain.", "local", "at0107"); + URINE("Urine", "The likely source of infection is urine.", "local", "at0014"), + + INDWELLING_DEVICE("Indwelling device", "The likely source of infection is an indwelling device.", "local", "at0027"), + + RESPIRATORY("Respiratory", "The likely source of infection is respiratory.", "local", "at0012"), + + SURGICAL("Surgical", "The likely source of infection is surgical.", "local", "at0015"), + + BRAIN("Brain", "The likely source of infection is brain.", "local", "at0013"); private String value; @@ -15,7 +23,7 @@ public enum ValueDefiningcode7 implements EnumValueSet { private String code; - ValueDefiningcode7(String value, String description, String terminologyId, String code) { + ValueDefiningCode7(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -23,18 +31,18 @@ public enum ValueDefiningcode7 implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java index d97c24561..22d33048f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java @@ -1,11 +1,12 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.generic.PartyProxy; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,91 +14,102 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.body_weight.v2") public class WeightObservation { - @Path("/protocol[at0015]/items[at0027]") - private List extension; + @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude") + private Double weightMagnitude; - @Path("/language") - private Language language; + @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units") + private String weightUnits; - @Path("/data[at0002]/origin|value") - private TemporalAccessor originValue; + @Path("/data[at0002]/events[at0003]/state[at0008]") + private ItemTree stateStructure; - @Path("/protocol[at0015]/items[at0020]") - private Cluster device; + @Path("/data[at0002]/events[at0003]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude") - private Double weightMagnitude; + @Path("/data[at0002]/origin|value") + private TemporalAccessor originValue; - @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units") - private String weightUnits; + @Path("/protocol[at0015]/items[at0020]") + private Cluster device; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0015]/items[at0027]") + private List extension; - @Path("/data[at0002]/events[at0003]/time|value") - private TemporalAccessor timeValue; + @Path("/subject") + private PartyProxy subject; - public void setExtension(List extension) { - this.extension = extension; - } + @Path("/language") + private Language language; - public List getExtension() { - return this.extension; - } + public void setWeightMagnitude(Double weightMagnitude) { + this.weightMagnitude = weightMagnitude; + } - public void setLanguage(Language language) { - this.language = language; - } + public Double getWeightMagnitude() { + return this.weightMagnitude ; + } - public Language getLanguage() { - return this.language; - } + public void setWeightUnits(String weightUnits) { + this.weightUnits = weightUnits; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public String getWeightUnits() { + return this.weightUnits ; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public void setStateStructure(ItemTree stateStructure) { + this.stateStructure = stateStructure; + } - public void setDevice(Cluster device) { - this.device = device; - } + public ItemTree getStateStructure() { + return this.stateStructure ; + } - public Cluster getDevice() { - return this.device; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public void setWeightMagnitude(Double weightMagnitude) { - this.weightMagnitude = weightMagnitude; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public Double getWeightMagnitude() { - return this.weightMagnitude; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public void setWeightUnits(String weightUnits) { - this.weightUnits = weightUnits; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public String getWeightUnits() { - return this.weightUnits; - } + public void setDevice(Cluster device) { + this.device = device; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public Cluster getDevice() { + return this.device ; + } - public PartyProxy getSubject() { - return this.subject; - } + public void setExtension(List extension) { + this.extension = extension; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public List getExtension() { + return this.extension ; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservationContainment.java index 7f8fe3cff..aa5188f3c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservationContainment.java @@ -1,34 +1,37 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.generic.PartyProxy; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class WeightObservationContainment extends Containment { public SelectAqlField WEIGHT_OBSERVATION = new AqlFieldImp(WeightObservation.class, "", "WeightObservation", WeightObservation.class, this); - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(WeightObservation.class, "/protocol[at0015]/items[at0027]", "extension", Cluster.class, this); + public SelectAqlField WEIGHT_MAGNITUDE = new AqlFieldImp(WeightObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude", "weightMagnitude", Double.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(WeightObservation.class, "/language", "language", Language.class, this); + public SelectAqlField WEIGHT_UNITS = new AqlFieldImp(WeightObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units", "weightUnits", String.class, this); + + public SelectAqlField STATE_STRUCTURE = new AqlFieldImp(WeightObservation.class, "/data[at0002]/events[at0003]/state[at0008]", "stateStructure", ItemTree.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(WeightObservation.class, "/data[at0002]/events[at0003]/time|value", "timeValue", TemporalAccessor.class, this); public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(WeightObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); public SelectAqlField DEVICE = new AqlFieldImp(WeightObservation.class, "/protocol[at0015]/items[at0020]", "device", Cluster.class, this); - public SelectAqlField WEIGHT_MAGNITUDE = new AqlFieldImp(WeightObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude", "weightMagnitude", Double.class, this); - - public SelectAqlField WEIGHT_UNITS = new AqlFieldImp(WeightObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units", "weightUnits", String.class, this); + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(WeightObservation.class, "/protocol[at0015]/items[at0027]", "extension", Cluster.class, this); public SelectAqlField SUBJECT = new AqlFieldImp(WeightObservation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(WeightObservation.class, "/data[at0002]/events[at0003]/time|value", "timeValue", TemporalAccessor.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(WeightObservation.class, "/language", "language", Language.class, this); private WeightObservationContainment() { super("openEHR-EHR-OBSERVATION.body_weight.v2"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java index 5e707b767..047ca5c73 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java @@ -4,9 +4,6 @@ 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 org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Id; @@ -15,75 +12,86 @@ import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.AbteilungsfallCluster; import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.VersorgungsfallCluster; import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.VersorgungsortAdminEntry; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; +import java.time.temporal.TemporalAccessor; +import java.util.List; + @Entity @Archetype("openEHR-EHR-COMPOSITION.event_summary.v0") @Template("Patientenaufenthalt") public class PatientenaufenthaltComposition { - @Id - private VersionUid versionUid; + @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0 and name/value='Versorgungsfall']") + private VersorgungsfallCluster versorgungsfall; - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; + @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0 and name/value='Abteilungsfall']") + private AbteilungsfallCluster abteilungsfall; + + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; @Path("/context/participations") private List participations; - @Path("/content[openEHR-EHR-ADMIN_ENTRY.hospitalization.v0 and name/value='Versorgungsort']") - private VersorgungsortAdminEntry versorgungsort; + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; - @Path("/language") - private Language language; + @Path("/context/location") + private String location; @Path("/context/health_care_facility") private PartyIdentified healthCareFacility; - @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0 and name/value='Abteilungsfall']") - private AbteilungsfallCluster abteilungsfall; - - @Path("/territory") - private Territory territory; - - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; - @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0 and name/value='Versorgungsfall']") - private VersorgungsfallCluster versorgungsfall; + @Path("/content[openEHR-EHR-ADMIN_ENTRY.hospitalization.v0 and name/value='Versorgungsort']") + private VersorgungsortAdminEntry versorgungsort; @Path("/composer") private PartyProxy composer; - @Path("/context/setting|defining_code") - private SettingDefiningcode settingDefiningcode; + @Path("/language") + private Language language; @Path("/feeder_audit") private FeederAudit feederAudit; - @Path("/context/location") - private String location; - @Path("/category|defining_code") - private CategoryDefiningcode categoryDefiningcode; + private Category categoryDefiningCode; - public VersionUid getVersionUid() { - return this.versionUid ; + @Path("/territory") + private Territory territory; + + @Id + private VersionUid versionUid; + + public void setVersorgungsfall(VersorgungsfallCluster versorgungsfall) { + this.versorgungsfall = versorgungsfall; } - public void setVersionUid(VersionUid versionUid) { - this.versionUid = versionUid; + public VersorgungsfallCluster getVersorgungsfall() { + return this.versorgungsfall ; } - public void setEndTimeValue(TemporalAccessor endTimeValue) { - this.endTimeValue = endTimeValue; + public void setAbteilungsfall(AbteilungsfallCluster abteilungsfall) { + this.abteilungsfall = abteilungsfall; } - public TemporalAccessor getEndTimeValue() { - return this.endTimeValue ; + public AbteilungsfallCluster getAbteilungsfall() { + return this.abteilungsfall ; + } + + public void setStartTimeValue(TemporalAccessor startTimeValue) { + this.startTimeValue = startTimeValue; + } + + public TemporalAccessor getStartTimeValue() { + return this.startTimeValue ; } public void setParticipations(List participations) { @@ -94,20 +102,20 @@ public List getParticipations() { return this.participations ; } - public void setVersorgungsort(VersorgungsortAdminEntry versorgungsort) { - this.versorgungsort = versorgungsort; + public void setEndTimeValue(TemporalAccessor endTimeValue) { + this.endTimeValue = endTimeValue; } - public VersorgungsortAdminEntry getVersorgungsort() { - return this.versorgungsort ; + public TemporalAccessor getEndTimeValue() { + return this.endTimeValue ; } - public void setLanguage(Language language) { - this.language = language; + public void setLocation(String location) { + this.location = location; } - public Language getLanguage() { - return this.language ; + public String getLocation() { + return this.location ; } public void setHealthCareFacility(PartyIdentified healthCareFacility) { @@ -118,36 +126,20 @@ public PartyIdentified getHealthCareFacility() { return this.healthCareFacility ; } - public void setAbteilungsfall(AbteilungsfallCluster abteilungsfall) { - this.abteilungsfall = abteilungsfall; - } - - public AbteilungsfallCluster getAbteilungsfall() { - return this.abteilungsfall ; - } - - public void setTerritory(Territory territory) { - this.territory = territory; - } - - public Territory getTerritory() { - return this.territory ; - } - - public void setStartTimeValue(TemporalAccessor startTimeValue) { - this.startTimeValue = startTimeValue; + public void setSettingDefiningCode(Setting settingDefiningCode) { + this.settingDefiningCode = settingDefiningCode; } - public TemporalAccessor getStartTimeValue() { - return this.startTimeValue ; + public Setting getSettingDefiningCode() { + return this.settingDefiningCode ; } - public void setVersorgungsfall(VersorgungsfallCluster versorgungsfall) { - this.versorgungsfall = versorgungsfall; + public void setVersorgungsort(VersorgungsortAdminEntry versorgungsort) { + this.versorgungsort = versorgungsort; } - public VersorgungsfallCluster getVersorgungsfall() { - return this.versorgungsfall ; + public VersorgungsortAdminEntry getVersorgungsort() { + return this.versorgungsort ; } public void setComposer(PartyProxy composer) { @@ -158,12 +150,12 @@ public PartyProxy getComposer() { return this.composer ; } - public void setSettingDefiningcode(SettingDefiningcode settingDefiningcode) { - this.settingDefiningcode = settingDefiningcode; + public void setLanguage(Language language) { + this.language = language; } - public SettingDefiningcode getSettingDefiningcode() { - return this.settingDefiningcode ; + public Language getLanguage() { + return this.language ; } public void setFeederAudit(FeederAudit feederAudit) { @@ -174,19 +166,27 @@ public FeederAudit getFeederAudit() { return this.feederAudit ; } - public void setLocation(String location) { - this.location = location; + public void setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; } - public String getLocation() { - return this.location ; + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; } - public void setCategoryDefiningcode(CategoryDefiningcode categoryDefiningcode) { - this.categoryDefiningcode = categoryDefiningcode; + public void setTerritory(Territory territory) { + this.territory = territory; } - public CategoryDefiningcode getCategoryDefiningcode() { - return this.categoryDefiningcode ; + public Territory getTerritory() { + return this.territory ; + } + + public VersionUid getVersionUid() { + return this.versionUid ; + } + + public void setVersionUid(VersionUid versionUid) { + this.versionUid = versionUid; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltCompositionContainment.java index b3a8121fe..13b5eb1b3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltCompositionContainment.java @@ -4,8 +4,6 @@ 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 org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -14,41 +12,43 @@ import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.AbteilungsfallCluster; import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.VersorgungsfallCluster; import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.VersorgungsortAdminEntry; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; + +import java.time.temporal.TemporalAccessor; public class PatientenaufenthaltCompositionContainment extends Containment { public SelectAqlField PATIENTENAUFENTHALT_COMPOSITION = new AqlFieldImp(PatientenaufenthaltComposition.class, "", "PatientenaufenthaltComposition", PatientenaufenthaltComposition.class, this); - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + public SelectAqlField VERSORGUNGSFALL = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]", "versorgungsfall", VersorgungsfallCluster.class, this); - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(PatientenaufenthaltComposition.class, "/context/participations", "participations", Participation.class, this); + public SelectAqlField ABTEILUNGSFALL = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]", "abteilungsfall", AbteilungsfallCluster.class, this); - public SelectAqlField VERSORGUNGSORT = new AqlFieldImp(PatientenaufenthaltComposition.class, "/content[openEHR-EHR-ADMIN_ENTRY.hospitalization.v0 and name/value='Versorgungsort']", "versorgungsort", VersorgungsortAdminEntry.class, this); + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(PatientenaufenthaltComposition.class, "/language", "language", Language.class, this); + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(PatientenaufenthaltComposition.class, "/context/participations", "participations", Participation.class, this); - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - public SelectAqlField ABTEILUNGSFALL = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0 and name/value='Abteilungsfall']", "abteilungsfall", AbteilungsfallCluster.class, this); + public SelectAqlField LOCATION = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/location", "location", String.class, this); - public SelectAqlField TERRITORY = new AqlFieldImp(PatientenaufenthaltComposition.class, "/territory", "territory", Territory.class, this); + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - public SelectAqlField VERSORGUNGSFALL = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0 and name/value='Versorgungsfall']", "versorgungsfall", VersorgungsfallCluster.class, this); + public SelectAqlField VERSORGUNGSORT = new AqlFieldImp(PatientenaufenthaltComposition.class, "/content[openEHR-EHR-ADMIN_ENTRY.hospitalization.v0]", "versorgungsort", VersorgungsortAdminEntry.class, this); public SelectAqlField COMPOSER = new AqlFieldImp(PatientenaufenthaltComposition.class, "/composer", "composer", PartyProxy.class, this); - public SelectAqlField SETTING_DEFININGCODE = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/setting|defining_code", "settingDefiningcode", SettingDefiningcode.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(PatientenaufenthaltComposition.class, "/language", "language", Language.class, this); public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(PatientenaufenthaltComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - public SelectAqlField LOCATION = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/location", "location", String.class, this); + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(PatientenaufenthaltComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - public SelectAqlField CATEGORY_DEFININGCODE = new AqlFieldImp(PatientenaufenthaltComposition.class, "/category|defining_code", "categoryDefiningcode", CategoryDefiningcode.class, this); + public SelectAqlField TERRITORY = new AqlFieldImp(PatientenaufenthaltComposition.class, "/territory", "territory", Territory.class, this); private PatientenaufenthaltCompositionContainment() { super("openEHR-EHR-COMPOSITION.event_summary.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java index 31bbb6a1c..f89f4fbdb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java @@ -1,6 +1,5 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; -import java.lang.String; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -8,7 +7,7 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.case_identification.v0") public class AbteilungsfallCluster { - @Path("/items[at0001]/value|value") + @Path("/items[at0001 and name/value='Zugehörige Abteilungsfall-Kennung']/value|value") private String zugehorigeAbteilungsfallKennungValue; public void setZugehorigeAbteilungsfallKennungValue(String zugehorigeAbteilungsfallKennungValue) { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallClusterContainment.java index 64a9ce533..d7b0258cb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallClusterContainment.java @@ -1,6 +1,5 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; -import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java index a481e54aa..795eb8c7c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java @@ -2,26 +2,32 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.DvIdentifier; -import java.lang.String; -import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import java.util.List; + @Entity @Archetype("openEHR-EHR-CLUSTER.device.v1") public class DetailsZumBettCluster { + @Path("/items[at0001]/value|value") + private String geratenameValue; + + @Path("/items[at0003]/value|value") + private String geratetypValue; + @Path("/items[at0009]") private List eigenschaften; @Path("/items[at0021]/value") private DvIdentifier eindeutigeIdentifikationsnummerId; - @Path("/items[at0003]/value|value") - private String geratetypValue; + @Path("/items[at0019]") + private List gerateverwaltung; - @Path("/items[at0001]/value|value") - private String geratenameValue; + @Path("/items[at0018]") + private List komponenten; @Path("/items[at0026]") private List erweiterung; @@ -29,11 +35,21 @@ public class DetailsZumBettCluster { @Path("/items[at0027]") private List multimedia; - @Path("/items[at0019]") - private List gerateverwaltung; + public void setGeratenameValue(String geratenameValue) { + this.geratenameValue = geratenameValue; + } - @Path("/items[at0018]") - private List komponenten; + public String getGeratenameValue() { + return this.geratenameValue ; + } + + public void setGeratetypValue(String geratetypValue) { + this.geratetypValue = geratetypValue; + } + + public String getGeratetypValue() { + return this.geratetypValue ; + } public void setEigenschaften(List eigenschaften) { this.eigenschaften = eigenschaften; @@ -51,20 +67,20 @@ public DvIdentifier getEindeutigeIdentifikationsnummerId() { return this.eindeutigeIdentifikationsnummerId ; } - public void setGeratetypValue(String geratetypValue) { - this.geratetypValue = geratetypValue; + public void setGerateverwaltung(List gerateverwaltung) { + this.gerateverwaltung = gerateverwaltung; } - public String getGeratetypValue() { - return this.geratetypValue ; + public List getGerateverwaltung() { + return this.gerateverwaltung ; } - public void setGeratenameValue(String geratenameValue) { - this.geratenameValue = geratenameValue; + public void setKomponenten(List komponenten) { + this.komponenten = komponenten; } - public String getGeratenameValue() { - return this.geratenameValue ; + public List getKomponenten() { + return this.komponenten ; } public void setErweiterung(List erweiterung) { @@ -82,20 +98,4 @@ public void setMultimedia(List multimedia) { public List getMultimedia() { return this.multimedia ; } - - public void setGerateverwaltung(List gerateverwaltung) { - this.gerateverwaltung = gerateverwaltung; - } - - public List getGerateverwaltung() { - return this.gerateverwaltung ; - } - - public void setKomponenten(List komponenten) { - this.komponenten = komponenten; - } - - public List getKomponenten() { - return this.komponenten ; - } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettClusterContainment.java index a95e8ea2e..e88392c9d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettClusterContainment.java @@ -2,7 +2,6 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.DvIdentifier; -import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -12,22 +11,22 @@ public class DetailsZumBettClusterContainment extends Containment { public SelectAqlField DETAILS_ZUM_BETT_CLUSTER = new AqlFieldImp(DetailsZumBettCluster.class, "", "DetailsZumBettCluster", DetailsZumBettCluster.class, this); + public SelectAqlField GERATENAME_VALUE = new AqlFieldImp(DetailsZumBettCluster.class, "/items[at0001]/value|value", "geratenameValue", String.class, this); + + public SelectAqlField GERATETYP_VALUE = new AqlFieldImp(DetailsZumBettCluster.class, "/items[at0003]/value|value", "geratetypValue", String.class, this); + public ListSelectAqlField EIGENSCHAFTEN = new ListAqlFieldImp(DetailsZumBettCluster.class, "/items[at0009]", "eigenschaften", Cluster.class, this); public SelectAqlField EINDEUTIGE_IDENTIFIKATIONSNUMMER_ID = new AqlFieldImp(DetailsZumBettCluster.class, "/items[at0021]/value", "eindeutigeIdentifikationsnummerId", DvIdentifier.class, this); - public SelectAqlField GERATETYP_VALUE = new AqlFieldImp(DetailsZumBettCluster.class, "/items[at0003]/value|value", "geratetypValue", String.class, this); + public ListSelectAqlField GERATEVERWALTUNG = new ListAqlFieldImp(DetailsZumBettCluster.class, "/items[at0019]", "gerateverwaltung", Cluster.class, this); - public SelectAqlField GERATENAME_VALUE = new AqlFieldImp(DetailsZumBettCluster.class, "/items[at0001]/value|value", "geratenameValue", String.class, this); + public ListSelectAqlField KOMPONENTEN = new ListAqlFieldImp(DetailsZumBettCluster.class, "/items[at0018]", "komponenten", Cluster.class, this); public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(DetailsZumBettCluster.class, "/items[at0026]", "erweiterung", Cluster.class, this); public ListSelectAqlField MULTIMEDIA = new ListAqlFieldImp(DetailsZumBettCluster.class, "/items[at0027]", "multimedia", Cluster.class, this); - public ListSelectAqlField GERATEVERWALTUNG = new ListAqlFieldImp(DetailsZumBettCluster.class, "/items[at0019]", "gerateverwaltung", Cluster.class, this); - - public ListSelectAqlField KOMPONENTEN = new ListAqlFieldImp(DetailsZumBettCluster.class, "/items[at0018]", "komponenten", Cluster.class, this); - private DetailsZumBettClusterContainment() { super("openEHR-EHR-CLUSTER.device.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java index 53c5947be..9252c7692 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java @@ -1,6 +1,5 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; -import java.lang.String; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -8,66 +7,67 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") public class StandortCluster { - @Path("/items[at0029]/value|value") - private String zimmerkennungValue; + @Path("/items[at0040]/value|value") + private String standorttypValue; - @Path("/items[at0024]/value|value") - private String campusValue; + @Path("/items[at0046]/value|value") + private String standortbeschreibungValue; - @Path("/items[at0028]/value|value") - private String ebeneValue; + @Path("/items[at0048]/value|defining_code") + private StandortschlusselDefiningCode standortschlusselDefiningCode; - @Path("/items[at0034]/value|value") - private String bettplatzkennungValue; + @Path("/items[at0024]/value|value") + private String campusValue; @Path("/items[at0025]/value|value") private String gebaudegruppeValue; - @Path("/items[at0027]/value|value") + @Path("/items[at0028]/value|value") + private String ebeneValue; + + @Path("/items[at0027 and name/value='Stationskennung']/value|value") private String stationskennungValue; - @Path("/items[at0040]/value|value") - private String standorttypValue; + @Path("/items[at0029 and name/value='Zimmerkennung']/value|value") + private String zimmerkennungValue; + + @Path("/items[at0034 and name/value='Bettplatzkennung']/value|value") + private String bettplatzkennungValue; @Path("/items[openEHR-EHR-CLUSTER.device.v1 and name/value='Details zum Bett']") private DetailsZumBettCluster detailsZumBett; - @Path("/items[at0046]/value|value") - private String standortbeschreibungValue; - - @Path("/items[at0048]/value|defining_code") - private StandortschlusselDefiningcode standortschlusselDefiningcode; - - public void setZimmerkennungValue(String zimmerkennungValue) { - this.zimmerkennungValue = zimmerkennungValue; + public void setStandorttypValue(String standorttypValue) { + this.standorttypValue = standorttypValue; } - public String getZimmerkennungValue() { - return this.zimmerkennungValue ; + public String getStandorttypValue() { + return this.standorttypValue ; } - public void setCampusValue(String campusValue) { - this.campusValue = campusValue; + public void setStandortbeschreibungValue(String standortbeschreibungValue) { + this.standortbeschreibungValue = standortbeschreibungValue; } - public String getCampusValue() { - return this.campusValue ; + public String getStandortbeschreibungValue() { + return this.standortbeschreibungValue ; } - public void setEbeneValue(String ebeneValue) { - this.ebeneValue = ebeneValue; + public void setStandortschlusselDefiningCode( + StandortschlusselDefiningCode standortschlusselDefiningCode) { + this.standortschlusselDefiningCode = standortschlusselDefiningCode; } - public String getEbeneValue() { - return this.ebeneValue ; + public StandortschlusselDefiningCode getStandortschlusselDefiningCode() { + return this.standortschlusselDefiningCode ; } - public void setBettplatzkennungValue(String bettplatzkennungValue) { - this.bettplatzkennungValue = bettplatzkennungValue; + public void setCampusValue(String campusValue) { + this.campusValue = campusValue; } - public String getBettplatzkennungValue() { - return this.bettplatzkennungValue ; + public String getCampusValue() { + return this.campusValue ; } public void setGebaudegruppeValue(String gebaudegruppeValue) { @@ -78,44 +78,43 @@ public String getGebaudegruppeValue() { return this.gebaudegruppeValue ; } - public void setStationskennungValue(String stationskennungValue) { - this.stationskennungValue = stationskennungValue; + public void setEbeneValue(String ebeneValue) { + this.ebeneValue = ebeneValue; } - public String getStationskennungValue() { - return this.stationskennungValue ; + public String getEbeneValue() { + return this.ebeneValue ; } - public void setStandorttypValue(String standorttypValue) { - this.standorttypValue = standorttypValue; + public void setStationskennungValue(String stationskennungValue) { + this.stationskennungValue = stationskennungValue; } - public String getStandorttypValue() { - return this.standorttypValue ; + public String getStationskennungValue() { + return this.stationskennungValue ; } - public void setDetailsZumBett(DetailsZumBettCluster detailsZumBett) { - this.detailsZumBett = detailsZumBett; + public void setZimmerkennungValue(String zimmerkennungValue) { + this.zimmerkennungValue = zimmerkennungValue; } - public DetailsZumBettCluster getDetailsZumBett() { - return this.detailsZumBett ; + public String getZimmerkennungValue() { + return this.zimmerkennungValue ; } - public void setStandortbeschreibungValue(String standortbeschreibungValue) { - this.standortbeschreibungValue = standortbeschreibungValue; + public void setBettplatzkennungValue(String bettplatzkennungValue) { + this.bettplatzkennungValue = bettplatzkennungValue; } - public String getStandortbeschreibungValue() { - return this.standortbeschreibungValue ; + public String getBettplatzkennungValue() { + return this.bettplatzkennungValue ; } - public void setStandortschlusselDefiningcode( - StandortschlusselDefiningcode standortschlusselDefiningcode) { - this.standortschlusselDefiningcode = standortschlusselDefiningcode; + public void setDetailsZumBett(DetailsZumBettCluster detailsZumBett) { + this.detailsZumBett = detailsZumBett; } - public StandortschlusselDefiningcode getStandortschlusselDefiningcode() { - return this.standortschlusselDefiningcode ; + public DetailsZumBettCluster getDetailsZumBett() { + return this.detailsZumBett ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortClusterContainment.java index eb13353c2..dae0fa859 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortClusterContainment.java @@ -1,6 +1,5 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; -import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; @@ -8,25 +7,25 @@ public class StandortClusterContainment extends Containment { public SelectAqlField STANDORT_CLUSTER = new AqlFieldImp(StandortCluster.class, "", "StandortCluster", StandortCluster.class, this); - public SelectAqlField ZIMMERKENNUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0029]/value|value", "zimmerkennungValue", String.class, this); + public SelectAqlField STANDORTTYP_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0040]/value|value", "standorttypValue", String.class, this); - public SelectAqlField CAMPUS_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0024]/value|value", "campusValue", String.class, this); + public SelectAqlField STANDORTBESCHREIBUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0046]/value|value", "standortbeschreibungValue", String.class, this); - public SelectAqlField EBENE_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0028]/value|value", "ebeneValue", String.class, this); + public SelectAqlField STANDORTSCHLUSSEL_DEFINING_CODE = new AqlFieldImp(StandortCluster.class, "/items[at0048]/value|defining_code", "standortschlusselDefiningCode", StandortschlusselDefiningCode.class, this); - public SelectAqlField BETTPLATZKENNUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0034]/value|value", "bettplatzkennungValue", String.class, this); + public SelectAqlField CAMPUS_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0024]/value|value", "campusValue", String.class, this); public SelectAqlField GEBAUDEGRUPPE_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0025]/value|value", "gebaudegruppeValue", String.class, this); - public SelectAqlField STATIONSKENNUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0027]/value|value", "stationskennungValue", String.class, this); + public SelectAqlField EBENE_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0028]/value|value", "ebeneValue", String.class, this); - public SelectAqlField STANDORTTYP_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0040]/value|value", "standorttypValue", String.class, this); + public SelectAqlField STATIONSKENNUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0027]/value|value", "stationskennungValue", String.class, this); - public SelectAqlField DETAILS_ZUM_BETT = new AqlFieldImp(StandortCluster.class, "/items[openEHR-EHR-CLUSTER.device.v1 and name/value='Details zum Bett']", "detailsZumBett", DetailsZumBettCluster.class, this); + public SelectAqlField ZIMMERKENNUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0029]/value|value", "zimmerkennungValue", String.class, this); - public SelectAqlField STANDORTBESCHREIBUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0046]/value|value", "standortbeschreibungValue", String.class, this); + public SelectAqlField BETTPLATZKENNUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0034]/value|value", "bettplatzkennungValue", String.class, this); - public SelectAqlField STANDORTSCHLUSSEL_DEFININGCODE = new AqlFieldImp(StandortCluster.class, "/items[at0048]/value|defining_code", "standortschlusselDefiningcode", StandortschlusselDefiningcode.class, this); + public SelectAqlField DETAILS_ZUM_BETT = new AqlFieldImp(StandortCluster.class, "/items[openEHR-EHR-CLUSTER.device.v1]", "detailsZumBett", DetailsZumBettCluster.class, this); private StandortClusterContainment() { super("openEHR-EHR-CLUSTER.location.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortschlusselDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortschlusselDefiningcode.java index a3b1dffb2..1e04607e7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortschlusselDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortschlusselDefiningcode.java @@ -1,222 +1,301 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; -import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; -public enum StandortschlusselDefiningcode implements EnumValueSet { - PALLIATIVMEDIZIN("Palliativmedizin", null, "§301 SGB V", "3752"), +public enum StandortschlusselDefiningCode implements EnumValueSet { + NEUROCHIRURGIE("Neurochirurgie", "Neurochirurgie", "§301 SGB V", "1700"), - SCHWERPUNKT_NEUROCHIRURGIE("Intensivmedizin/Schwerpunkt Neurochirurgie", null, "§301 SGB V", "3617"), + HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE_SCHWERPUNKT_FRAUENHEILKUNDE("Hämatologie und internistische Onkologie/Schwerpunkt Frauenheilkunde", "Hämatologie und internistische Onkologie/Schwerpunkt Frauenheilkunde", "§301 SGB V", "0524"), - SCHWERPUNKT_HANDCHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Handchirurgie", null, "§301 SGB V", "1551"), + INTENSIVMEDIZIN_SCHWERPUNKT_KARDIOLOGIE("Intensivmedizin/Schwerpunkt Kardiologie", "Intensivmedizin/Schwerpunkt Kardiologie", "§301 SGB V", "3603"), - ORTHOPADIE("Orthopädie", null, "§301 SGB V", "2300"), + INNERE_MEDIZIN_SCHWERPUNKT_KARDIOLOGIE("Innere Medizin/Schwerpunkt Kardiologie", "Innere Medizin/Schwerpunkt Kardiologie", "§301 SGB V", "0103"), - SCHWERPUNKT_NEUROLOGIE("Allgemeine Psychiatrie/Schwerpunkt Neurologie", null, "§301 SGB V", "2928"), + NEUROLOGIE_SCHWERPUNKT_GERONTOLOGIE("Neurologie/Schwerpunkt Gerontologie", "Neurologie/Schwerpunkt Gerontologie", "§301 SGB V", "2851"), - SCHWERPUNKT_PADIATRIE("Lungen- und Bronchialheilkunde/Schwerpunkt Pädiatrie", null, "§301 SGB V", "1410"), + ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_SUCHTBEHANDLUNG_TAGESKLINIK("Allgemeine Psychiatrie/Schwerpunkt Suchtbehandlung, Tagesklinik", "Allgemeine Psychiatrie/Schwerpunkt Suchtbehandlung, Tagesklinik", "§301 SGB V", "2953"), - SCHWERPUNKT_CHIRURGIE("Intensivmedizin/Schwerpunkt Chirurgie", null, "§301 SGB V", "3618"), + WEANINGEINHEIT("Weaningeinheit", "Weaningeinheit", "§301 SGB V", "3758"), - INTENSIVMEDIZIN13_ABS2_SATZ32_HALBSATZ_BPFLV_IN_DER_AM31122003_GELTENDEN_FASSUNG("Herzchirurgie/Intensivmedizin (§ 13 Abs. 2 Satz 3 2. Halbsatz BPflV in der am 31.12.2003 geltenden Fassung)", null, "§301 SGB V", "2136"), + INNERE_MEDIZIN_SCHWERPUNKT_GASTROENTEROLOGIE("Innere Medizin/Schwerpunkt Gastroenterologie", "Innere Medizin/Schwerpunkt Gastroenterologie", "§301 SGB V", "0107"), - SCHWERPUNKT_GASTROENTEROLOGIE("Pädiatrie/Schwerpunkt Gastroenterologie", null, "§301 SGB V", "1007"), + ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_FORENSISCHE_BEHANDLUNG("Allgemeine Psychiatrie/Schwerpunkt Forensische Behandlung", "Allgemeine Psychiatrie/Schwerpunkt Forensische Behandlung", "§301 SGB V", "2952"), - SCHWERPUNKT_HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE("Innere Medizin/Schwerpunkt Hämatologie und internistische Onkologie", null, "§301 SGB V", "0105"), + INNERE_MEDIZIN_SCHWERPUNKT_HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE("Innere Medizin/Schwerpunkt Hämatologie und internistische Onkologie", "Innere Medizin/Schwerpunkt Hämatologie und internistische Onkologie", "§301 SGB V", "0105"), - SUCHTMEDIZIN("Suchtmedizin", null, "§301 SGB V", "3756"), + GERIATRIE_TAGESKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Geriatrie/Tagesklinik (für teilstationäre Pflegesätze)", "Geriatrie/Tagesklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "0260"), - SCHWERPUNKT_HERZCHIRURGIE("Thoraxchirurgie/Schwerpunkt Herzchirurgie", null, "§301 SGB V", "2021"), + RHEUMATOLOGIE_SCHWERPUNKT_PADIATRIE("Rheumatologie/Schwerpunkt Pädiatrie", "Rheumatologie/Schwerpunkt Pädiatrie", "§301 SGB V", "0910"), - SCHWERPUNKT_SCHLAGANFALLPATIENTEN("Neurologie/Schwerpunkt Schlaganfallpatienten", null, "§301 SGB V", "2856"), + PADIATRIE_SCHWERPUNKT_KINDERNEUROLOGIE("Pädiatrie/Schwerpunkt Kinderneurologie", "Pädiatrie/Schwerpunkt Kinderneurologie", "§301 SGB V", "1028"), - PNEUMOLOGIE("Pneumologie", null, "§301 SGB V", "0800"), + ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_GERONTOPSYCHIATRIE_TAGESKLINIK("Allgemeine Psychiatrie/Schwerpunkt Gerontopsychiatrie, Tagesklinik", "Allgemeine Psychiatrie/Schwerpunkt Gerontopsychiatrie, Tagesklinik", "§301 SGB V", "2955"), - SCHWERPUNKT_INTENSIVMEDIZIN("Kinderkardiologie/Schwerpunkt Intensivmedizin", null, "§301 SGB V", "1136"), + HERZCHIRURGIE_SCHWERPUNKT_THORAXCHIRURGIE_INTENSIVMEDIZIN("Herzchirurgie/Schwerpunkt Thoraxchirurgie Intensivmedizin", "Herzchirurgie/Schwerpunkt Thoraxchirurgie Intensivmedizin", "§301 SGB V", "2150"), - SCHWERPUNKT_SUCHTBEHANDLUNG_NACHTKLINIK("Allgemeine Psychiatrie/Schwerpunkt Suchtbehandlung, Nachtklinik", null, "§301 SGB V", "2954"), + ENDOKRINOLOGIE_SCHWERPUNKT_GASTROENTEROLOGIE("Endokrinologie/Schwerpunkt Gastroenterologie", "Endokrinologie/Schwerpunkt Gastroenterologie", "§301 SGB V", "0607"), - SCHWERPUNKT_LUNGEN_UND_BRONCHIALHEILKUNDE("Innere Medizin/Schwerpunkt Lungen- und Bronchialheilkunde", null, "§301 SGB V", "0114"), + NEONATOLOGIE("Neonatologie", "Neonatologie", "§301 SGB V", "1200"), - LANGZEITBEREICH_KINDER("Langzeitbereich Kinder", null, "§301 SGB V", "1051"), + SUCHTMEDIZIN("Suchtmedizin", "Suchtmedizin", "§301 SGB V", "3756"), - SCHWERPUNKT_GERIATRIE("Frauenheilkunde/Schwerpunkt Geriatrie", null, "§301 SGB V", "2402"), + GERIATRIE("Geriatrie", "Geriatrie", "§301 SGB V", "0200"), - RADIOLOGIE("Radiologie", null, "§301 SGB V", "3751"), + ALLGEMEINE_CHIRURGIE_INTENSIVMEDIZIN13_ABS2_SATZ32_HALBS_BPFLV_IN_DER_AM31122003_GELTENDEN_FASSUNG("Allgemeine Chirurgie/Intensivmedizin (§ 13 Abs. 2 Satz 3, 2. Halbs. BPflV in der am 31.12.2003 geltenden Fassung)", "Allgemeine Chirurgie/Intensivmedizin (§ 13 Abs. 2 Satz 3, 2. Halbs. BPflV in der am 31.12.2003 geltenden Fassung)", "§301 SGB V", "1536"), - VISCERALCHIRURGIE("Visceralchirurgie", null, "§301 SGB V", "3757"), + PADIATRIE_SCHWERPUNKT_HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE("Pädiatrie/Schwerpunkt Hämatologie und internistische Onkologie", "Pädiatrie/Schwerpunkt Hämatologie und internistische Onkologie", "§301 SGB V", "1005"), - SCHWERPUNKT_SUCHTBEHANDLUNG("Allgemeine Psychiatrie/Schwerpunkt Suchtbehandlung", null, "§301 SGB V", "2950"), + INTENSIVMEDIZIN_HERZ_THORAXCHIRURGIE("Intensivmedizin/Herz-Thoraxchirurgie", "Intensivmedizin/Herz-Thoraxchirurgie", "§301 SGB V", "3652"), - SCHWERPUNKT_ENDOKRINOLOGIE("Innere Medizin/Schwerpunkt Endokrinologie", null, "§301 SGB V", "0106"), + ANGIOLOGIE("Angiologie", "Angiologie", "§301 SGB V", "3750"), - PLASTISCHE_CHIRURGIE("Plastische Chirurgie", null, "§301 SGB V", "1900"), + NEPHROLOGIE_INTENSIVMEDIZIN("Nephrologie/Intensivmedizin", "Nephrologie/Intensivmedizin", "§301 SGB V", "0436"), - SCHWERPUNKT_FORENSISCHE_BEHANDLUNG("Allgemeine Psychiatrie/Schwerpunkt Forensische Behandlung", null, "§301 SGB V", "2952"), + FRAUENHEILKUNDE("Frauenheilkunde", "Frauenheilkunde", "§301 SGB V", "2425"), - SCHWERPUNKT_THORAXCHIRURGIE("Herzchirurgie/Schwerpunkt Thoraxchirurgie", null, "§301 SGB V", "2120"), + KINDERCHIRURGIE("Kinderchirurgie", "Kinderchirurgie", "§301 SGB V", "1300"), - DERMATOLOGIE("Dermatologie", null, "§301 SGB V", "3400"), + DERMATOLOGIE_TAGESKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Dermatologie/Tagesklinik (für teilstationäre Pflegesätze)", "Dermatologie/Tagesklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "3460"), - SCHWERPUNKT_NEONATOLOGIE("Pädiatrie/Schwerpunkt Neonatologie", null, "§301 SGB V", "1012"), + PSYCHOSOMATIK_PSYCHOTHERAPIE("Psychosomatik/Psychotherapie", "Psychosomatik/Psychotherapie", "§301 SGB V", "3100"), - TAGESKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Allgemeine Psychiatrie/Tagesklinik (für teilstationäre Pflegesätze)", null, "§301 SGB V", "2960"), + PADIATRIE_SCHWERPUNKT_NEONATOLOGIE("Pädiatrie/Schwerpunkt Neonatologie", "Pädiatrie/Schwerpunkt Neonatologie", "§301 SGB V", "1012"), - ZAHN_UND_KIEFERHEILKUNDE_MUND_UND_KIEFERCHIRURGIE("Zahn- und Kieferheilkunde, Mund- und Kieferchirurgie", null, "§301 SGB V", "3500"), + UROLOGIE("Urologie", "Urologie", "§301 SGB V", "2200"), - UNFALLCHIRURGIE("Unfallchirurgie", null, "§301 SGB V", "1600"), + INNERE_MEDIZIN_SCHWERPUNKT_LUNGEN_UND_BRONCHIALHEILKUNDE("Innere Medizin/Schwerpunkt Lungen- und Bronchialheilkunde", "Innere Medizin/Schwerpunkt Lungen- und Bronchialheilkunde", "§301 SGB V", "0114"), - SONSTIGE_FACHABTEILUNG("Sonstige Fachabteilung", null, "§301 SGB V", "3700"), + THORAXCHIRURGIE("Thoraxchirurgie", "Thoraxchirurgie", "§301 SGB V", "2000"), - NACHTKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Allgemeine Psychiatrie/Nachtklinik (für teilstationäre Pflegesätze)", null, "§301 SGB V", "2961"), + PADIATRIE_SCHWERPUNKT_NEPHROLOGIE("Pädiatrie/Schwerpunkt Nephrologie", "Pädiatrie/Schwerpunkt Nephrologie", "§301 SGB V", "1004"), - GERIATRIE("Geriatrie", null, "§301 SGB V", "0200"), + HERZCHIRURGIE_INTENSIVMEDIZIN13_ABS2_SATZ32_HALBSATZ_BPFLV_IN_DER_AM31122003_GELTENDEN_FASSUNG("Herzchirurgie/Intensivmedizin (§ 13 Abs. 2 Satz 3 2. Halbsatz BPflV in der am 31.12.2003 geltenden Fassung)", "Herzchirurgie/Intensivmedizin (§ 13 Abs. 2 Satz 3 2. Halbsatz BPflV in der am 31.12.2003 geltenden Fassung)", "§301 SGB V", "2136"), - INTENSIVMEDIZIN("Intensivmedizin", null, "§301 SGB V", "3600"), + INNERE_MEDIZIN_SCHWERPUNKT_SCHLAGANFALLPATIENTEN("Innere Medizin/Schwerpunkt Schlaganfallpatienten", "Innere Medizin/Schwerpunkt Schlaganfallpatienten", "§301 SGB V", "0156"), - SCHWERPUNKT_PNEUMOLOGIE("Innere Medizin/Schwerpunkt Pneumologie", null, "§301 SGB V", "0108"), + ENDOKRINOLOGIE_SCHWERPUNKT_PADIATRIE("Endokrinologie/Schwerpunkt Pädiatrie", "Endokrinologie/Schwerpunkt Pädiatrie", "§301 SGB V", "0610"), - SCHWERPUNKT_STRAHLENHEILKUNDE("Nuklearmedizin/Schwerpunkt Strahlenheilkunde", null, "§301 SGB V", "3233"), + PSYCHOSOMATIK_PSYCHOTHERAPIE_NACHTKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Psychosomatik/Psychotherapie/Nachtklinik (für teilstationäre Pflegesätze)", "Psychosomatik/Psychotherapie/Nachtklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "3161"), - DAVON_GEBURTSHILFE("davon Geburtshilfe", null, "§301 SGB V", "2500"), + GASTROENTEROLOGIE("Gastroenterologie", "Gastroenterologie", "§301 SGB V", "0700"), - KINDER_UND_JUGENDPSYCHIATRIE("Kinder- und Jugendpsychiatrie", null, "§301 SGB V", "3000"), + NEUROLOGIE("Neurologie", "Neurologie", "§301 SGB V", "2800"), - NEPHROLOGIE("Nephrologie", null, "§301 SGB V", "0400"), + GASTROENTEROLOGIE_SCHWERPUNKT_PADIATRIE("Gastroenterologie/Schwerpunkt Pädiatrie", "Gastroenterologie/Schwerpunkt Pädiatrie", "§301 SGB V", "0710"), - SCHWERPUNKT_KARDIOLOGIE("Intensivmedizin/Schwerpunkt Kardiologie", null, "§301 SGB V", "3603"), + UNFALLCHIRURGIE("Unfallchirurgie", "Unfallchirurgie", "§301 SGB V", "1600"), - SCHWERPUNKT_GERONTOPSYCHIATRIE_TAGESKLINIK("Allgemeine Psychiatrie/Schwerpunkt Gerontopsychiatrie, Tagesklinik", null, "§301 SGB V", "2955"), + LUNGEN_UND_BRONCHIALHEILKUNDE_SCHWERPUNKT_PADIATRIE("Lungen- und Bronchialheilkunde/Schwerpunkt Pädiatrie", "Lungen- und Bronchialheilkunde/Schwerpunkt Pädiatrie", "§301 SGB V", "1410"), - NEUROLOGIE("Neurologie", null, "§301 SGB V", "2800"), + INNERE_MEDIZIN_SCHWERPUNKT_NEPHROLOGIE("Innere Medizin/Schwerpunkt Nephrologie", "Innere Medizin/Schwerpunkt Nephrologie", "§301 SGB V", "0104"), - ORTHOPADIE_UND_UNFALLCHIRURGIE("Orthopädie und Unfallchirurgie", null, "§301 SGB V", "2316"), + HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE("Hämatologie und internistische Onkologie", "Hämatologie und internistische Onkologie", "§301 SGB V", "0500"), - SCHWERPUNKT_UROLOGIE("Intensivmedizin/Schwerpunkt Urologie", null, "§301 SGB V", "3622"), + ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_SUCHTBEHANDLUNG_NACHTKLINIK("Allgemeine Psychiatrie/Schwerpunkt Suchtbehandlung, Nachtklinik", "Allgemeine Psychiatrie/Schwerpunkt Suchtbehandlung, Nachtklinik", "§301 SGB V", "2954"), - SCHWERPUNKT_ORTHOPADIE("Chirurgie/Schwerpunkt Orthopädie", null, "§301 SGB V", "1523"), + PADIATRIE_SCHWERPUNKT_ENDOKRINOLOGIE("Pädiatrie/Schwerpunkt Endokrinologie", "Pädiatrie/Schwerpunkt Endokrinologie", "§301 SGB V", "1006"), - SCHWERPUNKT_KINDERNEUROLOGIE("Pädiatrie/Schwerpunkt Kinderneurologie", null, "§301 SGB V", "1028"), + PADIATRIE_SCHWERPUNKT_LUNGEN_UND_BRONCHIALHEILKUNDE("Pädiatrie/Schwerpunkt Lungen- und Bronchialheilkunde", "Pädiatrie/Schwerpunkt Lungen- und Bronchialheilkunde", "§301 SGB V", "1014"), - SCHWERPUNKT_NEPHROLOGIE("Innere Medizin/Schwerpunkt Nephrologie", null, "§301 SGB V", "0104"), + INNERE_MEDIZIN_SCHWERPUNKT_INFEKTIONSKRANKHEITEN("Innere Medizin/Schwerpunkt Infektionskrankheiten", "Innere Medizin/Schwerpunkt Infektionskrankheiten", "§301 SGB V", "0152"), - SCHWERPUNKT_PLASTISCHE_CHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Plastische Chirurgie", null, "§301 SGB V", "1519"), + PADIATRIE_SCHWERPUNKT_PERINATALMEDIZIN("Pädiatrie/Schwerpunkt Perinatalmedizin", "Pädiatrie/Schwerpunkt Perinatalmedizin", "§301 SGB V", "1050"), - ENDOKRINOLOGIE("Endokrinologie", null, "§301 SGB V", "0600"), + INTENSIVMEDIZIN("Intensivmedizin", "Intensivmedizin", "§301 SGB V", "3600"), - TUMORFORSCHUNG("Innere Medizin/Tumorforschung", null, "§301 SGB V", "0150"), + ALLGEMEINE_PSYCHIATRIE_NACHTKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Allgemeine Psychiatrie/Nachtklinik (für teilstationäre Pflegesätze)", "Allgemeine Psychiatrie/Nachtklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "2961"), - AUGENHEILKUNDE("Augenheilkunde", null, "§301 SGB V", "2700"), + ENDOKRINOLOGIE("Endokrinologie", "Endokrinologie", "§301 SGB V", "0600"), - LUNGEN_UND_BRONCHIALHEILKUNDE("Lungen- und Bronchialheilkunde", null, "§301 SGB V", "1400"), + INTENSIVMEDIZIN_SCHWERPUNKT_INNERE_MEDIZIN("Intensivmedizin/Schwerpunkt Innere Medizin", "Intensivmedizin/Schwerpunkt Innere Medizin", "§301 SGB V", "3601"), - PADIATRIE("Pädiatrie", null, "§301 SGB V", "1000"), + INTENSIVMEDIZIN_SCHWERPUNKT_CHIRURGIE("Intensivmedizin/Schwerpunkt Chirurgie", "Intensivmedizin/Schwerpunkt Chirurgie", "§301 SGB V", "3618"), - SCHWERPUNKT_GEFASSCHIRURGIE("Herzchirurgie/Schwerpunkt Gefäßchirurgie", null, "§301 SGB V", "2118"), + NEUROLOGIE_SCHWERPUNKT_PADIATRIE("Neurologie/Schwerpunkt Pädiatrie", "Neurologie/Schwerpunkt Pädiatrie", "§301 SGB V", "2810"), - HEILTHERAPEUTISCHE_ABTEILUNG("Heiltherapeutische Abteilung", null, "§301 SGB V", "3754"), + OPERATIVE_INTENSIVMEDIZIN_SCHWERPUNKT_CHIRURGIE("Operative Intensivmedizin/Schwerpunkt Chirurgie", "Operative Intensivmedizin/Schwerpunkt Chirurgie", "§301 SGB V", "3650"), - SCHWERPUNKT_RHEUMATOLOGIE("Pädiatrie/Schwerpunkt Rheumatologie", null, "§301 SGB V", "1009"), + AUGENHEILKUNDE("Augenheilkunde", "Augenheilkunde", "§301 SGB V", "2700"), - KINDERKARDIOLOGIE("Kinderkardiologie", null, "§301 SGB V", "1100"), + STRAHLENHEILKUNDE("Strahlenheilkunde", "Strahlenheilkunde", "§301 SGB V", "3300"), - SCHWERPUNKT_HERZCHIRURGIE_INTENSIVMEDIZIN("Thoraxchirurgie/Schwerpunkt Herzchirurgie Intensivmedizin", null, "§301 SGB V", "2050"), + INNERE_MEDIZIN_SCHWERPUNKT_DIABETES("Innere Medizin/Schwerpunkt Diabetes", "Innere Medizin/Schwerpunkt Diabetes", "§301 SGB V", "0153"), - UROLOGIE("Urologie", null, "§301 SGB V", "2200"), + SCHMERZTHERAPIE("Schmerztherapie", "Schmerztherapie", "§301 SGB V", "3753"), - GASTROENTEROLOGIE("Gastroenterologie", null, "§301 SGB V", "0700"), + KINDER_UND_JUGENDPSYCHIATRIE_NACHTKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Kinder- und Jugendpsychiatrie/Nachtklinik (für teilstationäre Pflegesätze)", "Kinder- und Jugendpsychiatrie/Nachtklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "3061"), - ANGIOLOGIE("Angiologie", null, "§301 SGB V", "3750"), + INTENSIVMEDIZIN_HERZCHIRURGIE("Intensivmedizin/Herzchirurgie", "Intensivmedizin/Herzchirurgie", "§301 SGB V", "3621"), - SCHWERPUNKT_KINDERKARDIOLOGIE("Pädiatrie/Schwerpunkt Kinderkardiologie", null, "§301 SGB V", "1011"), + ORTHOPADIE_SCHWERPUNKT_CHIRURGIE("Orthopädie/Schwerpunkt Chirurgie", "Orthopädie/Schwerpunkt Chirurgie", "§301 SGB V", "2315"), - GEFASSCHIRURGIE("Gefäßchirurgie", null, "§301 SGB V", "1800"), + INNERE_MEDIZIN_SCHWERPUNKT_NATURHEILKUNDE("Innere Medizin/Schwerpunkt Naturheilkunde", "Innere Medizin/Schwerpunkt Naturheilkunde", "§301 SGB V", "0154"), - ALLGEMEINE_PSYCHIATRIE("Allgemeine Psychiatrie", null, "§301 SGB V", "2900"), + ORTHOPADIE_SCHWERPUNKT_RHEUMATOLOGIE("Orthopädie/Schwerpunkt Rheumatologie", "Orthopädie/Schwerpunkt Rheumatologie", "§301 SGB V", "2309"), - HALS_NASEN_OHRENHEILKUNDE("Hals-, Nasen-, Ohrenheilkunde", null, "§301 SGB V", "2600"), + FRAUENHEILKUNDE_SCHWERPUNKT_GERIATRIE("Frauenheilkunde/Schwerpunkt Geriatrie", "Frauenheilkunde/Schwerpunkt Geriatrie", "§301 SGB V", "2402"), - HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE("Hämatologie und internistische Onkologie", null, "§301 SGB V", "0500"), + ALLGEMEINE_CHIRURGIE("Allgemeine Chirurgie", "Allgemeine Chirurgie", "§301 SGB V", "1500"), - NEONATOLOGIE("Neonatologie", null, "§301 SGB V", "1200"), + ALLGEMEINE_PSYCHIATRIE_TAGESKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Allgemeine Psychiatrie/Tagesklinik (für teilstationäre Pflegesätze)", "Allgemeine Psychiatrie/Tagesklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "2960"), - PSYCHOTHERAPIE("Allgemeine Psychiatrie/Schwerpunkt Psychosomatik/Psychotherapie", null, "§301 SGB V", "2931"), + ZAHN_UND_KIEFERHEILKUNDE_MUND_UND_KIEFERCHIRURGIE("Zahn- und Kieferheilkunde, Mund- und Kieferchirurgie", "Zahn- und Kieferheilkunde, Mund- und Kieferchirurgie", "§301 SGB V", "3500"), - SCHWERPUNKT_THORAXCHIRURGIE_INTENSIVMEDIZIN("Herzchirurgie/Schwerpunkt Thoraxchirurgie Intensivmedizin", null, "§301 SGB V", "2150"), + PADIATRIE("Pädiatrie", "Pädiatrie", "§301 SGB V", "1000"), - SCHWERPUNKT_KINDER_UND_JUGENDPSYCHOSOMATIK("Psychosomatik/Psychotherapie/Schwerpunkt Kinder- und Jugendpsychosomatik", null, "§301 SGB V", "3110"), + STRAHLENHEILKUNDE_SCHWERPUNKT_RADIOLOGIE("Strahlenheilkunde/Schwerpunkt Radiologie", "Strahlenheilkunde/Schwerpunkt Radiologie", "§301 SGB V", "3350"), - SCHWERPUNKT_GERONTOPSYCHIATRIE_NACHTKLINIK("Allgemeine Psychiatrie/Schwerpunkt Gerontopsychiatrie, Nachtklinik", null, "§301 SGB V", "2956"), + LANGZEITBEREICH_KINDER("Langzeitbereich Kinder", "Langzeitbereich Kinder", "§301 SGB V", "1051"), - SCHWERPUNKT_KINDER_UND_JUGENDPSYCHIATRIE("Allgemeine Psychiatrie/Schwerpunkt Kinder- und Jugendpsychiatrie", null, "§301 SGB V", "2930"), + ALLGEMEINE_CHIRURGIE_SCHWERPUNKT_THORAXCHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Thoraxchirurgie", "Allgemeine Chirurgie/Schwerpunkt Thoraxchirurgie", "§301 SGB V", "1520"), - SCHWERPUNKT_GERONTOLOGIE("Neurologie/Schwerpunkt Gerontologie", null, "§301 SGB V", "2851"), + PADIATRIE_SCHWERPUNKT_GASTROENTEROLOGIE("Pädiatrie/Schwerpunkt Gastroenterologie", "Pädiatrie/Schwerpunkt Gastroenterologie", "§301 SGB V", "1007"), - SCHWERPUNKT_NATURHEILKUNDE("Innere Medizin/Schwerpunkt Naturheilkunde", null, "§301 SGB V", "0154"), + HERZCHIRURGIE_SCHWERPUNKT_THORAXCHIRURGIE("Herzchirurgie/Schwerpunkt Thoraxchirurgie", "Herzchirurgie/Schwerpunkt Thoraxchirurgie", "§301 SGB V", "2120"), - WIRBELSAULENCHIRURGIE("Wirbelsäulenchirurgie", null, "§301 SGB V", "3755"), + ALLGEMEINE_CHIRURGIE_SCHWERPUNKT_GEFASSCHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Gefäßchirurgie", "Allgemeine Chirurgie/Schwerpunkt Gefäßchirurgie", "§301 SGB V", "1518"), - SCHWERPUNKT_HALS_NASEN_OHRENHEILKUNDE("Intensivmedizin/Schwerpunkt Hals-, Nasen-, Ohrenheilkunde", null, "§301 SGB V", "3626"), + PADIATRIE_SCHWERPUNKT_RHEUMATOLOGIE("Pädiatrie/Schwerpunkt Rheumatologie", "Pädiatrie/Schwerpunkt Rheumatologie", "§301 SGB V", "1009"), - SCHWERPUNKT_INNERE_MEDIZIN("Intensivmedizin/Schwerpunkt Innere Medizin", null, "§301 SGB V", "3601"), + INNERE_MEDIZIN_TUMORFORSCHUNG("Innere Medizin/Tumorforschung", "Innere Medizin/Tumorforschung", "§301 SGB V", "0150"), - FRAUENHEILKUNDE_UND_GEBURTSHILFE("Frauenheilkunde und Geburtshilfe", null, "§301 SGB V", "2400"), + INTENSIVMEDIZIN_SCHWERPUNKT_PADIATRIE("Intensivmedizin/Schwerpunkt Pädiatrie", "Intensivmedizin/Schwerpunkt Pädiatrie", "§301 SGB V", "3610"), - INTENSIVMEDIZIN13_ABS2_SATZ32_HALBS_BPFLV_IN_DER_AM31122003_GELTENDEN_FASSUNG("Allgemeine Chirurgie/Intensivmedizin (§ 13 Abs. 2 Satz 3, 2. Halbs. BPflV in der am 31.12.2003 geltenden Fassung)", null, "§301 SGB V", "1536"), + HALS_NASEN_OHRENHEILKUNDE("Hals-, Nasen-, Ohrenheilkunde", "Hals-, Nasen-, Ohrenheilkunde", "§301 SGB V", "2600"), - NUKLEARMEDIZIN("Nuklearmedizin", null, "§301 SGB V", "3200"), + HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE_SCHWERPUNKT_STRAHLENHEILKUNDE("Hämatologie und internistische Onkologie/Schwerpunkt Strahlenheilkunde", "Hämatologie und internistische Onkologie/Schwerpunkt Strahlenheilkunde", "§301 SGB V", "0533"), - STRAHLENHEILKUNDE("Strahlenheilkunde", null, "§301 SGB V", "3300"), + ALLGEMEINE_CHIRURGIE_SCHWERPUNKT_PLASTISCHE_CHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Plastische Chirurgie", "Allgemeine Chirurgie/Schwerpunkt Plastische Chirurgie", "§301 SGB V", "1519"), - SCHWERPUNKT_UNFALLCHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Unfallchirurgie", null, "§301 SGB V", "1516"), + THORAXCHIRURGIE_SCHWERPUNKT_HERZCHIRURGIE("Thoraxchirurgie/Schwerpunkt Herzchirurgie", "Thoraxchirurgie/Schwerpunkt Herzchirurgie", "§301 SGB V", "2021"), - HERZ_THORAXCHIRURGIE("Intensivmedizin/Herz-Thoraxchirurgie", null, "§301 SGB V", "3652"), + HERZCHIRURGIE_SCHWERPUNKT_GEFASSCHIRURGIE("Herzchirurgie/Schwerpunkt Gefäßchirurgie", "Herzchirurgie/Schwerpunkt Gefäßchirurgie", "§301 SGB V", "2118"), - SCHWERPUNKT_SUCHTBEHANDLUNG_TAGESKLINIK("Allgemeine Psychiatrie/Schwerpunkt Suchtbehandlung, Tagesklinik", null, "§301 SGB V", "2953"), + GEFASSCHIRURGIE("Gefäßchirurgie", "Gefäßchirurgie", "§301 SGB V", "1800"), - ALLGEMEINE_CHIRURGIE("Allgemeine Chirurgie", null, "§301 SGB V", "1500"), + FRAUENHEILKUNDE_UND_GEBURTSHILFE("Frauenheilkunde und Geburtshilfe", "Frauenheilkunde und Geburtshilfe", "§301 SGB V", "2400"), - THORAXCHIRURGIE("Thoraxchirurgie", null, "§301 SGB V", "2000"), + INNERE_MEDIZIN_SCHWERPUNKT_COLOPROKTOLOGIE("Innere Medizin/Schwerpunkt Coloproktologie", "Innere Medizin/Schwerpunkt Coloproktologie", "§301 SGB V", "0151"), - SCHWERPUNKT_FRAUENHEILKUNDE("Geriatrie/Schwerpunkt Frauenheilkunde", null, "§301 SGB V", "0224"), + ALLGEMEINE_CHIRURGIE_SCHWERPUNKT_HANDCHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Handchirurgie", "Allgemeine Chirurgie/Schwerpunkt Handchirurgie", "§301 SGB V", "1551"), - FRAUENHEILKUNDE("Frauenheilkunde", null, "§301 SGB V", "2425"), + PLASTISCHE_CHIRURGIE("Plastische Chirurgie", "Plastische Chirurgie", "§301 SGB V", "1900"), - SCHMERZTHERAPIE("Schmerztherapie", null, "§301 SGB V", "3753"), + DERMATOLOGIE("Dermatologie", "Dermatologie", "§301 SGB V", "3400"), - SCHWERPUNKT_PERINATALMEDIZIN("Pädiatrie/Schwerpunkt Perinatalmedizin", null, "§301 SGB V", "1050"), + THORAXCHIRURGIE_SCHWERPUNKT_HERZCHIRURGIE_INTENSIVMEDIZIN("Thoraxchirurgie/Schwerpunkt Herzchirurgie Intensivmedizin", "Thoraxchirurgie/Schwerpunkt Herzchirurgie Intensivmedizin", "§301 SGB V", "2050"), - WEANINGEINHEIT("Weaningeinheit", null, "§301 SGB V", "3758"), + INTENSIVMEDIZIN_SCHWERPUNKT_HALS_NASEN_OHRENHEILKUNDE("Intensivmedizin/Schwerpunkt Hals-, Nasen-, Ohrenheilkunde", "Intensivmedizin/Schwerpunkt Hals-, Nasen-, Ohrenheilkunde", "§301 SGB V", "3626"), - SCHWERPUNKT_GERONTOPSYCHIATRIE("Allgemeine Psychiatrie/Schwerpunkt Gerontopsychiatrie", null, "§301 SGB V", "2951"), + PNEUMOLOGIE("Pneumologie", "Pneumologie", "§301 SGB V", "0800"), - THORAX_HERZCHIRURGIE("Intensivmedizin/Thorax-Herzchirurgie", null, "§301 SGB V", "3651"), + PSYCHOSOMATIK_PSYCHOTHERAPIE_SCHWERPUNKT_KINDER_UND_JUGENDPSYCHOSOMATIK("Psychosomatik/Psychotherapie/Schwerpunkt Kinder- und Jugendpsychosomatik", "Psychosomatik/Psychotherapie/Schwerpunkt Kinder- und Jugendpsychosomatik", "§301 SGB V", "3110"), - INNERE_MEDIZIN("Innere Medizin", null, "§301 SGB V", "0100"), + INTENSIVMEDIZIN_SCHWERPUNKT_UROLOGIE("Intensivmedizin/Schwerpunkt Urologie", "Intensivmedizin/Schwerpunkt Urologie", "§301 SGB V", "3622"), - KARDIOLOGIE("Kardiologie", null, "§301 SGB V", "0300"), + HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE_SCHWERPUNKT_PADIATRIE("Hämatologie und internistische Onkologie/Schwerpunkt Pädiatrie", "Hämatologie und internistische Onkologie/Schwerpunkt Pädiatrie", "§301 SGB V", "0510"), - SCHWERPUNKT_DIABETES("Innere Medizin/Schwerpunkt Diabetes", null, "§301 SGB V", "0153"), + NUKLEARMEDIZIN("Nuklearmedizin", "Nuklearmedizin", "§301 SGB V", "3200"), - SCHWERPUNKT_COLOPROKTOLOGIE("Innere Medizin/Schwerpunkt Coloproktologie", null, "§301 SGB V", "0151"), + NUKLEARMEDIZIN_SCHWERPUNKT_STRAHLENHEILKUNDE("Nuklearmedizin/Schwerpunkt Strahlenheilkunde", "Nuklearmedizin/Schwerpunkt Strahlenheilkunde", "§301 SGB V", "3233"), - SCHWERPUNKT_ABDOMINAL_UND_GEFASSCHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Abdominal- und Gefäßchirurgie", null, "§301 SGB V", "1550"), + ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_SUCHTBEHANDLUNG("Allgemeine Psychiatrie/Schwerpunkt Suchtbehandlung", "Allgemeine Psychiatrie/Schwerpunkt Suchtbehandlung", "§301 SGB V", "2950"), - SCHWERPUNKT_KINDERCHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Kinderchirurgie", null, "§301 SGB V", "1513"), + GERIATRIE_NACHTKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Geriatrie/Nachtklinik (für teilstationäre Pflegesätze)", "Geriatrie/Nachtklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "0261"), - KINDERCHIRURGIE("Kinderchirurgie", null, "§301 SGB V", "1300"), + HEILTHERAPEUTISCHE_ABTEILUNG("Heiltherapeutische Abteilung", "Heiltherapeutische Abteilung", "§301 SGB V", "3754"), - HERZCHIRURGIE("Intensivmedizin/Herzchirurgie", null, "§301 SGB V", "3621"), + GERIATRIE_SCHWERPUNKT_FRAUENHEILKUNDE("Geriatrie/Schwerpunkt Frauenheilkunde", "Geriatrie/Schwerpunkt Frauenheilkunde", "§301 SGB V", "0224"), - SCHWERPUNKT_RADIOLOGIE("Strahlenheilkunde/Schwerpunkt Radiologie", null, "§301 SGB V", "3350"), + ORTHOPADIE_UND_UNFALLCHIRURGIE("Orthopädie und Unfallchirurgie", "Orthopädie und Unfallchirurgie", "§301 SGB V", "2316"), - RHEUMATOLOGIE("Rheumatologie", null, "§301 SGB V", "0900"), + ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_GERONTOPSYCHIATRIE("Allgemeine Psychiatrie/Schwerpunkt Gerontopsychiatrie", "Allgemeine Psychiatrie/Schwerpunkt Gerontopsychiatrie", "§301 SGB V", "2951"), - NEUROCHIRURGIE("Neurochirurgie", null, "§301 SGB V", "1700"), + HERZCHIRURGIE("Herzchirurgie", "Herzchirurgie", "§301 SGB V", "2100"), - SCHWERPUNKT_INFEKTIONSKRANKHEITEN("Innere Medizin/Schwerpunkt Infektionskrankheiten", null, "§301 SGB V", "0152"), + FRAUENHEILKUNDE_SCHWERPUNKT_HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE("Frauenheilkunde/Schwerpunkt Hämatologie und internistische Onkologie", "Frauenheilkunde/Schwerpunkt Hämatologie und internistische Onkologie", "§301 SGB V", "2405"), - SCHWERPUNKT_FRAUENHEILKUNDE_UND_GEBURTSHILFE("Intensivmedizin/Schwerpunkt Frauenheilkunde und Geburtshilfe", null, "§301 SGB V", "3624"); + ALLGEMEINE_CHIRURGIE_SCHWERPUNKT_ABDOMINAL_UND_GEFASSCHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Abdominal- und Gefäßchirurgie", "Allgemeine Chirurgie/Schwerpunkt Abdominal- und Gefäßchirurgie", "§301 SGB V", "1550"), + + SONSTIGE_FACHABTEILUNG("Sonstige Fachabteilung", "Sonstige Fachabteilung", "§301 SGB V", "3700"), + + RHEUMATOLOGIE("Rheumatologie", "Rheumatologie", "§301 SGB V", "0900"), + + THORAXCHIRURGIE_INTENSIVMEDIZIN("Thoraxchirurgie/Intensivmedizin", "Thoraxchirurgie/Intensivmedizin", "§301 SGB V", "2036"), + + LUNGEN_UND_BRONCHIALHEILKUNDE("Lungen- und Bronchialheilkunde", "Lungen- und Bronchialheilkunde", "§301 SGB V", "1400"), + + KINDER_UND_JUGENDPSYCHIATRIE_TAGESKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Kinder- und Jugendpsychiatrie/Tagesklinik (für teilstationäre Pflegesätze)", "Kinder- und Jugendpsychiatrie/Tagesklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "3060"), + + ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_NEUROLOGIE("Allgemeine Psychiatrie/Schwerpunkt Neurologie", "Allgemeine Psychiatrie/Schwerpunkt Neurologie", "§301 SGB V", "2928"), + + INTENSIVMEDIZIN_SCHWERPUNKT_FRAUENHEILKUNDE_UND_GEBURTSHILFE("Intensivmedizin/Schwerpunkt Frauenheilkunde und Geburtshilfe", "Intensivmedizin/Schwerpunkt Frauenheilkunde und Geburtshilfe", "§301 SGB V", "3624"), + + WIRBELSAULENCHIRURGIE("Wirbelsäulenchirurgie", "Wirbelsäulenchirurgie", "§301 SGB V", "3755"), + + PADIATRIE_SCHWERPUNKT_KINDERKARDIOLOGIE("Pädiatrie/Schwerpunkt Kinderkardiologie", "Pädiatrie/Schwerpunkt Kinderkardiologie", "§301 SGB V", "1011"), + + VISCERALCHIRURGIE("Visceralchirurgie", "Visceralchirurgie", "§301 SGB V", "3757"), + + PALLIATIVMEDIZIN("Palliativmedizin", "Palliativmedizin", "§301 SGB V", "3752"), + + CHIRURGIE_SCHWERPUNKT_ORTHOPADIE("Chirurgie/Schwerpunkt Orthopädie", "Chirurgie/Schwerpunkt Orthopädie", "§301 SGB V", "1523"), + + GASTROENTEROLOGIE_SCHWERPUNKT_ENDOKRINOLOGIE("Gastroenterologie/Schwerpunkt Endokrinologie", "Gastroenterologie/Schwerpunkt Endokrinologie", "§301 SGB V", "0706"), + + INNERE_MEDIZIN("Innere Medizin", "Innere Medizin", "§301 SGB V", "0100"), + + DAVON_GEBURTSHILFE("davon Geburtshilfe", "davon Geburtshilfe", "§301 SGB V", "2500"), + + ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_PSYCHOSOMATIK_PSYCHOTHERAPIE("Allgemeine Psychiatrie/Schwerpunkt Psychosomatik/Psychotherapie", "Allgemeine Psychiatrie/Schwerpunkt Psychosomatik/Psychotherapie", "§301 SGB V", "2931"), + + ALLGEMEINE_CHIRURGIE_SCHWERPUNKT_KINDERCHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Kinderchirurgie", "Allgemeine Chirurgie/Schwerpunkt Kinderchirurgie", "§301 SGB V", "1513"), + + KINDERKARDIOLOGIE("Kinderkardiologie", "Kinderkardiologie", "§301 SGB V", "1100"), + + INNERE_MEDIZIN_SCHWERPUNKT_ENDOKRINOLOGIE("Innere Medizin/Schwerpunkt Endokrinologie", "Innere Medizin/Schwerpunkt Endokrinologie", "§301 SGB V", "0106"), + + KINDERKARDIOLOGIE_SCHWERPUNKT_INTENSIVMEDIZIN("Kinderkardiologie/Schwerpunkt Intensivmedizin", "Kinderkardiologie/Schwerpunkt Intensivmedizin", "§301 SGB V", "1136"), + + INTENSIVMEDIZIN_THORAX_HERZCHIRURGIE("Intensivmedizin/Thorax-Herzchirurgie", "Intensivmedizin/Thorax-Herzchirurgie", "§301 SGB V", "3651"), + + ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_GERONTOPSYCHIATRIE_NACHTKLINIK("Allgemeine Psychiatrie/Schwerpunkt Gerontopsychiatrie, Nachtklinik", "Allgemeine Psychiatrie/Schwerpunkt Gerontopsychiatrie, Nachtklinik", "§301 SGB V", "2956"), + + RADIOLOGIE("Radiologie", "Radiologie", "§301 SGB V", "3751"), + + KARDIOLOGIE("Kardiologie", "Kardiologie", "§301 SGB V", "0300"), + + INTENSIVMEDIZIN_SCHWERPUNKT_NEUROLOGIE("Intensivmedizin/Schwerpunkt Neurologie", "Intensivmedizin/Schwerpunkt Neurologie", "§301 SGB V", "3628"), + + FRAUENHEILKUNDE_SCHWERPUNKT_ENDOKRINOLOGIE("Frauenheilkunde/Schwerpunkt Endokrinologie", "Frauenheilkunde/Schwerpunkt Endokrinologie", "§301 SGB V", "2406"), + + NEPHROLOGIE("Nephrologie", "Nephrologie", "§301 SGB V", "0400"), + + NEUROLOGIE_SCHWERPUNKT_SCHLAGANFALLPATIENTEN("Neurologie/Schwerpunkt Schlaganfallpatienten", "Neurologie/Schwerpunkt Schlaganfallpatienten", "§301 SGB V", "2856"), + + ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_KINDER_UND_JUGENDPSYCHIATRIE("Allgemeine Psychiatrie/Schwerpunkt Kinder- und Jugendpsychiatrie", "Allgemeine Psychiatrie/Schwerpunkt Kinder- und Jugendpsychiatrie", "§301 SGB V", "2930"), + + PSYCHOSOMATIK_PSYCHOTHERAPIE_TAGESKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Psychosomatik/Psychotherapie/Tagesklinik (für teilstationäre Pflegesätze)", "Psychosomatik/Psychotherapie/Tagesklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "3160"), + + NEPHROLOGIE_SCHWERPUNKT_PADIATRIE("Nephrologie/Schwerpunkt Pädiatrie", "Nephrologie/Schwerpunkt Pädiatrie", "§301 SGB V", "0410"), + + INNERE_MEDIZIN_SCHWERPUNKT_RHEUMATOLOGIE("Innere Medizin/Schwerpunkt Rheumatologie", "Innere Medizin/Schwerpunkt Rheumatologie", "§301 SGB V", "0109"), + + INNERE_MEDIZIN_SCHWERPUNKT_GERIATRIE("Innere Medizin/Schwerpunkt Geriatrie", "Innere Medizin/Schwerpunkt Geriatrie", "§301 SGB V", "0102"), + + INTENSIVMEDIZIN_SCHWERPUNKT_NEUROCHIRURGIE("Intensivmedizin/Schwerpunkt Neurochirurgie", "Intensivmedizin/Schwerpunkt Neurochirurgie", "§301 SGB V", "3617"), + + ALLGEMEINE_PSYCHIATRIE("Allgemeine Psychiatrie", "Allgemeine Psychiatrie", "§301 SGB V", "2900"), + + KINDER_UND_JUGENDPSYCHIATRIE("Kinder- und Jugendpsychiatrie", "Kinder- und Jugendpsychiatrie", "§301 SGB V", "3000"), + + INNERE_MEDIZIN_SCHWERPUNKT_PNEUMOLOGIE("Innere Medizin/Schwerpunkt Pneumologie", "Innere Medizin/Schwerpunkt Pneumologie", "§301 SGB V", "0108"), + + STRAHLENHEILKUNDE_SCHWERPUNKT_HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE("Strahlenheilkunde/Schwerpunkt Hämatologie und internistische Onkologie", "Strahlenheilkunde/Schwerpunkt Hämatologie und internistische Onkologie", "§301 SGB V", "3305"), + + ORTHOPADIE("Orthopädie", "Orthopädie", "§301 SGB V", "2300"), + + ALLGEMEINE_CHIRURGIE_SCHWERPUNKT_UNFALLCHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Unfallchirurgie", "Allgemeine Chirurgie/Schwerpunkt Unfallchirurgie", "§301 SGB V", "1516"); private String value; @@ -226,7 +305,7 @@ public enum StandortschlusselDefiningcode implements EnumValueSet { private String code; - StandortschlusselDefiningcode(String value, String description, String terminologyId, + StandortschlusselDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java index 542efa284..b1292db96 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java @@ -1,6 +1,5 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; -import java.lang.String; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -8,7 +7,7 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.case_identification.v0") public class VersorgungsfallCluster { - @Path("/items[at0001]/value|value") + @Path("/items[at0001 and name/value='Zugehörige Versorgungsfall-Kennung']/value|value") private String zugehorigeVersorgungsfallKennungValue; public void setZugehorigeVersorgungsfallKennungValue( diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallClusterContainment.java index d1f5b4a3a..5cba715b0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallClusterContainment.java @@ -1,6 +1,5 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; -import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java index 26b35400b..b5151c8a7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java @@ -1,12 +1,12 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.hospitalization.v0") @@ -14,17 +14,14 @@ public class VersorgungsortAdminEntry { @Path("/data[at0001]/items[at0004]/value|value") private TemporalAccessor beginnValue; - @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.location.v1]") - private StandortCluster standort; - @Path("/data[at0001]/items[at0005]/value|value") private TemporalAccessor endeValue; @Path("/data[at0001]/items[at0006]/value|value") private String grundDesAufenthaltesValue; - @Path("/language") - private Language language; + @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.location.v1]") + private StandortCluster standort; @Path("/data[at0001]/items[at0009]/value|value") private String kommentarValue; @@ -32,6 +29,9 @@ public class VersorgungsortAdminEntry { @Path("/subject") private PartyProxy subject; + @Path("/language") + private Language language; + public void setBeginnValue(TemporalAccessor beginnValue) { this.beginnValue = beginnValue; } @@ -40,14 +40,6 @@ public TemporalAccessor getBeginnValue() { return this.beginnValue ; } - public void setStandort(StandortCluster standort) { - this.standort = standort; - } - - public StandortCluster getStandort() { - return this.standort ; - } - public void setEndeValue(TemporalAccessor endeValue) { this.endeValue = endeValue; } @@ -64,12 +56,12 @@ public String getGrundDesAufenthaltesValue() { return this.grundDesAufenthaltesValue ; } - public void setLanguage(Language language) { - this.language = language; + public void setStandort(StandortCluster standort) { + this.standort = standort; } - public Language getLanguage() { - return this.language ; + public StandortCluster getStandort() { + return this.standort ; } public void setKommentarValue(String kommentarValue) { @@ -87,4 +79,12 @@ public void setSubject(PartyProxy subject) { public PartyProxy getSubject() { return this.subject ; } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntryContainment.java index 639ad1102..d150adc63 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntryContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntryContainment.java @@ -1,30 +1,30 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; public class VersorgungsortAdminEntryContainment extends Containment { public SelectAqlField VERSORGUNGSORT_ADMIN_ENTRY = new AqlFieldImp(VersorgungsortAdminEntry.class, "", "VersorgungsortAdminEntry", VersorgungsortAdminEntry.class, this); public SelectAqlField BEGINN_VALUE = new AqlFieldImp(VersorgungsortAdminEntry.class, "/data[at0001]/items[at0004]/value|value", "beginnValue", TemporalAccessor.class, this); - public SelectAqlField STANDORT = new AqlFieldImp(VersorgungsortAdminEntry.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.location.v1]", "standort", StandortCluster.class, this); - public SelectAqlField ENDE_VALUE = new AqlFieldImp(VersorgungsortAdminEntry.class, "/data[at0001]/items[at0005]/value|value", "endeValue", TemporalAccessor.class, this); public SelectAqlField GRUND_DES_AUFENTHALTES_VALUE = new AqlFieldImp(VersorgungsortAdminEntry.class, "/data[at0001]/items[at0006]/value|value", "grundDesAufenthaltesValue", String.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(VersorgungsortAdminEntry.class, "/language", "language", Language.class, this); + public SelectAqlField STANDORT = new AqlFieldImp(VersorgungsortAdminEntry.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.location.v1]", "standort", StandortCluster.class, this); public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(VersorgungsortAdminEntry.class, "/data[at0001]/items[at0009]/value|value", "kommentarValue", String.class, this); public SelectAqlField SUBJECT = new AqlFieldImp(VersorgungsortAdminEntry.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(VersorgungsortAdminEntry.class, "/language", "language", Language.class, this); + private VersorgungsortAdminEntryContainment() { super("openEHR-EHR-ADMIN_ENTRY.hospitalization.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java index b598b9e7e..6babdf0b5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java @@ -11,11 +11,11 @@ import org.ehrbase.client.annotations.Path; import org.ehrbase.client.annotations.Template; import org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition.SchwangerschaftsstatusObservation; -import org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition.StatusDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition.StatusDefiningCode; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; import java.time.temporal.TemporalAccessor; @@ -25,179 +25,179 @@ @Archetype("openEHR-EHR-COMPOSITION.registereintrag.v1") @Template("Schwangerschaftsstatus") public class SchwangerschaftsstatusComposition { - @Id - private VersionUid versionUid; + @Path("/context/other_context[at0001]/items[at0002]") + private List erweiterung; - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; + @Path("/context/other_context[at0001]/items[at0004]/value|defining_code") + private StatusDefiningCode statusDefiningCode; - @Path("/context/participations") - private List participations; + @Path("/context/other_context[at0001]/items[at0005]/value|value") + private String kategorieValue; - @Path("/language") - private Language language; + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; + @Path("/context/participations") + private List participations; - @Path("/context/other_context[at0001]/items[at0004]/value|defining_code") - private StatusDefiningcode statusDefiningcode; + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; - @Path("/context/other_context[at0001]/items[at0005]/value|value") - private String kategorieValue; + @Path("/context/location") + private String location; - @Path("/territory") - private Territory territory; + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; - @Path("/composer") - private PartyProxy composer; + @Path("/content[openEHR-EHR-OBSERVATION.pregnancy_status.v0]") + private SchwangerschaftsstatusObservation schwangerschaftsstatus; - @Path("/context/setting|defining_code") - private SettingDefiningcode settingDefiningcode; + @Path("/composer") + private PartyProxy composer; - @Path("/content[openEHR-EHR-OBSERVATION.pregnancy_status.v0]") - private SchwangerschaftsstatusObservation schwangerschaftsstatus; + @Path("/language") + private Language language; - @Path("/feeder_audit") - private FeederAudit feederAudit; + @Path("/feeder_audit") + private FeederAudit feederAudit; - @Path("/context/location") - private String location; + @Path("/category|defining_code") + private Category categoryDefiningCode; - @Path("/category|defining_code") - private CategoryDefiningcode categoryDefiningcode; + @Path("/territory") + private Territory territory; - @Path("/context/other_context[at0001]/items[at0002]") - private List erweiterung; + @Id + private VersionUid versionUid; - public VersionUid getVersionUid() { - return this.versionUid; - } + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } - public void setVersionUid(VersionUid versionUid) { - this.versionUid = versionUid; - } + public List getErweiterung() { + return this.erweiterung ; + } - public void setEndTimeValue(TemporalAccessor endTimeValue) { - this.endTimeValue = endTimeValue; - } + public void setStatusDefiningCode(StatusDefiningCode statusDefiningCode) { + this.statusDefiningCode = statusDefiningCode; + } - public TemporalAccessor getEndTimeValue() { - return this.endTimeValue; - } + public StatusDefiningCode getStatusDefiningCode() { + return this.statusDefiningCode ; + } - public void setParticipations(List participations) { - this.participations = participations; - } + public void setKategorieValue(String kategorieValue) { + this.kategorieValue = kategorieValue; + } - public List getParticipations() { - return this.participations; - } + public String getKategorieValue() { + return this.kategorieValue ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setStartTimeValue(TemporalAccessor startTimeValue) { + this.startTimeValue = startTimeValue; + } - public Language getLanguage() { - return this.language; - } + public TemporalAccessor getStartTimeValue() { + return this.startTimeValue ; + } - public void setHealthCareFacility(PartyIdentified healthCareFacility) { - this.healthCareFacility = healthCareFacility; - } + public void setParticipations(List participations) { + this.participations = participations; + } - public PartyIdentified getHealthCareFacility() { - return this.healthCareFacility; - } + public List getParticipations() { + return this.participations ; + } - public void setStatusDefiningcode(StatusDefiningcode statusDefiningcode) { - this.statusDefiningcode = statusDefiningcode; - } + public void setEndTimeValue(TemporalAccessor endTimeValue) { + this.endTimeValue = endTimeValue; + } - public StatusDefiningcode getStatusDefiningcode() { - return this.statusDefiningcode; - } + public TemporalAccessor getEndTimeValue() { + return this.endTimeValue ; + } - public void setKategorieValue(String kategorieValue) { - this.kategorieValue = kategorieValue; - } + public void setLocation(String location) { + this.location = location; + } - public String getKategorieValue() { - return this.kategorieValue; - } + public String getLocation() { + return this.location ; + } - public void setTerritory(Territory territory) { - this.territory = territory; - } + public void setHealthCareFacility(PartyIdentified healthCareFacility) { + this.healthCareFacility = healthCareFacility; + } - public Territory getTerritory() { - return this.territory; - } + public PartyIdentified getHealthCareFacility() { + return this.healthCareFacility ; + } - public void setStartTimeValue(TemporalAccessor startTimeValue) { - this.startTimeValue = startTimeValue; - } + public void setSettingDefiningCode(Setting settingDefiningCode) { + this.settingDefiningCode = settingDefiningCode; + } - public TemporalAccessor getStartTimeValue() { - return this.startTimeValue; - } + public Setting getSettingDefiningCode() { + return this.settingDefiningCode ; + } - public void setComposer(PartyProxy composer) { - this.composer = composer; - } + public void setSchwangerschaftsstatus(SchwangerschaftsstatusObservation schwangerschaftsstatus) { + this.schwangerschaftsstatus = schwangerschaftsstatus; + } - public PartyProxy getComposer() { - return this.composer; - } + public SchwangerschaftsstatusObservation getSchwangerschaftsstatus() { + return this.schwangerschaftsstatus ; + } - public void setSettingDefiningcode(SettingDefiningcode settingDefiningcode) { - this.settingDefiningcode = settingDefiningcode; - } + public void setComposer(PartyProxy composer) { + this.composer = composer; + } - public SettingDefiningcode getSettingDefiningcode() { - return this.settingDefiningcode; - } + public PartyProxy getComposer() { + return this.composer ; + } - public void setSchwangerschaftsstatus(SchwangerschaftsstatusObservation schwangerschaftsstatus) { - this.schwangerschaftsstatus = schwangerschaftsstatus; - } + public void setLanguage(Language language) { + this.language = language; + } - public SchwangerschaftsstatusObservation getSchwangerschaftsstatus() { - return this.schwangerschaftsstatus; - } + public Language getLanguage() { + return this.language ; + } - public void setFeederAudit(FeederAudit feederAudit) { - this.feederAudit = feederAudit; - } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } - public FeederAudit getFeederAudit() { - return this.feederAudit; - } + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } - public void setLocation(String location) { - this.location = location; - } + public void setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } - public String getLocation() { - return this.location; - } + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } - public void setCategoryDefiningcode(CategoryDefiningcode categoryDefiningcode) { - this.categoryDefiningcode = categoryDefiningcode; - } + public void setTerritory(Territory territory) { + this.territory = territory; + } - public CategoryDefiningcode getCategoryDefiningcode() { - return this.categoryDefiningcode; - } + public Territory getTerritory() { + return this.territory ; + } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } + public VersionUid getVersionUid() { + return this.versionUid ; + } - public List getErweiterung() { - return this.erweiterung; - } + public void setVersionUid(VersionUid versionUid) { + this.versionUid = versionUid; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusCompositionContainment.java index aca0e0bb3..e940055e3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusCompositionContainment.java @@ -11,46 +11,46 @@ import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition.SchwangerschaftsstatusObservation; -import org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition.StatusDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition.StatusDefiningCode; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import java.time.temporal.TemporalAccessor; public class SchwangerschaftsstatusCompositionContainment extends Containment { public SelectAqlField SCHWANGERSCHAFTSSTATUS_COMPOSITION = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "", "SchwangerschaftsstatusComposition", SchwangerschaftsstatusComposition.class, this); - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/participations", "participations", Participation.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/other_context[at0001]/items[at0002]", "erweiterung", Cluster.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/language", "language", Language.class, this); + public SelectAqlField STATUS_DEFINING_CODE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/other_context[at0001]/items[at0004]/value|defining_code", "statusDefiningCode", StatusDefiningCode.class, this); - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + public SelectAqlField KATEGORIE_VALUE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "kategorieValue", String.class, this); - public SelectAqlField STATUS_DEFININGCODE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/other_context[at0001]/items[at0004]/value|defining_code", "statusDefiningcode", StatusDefiningcode.class, this); + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - public SelectAqlField KATEGORIE_VALUE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "kategorieValue", String.class, this); + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/participations", "participations", Participation.class, this); - public SelectAqlField TERRITORY = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/territory", "territory", Territory.class, this); + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + public SelectAqlField LOCATION = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/location", "location", String.class, this); - public SelectAqlField COMPOSER = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/composer", "composer", PartyProxy.class, this); + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - public SelectAqlField SETTING_DEFININGCODE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/setting|defining_code", "settingDefiningcode", SettingDefiningcode.class, this); + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); public SelectAqlField SCHWANGERSCHAFTSSTATUS = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/content[openEHR-EHR-OBSERVATION.pregnancy_status.v0]", "schwangerschaftsstatus", SchwangerschaftsstatusObservation.class, this); - public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public SelectAqlField COMPOSER = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/composer", "composer", PartyProxy.class, this); - public SelectAqlField LOCATION = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/location", "location", String.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/language", "language", Language.class, this); + + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - public SelectAqlField CATEGORY_DEFININGCODE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/category|defining_code", "categoryDefiningcode", CategoryDefiningcode.class, this); + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/other_context[at0001]/items[at0002]", "erweiterung", Cluster.class, this); + public SelectAqlField TERRITORY = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/territory", "territory", Territory.class, this); private SchwangerschaftsstatusCompositionContainment() { super("openEHR-EHR-COMPOSITION.registereintrag.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java index 6f2e2f0e6..579bd2734 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,69 +13,69 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.pregnancy_status.v0") public class SchwangerschaftsstatusObservation { - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|defining_code") + private StatusDefiningCode2 statusDefiningCode; - @Path("/subject") - private PartyProxy subject; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/language") - private Language language; + @Path("/protocol[at0021]/items[at0022]") + private List erweiterungen; - @Path("/protocol[at0021]/items[at0022]") - private List erweiterungen; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|defining_code") - private StatusDefiningcode2 statusDefiningcode; + @Path("/language") + private Language language; - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setStatusDefiningCode(StatusDefiningCode2 statusDefiningCode) { + this.statusDefiningCode = statusDefiningCode; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public StatusDefiningCode2 getStatusDefiningCode() { + return this.statusDefiningCode ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public PartyProxy getSubject() { - return this.subject; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setErweiterungen(List erweiterungen) { + this.erweiterungen = erweiterungen; + } - public Language getLanguage() { - return this.language; - } + public List getErweiterungen() { + return this.erweiterungen ; + } - public void setErweiterungen(List erweiterungen) { - this.erweiterungen = erweiterungen; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public List getErweiterungen() { - return this.erweiterungen; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setStatusDefiningcode(StatusDefiningcode2 statusDefiningcode) { - this.statusDefiningcode = statusDefiningcode; - } + public void setLanguage(Language language) { + this.language = language; + } - public StatusDefiningcode2 getStatusDefiningcode() { - return this.statusDefiningcode; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservationContainment.java index d6e169c2f..809ce26f1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservationContainment.java @@ -7,24 +7,24 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class SchwangerschaftsstatusObservationContainment extends Containment { public SelectAqlField SCHWANGERSCHAFTSSTATUS_OBSERVATION = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "", "SchwangerschaftsstatusObservation", SchwangerschaftsstatusObservation.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + public SelectAqlField STATUS_DEFINING_CODE = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|defining_code", "statusDefiningCode", StatusDefiningCode2.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "/language", "language", Language.class, this); - public ListSelectAqlField ERWEITERUNGEN = new ListAqlFieldImp(SchwangerschaftsstatusObservation.class, "/protocol[at0021]/items[at0022]", "erweiterungen", Cluster.class, this); - public SelectAqlField STATUS_DEFININGCODE = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|defining_code", "statusDefiningcode", StatusDefiningcode2.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "/language", "language", Language.class, this); private SchwangerschaftsstatusObservationContainment() { super("openEHR-EHR-OBSERVATION.pregnancy_status.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode.java index e6700642e..ad62a720e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum StatusDefiningcode implements EnumValueSet { +public enum StatusDefiningCode implements EnumValueSet { VORLAUFIG("vorläufig", "*", "local", "at0011"), FINAL("final", "*", "local", "at0012"), @@ -19,7 +19,7 @@ public enum StatusDefiningcode implements EnumValueSet { private String code; - StatusDefiningcode(String value, String description, String terminologyId, String code) { + StatusDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -27,18 +27,18 @@ public enum StatusDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode2.java index 8e3fabe40..78db99cc4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode2.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode2.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum StatusDefiningcode2 implements EnumValueSet { +public enum StatusDefiningCode2 implements EnumValueSet { SCHWANGER("Schwanger", "Die Person ist schwanger.", "local", "at0012"), NICHT_SCHWANGER("Nicht schwanger", "Die Person ist nicht schwanger.", "local", "at0013"), @@ -17,7 +17,7 @@ public enum StatusDefiningcode2 implements EnumValueSet { private String code; - StatusDefiningcode2(String value, String description, String terminologyId, String code) { + StatusDefiningCode2(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -25,18 +25,18 @@ public enum StatusDefiningcode2 implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java index 3f03c497a..a38309340 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java @@ -9,12 +9,12 @@ import org.ehrbase.client.annotations.Id; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; import org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition.EventsummaryCluster; import org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition.SmicsErgebnisObservation; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; import java.time.temporal.TemporalAccessor; @@ -24,179 +24,179 @@ @Archetype("openEHR-EHR-COMPOSITION.report.v1") @Template("SmICS-Befund") public class SmICSBefundComposition { - @Id - private VersionUid versionUid; + @Path("/context/other_context[at0001]/items[at0002]/value|value") + private String berichtIdValue; - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; + @Path("/context/other_context[at0001]/items[at0005]/value|value") + private String statusValue; - @Path("/context/participations") - private List participations; + @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.eventsummary.v0]") + private List eventsummary; - @Path("/language") - private Language language; + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; + @Path("/context/participations") + private List participations; - @Path("/context/other_context[at0001]/items[at0005]/value|value") - private String statusValue; + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; - @Path("/context/other_context[at0001]/items[at0002]/value|value") - private String berichtIdValue; + @Path("/context/location") + private String location; - @Path("/territory") - private Territory territory; + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; - @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.eventsummary.v0]") - private List eventsummary; + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; + @Path("/content[openEHR-EHR-OBSERVATION.smics_befund.v1]") + private SmicsErgebnisObservation smicsErgebnis; - @Path("/content[openEHR-EHR-OBSERVATION.smics_befund.v1]") - private SmicsErgebnisObservation smicsErgebnis; + @Path("/composer") + private PartyProxy composer; - @Path("/composer") - private PartyProxy composer; + @Path("/language") + private Language language; - @Path("/context/setting|defining_code") - private SettingDefiningcode settingDefiningcode; + @Path("/feeder_audit") + private FeederAudit feederAudit; - @Path("/feeder_audit") - private FeederAudit feederAudit; + @Path("/category|defining_code") + private Category categoryDefiningCode; - @Path("/context/location") - private String location; + @Path("/territory") + private Territory territory; - @Path("/category|defining_code") - private CategoryDefiningcode categoryDefiningcode; + @Id + private VersionUid versionUid; - public VersionUid getVersionUid() { - return this.versionUid; - } + public void setBerichtIdValue(String berichtIdValue) { + this.berichtIdValue = berichtIdValue; + } - public void setVersionUid(VersionUid versionUid) { - this.versionUid = versionUid; - } + public String getBerichtIdValue() { + return this.berichtIdValue ; + } - public void setEndTimeValue(TemporalAccessor endTimeValue) { - this.endTimeValue = endTimeValue; - } + public void setStatusValue(String statusValue) { + this.statusValue = statusValue; + } - public TemporalAccessor getEndTimeValue() { - return this.endTimeValue; - } + public String getStatusValue() { + return this.statusValue ; + } - public void setParticipations(List participations) { - this.participations = participations; - } + public void setEventsummary(List eventsummary) { + this.eventsummary = eventsummary; + } - public List getParticipations() { - return this.participations; - } + public List getEventsummary() { + return this.eventsummary ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setStartTimeValue(TemporalAccessor startTimeValue) { + this.startTimeValue = startTimeValue; + } - public Language getLanguage() { - return this.language; - } + public TemporalAccessor getStartTimeValue() { + return this.startTimeValue ; + } - public void setHealthCareFacility(PartyIdentified healthCareFacility) { - this.healthCareFacility = healthCareFacility; - } + public void setParticipations(List participations) { + this.participations = participations; + } - public PartyIdentified getHealthCareFacility() { - return this.healthCareFacility; - } + public List getParticipations() { + return this.participations ; + } - public void setStatusValue(String statusValue) { - this.statusValue = statusValue; - } + public void setEndTimeValue(TemporalAccessor endTimeValue) { + this.endTimeValue = endTimeValue; + } - public String getStatusValue() { - return this.statusValue; - } + public TemporalAccessor getEndTimeValue() { + return this.endTimeValue ; + } - public void setBerichtIdValue(String berichtIdValue) { - this.berichtIdValue = berichtIdValue; - } + public void setLocation(String location) { + this.location = location; + } - public String getBerichtIdValue() { - return this.berichtIdValue; - } + public String getLocation() { + return this.location ; + } - public void setTerritory(Territory territory) { - this.territory = territory; - } + public void setHealthCareFacility(PartyIdentified healthCareFacility) { + this.healthCareFacility = healthCareFacility; + } - public Territory getTerritory() { - return this.territory; - } + public PartyIdentified getHealthCareFacility() { + return this.healthCareFacility ; + } - public void setEventsummary(List eventsummary) { - this.eventsummary = eventsummary; - } + public void setSettingDefiningCode(Setting settingDefiningCode) { + this.settingDefiningCode = settingDefiningCode; + } - public List getEventsummary() { - return this.eventsummary; - } + public Setting getSettingDefiningCode() { + return this.settingDefiningCode ; + } - public void setStartTimeValue(TemporalAccessor startTimeValue) { - this.startTimeValue = startTimeValue; - } + public void setSmicsErgebnis(SmicsErgebnisObservation smicsErgebnis) { + this.smicsErgebnis = smicsErgebnis; + } - public TemporalAccessor getStartTimeValue() { - return this.startTimeValue; - } + public SmicsErgebnisObservation getSmicsErgebnis() { + return this.smicsErgebnis ; + } - public void setSmicsErgebnis(SmicsErgebnisObservation smicsErgebnis) { - this.smicsErgebnis = smicsErgebnis; - } + public void setComposer(PartyProxy composer) { + this.composer = composer; + } - public SmicsErgebnisObservation getSmicsErgebnis() { - return this.smicsErgebnis; - } + public PartyProxy getComposer() { + return this.composer ; + } - public void setComposer(PartyProxy composer) { - this.composer = composer; - } + public void setLanguage(Language language) { + this.language = language; + } - public PartyProxy getComposer() { - return this.composer; - } + public Language getLanguage() { + return this.language ; + } - public void setSettingDefiningcode(SettingDefiningcode settingDefiningcode) { - this.settingDefiningcode = settingDefiningcode; - } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } - public SettingDefiningcode getSettingDefiningcode() { - return this.settingDefiningcode; - } + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } - public void setFeederAudit(FeederAudit feederAudit) { - this.feederAudit = feederAudit; - } + public void setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } - public FeederAudit getFeederAudit() { - return this.feederAudit; - } + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } - public void setLocation(String location) { - this.location = location; - } + public void setTerritory(Territory territory) { + this.territory = territory; + } - public String getLocation() { - return this.location; - } + public Territory getTerritory() { + return this.territory ; + } - public void setCategoryDefiningcode(CategoryDefiningcode categoryDefiningcode) { - this.categoryDefiningcode = categoryDefiningcode; - } + public VersionUid getVersionUid() { + return this.versionUid ; + } - public CategoryDefiningcode getCategoryDefiningcode() { - return this.categoryDefiningcode; - } + public void setVersionUid(VersionUid versionUid) { + this.versionUid = versionUid; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundCompositionContainment.java index 84bd2677f..411cf9d5c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundCompositionContainment.java @@ -9,47 +9,47 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; import org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition.EventsummaryCluster; import org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition.SmicsErgebnisObservation; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import java.time.temporal.TemporalAccessor; public class SmICSBefundCompositionContainment extends Containment { public SelectAqlField SM_I_C_S_BEFUND_COMPOSITION = new AqlFieldImp(SmICSBefundComposition.class, "", "SmICSBefundComposition", SmICSBefundComposition.class, this); - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(SmICSBefundComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(SmICSBefundComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(SmICSBefundComposition.class, "/context/participations", "participations", Participation.class, this); + public SelectAqlField STATUS_VALUE = new AqlFieldImp(SmICSBefundComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "statusValue", String.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(SmICSBefundComposition.class, "/language", "language", Language.class, this); + public ListSelectAqlField EVENTSUMMARY = new ListAqlFieldImp(SmICSBefundComposition.class, "/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.eventsummary.v0]", "eventsummary", EventsummaryCluster.class, this); - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(SmICSBefundComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(SmICSBefundComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - public SelectAqlField STATUS_VALUE = new AqlFieldImp(SmICSBefundComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "statusValue", String.class, this); + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(SmICSBefundComposition.class, "/context/participations", "participations", Participation.class, this); - public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(SmICSBefundComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(SmICSBefundComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - public SelectAqlField TERRITORY = new AqlFieldImp(SmICSBefundComposition.class, "/territory", "territory", Territory.class, this); + public SelectAqlField LOCATION = new AqlFieldImp(SmICSBefundComposition.class, "/context/location", "location", String.class, this); - public ListSelectAqlField EVENTSUMMARY = new ListAqlFieldImp(SmICSBefundComposition.class, "/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.eventsummary.v0]", "eventsummary", EventsummaryCluster.class, this); + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(SmICSBefundComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(SmICSBefundComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(SmICSBefundComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); public SelectAqlField SMICS_ERGEBNIS = new AqlFieldImp(SmICSBefundComposition.class, "/content[openEHR-EHR-OBSERVATION.smics_befund.v1]", "smicsErgebnis", SmicsErgebnisObservation.class, this); public SelectAqlField COMPOSER = new AqlFieldImp(SmICSBefundComposition.class, "/composer", "composer", PartyProxy.class, this); - public SelectAqlField SETTING_DEFININGCODE = new AqlFieldImp(SmICSBefundComposition.class, "/context/setting|defining_code", "settingDefiningcode", SettingDefiningcode.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(SmICSBefundComposition.class, "/language", "language", Language.class, this); public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(SmICSBefundComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - public SelectAqlField LOCATION = new AqlFieldImp(SmICSBefundComposition.class, "/context/location", "location", String.class, this); + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(SmICSBefundComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - public SelectAqlField CATEGORY_DEFININGCODE = new AqlFieldImp(SmICSBefundComposition.class, "/category|defining_code", "categoryDefiningcode", CategoryDefiningcode.class, this); + public SelectAqlField TERRITORY = new AqlFieldImp(SmICSBefundComposition.class, "/territory", "territory", Territory.class, this); private SmICSBefundCompositionContainment() { super("openEHR-EHR-COMPOSITION.report.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java index b05661f96..65c7afa27 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java @@ -9,14 +9,14 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_panel.v0") public class AntibiogrammCluster { - @Path("/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]") - private List laboranalytResultat; + @Path("/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]") + private List laboranalytResultat; - public void setLaboranalytResultat(List laboranalytResultat) { - this.laboranalytResultat = laboranalytResultat; - } + public void setLaboranalytResultat(List laboranalytResultat) { + this.laboranalytResultat = laboranalytResultat; + } - public List getLaboranalytResultat() { - return this.laboranalytResultat; - } + public List getLaboranalytResultat() { + return this.laboranalytResultat ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammClusterContainment.java index 054827999..fa4e766e2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammClusterContainment.java @@ -7,15 +7,15 @@ import org.ehrbase.client.aql.field.SelectAqlField; public class AntibiogrammClusterContainment extends Containment { - public SelectAqlField ANTIBIOGRAMM_CLUSTER = new AqlFieldImp(AntibiogrammCluster.class, "", "AntibiogrammCluster", AntibiogrammCluster.class, this); + public SelectAqlField ANTIBIOGRAMM_CLUSTER = new AqlFieldImp(AntibiogrammCluster.class, "", "AntibiogrammCluster", AntibiogrammCluster.class, this); - public ListSelectAqlField LABORANALYT_RESULTAT = new ListAqlFieldImp(AntibiogrammCluster.class, "/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]", "laboranalytResultat", LaboranalytResultatCluster.class, this); + public ListSelectAqlField LABORANALYT_RESULTAT = new ListAqlFieldImp(AntibiogrammCluster.class, "/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]", "laboranalytResultat", LaboranalytResultatCluster.class, this); - private AntibiogrammClusterContainment() { - super("openEHR-EHR-CLUSTER.laboratory_test_panel.v0"); - } + private AntibiogrammClusterContainment() { + super("openEHR-EHR-CLUSTER.laboratory_test_panel.v0"); + } - public static AntibiogrammClusterContainment getInstance() { - return new AntibiogrammClusterContainment(); - } + public static AntibiogrammClusterContainment getInstance() { + return new AntibiogrammClusterContainment(); + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiotikumDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiotikumDefiningcode.java index d0790461d..240c8c2bc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiotikumDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiotikumDefiningcode.java @@ -2,350 +2,366 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum AntibiotikumDefiningcode implements EnumValueSet { - TEMOCILLIN("Temocillin", null, "LOINC", "18991-0"), +public enum AntibiotikumDefiningCode implements EnumValueSet { + RAMOPLANIN("Ramoplanin", "Ramoplanin", "LOINC", "41737-8"), - SULBACTAM("Cefoperazon/Sulbactam", null, "LOINC", "54166-4"), + MOXALACTAM_LATAMOXEF("Moxalactam (Latamoxef)", "Moxalactam (Latamoxef)", "LOINC", "18950-6"), - SPARFLOXACIN("Sparfloxacin", null, "LOINC", "23628-1"), + MUPIROCIN("Mupirocin", "Mupirocin", "LOINC", "20389-3"), - POSACONAZOL_E_TEST("Posaconazol (E-Test)", null, "LOINC", "54186-2"), + TRIMETHOPRIM("Trimethoprim", "Trimethoprim", "LOINC", "18997-7"), - CLAVULANSAURE("Amoxycillin/Clavulansäure", null, "LOINC", "18862-3"), + CEFSULODIN("Cefsulodin", "Cefsulodin", "LOINC", "18892-0"), - CEFTIZOXIM("Ceftizoxim", null, "LOINC", "18894-6"), + SOLITHROMYCIN("Solithromycin", "Solithromycin", "LOINC", "73587-8"), - CEFOXITIN("Cefoxitin", null, "LOINC", "18888-8"), + CEFONICID("Cefonicid", "Cefonicid", "LOINC", "18883-9"), - VORICONAZOL("Voriconazol", null, "LOINC", "32379-0"), + CEFTIZOXIM("Ceftizoxim", "Ceftizoxim", "LOINC", "18894-6"), - GENTAMICIN("Gentamicin", null, "LOINC", "18928-2"), + TEMOCILLIN("Temocillin", "Temocillin", "LOINC", "18991-0"), - SPECTINOMYCIN("Spectinomycin", null, "LOINC", "18980-3"), + STAVUDIN("Stavudin", "Stavudin", "LOINC", "30302-4"), - NETILMICIN("Netilmicin", null, "LOINC", "18954-8"), + CEFTAROLIN("Ceftarolin", "Ceftarolin", "LOINC", "73605-8"), - PYRAZINAMID("Pyrazinamid", null, "LOINC", "18973-8"), + NOVOBIOCIN("Novobiocin", "Novobiocin", "LOINC", "18957-1"), - SOLITHROMYCIN("Solithromycin", null, "LOINC", "73587-8"), + AMPICILLIN_SULBACTAM("Ampicillin/Sulbactam", "Ampicillin/Sulbactam", "LOINC", "18865-6"), - AVIBACTAM("Ceftazidim/Avibactam", null, "LOINC", "73603-3"), + GENTAMICIN("Gentamicin", "Gentamicin", "LOINC", "18928-2"), - NITROCEPHIN("Nitrocephin", null, "LOINC", "6985-6"), + FIDAXOMICIN("Fidaxomicin", "Fidaxomicin", "LOINC", "73599-3"), - CASPOFUNGIN_E_TEST("Caspofungin (E-Test)", null, "LOINC", "54185-4"), + ETHAMBUTOL("Ethambutol", "Ethambutol", "LOINC", "18921-7"), - CEFCAPEN("Cefcapen", null, "LOINC", "76143-7"), + OMADACYCLIN("Omadacyclin", "Omadacyclin", "LOINC", "73594-4"), - MEROPENEM("Meropenem", null, "LOINC", "18943-1"), + FOSFOMYCIN("Fosfomycin", "Fosfomycin", "LOINC", "25596-8"), - CEPHALEXIN("Cephalexin", null, "LOINC", "18897-9"), + CEFAMANDOL("Cefamandol", "Cefamandol", "LOINC", "18876-3"), - NALIDIXINSAURE("Nalidixinsäure", null, "LOINC", "18952-2"), + N5_FLUOROCYTOSIN("5-Fluorocytosin", "5-Fluorocytosin", "LOINC", "18855-7"), - VABORBACTAM("Meropenem/Vaborbactam", null, "LOINC", "88892-5"), + AZITHROMYCIN("Azithromycin", "Azithromycin", "LOINC", "18866-4"), - MECILLINAM_AMDINOCILLIN("Mecillinam (Amdinocillin)", null, "LOINC", "18859-9"), + NAFCILLIN("Nafcillin", "Nafcillin", "LOINC", "18951-4"), - DIFLOXACIN("Difloxacin", null, "LOINC", "35792-1"), + ZALCITABIN("Zalcitabin", "Zalcitabin", "LOINC", "30301-6"), - CEFAMANDOL("Cefamandol", null, "LOINC", "18876-3"), + CEFDITOREN("Cefditoren", "Cefditoren", "LOINC", "35762-4"), - FINAFLOXACIN("Finafloxacin", null, "LOINC", "73598-5"), + MEZLOCILLIN("Mezlocillin", "Mezlocillin", "LOINC", "18947-2"), - CEFOTIAM("Cefotiam", null, "LOINC", "32374-1"), + POLYMYXIN_B("Polymyxin B", "Polymyxin B", "LOINC", "421-8"), - OFLOXACIN("Ofloxacin", null, "LOINC", "18959-7"), + TIGECYCLIN("Tigecyclin", "Tigecyclin", "LOINC", "42357-4"), - ROXITHROMYCIN("Roxithromycin", null, "LOINC", "18978-7"), + CEFPODOXIM("Cefpodoxim", "Cefpodoxim", "LOINC", "18890-4"), - FOSFOMYCIN("Fosfomycin", null, "LOINC", "25596-8"), + SPARFLOXACIN("Sparfloxacin", "Sparfloxacin", "LOINC", "23628-1"), - DIDANOSIN("Didanosin", null, "LOINC", "30300-8"), + TEMAFLOXACIN("Temafloxacin", "Temafloxacin", "LOINC", "18990-2"), - SULOPENEM("Sulopenem", null, "LOINC", "55289-3"), + CEFAZOLIN("Cefazolin", "Cefazolin", "LOINC", "18878-9"), - CLARITHROMYCIN("Clarithromycin", null, "LOINC", "18907-6"), + NETILMICIN("Netilmicin", "Netilmicin", "LOINC", "18954-8"), - CEFOTETAN("Cefotetan", null, "LOINC", "18887-0"), + TELITHROMYCIN("Telithromycin", "Telithromycin", "LOINC", "35845-7"), - ANIDULAFUNGIN("Anidulafungin", null, "LOINC", "57095-2"), + CINOXACIN("Cinoxacin", "Cinoxacin", "LOINC", "18905-0"), - ICLAPRIM("Iclaprim", null, "LOINC", "73597-7"), + FUSIDINSAURE("Fusidinsäure", "Fusidinsäure", "LOINC", "18927-4"), - IMIPENEM("Imipenem", null, "LOINC", "18932-4"), + CEFIXIM("Cefixim", "Cefixim", "LOINC", "18880-5"), - ESBL_TESTUNG("ESBL - Testung", null, "LOINC", "6984-9"), + GATIFLOXACIN("Gatifloxacin", "Gatifloxacin", "LOINC", "31038-3"), - MOXALACTAM_LATAMOXEF("Moxalactam (Latamoxef)", null, "LOINC", "18950-6"), + ICLAPRIM("Iclaprim", "Iclaprim", "LOINC", "73597-7"), - TIGECYCLIN("Tigecyclin", null, "LOINC", "42357-4"), + PREMAFLOXACIN("Premafloxacin", "Premafloxacin", "LOINC", "73591-0"), - PENICILLIN("Penicillin", null, "LOINC", "18964-7"), + SULFISOXAZOL("Sulfisoxazol", "Sulfisoxazol", "LOINC", "18986-0"), - ERTAPENEM("Ertapenem", null, "LOINC", "35802-8"), + ITRACONAZOL("Itraconazol", "Itraconazol", "LOINC", "32603-3"), - DANOFLOXACIN("Danofloxacin", null, "LOINC", "73601-7"), + CLARITHROMYCIN("Clarithromycin", "Clarithromycin", "LOINC", "18907-6"), - ENOXACIN("Enoxacin", null, "LOINC", "18918-3"), + CEFEPIM("Cefepim", "Cefepim", "LOINC", "18879-7"), - STREPTOMYCIN_HIGH("Streptomycin-High", null, "LOINC", "18983-7"), + ENOXACIN("Enoxacin", "Enoxacin", "LOINC", "18918-3"), - ERYTHROMYCIN("Erythromycin", null, "LOINC", "18919-1"), + COLISTIN("Colistin", "Colistin", "LOINC", "18912-6"), - BACITRACIN("Bacitracin", null, "LOINC", "18870-6"), + MECILLINAM_AMDINOCILLIN("Mecillinam (Amdinocillin)", "Mecillinam (Amdinocillin)", "LOINC", "8-3"), - NYSTATIN("Nystatin", null, "LOINC", "10697-1"), + CEFTAROLIN_AVIBACTAM("Ceftarolin/Avibactam", "Ceftarolin/Avibactam", "LOINC", "73604-1"), - DALBAVANCIN("Dalbavancin", null, "LOINC", "41734-5"), + GENTAMICIN_HIGH_LEVEL("Gentamicin High-Level", "Gentamicin High-Level", "LOINC", "18929-0"), - DAPTOMYCIN("Daptomycin", null, "LOINC", "35789-7"), + ISAVUCONAZOL("Isavuconazol", "Isavuconazol", "LOINC", "88887-5"), - TROVAFLOXACIN("Trovafloxacin", null, "LOINC", "23642-2"), + OFLOXACIN("Ofloxacin", "Ofloxacin", "LOINC", "18959-7"), - TICARCILLIN("Ticarcillin", null, "LOINC", "18994-4"), + TOBRAMYCIN("Tobramycin", "Tobramycin", "LOINC", "18996-9"), - KANAMYCIN_HIGH("Kanamycin-High", null, "LOINC", "18936-5"), + KANAMYCIN("Kanamycin", "Kanamycin", "LOINC", "18935-7"), - ORITAVANCIN("Oritavancin", null, "LOINC", "41736-0"), + CEFTAZIDIM_CLAVULANSAURE("Ceftazidim/Clavulansäure", "Ceftazidim/Clavulansäure", "LOINC", "35776-4"), - RAZUPENEM("Razupenem", null, "LOINC", "73590-2"), + PENICILLIN("Penicillin", "Penicillin", "LOINC", "18964-7"), - PIPERACILLIN("Piperacillin", null, "LOINC", "18969-6"), + DIRITHROMYCIN("Dirithromycin", "Dirithromycin", "LOINC", "35795-4"), - CEFSULODIN("Cefsulodin", null, "LOINC", "18892-0"), + DALBAVANCIN("Dalbavancin", "Dalbavancin", "LOINC", "41734-5"), - CEFPIROM("Cefpirom", null, "LOINC", "18889-6"), + TOSUFLOXACIN("Tosufloxacin", "Tosufloxacin", "LOINC", "76146-0"), - TRIMETHOPRIM_COTRIMOXAZOL("Sulfamethoxazol/Trimethoprim (Cotrimoxazol)", null, "LOINC", "18998-5"), + VORICONAZOL("Voriconazol", "Voriconazol", "LOINC", "32379-0"), - CEFUROXIM("Cefuroxim", null, "LOINC", "51724-3"), + CEFTRIAXON("Ceftriaxon", "Ceftriaxon", "LOINC", "18895-3"), - CEFPROZIL("Cefprozil", null, "LOINC", "18891-2"), + VANCOMYCIN("Vancomycin", "Vancomycin", "LOINC", "19000-9"), - RIFAMPIN("Rifampin", null, "LOINC", "18974-6"), + CEFCAPEN("Cefcapen", "Cefcapen", "LOINC", "76143-7"), - GATIFLOXACIN("Gatifloxacin", null, "LOINC", "31038-3"), + STREPTOMYCIN_HIGH("Streptomycin-High", "Streptomycin-High", "LOINC", "18983-7"), - PARA_AMINO_SALICYLSAURE("para-Amino-Salicylsäure", null, "LOINC", "23629-9"), + RAZUPENEM("Razupenem", "Razupenem", "LOINC", "73590-2"), - CEFADROXIL("Cefadroxil", null, "LOINC", "18875-5"), + OXACILLIN("Oxacillin", "Oxacillin", "LOINC", "18961-3"), - TELAVANCIN("Telavancin", null, "LOINC", "88886-7"), + SULFONAMID("Sulfonamid", "Sulfonamid", "LOINC", "18987-8"), - PENICILLIN_G("Penicillin G", null, "LOINC", "18965-4"), + PIPERACILLIN_TAZOBACTAM("Piperacillin/Tazobactam", "Piperacillin/Tazobactam", "LOINC", "18970-4"), - FLUCLOXACILLIN("Flucloxacillin", null, "LOINC", "18923-3"), + BESIFLOXACIN("Besifloxacin", "Besifloxacin", "LOINC", "73606-6"), - STREPTOMYCIN("Streptomycin", null, "LOINC", "18982-9"), + METHICILLIN("Methicillin", "Methicillin", "LOINC", "18945-6"), - SARAFLOXACIN("Sarafloxacin", null, "LOINC", "73588-6"), + CEFOPERAZON("Cefoperazon", "Cefoperazon", "LOINC", "18884-7"), - FOSCARNET("Foscarnet", null, "LOINC", "256-8"), + CLOFAZIMIN("Clofazimin", "Clofazimin", "LOINC", "23627-3"), - GEMIFLOXACIN("Gemifloxacin", null, "LOINC", "35816-8"), + QUINUPRISTIN_DALFOPRISTIN("Quinupristin/Dalfopristin", "Quinupristin/Dalfopristin", "LOINC", "23640-6"), - NITROFURANTOIN("Nitrofurantoin", null, "LOINC", "18955-5"), + CEFOTAXIM("Cefotaxim", "Cefotaxim", "LOINC", "18886-2"), - FLORFENICOL("Florfenicol", null, "LOINC", "23740-4"), + CLINAFLOXACIN("Clinafloxacin", "Clinafloxacin", "LOINC", "32376-6"), - POLYMYXIN_B("Polymyxin B", null, "LOINC", "421-8"), + GREPAFLOXACIN("Grepafloxacin", "Grepafloxacin", "LOINC", "23638-0"), - CLOFAZIMIN("Clofazimin", null, "LOINC", "23627-3"), + AMPHOTERICIN_B("Amphotericin B", "Amphotericin B", "LOINC", "18863-1"), - FLEROXACIN("Fleroxacin", null, "LOINC", "32372-5"), + JOSAMYCIN("Josamycin", "Josamycin", "LOINC", "25597-6"), - AMPHOTERICIN_B("Amphotericin B", null, "LOINC", "18863-1"), + ERYTHROMYCIN("Erythromycin", "Erythromycin", "LOINC", "18919-1"), - NAFCILLIN("Nafcillin", null, "LOINC", "18951-4"), + LAMIVUDIN("Lamivudin", "Lamivudin", "LOINC", "30298-4"), - RIFABUTIN("Rifabutin", null, "LOINC", "19149-4"), + CEPHALEXIN("Cephalexin", "Cephalexin", "LOINC", "18897-9"), - PENICILLIN_V("Penicillin V", null, "LOINC", "18966-2"), + DANOFLOXACIN("Danofloxacin", "Danofloxacin", "LOINC", "73601-7"), - CEFDITOREN("Cefditoren", null, "LOINC", "35762-4"), + DOXYCYCLIN("Doxycyclin", "Doxycyclin", "LOINC", "18917-5"), - DOXYCYCLIN("Doxycyclin", null, "LOINC", "18917-5"), + ERTAPENEM("Ertapenem", "Ertapenem", "LOINC", "35802-8"), - TOBRAMYCIN("Tobramycin", null, "LOINC", "18996-9"), + SULBACTAM("Sulbactam", "Sulbactam", "LOINC", "55614-2"), - FLUCONAZOL("Fluconazol", null, "LOINC", "18924-1"), + CEFOTIAM("Cefotiam", "Cefotiam", "LOINC", "32374-1"), - MINOCYCLIN("Minocyclin", null, "LOINC", "18948-0"), + NORFLOXACIN("Norfloxacin", "Norfloxacin", "LOINC", "18956-3"), - LORACARBEF("Loracarbef", null, "LOINC", "18940-7"), + CEFTOBIPROL("Ceftobiprol", "Ceftobiprol", "LOINC", "43272-4"), - CEFTAROLIN("Ceftarolin", null, "LOINC", "73605-8"), + FLORFENICOL("Florfenicol", "Florfenicol", "LOINC", "23740-4"), - OMADACYCLIN("Omadacyclin", null, "LOINC", "73594-4"), + LINCOMYCIN("Lincomycin", "Lincomycin", "LOINC", "18938-1"), - TAZOBACTAM("Piperacillin/Tazobactam", null, "LOINC", "18970-4"), + ROXITHROMYCIN("Roxithromycin", "Roxithromycin", "LOINC", "18978-7"), - TRIMETHOPRIM("Trimethoprim", null, "LOINC", "18997-7"), + CLINDAMYCIN("Clindamycin", "Clindamycin", "LOINC", "18908-4"), - CEFACLOR("Cefaclor", null, "LOINC", "18874-8"), + MEROPENEM_VABORBACTAM("Meropenem/Vaborbactam", "Meropenem/Vaborbactam", "LOINC", "88892-5"), - PROTIONAMID("Protionamid", null, "LOINC", "63565-6"), + ANIDULAFUNGIN("Anidulafungin", "Anidulafungin", "LOINC", "57095-2"), - AZLOCILLIN("Azlocillin", null, "LOINC", "18867-2"), + DORIPENEM("Doripenem", "Doripenem", "LOINC", "60535-2"), - CEFIXIM("Cefixim", null, "LOINC", "18880-5"), + PLAZOMICIN("Plazomicin", "Plazomicin", "LOINC", "73592-8"), - CEPHALOTHIN("Cephalothin", null, "LOINC", "18900-1"), + CEFACLOR("Cefaclor", "Cefaclor", "LOINC", "18874-8"), - CEFTIBUTEN("Ceftibuten", null, "LOINC", "35779-8"), + SPECTINOMYCIN("Spectinomycin", "Spectinomycin", "LOINC", "18980-3"), - CEFDINIR("Cefdinir", null, "LOINC", "23636-4"), + MINOCYCLIN("Minocyclin", "Minocyclin", "LOINC", "18948-0"), - ZALCITABIN("Zalcitabin", null, "LOINC", "30301-6"), + TICARCILLIN_CLAVULANSAURE("Ticarcillin/Clavulansäure", "Ticarcillin/Clavulansäure", "LOINC", "18995-1"), - MICAFUNGIN_E_TEST("Micafungin (E-Test)", null, "LOINC", "85048-7"), + CARBENICILLIN("Carbenicillin", "Carbenicillin", "LOINC", "18873-0"), - GARENOXACIN("Garenoxacin", null, "LOINC", "35813-5"), + CEFTAZIDIM("Ceftazidim", "Ceftazidim", "LOINC", "18893-8"), - AZITHROMYCIN("Azithromycin", null, "LOINC", "18866-4"), + CEFETAMET("Cefetamet", "Cefetamet", "LOINC", "32377-4"), - LOMEFLOXACIN("Lomefloxacin", null, "LOINC", "18939-9"), + FINAFLOXACIN("Finafloxacin", "Finafloxacin", "LOINC", "73598-5"), - TEMAFLOXACIN("Temafloxacin", null, "LOINC", "18990-2"), + ZIDOVUDIN("Zidovudin", "Zidovudin", "LOINC", "531-4"), - CARBENICILLIN("Carbenicillin", null, "LOINC", "18873-0"), + AZTREONAM("Aztreonam", "Aztreonam", "LOINC", "18868-0"), - SULFAMETHOXAZOL("Sulfamethoxazol", null, "LOINC", "18985-2"), + NITROFURANTOIN("Nitrofurantoin", "Nitrofurantoin", "LOINC", "18955-5"), - COLISTIN("Colistin", null, "LOINC", "18912-6"), + AMPICILLIN("Ampicillin", "Ampicillin", "LOINC", "18864-9"), - FAROPENEM("Faropenem", null, "LOINC", "73600-9"), + DIDANOSIN("Didanosin", "Didanosin", "LOINC", "30300-8"), - AMPICILLIN("Ampicillin", null, "LOINC", "18864-9"), + TEICOPLANIN("Teicoplanin", "Teicoplanin", "LOINC", "18989-4"), - ZIDOVUDIN("Zidovudin", null, "LOINC", "531-4"), + GARENOXACIN("Garenoxacin", "Garenoxacin", "LOINC", "35813-5"), - CEFEPIM("Cefepim", null, "LOINC", "18879-7"), + PIPERACILLIN_SULBACTAM("Piperacillin/Sulbactam", "Piperacillin/Sulbactam", "LOINC", "54197-9"), - BESIFLOXACIN("Besifloxacin", null, "LOINC", "73606-6"), + PENICILLIN_G("Penicillin G", "Penicillin G", "LOINC", "18965-4"), - NORFLOXACIN("Norfloxacin", null, "LOINC", "18956-3"), + LORACARBEF("Loracarbef", "Loracarbef", "LOINC", "18940-7"), - ETHAMBUTOL("Ethambutol", null, "LOINC", "18921-7"), + PARA_AMINO_SALICYLSAURE("para-Amino-Salicylsäure", "para-Amino-Salicylsäure", "LOINC", "23629-9"), - CIPROFLOXACIN("Ciprofloxacin", null, "LOINC", "18906-8"), + AMOXYCILLIN_CLAVULANSAURE("Amoxycillin/Clavulansäure", "Amoxycillin/Clavulansäure", "LOINC", "18862-3"), - MUPIROCIN("Mupirocin", null, "LOINC", "20389-3"), + FAROPENEM("Faropenem", "Faropenem", "LOINC", "73600-9"), - ISONIAZID("Isoniazid", null, "LOINC", "18934-0"), + NITROCEPHIN("Nitrocephin", "Nitrocephin", "LOINC", "6985-6"), - TEICOPLANIN("Teicoplanin", null, "LOINC", "18989-4"), + LINEZOLID("Linezolid", "Linezolid", "LOINC", "29258-1"), - CEFTOBIPROL("Ceftobiprol", null, "LOINC", "43272-4"), + LEVOFLOXACIN("Levofloxacin", "Levofloxacin", "LOINC", "20629-2"), - AMOXICILLIN("Amoxicillin", null, "LOINC", "18861-5"), + RIFAMPIN("Rifampin", "Rifampin", "LOINC", "18974-6"), - CEFAZOLIN("Cefazolin", null, "LOINC", "18878-9"), + CAPREOMYCIN("Capreomycin", "Capreomycin", "LOINC", "18872-2"), - FUSIDINSAURE("Fusidinsäure", null, "LOINC", "18927-4"), + CASPOFUNGIN_E_TEST("Caspofungin (E-Test)", "Caspofungin (E-Test)", "LOINC", "54185-4"), - MOXIFLOXACIN("Moxifloxacin", null, "LOINC", "31039-1"), + TELAVANCIN("Telavancin", "Telavancin", "LOINC", "88886-7"), - DIRITHROMYCIN("Dirithromycin", null, "LOINC", "35795-4"), + ESBL_TESTUNG("ESBL - Testung", "ESBL - Testung", "LOINC", "6984-9"), - AMIKACIN("Amikacin", null, "LOINC", "18860-7"), + BACITRACIN("Bacitracin", "Bacitracin", "LOINC", "18870-6"), - CEFMETAZOL("Cefmetazol", null, "LOINC", "18881-3"), + CEFPIROM("Cefpirom", "Cefpirom", "LOINC", "18889-6"), - VANCOMYCIN("Vancomycin", null, "LOINC", "19000-9"), + KANAMYCIN_HIGH("Kanamycin-High", "Kanamycin-High", "LOINC", "18936-5"), - PLAZOMICIN("Plazomicin", null, "LOINC", "73592-8"), + PIPERACILLIN("Piperacillin", "Piperacillin", "LOINC", "18969-6"), - KANAMYCIN("Kanamycin", null, "LOINC", "18935-7"), + CEPHALOTHIN("Cephalothin", "Cephalothin", "LOINC", "18900-1"), - NOVOBIOCIN("Novobiocin", null, "LOINC", "18957-1"), + SULFAMETHOXAZOL("Sulfamethoxazol", "Sulfamethoxazol", "LOINC", "18985-2"), - GREPAFLOXACIN("Grepafloxacin", null, "LOINC", "23638-0"), + CIPROFLOXACIN("Ciprofloxacin", "Ciprofloxacin", "LOINC", "18906-8"), - CYCLOSERIN("Cycloserin", null, "LOINC", "18914-2"), + ISONIAZID("Isoniazid", "Isoniazid", "LOINC", "18934-0"), - DALFOPRISTIN("Quinupristin/Dalfopristin", null, "LOINC", "23640-6"), + MICAFUNGIN_E_TEST("Micafungin (E-Test)", "Micafungin (E-Test)", "LOINC", "85048-7"), - CINOXACIN("Cinoxacin", null, "LOINC", "18905-0"), + PROTIONAMID("Protionamid", "Protionamid", "LOINC", "63565-6"), - MEZLOCILLIN("Mezlocillin", null, "LOINC", "18947-2"), + CEFMETAZOL("Cefmetazol", "Cefmetazol", "LOINC", "18881-3"), - CEFOTAXIM("Cefotaxim", null, "LOINC", "18886-2"), + CEFTOLOZAN_TAZOBACTAM("Ceftolozan/Tazobactam", "Ceftolozan/Tazobactam", "LOINC", "73602-5"), - LINEZOLID("Linezolid", null, "LOINC", "29258-1"), + BEDAQUILINE("Bedaquiline", "Bedaquiline", "LOINC", "88703-4"), - TELITHROMYCIN("Telithromycin", null, "LOINC", "35845-7"), + FLUCONAZOL("Fluconazol", "Fluconazol", "LOINC", "18924-1"), - CEFTERAM("Cefteram", null, "LOINC", "76144-5"), + CEFOXITIN("Cefoxitin", "Cefoxitin", "LOINC", "18888-8"), - BEDAQUILINE("Bedaquiline", null, "LOINC", "88703-4"), + NEOMYCIN("Neomycin", "Neomycin", "LOINC", "18953-0"), - PRISTINAMYCIN("Pristinamycin", null, "LOINC", "32383-2"), + PRISTINAMYCIN("Pristinamycin", "Pristinamycin", "LOINC", "32383-2"), - TETRACYCLIN("Tetracyclin", null, "LOINC", "18993-6"), + CEFDINIR("Cefdinir", "Cefdinir", "LOINC", "23636-4"), - PREMAFLOXACIN("Premafloxacin", null, "LOINC", "73591-0"), + LOMEFLOXACIN("Lomefloxacin", "Lomefloxacin", "LOINC", "18939-9"), - AZTREONAM("Aztreonam", null, "LOINC", "18868-0"), + DAPTOMYCIN("Daptomycin", "Daptomycin", "LOINC", "35789-7"), - CHLORAMPHENICOL("Chloramphenicol", null, "LOINC", "18903-5"), + AMIKACIN("Amikacin", "Amikacin", "LOINC", "18860-7"), - ISAVUCONAZOL("Isavuconazol", null, "LOINC", "88887-5"), + CEFUROXIM("Cefuroxim", "Cefuroxim", "LOINC", "51724-3"), - CLINAFLOXACIN("Clinafloxacin", null, "LOINC", "32376-6"), + RIFABUTIN("Rifabutin", "Rifabutin", "LOINC", "19149-4"), - CEFETAMET("Cefetamet", null, "LOINC", "32377-4"), + TETRACYCLIN("Tetracyclin", "Tetracyclin", "LOINC", "18993-6"), - NEOMYCIN("Neomycin", null, "LOINC", "18953-0"), + CEFOTETAN("Cefotetan", "Cefotetan", "LOINC", "18887-0"), - TOSUFLOXACIN("Tosufloxacin", null, "LOINC", "76146-0"), + CYCLOSERIN("Cycloserin", "Cycloserin", "LOINC", "18914-2"), - CEFONICID("Cefonicid", null, "LOINC", "18883-9"), + CEFTAZIDIM_AVIBACTAM("Ceftazidim/Avibactam", "Ceftazidim/Avibactam", "LOINC", "73603-3"), - FIDAXOMICIN("Fidaxomicin", null, "LOINC", "73599-3"), + SULOPENEM("Sulopenem", "Sulopenem", "LOINC", "55289-3"), - SULFISOXAZOL("Sulfisoxazol", null, "LOINC", "18986-0"), + STREPTOMYCIN("Streptomycin", "Streptomycin", "LOINC", "18982-9"), - JOSAMYCIN("Josamycin", null, "LOINC", "25597-6"), + CEFTERAM("Cefteram", "Cefteram", "LOINC", "76144-5"), - LAMIVUDIN("Lamivudin", null, "LOINC", "30298-4"), + PENICILLIN_V("Penicillin V", "Penicillin V", "LOINC", "18966-2"), - LINCOMYCIN("Lincomycin", null, "LOINC", "18938-1"), + FOSCARNET("Foscarnet", "Foscarnet", "LOINC", "256-8"), - LEVOFLOXACIN("Levofloxacin", null, "LOINC", "20629-2"), + CEFOTAXIM_CLAVULANSAURE("Cefotaxim/Clavulansäure", "Cefotaxim/Clavulansäure", "LOINC", "35771-5"), - CEFTAZIDIM("Ceftazidim", null, "LOINC", "18893-8"), + TICARCILLIN("Ticarcillin", "Ticarcillin", "LOINC", "18994-4"), - RAMOPLANIN("Ramoplanin", null, "LOINC", "41737-8"), + METRONIDAZOL("Metronidazol", "Metronidazol", "LOINC", "18946-4"), - GENTAMICIN_HIGH_LEVEL("Gentamicin High-Level", null, "LOINC", "18929-0"), + SULFAMETHOXAZOL_TRIMETHOPRIM_COTRIMOXAZOL("Sulfamethoxazol/Trimethoprim (Cotrimoxazol)", "Sulfamethoxazol/Trimethoprim (Cotrimoxazol)", "LOINC", "18998-5"), - CAPREOMYCIN("Capreomycin", null, "LOINC", "18872-2"), + NALIDIXINSAURE("Nalidixinsäure", "Nalidixinsäure", "LOINC", "18952-2"), - ITRACONAZOL("Itraconazol", null, "LOINC", "32603-3"), + DIFLOXACIN("Difloxacin", "Difloxacin", "LOINC", "35792-1"), - SULFONAMID("Sulfonamid", null, "LOINC", "18987-8"), + CEFADROXIL("Cefadroxil", "Cefadroxil", "LOINC", "18875-5"), - CLINDAMYCIN("Clindamycin", null, "LOINC", "18908-4"), + IMIPENEM("Imipenem", "Imipenem", "LOINC", "18932-4"), - STAVUDIN("Stavudin", null, "LOINC", "30302-4"), + CEFTIBUTEN("Ceftibuten", "Ceftibuten", "LOINC", "35779-8"), - CEFTRIAXON("Ceftriaxon", null, "LOINC", "18895-3"), + NYSTATIN("Nystatin", "Nystatin", "LOINC", "10697-1"), - N5_FLUOROCYTOSIN("5-Fluorocytosin", null, "LOINC", "18855-7"), + CHLORAMPHENICOL("Chloramphenicol", "Chloramphenicol", "LOINC", "18903-5"), - METRONIDAZOL("Metronidazol", null, "LOINC", "18946-4"), + PYRAZINAMID("Pyrazinamid", "Pyrazinamid", "LOINC", "18973-8"), - OXACILLIN("Oxacillin", null, "LOINC", "18961-3"), + CEFPROZIL("Cefprozil", "Cefprozil", "LOINC", "18891-2"), - METHICILLIN("Methicillin", null, "LOINC", "18945-6"), + FLEROXACIN("Fleroxacin", "Fleroxacin", "LOINC", "32372-5"), - CEFPODOXIM("Cefpodoxim", null, "LOINC", "18890-4"), + FLUCLOXACILLIN("Flucloxacillin", "Flucloxacillin", "LOINC", "18923-3"), - DORIPENEM("Doripenem", null, "LOINC", "60535-2"), + TROVAFLOXACIN("Trovafloxacin", "Trovafloxacin", "LOINC", "23642-2"), - CEFOPERAZON("Cefoperazon", null, "LOINC", "18884-7"); + ORITAVANCIN("Oritavancin", "Oritavancin", "LOINC", "41736-0"), + + AZLOCILLIN("Azlocillin", "Azlocillin", "LOINC", "18867-2"), + + MEROPENEM("Meropenem", "Meropenem", "LOINC", "18943-1"), + + MOXIFLOXACIN("Moxifloxacin", "Moxifloxacin", "LOINC", "31039-1"), + + POSACONAZOL_E_TEST("Posaconazol (E-Test)", "Posaconazol (E-Test)", "LOINC", "54186-2"), + + AMOXICILLIN("Amoxicillin", "Amoxicillin", "LOINC", "18861-5"), + + CEFOPERAZON_SULBACTAM("Cefoperazon/Sulbactam", "Cefoperazon/Sulbactam", "LOINC", "54166-4"), + + SARAFLOXACIN("Sarafloxacin", "Sarafloxacin", "LOINC", "73588-6"), + + GEMIFLOXACIN("Gemifloxacin", "Gemifloxacin", "LOINC", "35816-8"); private String value; @@ -355,7 +371,7 @@ public enum AntibiotikumDefiningcode implements EnumValueSet { private String code; - AntibiotikumDefiningcode(String value, String description, String terminologyId, String code) { + AntibiotikumDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -363,18 +379,18 @@ public enum AntibiotikumDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/Definingcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ArtDerTypisierungDefiningCode.java similarity index 77% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/Definingcode.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ArtDerTypisierungDefiningCode.java index 5e2708d0d..96ccc6894 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/Definingcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ArtDerTypisierungDefiningCode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum Definingcode implements EnumValueSet { +public enum ArtDerTypisierungDefiningCode implements EnumValueSet { ANDERE("Andere", "*", "local", "at0007"), PULSFELDGELELEKTROPHORESE_PFGE("Pulsfeldgelelektrophorese (PFGE)", "*", "local", "at0003"), @@ -21,7 +21,8 @@ public enum Definingcode implements EnumValueSet { private String code; - Definingcode(String value, String description, String terminologyId, String code) { + ArtDerTypisierungDefiningCode(String value, String description, String terminologyId, + String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -29,18 +30,18 @@ public enum Definingcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ContextEventsummaryBeteiligtePersonenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ContextEventsummaryBeteiligtePersonenCluster.java deleted file mode 100644 index b84899ae0..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ContextEventsummaryBeteiligtePersonenCluster.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -import java.util.List; - -@Entity -public class ContextEventsummaryBeteiligtePersonenCluster { - @Path("/items[at0010]") - private List idDerPerson; - - @Path("/items[at0011]/value|value") - private String artDerPersonValue; - - public void setIdDerPerson(List idDerPerson) { - this.idDerPerson = idDerPerson; - } - - public List getIdDerPerson() { - return this.idDerPerson; - } - - public void setArtDerPersonValue(String artDerPersonValue) { - this.artDerPersonValue = artDerPersonValue; - } - - public String getArtDerPersonValue() { - return this.artDerPersonValue; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ContextEventsummaryDvuri.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ContextEventsummaryDvuri.java deleted file mode 100644 index 08599535d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ContextEventsummaryDvuri.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -import java.net.URI; - -@Entity -@OptionFor("DV_URI") -public class ContextEventsummaryDvuri implements ContextEventsummaryChoice { - @Path("|value") - private URI valueValue; - - public void setValueValue(URI valueValue) { - this.valueValue = valueValue; - } - - public URI getValueValue() { - return this.valueValue; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ContextEventsummaryIdDerPersonElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ContextEventsummaryIdDerPersonElement.java deleted file mode 100644 index a9ed7493b..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ContextEventsummaryIdDerPersonElement.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import org.ehrbase.client.annotations.Choice; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class ContextEventsummaryIdDerPersonElement { - @Path("/value") - @Choice - private ContextEventsummaryChoice value; - - public void setValue(ContextEventsummaryChoice value) { - this.value = value; - } - - public ContextEventsummaryChoice getValue() { - return this.value; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EigenschaftenDesBeteiligtenErregersErregertypisierungArtDerTypisierungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EigenschaftenDesBeteiligtenErregersErregertypisierungArtDerTypisierungElement.java deleted file mode 100644 index 1aa61ca23..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EigenschaftenDesBeteiligtenErregersErregertypisierungArtDerTypisierungElement.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class EigenschaftenDesBeteiligtenErregersErregertypisierungArtDerTypisierungElement { - @Path("/value|defining_code") - private Definingcode definingcode; - - public void setDefiningcode(Definingcode definingcode) { - this.definingcode = definingcode; - } - - public Definingcode getDefiningcode() { - return this.definingcode; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EigenschaftenDesBeteiligtenErregersErregertypisierungErgebnisElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EigenschaftenDesBeteiligtenErregersErregertypisierungErgebnisElement.java deleted file mode 100644 index e7995c924..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EigenschaftenDesBeteiligtenErregersErregertypisierungErgebnisElement.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import com.nedap.archie.rm.datavalues.encapsulated.DvMultimedia; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class EigenschaftenDesBeteiligtenErregersErregertypisierungErgebnisElement { - @Path("/value") - private DvMultimedia value; - - public void setValue(DvMultimedia value) { - this.value = value; - } - - public DvMultimedia getValue() { - return this.value; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java index f3d394e91..d4cbbb242 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java @@ -11,125 +11,114 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.erregerdetails.v1") public class ErregerdetailsCluster { - @Path("/items[openEHR-EHR-CLUSTER.laboratory_test_panel.v0 and name/value='Antibiogramm']") - private AntibiogrammCluster antibiogramm; + @Path("/items[at0047]") + private List keimSubtyp; - @Path("/items[at0003]/value") - private DvOrdinal haufigkeit; + @Path("/items[at0035]/value|magnitude") + private Double keimzahlMagnitude; - @Path("/items[at0062]/value|value") - private String kommentarValue; + @Path("/items[at0035]/value|units") + private String keimzahlUnits; - @Path("/items[at0057]") - private List resistenzmechanismus; + @Path("/items[at0003]/value") + private DvOrdinal haufigkeit; - @Path("/items[at0035]/value|magnitude") - private Double keimzahlMagnitude; + @Path("/items[at0016]/value|value") + private String virulenzfaktorValue; - @Path("/items[at0035]/value|units") - private String keimzahlUnits; + @Path("/items[openEHR-EHR-CLUSTER.laboratory_test_panel.v0 and name/value='Antibiogramm']") + private AntibiogrammCluster antibiogramm; - @Path("/items[at0059]") - private List weitereErganzungen; + @Path("/items[at0057]") + private List resistenzmechanismus; - @Path("/items[at0047]") - private List keimSubtyp; + @Path("/items[at0018]/value|defining_code") + private MreKlasseDefiningCode mreKlasseDefiningCode; - @Path("/items[at0035]/null_flavour|defining_code") - private KeimzahlDefiningcode keimzahlDefiningcode; + @Path("/items[at0062]/value|value") + private String kommentarValue; - @Path("/items[at0016]/value|value") - private String virulenzfaktorValue; + @Path("/items[at0059]") + private List weitereErganzungen; - @Path("/items[at0018]/value|defining_code") - private MreKlasseDefiningcode mreKlasseDefiningcode; + public void setKeimSubtyp(List keimSubtyp) { + this.keimSubtyp = keimSubtyp; + } - public void setAntibiogramm(AntibiogrammCluster antibiogramm) { - this.antibiogramm = antibiogramm; - } + public List getKeimSubtyp() { + return this.keimSubtyp ; + } - public AntibiogrammCluster getAntibiogramm() { - return this.antibiogramm; - } + public void setKeimzahlMagnitude(Double keimzahlMagnitude) { + this.keimzahlMagnitude = keimzahlMagnitude; + } - public void setHaufigkeit(DvOrdinal haufigkeit) { - this.haufigkeit = haufigkeit; - } + public Double getKeimzahlMagnitude() { + return this.keimzahlMagnitude ; + } - public DvOrdinal getHaufigkeit() { - return this.haufigkeit; - } + public void setKeimzahlUnits(String keimzahlUnits) { + this.keimzahlUnits = keimzahlUnits; + } - public void setKommentarValue(String kommentarValue) { - this.kommentarValue = kommentarValue; - } + public String getKeimzahlUnits() { + return this.keimzahlUnits ; + } - public String getKommentarValue() { - return this.kommentarValue; - } + public void setHaufigkeit(DvOrdinal haufigkeit) { + this.haufigkeit = haufigkeit; + } - public void setResistenzmechanismus( - List resistenzmechanismus) { - this.resistenzmechanismus = resistenzmechanismus; - } + public DvOrdinal getHaufigkeit() { + return this.haufigkeit ; + } - public List getResistenzmechanismus() { - return this.resistenzmechanismus; - } + public void setVirulenzfaktorValue(String virulenzfaktorValue) { + this.virulenzfaktorValue = virulenzfaktorValue; + } - public void setKeimzahlMagnitude(Double keimzahlMagnitude) { - this.keimzahlMagnitude = keimzahlMagnitude; - } + public String getVirulenzfaktorValue() { + return this.virulenzfaktorValue ; + } - public Double getKeimzahlMagnitude() { - return this.keimzahlMagnitude; - } + public void setAntibiogramm(AntibiogrammCluster antibiogramm) { + this.antibiogramm = antibiogramm; + } - public void setKeimzahlUnits(String keimzahlUnits) { - this.keimzahlUnits = keimzahlUnits; - } + public AntibiogrammCluster getAntibiogramm() { + return this.antibiogramm ; + } - public String getKeimzahlUnits() { - return this.keimzahlUnits; - } + public void setResistenzmechanismus( + List resistenzmechanismus) { + this.resistenzmechanismus = resistenzmechanismus; + } - public void setWeitereErganzungen(List weitereErganzungen) { - this.weitereErganzungen = weitereErganzungen; - } + public List getResistenzmechanismus() { + return this.resistenzmechanismus ; + } - public List getWeitereErganzungen() { - return this.weitereErganzungen; - } + public void setMreKlasseDefiningCode(MreKlasseDefiningCode mreKlasseDefiningCode) { + this.mreKlasseDefiningCode = mreKlasseDefiningCode; + } - public void setKeimSubtyp(List keimSubtyp) { - this.keimSubtyp = keimSubtyp; - } + public MreKlasseDefiningCode getMreKlasseDefiningCode() { + return this.mreKlasseDefiningCode ; + } - public List getKeimSubtyp() { - return this.keimSubtyp; - } + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } - public void setKeimzahlDefiningcode(KeimzahlDefiningcode keimzahlDefiningcode) { - this.keimzahlDefiningcode = keimzahlDefiningcode; - } + public String getKommentarValue() { + return this.kommentarValue ; + } - public KeimzahlDefiningcode getKeimzahlDefiningcode() { - return this.keimzahlDefiningcode; - } + public void setWeitereErganzungen(List weitereErganzungen) { + this.weitereErganzungen = weitereErganzungen; + } - public void setVirulenzfaktorValue(String virulenzfaktorValue) { - this.virulenzfaktorValue = virulenzfaktorValue; - } - - public String getVirulenzfaktorValue() { - return this.virulenzfaktorValue; - } - - public void setMreKlasseDefiningcode(MreKlasseDefiningcode mreKlasseDefiningcode) { - this.mreKlasseDefiningcode = mreKlasseDefiningcode; - } - - public MreKlasseDefiningcode getMreKlasseDefiningcode() { - return this.mreKlasseDefiningcode; - } + public List getWeitereErganzungen() { + return this.weitereErganzungen ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsClusterContainment.java index 3623660aa..7e6a43103 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsClusterContainment.java @@ -11,27 +11,25 @@ public class ErregerdetailsClusterContainment extends Containment { public SelectAqlField ERREGERDETAILS_CLUSTER = new AqlFieldImp(ErregerdetailsCluster.class, "", "ErregerdetailsCluster", ErregerdetailsCluster.class, this); - public SelectAqlField ANTIBIOGRAMM = new AqlFieldImp(ErregerdetailsCluster.class, "/items[openEHR-EHR-CLUSTER.laboratory_test_panel.v0 and name/value='Antibiogramm']", "antibiogramm", AntibiogrammCluster.class, this); - - public SelectAqlField HAUFIGKEIT = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0003]/value", "haufigkeit", DvOrdinal.class, this); - - public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0062]/value|value", "kommentarValue", String.class, this); - - public ListSelectAqlField RESISTENZMECHANISMUS = new ListAqlFieldImp(ErregerdetailsCluster.class, "/items[at0057]", "resistenzmechanismus", LaboranalytResultatResistenzmechanismusCluster.class, this); + public ListSelectAqlField KEIM_SUBTYP = new ListAqlFieldImp(ErregerdetailsCluster.class, "/items[at0047]", "keimSubtyp", ErregerdetailsKeimSubtypElement.class, this); public SelectAqlField KEIMZAHL_MAGNITUDE = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0035]/value|magnitude", "keimzahlMagnitude", Double.class, this); public SelectAqlField KEIMZAHL_UNITS = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0035]/value|units", "keimzahlUnits", String.class, this); - public ListSelectAqlField WEITERE_ERGANZUNGEN = new ListAqlFieldImp(ErregerdetailsCluster.class, "/items[at0059]", "weitereErganzungen", Cluster.class, this); + public SelectAqlField HAUFIGKEIT = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0003]/value", "haufigkeit", DvOrdinal.class, this); - public ListSelectAqlField KEIM_SUBTYP = new ListAqlFieldImp(ErregerdetailsCluster.class, "/items[at0047]", "keimSubtyp", LaboranalytResultatKeimSubtypElement.class, this); + public SelectAqlField VIRULENZFAKTOR_VALUE = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0016]/value|value", "virulenzfaktorValue", String.class, this); - public SelectAqlField KEIMZAHL_DEFININGCODE = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0035]/null_flavour|defining_code", "keimzahlDefiningcode", KeimzahlDefiningcode.class, this); + public SelectAqlField ANTIBIOGRAMM = new AqlFieldImp(ErregerdetailsCluster.class, "/items[openEHR-EHR-CLUSTER.laboratory_test_panel.v0]", "antibiogramm", AntibiogrammCluster.class, this); - public SelectAqlField VIRULENZFAKTOR_VALUE = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0016]/value|value", "virulenzfaktorValue", String.class, this); + public ListSelectAqlField RESISTENZMECHANISMUS = new ListAqlFieldImp(ErregerdetailsCluster.class, "/items[at0057]", "resistenzmechanismus", ErregerdetailsResistenzmechanismusCluster.class, this); + + public SelectAqlField MRE_KLASSE_DEFINING_CODE = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0018]/value|defining_code", "mreKlasseDefiningCode", MreKlasseDefiningCode.class, this); - public SelectAqlField MRE_KLASSE_DEFININGCODE = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0018]/value|defining_code", "mreKlasseDefiningcode", MreKlasseDefiningcode.class, this); + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0062]/value|value", "kommentarValue", String.class, this); + + public ListSelectAqlField WEITERE_ERGANZUNGEN = new ListAqlFieldImp(ErregerdetailsCluster.class, "/items[at0059]", "weitereErganzungen", Cluster.class, this); private ErregerdetailsClusterContainment() { super("openEHR-EHR-CLUSTER.erregerdetails.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java new file mode 100644 index 000000000..6836724c1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java @@ -0,0 +1,18 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class ErregerdetailsKeimSubtypElement { + @Path("/value|value") + private String value; + + public void setValue(String value) { + this.value = value; + } + + public String getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java new file mode 100644 index 000000000..14a42a06c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java @@ -0,0 +1,18 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class ErregerdetailsResistenzmechanismusCluster { + @Path("/items[at0017]/value|value") + private String resistenzmechanismusBezeichnungValue; + + public void setResistenzmechanismusBezeichnungValue(String resistenzmechanismusBezeichnungValue) { + this.resistenzmechanismusBezeichnungValue = resistenzmechanismusBezeichnungValue; + } + + public String getResistenzmechanismusBezeichnungValue() { + return this.resistenzmechanismusBezeichnungValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregernameDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregernameDefiningcode.java index 9e281c5d9..4ab6c16ce 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregernameDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregernameDefiningcode.java @@ -2,1258 +2,1258 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum ErregernameDefiningcode implements EnumValueSet { - SALMONELLA_TYPHIMURIUM_ORGANISM("Salmonella Typhimurium (organism)", null, "SNOMED-CT", "50136005"), +public enum ErregernameDefiningCode implements EnumValueSet { + PARABURKHOLDERIA_PHENAZINIUM("Paraburkholderia phenazinium", "Paraburkholderia phenazinium", "SNOMED-CT", "431166001"), - CITROBACTER_YOUNGAE_ORGANISM("Citrobacter youngae (organism)", null, "SNOMED-CT", "114443001"), + MYCOBACTERIUM_MICROTI_ORGANISM("Mycobacterium microti (organism)", "Mycobacterium microti (organism)", "SNOMED-CT", "70801007"), - BACILLUS_CEREUS_ORGANISM("Bacillus cereus (organism)", null, "SNOMED-CT", "84408007"), + LEGIONELLA_PNEUMOPHILA_SEROGROUP1_ORGANISM("Legionella pneumophila serogroup 1 (organism)", "Legionella pneumophila serogroup 1 (organism)", "SNOMED-CT", "103463005"), - PASTEURELLA_PNEUMOTROPICA_ORGANISM("Pasteurella pneumotropica (organism)", null, "SNOMED-CT", "32562008"), + RHIZOBIUM_RADIOBACTER_ORGANISM("Rhizobium radiobacter (organism)", "Rhizobium radiobacter (organism)", "SNOMED-CT", "438107000"), - GENUS_LACTOBACILLUS_ORGANISM("Genus Lactobacillus (organism)", null, "SNOMED-CT", "43690008"), + GENUS_CUTIBACTERIUM_ORGANISM("Genus Cutibacterium (organism)", "Genus Cutibacterium (organism)", "SNOMED-CT", "763051006"), - SALMONELLA_TYPHI_ORGANISM("Salmonella Typhi (organism)", null, "SNOMED-CT", "5595000"), + ENTEROCOCCUS_FAECIUM_ORGANISM("Enterococcus faecium (organism)", "Enterococcus faecium (organism)", "SNOMED-CT", "90272000"), - STREPTOCOCCUS_AGALACTIAE_ORGANISM("Streptococcus agalactiae (organism)", null, "SNOMED-CT", "43492007"), + LACTOBACILLUS_CASEI_ORGANISM("Lactobacillus casei (organism)", "Lactobacillus casei (organism)", "SNOMED-CT", "1017006"), - SALMONELLA_LIVINGSTONE("Salmonella Livingstone", null, "SNOMED-CT", "66713000"), + PSEUDOMONAS_AERUGINOSA_ORGANISM("Pseudomonas aeruginosa (organism)", "Pseudomonas aeruginosa (organism)", "SNOMED-CT", "52499004"), - BACTEROIDES_FRAGILIS_GROUP_ORGANISM("Bacteroides fragilis group (organism)", null, "SNOMED-CT", "417375007"), + PROVIDENCIA_HEIMBACHAE_ORGANISM("Providencia heimbachae (organism)", "Providencia heimbachae (organism)", "SNOMED-CT", "47300009"), - MYCOBACTERIUM_ABSCESSUS_ORGANISM("Mycobacterium abscessus (organism)", null, "SNOMED-CT", "113838007"), + CITROBACTER_BRAAKII_ORGANISM("Citrobacter braakii (organism)", "Citrobacter braakii (organism)", "SNOMED-CT", "114262000"), - STAPHYLOCOCCUS_ARGENTEUS_ORGANISM("Staphylococcus argenteus (organism)", null, "SNOMED-CT", "782316009"), + STREPTOCOCCUS_INTERMEDIUS_ORGANISM("Streptococcus intermedius (organism)", "Streptococcus intermedius (organism)", "SNOMED-CT", "62170002"), - ENTEROCOCCUS_CASSELIFLAVUS_ORGANISM("Enterococcus casseliflavus (organism)", null, "SNOMED-CT", "30949009"), + HAEMOPHILUS_PARAHAEMOLYTICUS_ORGANISM("Haemophilus parahaemolyticus (organism)", "Haemophilus parahaemolyticus (organism)", "SNOMED-CT", "89800007"), - LEGIONELLA_PNEUMOPHILA_SEROGROUP8_ORGANISM("Legionella pneumophila serogroup 8 (organism)", null, "SNOMED-CT", "103470005"), + AEROMONAS_JANDEI_ORGANISM("Aeromonas jandei (organism)", "Aeromonas jandei (organism)", "SNOMED-CT", "115034008"), - ACINETOBACTER_LWOFFI_ORGANISM("Acinetobacter lwoffi (organism)", null, "SNOMED-CT", "83088009"), + KOSAKONIA_COWANII("Kosakonia cowanii", "Kosakonia cowanii", "SNOMED-CT", "416229008"), - PENICILLIUM_ORGANISM("Penicillium (organism)", null, "SNOMED-CT", "42993004"), + PASTEURELLA_DAGMATIS_ORGANISM("Pasteurella dagmatis (organism)", "Pasteurella dagmatis (organism)", "SNOMED-CT", "80948000"), - GRANULICATELLA_ADIACENS_ORGANISM("Granulicatella adiacens (organism)", null, "SNOMED-CT", "113713009"), + SAPROCHAETE_CAPITATA_ORGANISM("Saprochaete capitata (organism)", "Saprochaete capitata (organism)", "SNOMED-CT", "67999003"), - BACTEROIDES_THETAIOTAOMICRON_ORGANISM("Bacteroides thetaiotaomicron (organism)", null, "SNOMED-CT", "34236001"), + AGGREGATIBACTER_ACTINOMYCETEMCOMITANS_ORGANISM("Aggregatibacter actinomycetemcomitans (organism)", "Aggregatibacter actinomycetemcomitans (organism)", "SNOMED-CT", "442680008"), - CORYNEBACTERIUM_AFERMENTANS_ORGANISM("Corynebacterium afermentans (organism)", null, "SNOMED-CT", "113608003"), + BREVUNDIMONAS_DIMINUTA_ORGANISM("Brevundimonas diminuta (organism)", "Brevundimonas diminuta (organism)", "SNOMED-CT", "113689009"), - LEGIONELLA_BOZEMANAE_ORGANISM("Legionella bozemanae (organism)", null, "SNOMED-CT", "450611004"), + SALMONELLA_DERBY("Salmonella Derby", "Salmonella Derby", "SNOMED-CT", "37091006"), - SHEWANELLA_ALGAE_ORGANISM("Shewanella algae (organism)", null, "SNOMED-CT", "113702006"), + CORYNEBACTERIUM_GLUCURONOLYTICUM_ORGANISM("Corynebacterium glucuronolyticum (organism)", "Corynebacterium glucuronolyticum (organism)", "SNOMED-CT", "413927008"), - STREPTOCOCCUS_MITIS_ORGANISM("Streptococcus mitis (organism)", null, "SNOMED-CT", "57997003"), + SALMONELLA_WIEN("Salmonella Wien", "Salmonella Wien", "SNOMED-CT", "21975008"), - ACINETOBACTER_CALCOACETICUS_ORGANISM("Acinetobacter calcoaceticus (organism)", null, "SNOMED-CT", "82550008"), + ENTEROBACTER_LUDWIGII("Enterobacter ludwigii", "Enterobacter ludwigii", "SNOMED-CT", "432763001"), - BACILLUS_THURINGIENSIS_ORGANISM("Bacillus thuringiensis (organism)", null, "SNOMED-CT", "64840009"), + AEROMONAS_HYDROPHILA_ORGANISM("Aeromonas hydrophila (organism)", "Aeromonas hydrophila (organism)", "SNOMED-CT", "85823000"), - LEGIONELLA_PNEUMOPHILA_SEROGROUP4_ORGANISM("Legionella pneumophila serogroup 4 (organism)", null, "SNOMED-CT", "103466002"), + SALMONELLA_BREDENEY("Salmonella Bredeney", "Salmonella Bredeney", "SNOMED-CT", "82364007"), - ACINETOBACTER_GENOSPECIES3_ORGANISM("Acinetobacter genospecies 3 (organism)", null, "SNOMED-CT", "113377003"), + SACCHAROMYCES_CEREVISIAE_ORGANISM("Saccharomyces cerevisiae (organism)", "Saccharomyces cerevisiae (organism)", "SNOMED-CT", "58296003"), - STAPHYLOCOCCUS_INTERMEDIUS_ORGANISM("Staphylococcus intermedius (organism)", null, "SNOMED-CT", "34605002"), + GENUS_FUSOBACTERIUM_ORGANISM("Genus Fusobacterium (organism)", "Genus Fusobacterium (organism)", "SNOMED-CT", "33562003"), - ENTEROBACTER_ASBURIAE_ORGANISM("Enterobacter asburiae (organism)", null, "SNOMED-CT", "33115003"), + GENUS_ACTINOMYCES_ORGANISM("Genus Actinomyces (organism)", "Genus Actinomyces (organism)", "SNOMED-CT", "40560008"), - LEGIONELLA_MICDADEI_ORGANISM("Legionella micdadei (organism)", null, "SNOMED-CT", "116380009"), + KLEBSIELLA_VARIICOLA_ORGANISM("Klebsiella variicola (organism)", "Klebsiella variicola (organism)", "SNOMED-CT", "431976004"), - SALMONELLA_ENTERICA_SUBSP_ARIZONAE_ORGANISM("Salmonella enterica subsp. arizonae (organism)", null, "SNOMED-CT", "397502001"), + SALMONELLA_TENNESSEE("Salmonella Tennessee", "Salmonella Tennessee", "SNOMED-CT", "79153007"), - ANAEROBIC_GRAM_NEGATIVE_BACILLUS_ORGANISM("Anaerobic Gram-negative bacillus (organism)", null, "SNOMED-CT", "243386003"), + SALMONELLA_VIRCHOW("Salmonella Virchow", "Salmonella Virchow", "SNOMED-CT", "5929008"), - GENUS_CORYNEBACTERIUM_ORGANISM("Genus Corynebacterium (organism)", null, "SNOMED-CT", "77086004"), + PARABURKHOLDERIA_XENOVORANS("Paraburkholderia xenovorans", "Paraburkholderia xenovorans", "SNOMED-CT", "431176003"), - MORAXELLA_CATARRHALIS_ORGANISM("Moraxella catarrhalis (organism)", null, "SNOMED-CT", "24226003"), + STAPHYLOCOCCUS_CAPRAE_ORGANISM("Staphylococcus caprae (organism)", "Staphylococcus caprae (organism)", "SNOMED-CT", "76969000"), - ACINETOBACTER_PITTII_ORGANISM("Acinetobacter pittii (organism)", null, "SNOMED-CT", "698244000"), + LEGIONELLA_PNEUMOPHILIA_SEROGROUP12_ORGANISM("Legionella pneumophilia serogroup 12 (organism)", "Legionella pneumophilia serogroup 12 (organism)", "SNOMED-CT", "131324005"), - DELFTIA_ACIDOVORANS_ORGANISM("Delftia acidovorans (organism)", null, "SNOMED-CT", "20432002"), + LEGIONELLA_BELIARDENSIS_ORGANISM("Legionella beliardensis (organism)", "Legionella beliardensis (organism)", "SNOMED-CT", "432714000"), - CANDIDA_AURIS_ORGANISM("Candida auris (organism)", null, "SNOMED-CT", "3491000146109"), + CITROBACTER_FARMERI_ORGANISM("Citrobacter farmeri (organism)", "Citrobacter farmeri (organism)", "SNOMED-CT", "114263005"), - SERRATIA_GRIMESII_ORGANISM("Serratia grimesii (organism)", null, "SNOMED-CT", "115005002"), + STAPHYLOCOCCUS_WARNERI_ORGANISM("Staphylococcus warneri (organism)", "Staphylococcus warneri (organism)", "SNOMED-CT", "63550006"), - GENUS_KLEBSIELLA_ORGANISM("Genus Klebsiella (organism)", null, "SNOMED-CT", "75032006"), + CITROBACTER_FREUNDII_COMPLEX_ORGANISM("Citrobacter freundii complex (organism)", "Citrobacter freundii complex (organism)", "SNOMED-CT", "782522004"), - MYCOBACTERIUM_BOVIS_ORGANISM("Mycobacterium bovis (organism)", null, "SNOMED-CT", "27142009"), + PANTOEA_DISPERSA_ORGANISM("Pantoea dispersa (organism)", "Pantoea dispersa (organism)", "SNOMED-CT", "115017000"), - PARABACTEROIDES_DISTASONIS_ORGANISM("Parabacteroides distasonis (organism)", null, "SNOMED-CT", "447512008"), + GENUS_LEGIONELLA_ORGANISM("Genus Legionella (organism)", "Genus Legionella (organism)", "SNOMED-CT", "7527002"), - BURKHOLDERIA_DOLOSA("Burkholderia dolosa", null, "SNOMED-CT", "431173006"), + CANDIDA_ALBICANS_ORGANISM("Candida albicans (organism)", "Candida albicans (organism)", "SNOMED-CT", "53326005"), - SALMONELLA_MUENSTER("Salmonella Muenster", null, "SNOMED-CT", "68916009"), + STAPHYLOCOCCUS_PETTENKOFERI_ORGANISM("Staphylococcus pettenkoferi (organism)", "Staphylococcus pettenkoferi (organism)", "SNOMED-CT", "428731005"), - SHIGELLA_SONNEI_ORGANISM("Shigella sonnei (organism)", null, "SNOMED-CT", "4298009"), + PANTOEA_ANANATIS_ORGANISM("Pantoea ananatis (organism)", "Pantoea ananatis (organism)", "SNOMED-CT", "115014007"), - CORYNEBACTERIUM_STRIATUM_ORGANISM("Corynebacterium striatum (organism)", null, "SNOMED-CT", "63815007"), + MYCOBACTERIUM_TUBERCULOSIS_ORGANISM("Mycobacterium tuberculosis (organism)", "Mycobacterium tuberculosis (organism)", "SNOMED-CT", "113861009"), - MORAXELLA_LACUNATA_ORGANISM("Moraxella lacunata (organism)", null, "SNOMED-CT", "84066001"), + SALMONELLA_ORANIENBURG("Salmonella Oranienburg", "Salmonella Oranienburg", "SNOMED-CT", "46667007"), - ASPERGILLUS_FLAVUS_GROUP_ORGANISM("Aspergillus flavus group (organism)", null, "SNOMED-CT", "243491003"), + BURKHOLDERIA_CENOCEPACIA_ORGANISM("Burkholderia cenocepacia (organism)", "Burkholderia cenocepacia (organism)", "SNOMED-CT", "416941006"), - PARABURKHOLDERIA_XENOVORANS("Paraburkholderia xenovorans", null, "SNOMED-CT", "431176003"), + GENUS_CLOSTRIDIUM_ORGANISM("Genus Clostridium (organism)", "Genus Clostridium (organism)", "SNOMED-CT", "8191000"), - LEGIONELLA_JORDANIS_ORGANISM("Legionella jordanis (organism)", null, "SNOMED-CT", "39739007"), + KLEBSIELLA_PNEUMONIAE_SS_PNEUMONIAE_ORGANISM("Klebsiella pneumoniae ss. pneumoniae (organism)", "Klebsiella pneumoniae ss. pneumoniae (organism)", "SNOMED-CT", "18400002"), - STAPHYLOCOCCUS_XYLOSUS_ORGANISM("Staphylococcus xylosus (organism)", null, "SNOMED-CT", "32737005"), + CRONOBACTER_UNIVERSALIS_ORGANISM("Cronobacter universalis (organism)", "Cronobacter universalis (organism)", "SNOMED-CT", "707335003"), - ACHROMOBACTER_PIECHAUDII_ORGANISM("Achromobacter piechaudii (organism)", null, "SNOMED-CT", "413420000"), + LEGIONELLA_GORMANII_ORGANISM("Legionella gormanii (organism)", "Legionella gormanii (organism)", "SNOMED-CT", "113721003"), - GENUS_CUTIBACTERIUM_ORGANISM("Genus Cutibacterium (organism)", null, "SNOMED-CT", "763051006"), + MORAXELLA_OSLOENSIS_ORGANISM("Moraxella osloensis (organism)", "Moraxella osloensis (organism)", "SNOMED-CT", "72401008"), - STAPHYLOCOCCUS_HOMINIS_ORGANISM("Staphylococcus hominis (organism)", null, "SNOMED-CT", "44827007"), + SALMONELLA_HAVANA("Salmonella Havana", "Salmonella Havana", "SNOMED-CT", "38788001"), - KLEBSIELLA_AEROGENES_ORGANISM("Klebsiella aerogenes (organism)", null, "SNOMED-CT", "62592009"), + SALMONELLA_GOLDCOAST("Salmonella Goldcoast", "Salmonella Goldcoast", "SNOMED-CT", "16820003"), - SALMONELLA_SAINTPAUL("Salmonella Saintpaul", null, "SNOMED-CT", "2820001"), + SALMONELLA_SANDIEGO("Salmonella Sandiego", "Salmonella Sandiego", "SNOMED-CT", "112287008"), - SALMONELLA_BRANDENBURG("Salmonella Brandenburg", null, "SNOMED-CT", "16888008"), + ASPERGILLUS_TERREUS_ORGANISM("Aspergillus terreus (organism)", "Aspergillus terreus (organism)", "SNOMED-CT", "26406003"), - SALMONELLA_CHOLERAESUIS_VAR_KUNZENDORF("Salmonella Choleraesuis var. Kunzendorf", null, "SNOMED-CT", "370577001"), + PANTOEA_STEWARTII_ORGANISM("Pantoea stewartii (organism)", "Pantoea stewartii (organism)", "SNOMED-CT", "131300002"), - INQUILINUS_LIMOSUS_ORGANISM("Inquilinus limosus (organism)", null, "SNOMED-CT", "427977006"), + SALMONELLA_CHOLERAESUIS_VAR_KUNZENDORF("Salmonella Choleraesuis var. Kunzendorf", "Salmonella Choleraesuis var. Kunzendorf", "SNOMED-CT", "370577001"), - CORYNEBACTERIUM_GLUCURONOLYTICUM_ORGANISM("Corynebacterium glucuronolyticum (organism)", null, "SNOMED-CT", "413927008"), + BREVUNDIMONAS_VESICULARIS_ORGANISM("Brevundimonas vesicularis (organism)", "Brevundimonas vesicularis (organism)", "SNOMED-CT", "113690000"), - GENUS_ACINETOBACTER_ORGANISM("Genus Acinetobacter (organism)", null, "SNOMED-CT", "7757008"), + LEGIONELLA_PNEUMOPHILA_SEROGROUP6_ORGANISM("Legionella pneumophila serogroup 6 (organism)", "Legionella pneumophila serogroup 6 (organism)", "SNOMED-CT", "103468001"), - ENTEROBACTER_PYRINUS("Enterobacter pyrinus", null, "SNOMED-CT", "114455007"), + ENTEROBACTER_KOBEI_ORGANISM("Enterobacter kobei (organism)", "Enterobacter kobei (organism)", "SNOMED-CT", "114456008"), - LEGIONELLA_TUCSONENSIS_ORGANISM("Legionella tucsonensis (organism)", null, "SNOMED-CT", "103461007"), + BURKHOLDERIA_DOLOSA("Burkholderia dolosa", "Burkholderia dolosa", "SNOMED-CT", "431173006"), - SUBGENUS_MORAXELLA_ORGANISM("Subgenus Moraxella (organism)", null, "SNOMED-CT", "427057001"), + LEGIONELLA_PNEUMOPHILIA_SEROGROUP11_ORGANISM("Legionella pneumophilia serogroup 11 (organism)", "Legionella pneumophilia serogroup 11 (organism)", "SNOMED-CT", "131323004"), - PASTEURELLA_MULTOCIDA_ORGANISM("Pasteurella multocida (organism)", null, "SNOMED-CT", "10879005"), + BACTEROIDES_FRAGILIS_ORGANISM("Bacteroides fragilis (organism)", "Bacteroides fragilis (organism)", "SNOMED-CT", "55247009"), - MORGANELLA_MORGANII_SUBSP_MORGANII_ORGANISM("Morganella morganii subsp morganii (organism)", null, "SNOMED-CT", "243302003"), + STREPTOCOCCUS_DYSGALACTIAE_SUBSPECIES_EQUISIMILIS_ORGANISM("Streptococcus dysgalactiae subspecies equisimilis (organism)", "Streptococcus dysgalactiae subspecies equisimilis (organism)", "SNOMED-CT", "128338004"), - ENTEROCOCCUS_FAECIUM_ORGANISM("Enterococcus faecium (organism)", null, "SNOMED-CT", "90272000"), + CANDIDA_UTILIS_ORGANISM("Candida utilis (organism)", "Candida utilis (organism)", "SNOMED-CT", "243464000"), - SALMONELLA_OHIO("Salmonella Ohio", null, "SNOMED-CT", "67210008"), + ESCHERICHIA_COLI_ORGANISM("Escherichia coli (organism)", "Escherichia coli (organism)", "SNOMED-CT", "112283007"), - SALMONELLA_STANLEY("Salmonella Stanley", null, "SNOMED-CT", "88091007"), + AEROMONAS_VERONII_ORGANISM("Aeromonas veronii (organism)", "Aeromonas veronii (organism)", "SNOMED-CT", "9281006"), - MUCOID_PSEUDOMONAS_AERUGINOSA_ORGANISM("Mucoid Pseudomonas aeruginosa (organism)", null, "SNOMED-CT", "733537009"), + SALMONELLA_NEWPORT("Salmonella Newport", "Salmonella Newport", "SNOMED-CT", "56077000"), - LEGIONELLA_PNEUMOPHILA_ORGANISM("Legionella pneumophila (organism)", null, "SNOMED-CT", "80897008"), + STREPTOCOCCUS_CONSTELLATUS_ORGANISM("Streptococcus constellatus (organism)", "Streptococcus constellatus (organism)", "SNOMED-CT", "76199005"), - GARDNERELLA_VAGINALIS_ORGANISM("Gardnerella vaginalis (organism)", null, "SNOMED-CT", "64071004"), + CANDIDA_LUSITANIAE_ORGANISM("Candida lusitaniae (organism)", "Candida lusitaniae (organism)", "SNOMED-CT", "47608006"), - LACTOBACILLUS_RHAMNOSUS_ORGANISM("Lactobacillus rhamnosus (organism)", null, "SNOMED-CT", "113798001"), + MORAXELLA_LACUNATA_ORGANISM("Moraxella lacunata (organism)", "Moraxella lacunata (organism)", "SNOMED-CT", "84066001"), - CANDIDA_UTILIS_ORGANISM("Candida utilis (organism)", null, "SNOMED-CT", "243464000"), + SALMONELLA_PANAMA("Salmonella Panama", "Salmonella Panama", "SNOMED-CT", "40114001"), - LACTOBACILLUS_CASEI_ORGANISM("Lactobacillus casei (organism)", null, "SNOMED-CT", "1017006"), + CORYNEBACTERIUM_PSEUDODIPHTHERITICUM_ORGANISM("Corynebacterium pseudodiphtheriticum (organism)", "Corynebacterium pseudodiphtheriticum (organism)", "SNOMED-CT", "12050008"), - BACILLUS_LICHENIFORMIS_ORGANISM("Bacillus licheniformis (organism)", null, "SNOMED-CT", "74867004"), + ACTINOMYCES_NEUII_ORGANISM("Actinomyces neuii (organism)", "Actinomyces neuii (organism)", "SNOMED-CT", "877802991000087109"), - STREPTOCOCCUS_EQUINUS_ORGANISM("Streptococcus equinus (organism)", null, "SNOMED-CT", "72646003"), + ASPERGILLUS_FUMIGATUS_SPECIES_COMPLEX_ORGANISM("Aspergillus fumigatus species complex (organism)", "Aspergillus fumigatus species complex (organism)", "SNOMED-CT", "719029007"), - BACTEROIDES_VULGATUS_ORGANISM("Bacteroides vulgatus (organism)", null, "SNOMED-CT", "52798008"), + CRONOBACTER_MALONATICUS("Cronobacter malonaticus", "Cronobacter malonaticus", "SNOMED-CT", "445560007"), - SALMONELLA_GROUP_O35_ORGANISM("Salmonella group O:35 (organism)", null, "SNOMED-CT", "404341009"), + HAEMOPHILUS_PARAINFLUENZAE_ORGANISM("Haemophilus parainfluenzae (organism)", "Haemophilus parainfluenzae (organism)", "SNOMED-CT", "51593004"), - SALMONELLA_ORANIENBURG("Salmonella Oranienburg", null, "SNOMED-CT", "46667007"), + LEGIONELLA_TUCSONENSIS_ORGANISM("Legionella tucsonensis (organism)", "Legionella tucsonensis (organism)", "SNOMED-CT", "103461007"), - SALMONELLA_MONTEVIDEO("Salmonella Montevideo", null, "SNOMED-CT", "80268001"), + GENUS_PICHIA_ORGANISM("Genus Pichia (organism)", "Genus Pichia (organism)", "SNOMED-CT", "4163004"), - PARABURKHOLDERIA_TROPICA("Paraburkholderia tropica", null, "SNOMED-CT", "431175004"), + YEAST_ORGANISM("Yeast (organism)", "Yeast (organism)", "SNOMED-CT", "62093005"), - CITROBACTER_GILLENII("Citrobacter gillenii", null, "SNOMED-CT", "416990006"), + ENTEROBACTER_AMNIGENUS_BIOGROUP_II_ORGANISM("Enterobacter amnigenus biogroup II (organism)", "Enterobacter amnigenus biogroup II (organism)", "SNOMED-CT", "114453000"), - PANTOEA_ANANATIS_ORGANISM("Pantoea ananatis (organism)", null, "SNOMED-CT", "115014007"), + CRONOBACTER_DUBLINENSIS_SUBSPECIES_LAUSANNENSIS("Cronobacter dublinensis subspecies lausannensis", "Cronobacter dublinensis subspecies lausannensis", "SNOMED-CT", "5711000087108"), - PREVOTELLA_MELANINOGENICA_ORGANISM("Prevotella melaninogenica (organism)", null, "SNOMED-CT", "114144004"), + ASPERGILLUS_NIDULANS_GROUP_ORGANISM("Aspergillus nidulans Group (organism)", "Aspergillus nidulans Group (organism)", "SNOMED-CT", "415879008"), - LEGIONELLA_YABUUCHIAE_ORGANISM("Legionella yabuuchiae (organism)", null, "SNOMED-CT", "5131000146101"), + CLOSTRIDIOIDES_DIFFICILE_ORGANISM("Clostridioides difficile (organism)", "Clostridioides difficile (organism)", "SNOMED-CT", "5933001"), - LEGIONELLA_WADSWORTHII_ORGANISM("Legionella wadsworthii (organism)", null, "SNOMED-CT", "8147000"), + SALMONELLA_MONSCHAUI("Salmonella Monschaui", "Salmonella Monschaui", "SNOMED-CT", "65132007"), - GENUS_PEPTONIPHILUS_ORGANISM("Genus Peptoniphilus (organism)", null, "SNOMED-CT", "430742009"), + GENUS_PSEUDOMONAS_ORGANISM("Genus Pseudomonas (organism)", "Genus Pseudomonas (organism)", "SNOMED-CT", "57032008"), - ACHROMOBACTER_XYLOSOXIDANS_XYLOSOXIDANS_ORGANISM("Achromobacter xylosoxidans xylosoxidans (organism)", null, "SNOMED-CT", "423897003"), + PROTEUS_MYXOFACIENS_ORGANISM("Proteus myxofaciens (organism)", "Proteus myxofaciens (organism)", "SNOMED-CT", "86145008"), - BURKHOLDERIA_PSEUDOMALLEI_ORGANISM("Burkholderia pseudomallei (organism)", null, "SNOMED-CT", "116399000"), + RHODOTORULA_RUBRA_ORGANISM("Rhodotorula rubra (organism)", "Rhodotorula rubra (organism)", "SNOMED-CT", "86724009"), - ACINETOBACTER_BAYLYI_ORGANISM("Acinetobacter baylyi (organism)", null, "SNOMED-CT", "423974000"), + STAPHYLOCOCCUS_SACCHAROLYTICUS_ORGANISM("Staphylococcus saccharolyticus (organism)", "Staphylococcus saccharolyticus (organism)", "SNOMED-CT", "41103009"), - MORAXELLA_NONLIQUEFACIENS_ORGANISM("Moraxella nonliquefaciens (organism)", null, "SNOMED-CT", "46455003"), + CANDIDA_MAGNOLIAE_ORGANISM("Candida magnoliae (organism)", "Candida magnoliae (organism)", "SNOMED-CT", "446239009"), - GENUS_BACTEROIDES_ORGANISM("Genus Bacteroides (organism)", null, "SNOMED-CT", "57522007"), + EIKENELLA_CORRODENS_ORGANISM("Eikenella corrodens (organism)", "Eikenella corrodens (organism)", "SNOMED-CT", "52591004"), - EIKENELLA_CORRODENS_ORGANISM("Eikenella corrodens (organism)", null, "SNOMED-CT", "52591004"), + HAFNIA_ALVEI_ORGANISM("Hafnia alvei (organism)", "Hafnia alvei (organism)", "SNOMED-CT", "76694001"), - KLEBSIELLA_VARIICOLA_ORGANISM("Klebsiella variicola (organism)", null, "SNOMED-CT", "431976004"), + SERRATIA_GRIMESII_ORGANISM("Serratia grimesii (organism)", "Serratia grimesii (organism)", "SNOMED-CT", "115005002"), - SERRATIA_LIQUEFACIENS_COMPLEX_ORGANISM("Serratia liquefaciens complex (organism)", null, "SNOMED-CT", "722258003"), + SALMONELLA_BRANDENBURG("Salmonella Brandenburg", "Salmonella Brandenburg", "SNOMED-CT", "16888008"), - STAPHYLOCOCCUS_LUGDUNENSIS_ORGANISM("Staphylococcus lugdunensis (organism)", null, "SNOMED-CT", "103494005"), + SUBGENUS_MORAXELLA_ORGANISM("Subgenus Moraxella (organism)", "Subgenus Moraxella (organism)", "SNOMED-CT", "427057001"), - ALCALIGENES_FAECALIS_ORGANISM("Alcaligenes faecalis (organism)", null, "SNOMED-CT", "25223004"), + YERSINIA_ENTEROCOLITICA_SEROGROUP_O5_ORGANISM("Yersinia enterocolitica serogroup O:5 (organism)", "Yersinia enterocolitica serogroup O:5 (organism)", "SNOMED-CT", "103431004"), - BACTEROIDES_UNIFORMIS_ORGANISM("Bacteroides uniformis (organism)", null, "SNOMED-CT", "59604009"), + LEUCONOSTOC_LACTIS_ORGANISM("Leuconostoc lactis (organism)", "Leuconostoc lactis (organism)", "SNOMED-CT", "70285009"), - STENOTROPHOMONAS_MALTOPHILIA_ORGANISM("Stenotrophomonas maltophilia (organism)", null, "SNOMED-CT", "113697002"), + SALMONELLA_MANCHESTER("Salmonella Manchester", "Salmonella Manchester", "SNOMED-CT", "70605000"), - SALMONELLA_BAREILLY("Salmonella Bareilly", null, "SNOMED-CT", "8044005"), + LEGIONELLA_PNEUMOPHILIA_SEROGROUP13_ORGANISM("Legionella pneumophilia serogroup 13 (organism)", "Legionella pneumophilia serogroup 13 (organism)", "SNOMED-CT", "131325006"), - PROVIDENCIA_RUSTIGIANII_ORGANISM("Providencia rustigianii (organism)", null, "SNOMED-CT", "19196004"), + BIFIDOBACTERIUM_DENTIUM_ORGANISM("Bifidobacterium dentium (organism)", "Bifidobacterium dentium (organism)", "SNOMED-CT", "36623007"), - GENUS_CLOSTRIDIUM_ORGANISM("Genus Clostridium (organism)", null, "SNOMED-CT", "8191000"), + CLOSTRIDIUM_PERFRINGENS_ORGANISM("Clostridium perfringens (organism)", "Clostridium perfringens (organism)", "SNOMED-CT", "8331005"), - HAEMOPHILUS_INFLUENZAE_TYPE_B_ORGANISM("Haemophilus influenzae type b (organism)", null, "SNOMED-CT", "103442008"), + CRYPTOCOCCUS_ORGANISM("Cryptococcus (organism)", "Cryptococcus (organism)", "SNOMED-CT", "17579001"), - ASPERGILLUS_FUMIGATUS_ORGANISM("Aspergillus fumigatus (organism)", null, "SNOMED-CT", "32684000"), + MIXTA_CALIDA_ORGANISM("Mixta calida (organism)", "Mixta calida (organism)", "SNOMED-CT", "709310002"), - WANGIELLA_DERMATITIDIS_ORGANISM("Wangiella dermatitidis (organism)", null, "SNOMED-CT", "20586007"), + SALMONELLA_ALBANY("Salmonella Albany", "Salmonella Albany", "SNOMED-CT", "72033009"), - BURKHOLDERIA_PYRROCINIA("Burkholderia pyrrocinia", null, "SNOMED-CT", "113677007"), + STREPTOCOCCUS_VESTIBULARIS_ORGANISM("Streptococcus vestibularis (organism)", "Streptococcus vestibularis (organism)", "SNOMED-CT", "113998009"), - CLOSTRIDIUM_SEPTICUM_ORGANISM("Clostridium septicum (organism)", null, "SNOMED-CT", "33101000"), + LEGIONELLA_BIRMINGHAMENSIS_ORGANISM("Legionella birminghamensis (organism)", "Legionella birminghamensis (organism)", "SNOMED-CT", "22592008"), - BACILLUS_PUMILUS_ORGANISM("Bacillus pumilus (organism)", null, "SNOMED-CT", "16580009"), + STREPTOCOCCUS_VIRIDANS_GROUP_ORGANISM("Streptococcus, viridans group (organism)", "Streptococcus, viridans group (organism)", "SNOMED-CT", "31703004"), - CRONOBACTER_DUBLINENSIS_SUBSPECIES_LAUSANNENSIS("Cronobacter dublinensis subspecies lausannensis", null, "SNOMED-CT", "5711000087108"), + PANTOEA_AGGLOMERANS_ORGANISM("Pantoea agglomerans (organism)", "Pantoea agglomerans (organism)", "SNOMED-CT", "115015008"), - BACTEROIDES_STERCORIS_ORGANISM("Bacteroides stercoris (organism)", null, "SNOMED-CT", "163009"), + SERRATIA_PLYMUTHICA_ORGANISM("Serratia plymuthica (organism)", "Serratia plymuthica (organism)", "SNOMED-CT", "28955009"), - BURKHOLDERIA_STABILIS("Burkholderia stabilis", null, "SNOMED-CT", "416616001"), + ANAEROBIC_GRAM_NEGATIVE_BACILLUS_ORGANISM("Anaerobic Gram-negative bacillus (organism)", "Anaerobic Gram-negative bacillus (organism)", "SNOMED-CT", "243386003"), - SALMONELLA_CHOLERAESUIS_ORGANISM("Salmonella Choleraesuis (organism)", null, "SNOMED-CT", "80232006"), + BREVUNDIMONAS_AURANTIACA("Brevundimonas aurantiaca", "Brevundimonas aurantiaca", "SNOMED-CT", "423035009"), - SALMONELLA_GALLINARUM("Salmonella Gallinarum", null, "SNOMED-CT", "370576005"), + BETA_HEMOLYTIC_STREPTOCOCCUS_GROUP_A_ORGANISM("Beta-hemolytic Streptococcus, group A (organism)", "Beta-hemolytic Streptococcus, group A (organism)", "SNOMED-CT", "413643004"), - BACILLUS_MEGATERIUM_ORGANISM("Bacillus megaterium (organism)", null, "SNOMED-CT", "79109002"), + NEISSERIA_GONORRHOEAE_ORGANISM("Neisseria gonorrhoeae (organism)", "Neisseria gonorrhoeae (organism)", "SNOMED-CT", "68704007"), - ACINETOBACTER_BAUMANNII_ORGANISM("Acinetobacter baumannii (organism)", null, "SNOMED-CT", "91288006"), + BURKHOLDERIA_VIETNAMIENSIS_ORGANISM("Burkholderia vietnamiensis (organism)", "Burkholderia vietnamiensis (organism)", "SNOMED-CT", "113680008"), - HAEMOPHILUS_PARAINFLUENZAE_ORGANISM("Haemophilus parainfluenzae (organism)", null, "SNOMED-CT", "51593004"), + PEPTONIPHILUS_HAREI_ORGANISM("Peptoniphilus harei (organism)", "Peptoniphilus harei (organism)", "SNOMED-CT", "433373007"), - KOSAKONIA_RADICINCITANS("Kosakonia radicincitans", null, "SNOMED-CT", "8181000146108"), + SALMONELLA_ENTERICA_SUBSP_ENTERICA_ORGANISM("Salmonella enterica subsp. enterica (organism)", "Salmonella enterica subsp. enterica (organism)", "SNOMED-CT", "398508004"), - STREPTOCOCCUS_GALLOLYTICUS_SUBSPECIES_GALLOLYTICUS_ORGANISM("Streptococcus gallolyticus subspecies gallolyticus (organism)", null, "SNOMED-CT", "421544007"), + DERMABACTER_HOMINIS_ORGANISM("Dermabacter hominis (organism)", "Dermabacter hominis (organism)", "SNOMED-CT", "413977006"), - GENUS_PANTOEA_ORGANISM("Genus Pantoea (organism)", null, "SNOMED-CT", "115013001"), + MORGANELLA_MORGANII_SUBSP_SIBONII_ORGANISM("Morganella morganii subsp sibonii (organism)", "Morganella morganii subsp sibonii (organism)", "SNOMED-CT", "243303008"), - SALMONELLA_DUISBURG("Salmonella Duisburg", null, "SNOMED-CT", "42410007"), + STENOTROPHOMONAS_ACIDAMINIPHILA_ORGANISM("Stenotrophomonas acidaminiphila (organism)", "Stenotrophomonas acidaminiphila (organism)", "SNOMED-CT", "415583001"), - EGGERTHELLA_LENTA_ORGANISM("Eggerthella lenta (organism)", null, "SNOMED-CT", "414077004"), + LEGIONELLA_ERYTHRA_ORGANISM("Legionella erythra (organism)", "Legionella erythra (organism)", "SNOMED-CT", "28109006"), - STREPTOCOCCUS_CANIS_ORGANISM("Streptococcus canis (organism)", null, "SNOMED-CT", "88231003"), + SALMONELLA_SINSTORF("Salmonella Sinstorf", "Salmonella Sinstorf", "SNOMED-CT", "71443004"), - BACILLUS_CEREUS_GROUP_ORGANISM("Bacillus cereus group (organism)", null, "SNOMED-CT", "413618005"), + PSEUDOMONAS_MENDOCINA_ORGANISM("Pseudomonas mendocina (organism)", "Pseudomonas mendocina (organism)", "SNOMED-CT", "59419001"), - GENUS_ENTEROCOCCUS_ORGANISM("Genus Enterococcus (organism)", null, "SNOMED-CT", "2785000"), + ANAEROBIC_GRAM_POSITIVE_BACILLUS_ORGANISM("Anaerobic Gram-positive bacillus (organism)", "Anaerobic Gram-positive bacillus (organism)", "SNOMED-CT", "243398008"), - RAOULTELLA_ORNITHINOLYTICA_ORGANISM("Raoultella ornithinolytica (organism)", null, "SNOMED-CT", "416832000"), + ENTEROBACTER_HORMAECHEI_ORGANISM("Enterobacter hormaechei (organism)", "Enterobacter hormaechei (organism)", "SNOMED-CT", "114454006"), - CLOSTRIDIUM_RAMOSUM_ORGANISM("Clostridium ramosum (organism)", null, "SNOMED-CT", "42706008"), + BURKHOLDERIA_MALLEI("Burkholderia mallei", "Burkholderia mallei", "SNOMED-CT", "113674000"), - CORYNEBACTERIUM_AMYCOLATUM_ORGANISM("Corynebacterium amycolatum (organism)", null, "SNOMED-CT", "113611002"), + BURKHOLDERIA_PYRROCINIA("Burkholderia pyrrocinia", "Burkholderia pyrrocinia", "SNOMED-CT", "113677007"), - ACINETOBACTER_TJERNBERGIAE_ORGANISM("Acinetobacter tjernbergiae (organism)", null, "SNOMED-CT", "425109008"), + SALMONELLA_CHOLERAESUIS_ORGANISM("Salmonella Choleraesuis (organism)", "Salmonella Choleraesuis (organism)", "SNOMED-CT", "80232006"), - STREPTOCOCCUS_AGALACTIAE_SEROTYPE_IB_ORGANISM("Streptococcus agalactiae serotype Ib (organism)", null, "SNOMED-CT", "698166003"), + LEGIONELLA_PNEUMOPHILA_SEROGROUP2_ORGANISM("Legionella pneumophila serogroup 2 (organism)", "Legionella pneumophila serogroup 2 (organism)", "SNOMED-CT", "103464004"), - SALMONELLA_MANHATTAN("Salmonella Manhattan", null, "SNOMED-CT", "20073008"), + STENOTROPHOMONAS_NITRITIREDUCENS_ORGANISM("Stenotrophomonas nitritireducens (organism)", "Stenotrophomonas nitritireducens (organism)", "SNOMED-CT", "416746005"), - STAPHYLOCOCCUS_HAEMOLYTICUS_ORGANISM("Staphylococcus haemolyticus (organism)", null, "SNOMED-CT", "83452006"), + STREPTOCOCCUS_CONSTELLATUS_SUBSPECIES_CONSTELLATUS_ORGANISM("Streptococcus constellatus subspecies constellatus (organism)", "Streptococcus constellatus subspecies constellatus (organism)", "SNOMED-CT", "415601009"), - GENUS_ACTINOMYCES_ORGANISM("Genus Actinomyces (organism)", null, "SNOMED-CT", "40560008"), + BREVUNDIMONAS_NASDAE("Brevundimonas nasdae", "Brevundimonas nasdae", "SNOMED-CT", "424717001"), - CITROBACTER_KOSERI("Citrobacter koseri", null, "SNOMED-CT", "114264004"), + PARABURKHOLDERIA_TERRICOLA("Paraburkholderia terricola", "Paraburkholderia terricola", "SNOMED-CT", "431683009"), - PARABURKHOLDERIA_TUBERUM("Paraburkholderia tuberum", null, "SNOMED-CT", "431167005"), + CHRYSEOBACTERIUM_GLEUM_ORGANISM("Chryseobacterium gleum (organism)", "Chryseobacterium gleum (organism)", "SNOMED-CT", "113548000"), - CHRYSEOBACTERIUM_GLEUM_ORGANISM("Chryseobacterium gleum (organism)", null, "SNOMED-CT", "113548000"), + ACINETOBACTER_URSINGII_ORGANISM("Acinetobacter ursingii (organism)", "Acinetobacter ursingii (organism)", "SNOMED-CT", "424791004"), - ACTINOMYCES_TURICENSIS_ORGANISM("Actinomyces turicensis (organism)", null, "SNOMED-CT", "113422006"), + SALMONELLA_RICHMOND("Salmonella Richmond", "Salmonella Richmond", "SNOMED-CT", "31517006"), - ACINETOBACTER_URSINGII_ORGANISM("Acinetobacter ursingii (organism)", null, "SNOMED-CT", "424791004"), + ASPERGILLUS_NIGER_ORGANISM("Aspergillus niger (organism)", "Aspergillus niger (organism)", "SNOMED-CT", "89354002"), - SALMONELLA_RICHMOND("Salmonella Richmond", null, "SNOMED-CT", "31517006"), + MYCOBACTERIUM_BOVIS_ORGANISM("Mycobacterium bovis (organism)", "Mycobacterium bovis (organism)", "SNOMED-CT", "27142009"), - BURKHOLDERIA_CENOCEPACIA_ORGANISM("Burkholderia cenocepacia (organism)", null, "SNOMED-CT", "416941006"), + MYCOBACTERIUM_BOVIS_SUBSPECIES_BOVIS_ORGANISM("Mycobacterium bovis subspecies bovis (organism)", "Mycobacterium bovis subspecies bovis (organism)", "SNOMED-CT", "832924651000087107"), - ENTEROBACTER_LUDWIGII("Enterobacter ludwigii", null, "SNOMED-CT", "432763001"), + LEGIONELLA_ISRAELENSIS_ORGANISM("Legionella israelensis (organism)", "Legionella israelensis (organism)", "SNOMED-CT", "3128001"), - SALMONELLA_ADELAIDE("Salmonella Adelaide", null, "SNOMED-CT", "10343005"), + SALMONELLA_PARATYPHI_B_VAR_JAVA("Salmonella Paratyphi B var. Java", "Salmonella Paratyphi B var. Java", "SNOMED-CT", "128388007"), - MYCOBACTERIUM_AVIUM_ORGANISM("Mycobacterium avium (organism)", null, "SNOMED-CT", "83723009"), + ACINETOBACTER_TANDOII_ORGANISM("Acinetobacter tandoii (organism)", "Acinetobacter tandoii (organism)", "SNOMED-CT", "424021002"), - SALMONELLA_GROUP_O4_ORGANISM("Salmonella group O:4 (organism)", null, "SNOMED-CT", "398467008"), + PROTEUS_VULGARIS_ORGANISM("Proteus vulgaris (organism)", "Proteus vulgaris (organism)", "SNOMED-CT", "45834001"), - ACINETOBACTER_BEREZINIAE_ORGANISM("Acinetobacter bereziniae (organism)", null, "SNOMED-CT", "700398000"), + SALMONELLA_SEROGROUP_C_ORGANISM("Salmonella, serogroup C (organism)", "Salmonella, serogroup C (organism)", "SNOMED-CT", "116048001"), - HAEMOPHILUS_HAEMOLYTICUS_ORGANISM("Haemophilus haemolyticus (organism)", null, "SNOMED-CT", "54950008"), + LACTOCOCCUS_LACTIS_SUBSPECIES_LACTIS_ORGANISM("Lactococcus lactis subspecies lactis (organism)", "Lactococcus lactis subspecies lactis (organism)", "SNOMED-CT", "38518005"), - EUBACTERIUM_LIMOSUM_ORGANISM("Eubacterium limosum (organism)", null, "SNOMED-CT", "87632000"), + LEGIONELLA_PNEUMOPHILIA_SEROGROUP14_ORGANISM("Legionella pneumophilia serogroup 14 (organism)", "Legionella pneumophilia serogroup 14 (organism)", "SNOMED-CT", "131326007"), - ACINETOBACTER_TOWNERI_ORGANISM("Acinetobacter towneri (organism)", null, "SNOMED-CT", "424930007"), + PEDIOCOCCUS_ACIDILACTICI_ORGANISM("Pediococcus acidilactici (organism)", "Pediococcus acidilactici (organism)", "SNOMED-CT", "243237003"), - BREVUNDIMONAS_DIMINUTA_ORGANISM("Brevundimonas diminuta (organism)", null, "SNOMED-CT", "113689009"), + GENUS_ALCALIGENES_ORGANISM("Genus Alcaligenes (organism)", "Genus Alcaligenes (organism)", "SNOMED-CT", "68571003"), - SALMONELLA_AGONA("Salmonella Agona", null, "SNOMED-CT", "80627004"), + ASPERGILLUS_USTUS_ORGANISM("Aspergillus ustus (organism)", "Aspergillus ustus (organism)", "SNOMED-CT", "23179008"), - GENUS_CITROBACTER_ORGANISM("Genus Citrobacter (organism)", null, "SNOMED-CT", "75972000"), + CLOSTRIDIUM_RAMOSUM_ORGANISM("Clostridium ramosum (organism)", "Clostridium ramosum (organism)", "SNOMED-CT", "42706008"), - PANTOEA_AGGLOMERANS_ORGANISM("Pantoea agglomerans (organism)", null, "SNOMED-CT", "115015008"), + KOCURIA_KRISTINAE_ORGANISM("Kocuria kristinae (organism)", "Kocuria kristinae (organism)", "SNOMED-CT", "113772007"), - LEGIONELLA_PNEUMOPHILIA_SEROGROUP13_ORGANISM("Legionella pneumophilia serogroup 13 (organism)", null, "SNOMED-CT", "131325006"), + CAMPYLOBACTER_JEJUNI_ORGANISM("Campylobacter jejuni (organism)", "Campylobacter jejuni (organism)", "SNOMED-CT", "66543000"), - GENUS_PASTEURELLA_ORGANISM("Genus Pasteurella (organism)", null, "SNOMED-CT", "87579009"), + PANTOEA_SEPTICA_ORGANISM("Pantoea septica (organism)", "Pantoea septica (organism)", "SNOMED-CT", "5681000146105"), - SALMONELLA_KENTUCKY("Salmonella Kentucky", null, "SNOMED-CT", "8455004"), + STREPTOCOCCUS_ORALIS_ORGANISM("Streptococcus oralis (organism)", "Streptococcus oralis (organism)", "SNOMED-CT", "19870004"), - ROTHIA_DENTOCARIOSA_ORGANISM("Rothia dentocariosa (organism)", null, "SNOMED-CT", "35379007"), + PREVOTELLA_INTERMEDIA_ORGANISM("Prevotella intermedia (organism)", "Prevotella intermedia (organism)", "SNOMED-CT", "114142000"), - ASPERGILLUS_FLAVUS_ORGANISM("Aspergillus flavus (organism)", null, "SNOMED-CT", "66821001"), + LEGIONELLA_BRUNENSIS_ORGANISM("Legionella brunensis (organism)", "Legionella brunensis (organism)", "SNOMED-CT", "103448007"), - PARABURKHOLDERIA_PHENAZINIUM("Paraburkholderia phenazinium", null, "SNOMED-CT", "431166001"), + STREPTOCOCCUS_AGALACTIAE_ORGANISM("Streptococcus agalactiae (organism)", "Streptococcus agalactiae (organism)", "SNOMED-CT", "43492007"), - ENTEROCOCCUS_HIRAE_ORGANISM("Enterococcus hirae (organism)", null, "SNOMED-CT", "73852008"), + STREPTOCOCCUS_MITIS_GROUP_ORGANISM("Streptococcus mitis group (organism)", "Streptococcus mitis group (organism)", "SNOMED-CT", "127539005"), - GENUS_MYCOBACTERIUM_ORGANISM("Genus Mycobacterium (organism)", null, "SNOMED-CT", "243368001"), + ACINETOBACTER_GENOSPECIES11_ORGANISM("Acinetobacter genospecies 11 (organism)", "Acinetobacter genospecies 11 (organism)", "SNOMED-CT", "113380002"), - CANDIDA_DUBLINIENSIS_ORGANISM("Candida dubliniensis (organism)", null, "SNOMED-CT", "115952006"), + PARABURKHOLDERIA_ANDROPOGONIS("Paraburkholderia andropogonis", "Paraburkholderia andropogonis", "SNOMED-CT", "113667005"), - SERRATIA_FICARIA_ORGANISM("Serratia ficaria (organism)", null, "SNOMED-CT", "802004"), + BREVUNDIMONAS_INTERMEDIA("Brevundimonas intermedia", "Brevundimonas intermedia", "SNOMED-CT", "423923008"), - ACINETOBACTER_DIJKSHOORNIAE_ORGANISM("Acinetobacter dijkshoorniae (organism)", null, "SNOMED-CT", "787183008"), + CORYNEBACTERIUM_AFERMENTANS_ORGANISM("Corynebacterium afermentans (organism)", "Corynebacterium afermentans (organism)", "SNOMED-CT", "113608003"), - PARABURKHOLDERIA_TERRICOLA("Paraburkholderia terricola", null, "SNOMED-CT", "431683009"), + NEISSERIA_SUBFLAVA_ORGANISM("Neisseria subflava (organism)", "Neisseria subflava (organism)", "SNOMED-CT", "77700001"), - ASPERGILLUS_SPECIES_NOT_ASPERGILLUS_FUMIGATUS_ORGANISM("Aspergillus species not Aspergillus fumigatus (organism)", null, "SNOMED-CT", "413584009"), + CORYNEBACTERIUM_TUBERCULOSTEARICUM_ORGANISM("Corynebacterium tuberculostearicum (organism)", "Corynebacterium tuberculostearicum (organism)", "SNOMED-CT", "416356007"), - GENUS_GEOTRICHUM_ORGANISM("Genus Geotrichum (organism)", null, "SNOMED-CT", "34324005"), + BACILLUS_THURINGIENSIS_ORGANISM("Bacillus thuringiensis (organism)", "Bacillus thuringiensis (organism)", "SNOMED-CT", "64840009"), - PREVOTELLA_BIVIA_ORGANISM("Prevotella bivia (organism)", null, "SNOMED-CT", "114131009"), + STREPTOCOCCUS_ANGINOSUS_GROUP_ORGANISM("Streptococcus anginosus group (organism)", "Streptococcus anginosus group (organism)", "SNOMED-CT", "415597009"), - MORGANELLA_MORGANII_SUBSP_SIBONII_ORGANISM("Morganella morganii subsp sibonii (organism)", null, "SNOMED-CT", "243303008"), + PAENIBACILLUS_MACERANS_ORGANISM("Paenibacillus macerans (organism)", "Paenibacillus macerans (organism)", "SNOMED-CT", "114101003"), - SAPROCHAETE_CAPITATA_ORGANISM("Saprochaete capitata (organism)", null, "SNOMED-CT", "67999003"), + PARABURKHOLDERIA_FUNGORUM_ORGANISM("Paraburkholderia fungorum (organism)", "Paraburkholderia fungorum (organism)", "SNOMED-CT", "417285005"), - STREPTOCOCCUS_CONSTELLATUS_SUBSPECIES_PHARYNGIS_ORGANISM("Streptococcus constellatus subspecies pharyngis (organism)", null, "SNOMED-CT", "415602002"), + FINEGOLDIA_MAGNA_ORGANISM("Finegoldia magna (organism)", "Finegoldia magna (organism)", "SNOMED-CT", "417469002"), - PSEUDOMONAS_STUTZERI_ORGANISM("Pseudomonas stutzeri (organism)", null, "SNOMED-CT", "58024003"), + ASPERGILLUS_GLAUCUS("Aspergillus glaucus", "Aspergillus glaucus", "SNOMED-CT", "19556009"), - STREPTOCOCCUS_SALIVARIUS_SUBSPECIES_THERMOPHILUS_ORGANISM("Streptococcus salivarius subspecies thermophilus (organism)", null, "SNOMED-CT", "23310006"), + CANDIDA_DUBLINIENSIS_ORGANISM("Candida dubliniensis (organism)", "Candida dubliniensis (organism)", "SNOMED-CT", "115952006"), - SALMONELLA_BRAENDERUP("Salmonella Braenderup", null, "SNOMED-CT", "35225001"), + STREPTOCOCCUS_SANGUINIS_ORGANISM("Streptococcus sanguinis (organism)", "Streptococcus sanguinis (organism)", "SNOMED-CT", "113993000"), - LEGIONELLA_ISRAELENSIS_ORGANISM("Legionella israelensis (organism)", null, "SNOMED-CT", "3128001"), + PROVIDENCIA_RUSTIGIANII_ORGANISM("Providencia rustigianii (organism)", "Providencia rustigianii (organism)", "SNOMED-CT", "19196004"), - HAEMOPHILUS_INFLUENZAE_ORGANISM("Haemophilus influenzae (organism)", null, "SNOMED-CT", "44470000"), + SHIGELLA_FLEXNERI_ORGANISM("Shigella flexneri (organism)", "Shigella flexneri (organism)", "SNOMED-CT", "85729005"), - GENUS_SHIGELLA_ORGANISM("Genus Shigella (organism)", null, "SNOMED-CT", "77352002"), + BURKHOLDERIA_MULTIVORANS_ORGANISM("Burkholderia multivorans (organism)", "Burkholderia multivorans (organism)", "SNOMED-CT", "113675004"), - ESCHERICHIA_VULNERIS_ORGANISM("Escherichia vulneris (organism)", null, "SNOMED-CT", "53013003"), + CITROBACTER_MURLINIAE("Citrobacter murliniae", "Citrobacter murliniae", "SNOMED-CT", "417581000"), - YERSINIA_ENTEROCOLITICA_ORGANISM("Yersinia enterocolitica (organism)", null, "SNOMED-CT", "65255000"), + PREVOTELLA_NANCEIENSIS_ORGANISM("Prevotella nanceiensis (organism)", "Prevotella nanceiensis (organism)", "SNOMED-CT", "441625003"), - KOCURIA_KRISTINAE_ORGANISM("Kocuria kristinae (organism)", null, "SNOMED-CT", "113772007"), + GENUS_ACINETOBACTER_ORGANISM("Genus Acinetobacter (organism)", "Genus Acinetobacter (organism)", "SNOMED-CT", "7757008"), - SALMONELLA_WIEN("Salmonella Wien", null, "SNOMED-CT", "21975008"), + ASPERGILLUS_SPECIES_NOT_ASPERGILLUS_FUMIGATUS_ORGANISM("Aspergillus species not Aspergillus fumigatus (organism)", "Aspergillus species not Aspergillus fumigatus (organism)", "SNOMED-CT", "413584009"), - AEROMONAS_VERONII_ORGANISM("Aeromonas veronii (organism)", null, "SNOMED-CT", "9281006"), + STAPHYLOCOCCUS_PASTEURI_ORGANISM("Staphylococcus pasteuri (organism)", "Staphylococcus pasteuri (organism)", "SNOMED-CT", "103495006"), - STREPTOCOCCUS_CRISTATUS_ORGANISM("Streptococcus cristatus (organism)", null, "SNOMED-CT", "113980005"), + PREVOTELLA_BIVIA_ORGANISM("Prevotella bivia (organism)", "Prevotella bivia (organism)", "SNOMED-CT", "114131009"), - SALMONELLA_PANAMA("Salmonella Panama", null, "SNOMED-CT", "40114001"), + MORGANELLA_MORGANII_ORGANISM("Morganella morganii (organism)", "Morganella morganii (organism)", "SNOMED-CT", "243301005"), - STREPTOCOCCUS_CONSTELLATUS_SUBSPECIES_CONSTELLATUS_ORGANISM("Streptococcus constellatus subspecies constellatus (organism)", null, "SNOMED-CT", "415601009"), + PREVOTELLA_BUCCAE_ORGANISM("Prevotella buccae (organism)", "Prevotella buccae (organism)", "SNOMED-CT", "114134001"), - BACILLUS_SIMPLEX_ORGANISM("Bacillus simplex (organism)", null, "SNOMED-CT", "113479004"), + KLUYVERA_INTERMEDIA("Kluyvera intermedia", "Kluyvera intermedia", "SNOMED-CT", "431977008"), - PROVIDENCIA_VERMICOLA_ORGANISM("Providencia vermicola (organism)", null, "SNOMED-CT", "6031000146109"), + PROVIDENCIA_VERMICOLA_ORGANISM("Providencia vermicola (organism)", "Providencia vermicola (organism)", "SNOMED-CT", "6031000146109"), - ANAEROBIC_BACTERIA_ORGANISM("Anaerobic bacteria (organism)", null, "SNOMED-CT", "59343002"), + CUTIBACTERIUM_ACNES_ORGANISM("Cutibacterium acnes (organism)", "Cutibacterium acnes (organism)", "SNOMED-CT", "39473003"), - AEROMONAS_TROTA_ORGANISM("Aeromonas trota (organism)", null, "SNOMED-CT", "243316008"), + PASTEURELLA_CANIS_ORGANISM("Pasteurella canis (organism)", "Pasteurella canis (organism)", "SNOMED-CT", "7784009"), - GENUS_MYROIDES_ORGANISM("Genus Myroides (organism)", null, "SNOMED-CT", "115127008"), + LEGIONELLA_YABUUCHIAE_ORGANISM("Legionella yabuuchiae (organism)", "Legionella yabuuchiae (organism)", "SNOMED-CT", "5131000146101"), - ROTHIA_MUCILAGINOSA_ORGANISM("Rothia mucilaginosa (organism)", null, "SNOMED-CT", "416544005"), + HAEMOPHILUS_HAEMOLYTICUS_ORGANISM("Haemophilus haemolyticus (organism)", "Haemophilus haemolyticus (organism)", "SNOMED-CT", "54950008"), - BURKHOLDERIA_CEPACIA_COMPLEX_ORGANISM("Burkholderia cepacia complex (organism)", null, "SNOMED-CT", "131281002"), + BACILLUS_CIRCULANS_ORGANISM("Bacillus circulans (organism)", "Bacillus circulans (organism)", "SNOMED-CT", "71812004"), - STAPHYLOCOCCUS_PASTEURI_ORGANISM("Staphylococcus pasteuri (organism)", null, "SNOMED-CT", "103495006"), + LEGIONELLA_RUBRILUCENS_ORGANISM("Legionella rubrilucens (organism)", "Legionella rubrilucens (organism)", "SNOMED-CT", "17298000"), - GENUS_NEISSERIA_ORGANISM("Genus Neisseria (organism)", null, "SNOMED-CT", "59083001"), + STREPTOCOCCUS_GORDONII_ORGANISM("Streptococcus gordonii (organism)", "Streptococcus gordonii (organism)", "SNOMED-CT", "113986004"), - PSEUDOMONAS_SPECIES_NOT_AERUGINOSA_ORGANISM("Pseudomonas species not aeruginosa (organism)", null, "SNOMED-CT", "710336008"), + PASTEURELLA_STOMATIS_ORGANISM("Pasteurella stomatis (organism)", "Pasteurella stomatis (organism)", "SNOMED-CT", "46827009"), - ENTEROCOCCUS_MALODORATUS_ORGANISM("Enterococcus malodoratus (organism)", null, "SNOMED-CT", "10262005"), + PSEUDOMONAS_PUTIDA_ORGANISM("Pseudomonas putida (organism)", "Pseudomonas putida (organism)", "SNOMED-CT", "68608003"), - GENUS_AEROCOCCUS_ORGANISM("Genus Aerococcus (organism)", null, "SNOMED-CT", "9008009"), + ASPERGILLUS_FLAVUS_ORGANISM("Aspergillus flavus (organism)", "Aspergillus flavus (organism)", "SNOMED-CT", "66821001"), - AEROMONAS_ENCHELEIA_ORGANISM("Aeromonas encheleia (organism)", null, "SNOMED-CT", "115028001"), + MYCOBACTERIUM_CAPRAE_ORGANISM("Mycobacterium caprae (organism)", "Mycobacterium caprae (organism)", "SNOMED-CT", "430579009"), - SALMONELLA_PARATYPHI_B("Salmonella Paratyphi B", null, "SNOMED-CT", "85908006"), + SALMONELLA_TYPHI_ORGANISM("Salmonella Typhi (organism)", "Salmonella Typhi (organism)", "SNOMED-CT", "5595000"), - PROVIDENCIA_ALCALIFACIENS_ORGANISM("Providencia alcalifaciens (organism)", null, "SNOMED-CT", "46349009"), + STREPTOCOCCUS_EQUINUS_ORGANISM("Streptococcus equinus (organism)", "Streptococcus equinus (organism)", "SNOMED-CT", "72646003"), - BORDETELLA_PERTUSSIS_ORGANISM("Bordetella pertussis (organism)", null, "SNOMED-CT", "5247005"), + GENUS_PREVOTELLA_ORGANISM("Genus Prevotella (organism)", "Genus Prevotella (organism)", "SNOMED-CT", "114129000"), - ACINETOBACTER_NOSOCOMIALIS_ORGANISM("Acinetobacter nosocomialis (organism)", null, "SNOMED-CT", "708859003"), + ASPERGILLUS_TAMARII_ORGANISM("Aspergillus tamarii (organism)", "Aspergillus tamarii (organism)", "SNOMED-CT", "3111000146107"), - BURKHOLDERIA_GLADIOLI_ORGANISM("Burkholderia gladioli (organism)", null, "SNOMED-CT", "113671008"), + CANDIDA_SPECIES_NOT_CANDIDA_ALBICANS_ORGANISM("Candida species not Candida albicans (organism)", "Candida species not Candida albicans (organism)", "SNOMED-CT", "714313009"), - AEROMONAS_POPOFFII_ORGANISM("Aeromonas popoffii (organism)", null, "SNOMED-CT", "115035009"), + AEROMONAS_ENCHELEIA_ORGANISM("Aeromonas encheleia (organism)", "Aeromonas encheleia (organism)", "SNOMED-CT", "115028001"), - SERRATIA_LIQUEFACIENS_ORGANISM("Serratia liquefaciens (organism)", null, "SNOMED-CT", "23787004"), + PARABURKHOLDERIA_TROPICA("Paraburkholderia tropica", "Paraburkholderia tropica", "SNOMED-CT", "431175004"), - CITROBACTER_MURLINIAE("Citrobacter murliniae", null, "SNOMED-CT", "417581000"), + LACTOBACILLUS_GASSERI_ORGANISM("Lactobacillus gasseri (organism)", "Lactobacillus gasseri (organism)", "SNOMED-CT", "71158000"), - SHIGELLA_DYSENTERIAE_ORGANISM("Shigella dysenteriae (organism)", null, "SNOMED-CT", "43612004"), + SHIGELLA_BOYDII_ORGANISM("Shigella boydii (organism)", "Shigella boydii (organism)", "SNOMED-CT", "55462008"), - PSEUDOMONAS_PUTIDA_ORGANISM("Pseudomonas putida (organism)", null, "SNOMED-CT", "68608003"), + KLEBSIELLA_OXYTOCA_ORGANISM("Klebsiella oxytoca (organism)", "Klebsiella oxytoca (organism)", "SNOMED-CT", "40886007"), - NON_TOXIGENIC_CLOSTRIDIUM_DIFFICILE_ORGANISM("Non-Toxigenic Clostridium difficile (organism)", null, "SNOMED-CT", "736051005"), + GENUS_MYCOBACTERIUM_ORGANISM("Genus Mycobacterium (organism)", "Genus Mycobacterium (organism)", "SNOMED-CT", "243368001"), - LEGIONELLA_PNEUMOPHILA_SEROGROUP3_ORGANISM("Legionella pneumophila serogroup 3 (organism)", null, "SNOMED-CT", "103465003"), + LEGIONELLA_BOZEMANAE_ORGANISM("Legionella bozemanae (organism)", "Legionella bozemanae (organism)", "SNOMED-CT", "450611004"), - LEGIONELLA_LANSINGENSIS_ORGANISM("Legionella lansingensis (organism)", null, "SNOMED-CT", "103452007"), + BURKHOLDERIA_GLUMAE("Burkholderia glumae", "Burkholderia glumae", "SNOMED-CT", "113673006"), - STAPHYLOCOCCUS_PETTENKOFERI_ORGANISM("Staphylococcus pettenkoferi (organism)", null, "SNOMED-CT", "428731005"), + PREVOTELLA_DISIENS_ORGANISM("Prevotella disiens (organism)", "Prevotella disiens (organism)", "SNOMED-CT", "114139006"), - CITROBACTER_RODENTIUM("Citrobacter rodentium", null, "SNOMED-CT", "114444007"), + AEROMONAS_POPOFFII_ORGANISM("Aeromonas popoffii (organism)", "Aeromonas popoffii (organism)", "SNOMED-CT", "115035009"), - MYCOBACTERIUM_GORDONAE_ORGANISM("Mycobacterium gordonae (organism)", null, "SNOMED-CT", "24871004"), + PARABURKHOLDERIA_PHYMATUM("Paraburkholderia phymatum", "Paraburkholderia phymatum", "SNOMED-CT", "431165002"), - FAMILY_ENTEROBACTERIACEAE_ORGANISM("Family Enterobacteriaceae (organism)", null, "SNOMED-CT", "106544002"), + ACINETOBACTER_TOWNERI_ORGANISM("Acinetobacter towneri (organism)", "Acinetobacter towneri (organism)", "SNOMED-CT", "424930007"), - CRYPTOCOCCUS_ORGANISM("Cryptococcus (organism)", null, "SNOMED-CT", "17579001"), + ACINETOBACTER_BAYLYI_ORGANISM("Acinetobacter baylyi (organism)", "Acinetobacter baylyi (organism)", "SNOMED-CT", "423974000"), - SALMONELLA_HAVANA("Salmonella Havana", null, "SNOMED-CT", "38788001"), + ANAEROBIC_BACTERIA_ORGANISM("Anaerobic bacteria (organism)", "Anaerobic bacteria (organism)", "SNOMED-CT", "59343002"), - PREVOTELLA_NANCEIENSIS_ORGANISM("Prevotella nanceiensis (organism)", null, "SNOMED-CT", "441625003"), + PSEUDOMONAS_CITRONELLOLIS_ORGANISM("Pseudomonas citronellolis (organism)", "Pseudomonas citronellolis (organism)", "SNOMED-CT", "31277003"), - ACTINOMYCES_ODONTOLYTICUS_ORGANISM("Actinomyces odontolyticus (organism)", null, "SNOMED-CT", "12069003"), + SALMONELLA_OHIO("Salmonella Ohio", "Salmonella Ohio", "SNOMED-CT", "67210008"), - STENOTROPHOMONAS_ACIDAMINIPHILA_ORGANISM("Stenotrophomonas acidaminiphila (organism)", null, "SNOMED-CT", "415583001"), + NEOSARTORYA_HIRATSUKAE_ORGANISM("Neosartorya hiratsukae (organism)", "Neosartorya hiratsukae (organism)", "SNOMED-CT", "414835000"), - STREPTOCOCCUS_SALIVARIUS_GROUP_ORGANISM("Streptococcus salivarius group (organism)", null, "SNOMED-CT", "127537007"), + ACTINOMYCES_NAESLUNDII_ORGANISM("Actinomyces naeslundii (organism)", "Actinomyces naeslundii (organism)", "SNOMED-CT", "8940004"), - AEROMONAS_EUCRENOPHILIA_ORGANISM("Aeromonas eucrenophilia (organism)", null, "SNOMED-CT", "115030004"), + SALMONELLA_SPECIES("Salmonella species", "Salmonella species", "SNOMED-CT", "27268008"), - LEGIONELLA_PNEUMOPHILA_SEROGROUP7_ORGANISM("Legionella pneumophila serogroup 7 (organism)", null, "SNOMED-CT", "103469009"), + SERRATIA_RUBIDAEA_ORGANISM("Serratia rubidaea (organism)", "Serratia rubidaea (organism)", "SNOMED-CT", "55825002"), - SALMONELLA_SEROGROUP_C_ORGANISM("Salmonella, serogroup C (organism)", null, "SNOMED-CT", "116048001"), + PREVOTELLA_ORIS_ORGANISM("Prevotella oris (organism)", "Prevotella oris (organism)", "SNOMED-CT", "114147006"), - CAMPYLOBACTER_JEJUNI_ORGANISM("Campylobacter jejuni (organism)", null, "SNOMED-CT", "66543000"), + CITROBACTER_GILLENII("Citrobacter gillenii", "Citrobacter gillenii", "SNOMED-CT", "416990006"), - STREPTOCOCCUS_GORDONII_ORGANISM("Streptococcus gordonii (organism)", null, "SNOMED-CT", "113986004"), + MYCOBACTERIUM_INTRACELLULARE_ORGANISM("Mycobacterium intracellulare (organism)", "Mycobacterium intracellulare (organism)", "SNOMED-CT", "83841006"), - KOSAKONIA_COWANII("Kosakonia cowanii", null, "SNOMED-CT", "416229008"), + CUPRIAVIDUS_PAUCULUS_ORGANISM("Cupriavidus pauculus (organism)", "Cupriavidus pauculus (organism)", "SNOMED-CT", "429465001"), - BREVUNDIMONAS_VESICULARIS_ORGANISM("Brevundimonas vesicularis (organism)", null, "SNOMED-CT", "113690000"), + ELIZABETHKINGIA_MIRICOLA_ORGANISM("Elizabethkingia miricola (organism)", "Elizabethkingia miricola (organism)", "SNOMED-CT", "444815005"), - LISTERIA_MONOCYTOGENES_ORGANISM("Listeria monocytogenes (organism)", null, "SNOMED-CT", "36094007"), + GRAM_POSITIVE_COCCUS_ORGANISM("Gram-positive coccus (organism)", "Gram-positive coccus (organism)", "SNOMED-CT", "59206002"), - MORGANELLA_MORGANII_ORGANISM("Morganella morganii (organism)", null, "SNOMED-CT", "243301005"), + ACINETOBACTER_NOSOCOMIALIS_ORGANISM("Acinetobacter nosocomialis (organism)", "Acinetobacter nosocomialis (organism)", "SNOMED-CT", "708859003"), - GENUS_PICHIA_ORGANISM("Genus Pichia (organism)", null, "SNOMED-CT", "4163004"), + CITROBACTER_FREUNDII_ORGANISM("Citrobacter freundii (organism)", "Citrobacter freundii (organism)", "SNOMED-CT", "6265002"), - PREVOTELLA_DISIENS_ORGANISM("Prevotella disiens (organism)", null, "SNOMED-CT", "114139006"), + BURKHOLDERIA_ANTHINA("Burkholderia anthina", "Burkholderia anthina", "SNOMED-CT", "417565005"), - GENUS_PROVIDENCIA_ORGANISM("Genus Providencia (organism)", null, "SNOMED-CT", "112284001"), + SERRATIA_QUINIVORANS_ORGANISM("Serratia quinivorans (organism)", "Serratia quinivorans (organism)", "SNOMED-CT", "438199009"), - CLOSTRIDIOIDES_DIFFICILE_ORGANISM("Clostridioides difficile (organism)", null, "SNOMED-CT", "5933001"), + GENUS_AEROCOCCUS_ORGANISM("Genus Aerococcus (organism)", "Genus Aerococcus (organism)", "SNOMED-CT", "9008009"), - STREPTOCOCCUS_PARASANGUINIS_ORGANISM("Streptococcus parasanguinis (organism)", null, "SNOMED-CT", "113990002"), + ENTEROCOCCUS_GALLINARUM_ORGANISM("Enterococcus gallinarum (organism)", "Enterococcus gallinarum (organism)", "SNOMED-CT", "53233007"), - TATUMELLA_TERREA_ORGANISM("Tatumella terrea (organism)", null, "SNOMED-CT", "8301000146102"), + CAMPYLOBACTER_UREOLYTICUS_ORGANISM("Campylobacter ureolyticus (organism)", "Campylobacter ureolyticus (organism)", "SNOMED-CT", "450602004"), - MYCOBACTERIUM_CAPRAE_ORGANISM("Mycobacterium caprae (organism)", null, "SNOMED-CT", "430579009"), + GRANULICATELLA_ADIACENS_ORGANISM("Granulicatella adiacens (organism)", "Granulicatella adiacens (organism)", "SNOMED-CT", "113713009"), - SERRATIA_PLYMUTHICA_ORGANISM("Serratia plymuthica (organism)", null, "SNOMED-CT", "28955009"), + ACHROMOBACTER_XYLOSOXIDANS_ORGANISM("Achromobacter xylosoxidans (organism)", "Achromobacter xylosoxidans (organism)", "SNOMED-CT", "413424009"), - AGGREGATIBACTER_ACTINOMYCETEMCOMITANS_ORGANISM("Aggregatibacter actinomycetemcomitans (organism)", null, "SNOMED-CT", "442680008"), + GENUS_PROPIONIBACTERIUM_ORGANISM("Genus Propionibacterium (organism)", "Genus Propionibacterium (organism)", "SNOMED-CT", "34844008"), - ACINETOBACTER_JUNII_ORGANISM("Acinetobacter junii (organism)", null, "SNOMED-CT", "13879009"), + SERRATIA_ENTOMOPHILA_ORGANISM("Serratia entomophila (organism)", "Serratia entomophila (organism)", "SNOMED-CT", "76656001"), - ACINETOBACTER_GERNERI_ORGANISM("Acinetobacter gerneri (organism)", null, "SNOMED-CT", "424700008"), + ASPERGILLUS_NIVEUS_ORGANISM("Aspergillus niveus (organism)", "Aspergillus niveus (organism)", "SNOMED-CT", "18651002"), - SERRATIA_FONTICOLA_ORGANISM("Serratia fonticola (organism)", null, "SNOMED-CT", "112329006"), + LACTOBACILLUS_PARACASEI_ORGANISM("Lactobacillus paracasei (organism)", "Lactobacillus paracasei (organism)", "SNOMED-CT", "113792000"), - PSEUDOMONAS_KOREENSIS_ORGANISM("Pseudomonas koreensis (organism)", null, "SNOMED-CT", "438724003"), + PASTEURELLA_MULTOCIDA_ORGANISM("Pasteurella multocida (organism)", "Pasteurella multocida (organism)", "SNOMED-CT", "10879005"), - YEAST_ORGANISM("Yeast (organism)", null, "SNOMED-CT", "62093005"), + GENUS_STREPTOCOCCUS_ORGANISM("Genus Streptococcus (organism)", "Genus Streptococcus (organism)", "SNOMED-CT", "58800005"), - BACTEROIDES_FRAGILIS_ORGANISM("Bacteroides fragilis (organism)", null, "SNOMED-CT", "55247009"), + BACTEROIDES_THETAIOTAOMICRON_ORGANISM("Bacteroides thetaiotaomicron (organism)", "Bacteroides thetaiotaomicron (organism)", "SNOMED-CT", "34236001"), - DERMABACTER_HOMINIS_ORGANISM("Dermabacter hominis (organism)", null, "SNOMED-CT", "413977006"), + YERSINIA_ENTEROCOLITICA_SEROGROUP_O3_ORGANISM("Yersinia enterocolitica serogroup O:3 (organism)", "Yersinia enterocolitica serogroup O:3 (organism)", "SNOMED-CT", "103430003"), - LEGIONELLA_PNEUMOPHILIA_SEROGROUP12_ORGANISM("Legionella pneumophilia serogroup 12 (organism)", null, "SNOMED-CT", "131324005"), + BURKHOLDERIA_CALEDONICA("Burkholderia caledonica", "Burkholderia caledonica", "SNOMED-CT", "423159001"), - BREVUNDIMONAS_NASDAE("Brevundimonas nasdae", null, "SNOMED-CT", "424717001"), + AGGREGATIBACTER_APHROPHILUS_ORGANISM("Aggregatibacter aphrophilus (organism)", "Aggregatibacter aphrophilus (organism)", "SNOMED-CT", "442683005"), - LEGIONELLA_PNEUMOPHILA_SEROGROUP2_ORGANISM("Legionella pneumophila serogroup 2 (organism)", null, "SNOMED-CT", "103464004"), + CRONOBACTER_TURICENSIS("Cronobacter turicensis", "Cronobacter turicensis", "SNOMED-CT", "445639005"), - ENTEROBACTER_CANCEROGENUS("Enterobacter cancerogenus", null, "SNOMED-CT", "114451003"), + EGGERTHELLA_LENTA_ORGANISM("Eggerthella lenta (organism)", "Eggerthella lenta (organism)", "SNOMED-CT", "414077004"), - SERRATIA_QUINIVORANS_ORGANISM("Serratia quinivorans (organism)", null, "SNOMED-CT", "438199009"), + INTERFERON_GAMMA_ASSAY_POSITIVE_FINDING("Interferon gamma assay positive (finding)", "Interferon gamma assay positive (finding)", "SNOMED-CT", "440662009"), - SALMONELLA_SINSTORF("Salmonella Sinstorf", null, "SNOMED-CT", "71443004"), + LEGIONELLA_PNEUMOPHILA_SEROGROUP4_ORGANISM("Legionella pneumophila serogroup 4 (organism)", "Legionella pneumophila serogroup 4 (organism)", "SNOMED-CT", "103466002"), - LACTOBACILLUS_JENSENII_ORGANISM("Lactobacillus jensenii (organism)", null, "SNOMED-CT", "65904004"), + ASPERGILLUS_NIDULANS_ORGANISM("Aspergillus nidulans (organism)", "Aspergillus nidulans (organism)", "SNOMED-CT", "60264008"), - LEGIONELLA_IMPLETISOLI_ORGANISM("Legionella impletisoli (organism)", null, "SNOMED-CT", "5121000146103"), + ACINETOBACTER_SCHINDLERI_ORGANISM("Acinetobacter schindleri (organism)", "Acinetobacter schindleri (organism)", "SNOMED-CT", "423732001"), - STAPHYLOCOCCUS_CAPRAE_ORGANISM("Staphylococcus caprae (organism)", null, "SNOMED-CT", "76969000"), + LEGIONELLA_PNEUMOPHILA_SEROGROUP7_ORGANISM("Legionella pneumophila serogroup 7 (organism)", "Legionella pneumophila serogroup 7 (organism)", "SNOMED-CT", "103469009"), - CANDIDA_TROPICALIS_ORGANISM("Candida tropicalis (organism)", null, "SNOMED-CT", "47885008"), + LEGIONELLA_DUMOFFII_ORGANISM("Legionella dumoffii (organism)", "Legionella dumoffii (organism)", "SNOMED-CT", "113720002"), - CUTIBACTERIUM_ACNES_ORGANISM("Cutibacterium acnes (organism)", null, "SNOMED-CT", "39473003"), + SHEWANELLA_PUTREFACIENS_ORGANISM("Shewanella putrefaciens (organism)", "Shewanella putrefaciens (organism)", "SNOMED-CT", "113700003"), - GENUS_PREVOTELLA_ORGANISM("Genus Prevotella (organism)", null, "SNOMED-CT", "114129000"), + GENUS_PEPTONIPHILUS_ORGANISM("Genus Peptoniphilus (organism)", "Genus Peptoniphilus (organism)", "SNOMED-CT", "430742009"), - ENTEROCOCCUS_FAECALIS_ORGANISM("Enterococcus faecalis (organism)", null, "SNOMED-CT", "78065002"), + SALMONELLA_POMONA("Salmonella Pomona", "Salmonella Pomona", "SNOMED-CT", "112314009"), - PSEUDOMONAS_MENDOCINA_ORGANISM("Pseudomonas mendocina (organism)", null, "SNOMED-CT", "59419001"), + LEGIONELLA_PNEUMOPHILA_ORGANISM("Legionella pneumophila (organism)", "Legionella pneumophila (organism)", "SNOMED-CT", "80897008"), - CORYNEBACTERIUM_PSEUDODIPHTHERITICUM_ORGANISM("Corynebacterium pseudodiphtheriticum (organism)", null, "SNOMED-CT", "12050008"), + PSEUDOMONAS_FLUORESCENS_ORGANISM("Pseudomonas fluorescens (organism)", "Pseudomonas fluorescens (organism)", "SNOMED-CT", "39289003"), - MYCOBACTERIUM_INTRACELLULARE_ORGANISM("Mycobacterium intracellulare (organism)", null, "SNOMED-CT", "83841006"), + ASPERGILLUS_BRASILIENSIS_ORGANISM("Aspergillus brasiliensis (organism)", "Aspergillus brasiliensis (organism)", "SNOMED-CT", "3101000146105"), - LEGIONELLA_PNEUMOPHILIA_SEROGROUP10_ORGANISM("Legionella pneumophilia serogroup 10 (organism)", null, "SNOMED-CT", "131322009"), + BACILLUS_SIMPLEX_ORGANISM("Bacillus simplex (organism)", "Bacillus simplex (organism)", "SNOMED-CT", "113479004"), - BURKHOLDERIA_MULTIVORANS_ORGANISM("Burkholderia multivorans (organism)", null, "SNOMED-CT", "113675004"), + DERMATOPHYTE_ORGANISM("Dermatophyte (organism)", "Dermatophyte (organism)", "SNOMED-CT", "115651002"), - SERRATIA_RUBIDAEA_ORGANISM("Serratia rubidaea (organism)", null, "SNOMED-CT", "55825002"), + ENTEROBACTER_CLOACAE_SUBSPECIES_DISSOLVENS("Enterobacter cloacae subspecies dissolvens", "Enterobacter cloacae subspecies dissolvens", "SNOMED-CT", "56813009"), - CANDIDA_LUSITANIAE_ORGANISM("Candida lusitaniae (organism)", null, "SNOMED-CT", "47608006"), + BREVUNDIMONAS_SUBVIBRIOIDES("Brevundimonas subvibrioides", "Brevundimonas subvibrioides", "SNOMED-CT", "423492004"), - LEUCONOSTOC_LACTIS_ORGANISM("Leuconostoc lactis (organism)", null, "SNOMED-CT", "70285009"), + LEGIONELLA_LANSINGENSIS_ORGANISM("Legionella lansingensis (organism)", "Legionella lansingensis (organism)", "SNOMED-CT", "103452007"), - YERSINIA_ENTEROCOLITICA_SEROGROUP_O9_ORGANISM("Yersinia enterocolitica serogroup O:9 (organism)", null, "SNOMED-CT", "103433001"), + SALMONELLA_GROUP_O35_ORGANISM("Salmonella group O:35 (organism)", "Salmonella group O:35 (organism)", "SNOMED-CT", "404341009"), - GENUS_VEILLONELLA_ORGANISM("Genus Veillonella (organism)", null, "SNOMED-CT", "29875005"), + CANDIDA_KEFYR_ORGANISM("Candida kefyr (organism)", "Candida kefyr (organism)", "SNOMED-CT", "446237006"), - GENUS_ALCALIGENES_ORGANISM("Genus Alcaligenes (organism)", null, "SNOMED-CT", "68571003"), + SALMONELLA_GIVE("Salmonella Give", "Salmonella Give", "SNOMED-CT", "71768003"), - STREPTOCOCCUS_DYSGALACTIAE_ORGANISM("Streptococcus dysgalactiae (organism)", null, "SNOMED-CT", "40812000"), + PSEUDOMONAS_KOREENSIS_ORGANISM("Pseudomonas koreensis (organism)", "Pseudomonas koreensis (organism)", "SNOMED-CT", "438724003"), - SALMONELLA_ALTONA("Salmonella Altona", null, "SNOMED-CT", "47229009"), + SALMONELLA_TYPHIMURIUM_ORGANISM("Salmonella Typhimurium (organism)", "Salmonella Typhimurium (organism)", "SNOMED-CT", "50136005"), - BURKHOLDERIA_MALLEI("Burkholderia mallei", null, "SNOMED-CT", "113674000"), + CANDIDA_GLABRATA_ORGANISM("Candida glabrata (organism)", "Candida glabrata (organism)", "SNOMED-CT", "444877006"), - PARABURKHOLDERIA_PHYMATUM("Paraburkholderia phymatum", null, "SNOMED-CT", "431165002"), + STAPHYLOCOCCUS_CAPITIS_ORGANISM("Staphylococcus capitis (organism)", "Staphylococcus capitis (organism)", "SNOMED-CT", "40347003"), - CRONOBACTER_TURICENSIS("Cronobacter turicensis", null, "SNOMED-CT", "445639005"), + SALMONELLA_SEROGROUP_D_ORGANISM("Salmonella, serogroup D (organism)", "Salmonella, serogroup D (organism)", "SNOMED-CT", "115408009"), - STAPHYLOCOCCUS_SIMULANS_ORGANISM("Staphylococcus simulans (organism)", null, "SNOMED-CT", "52122005"), + MANNHEIMIA_HAEMOLYTICA_ORGANISM("Mannheimia haemolytica (organism)", "Mannheimia haemolytica (organism)", "SNOMED-CT", "128385005"), - SALMONELLA_GIVE("Salmonella Give", null, "SNOMED-CT", "71768003"), + PREVOTELLA_MELANINOGENICA_ORGANISM("Prevotella melaninogenica (organism)", "Prevotella melaninogenica (organism)", "SNOMED-CT", "114144004"), - SALMONELLA_INDIANA("Salmonella Indiana", null, "SNOMED-CT", "12278000"), + CANDIDA_PARAPSILOSIS_ORGANISM("Candida parapsilosis (organism)", "Candida parapsilosis (organism)", "SNOMED-CT", "61302002"), - CORYNEBACTERIUM_ACCOLENS_ORGANISM("Corynebacterium accolens (organism)", null, "SNOMED-CT", "243254006"), + CITROBACTER_YOUNGAE_ORGANISM("Citrobacter youngae (organism)", "Citrobacter youngae (organism)", "SNOMED-CT", "114443001"), - ENTEROBACTER_CLOACAE_COMPLEX_ORGANISM("Enterobacter cloacae complex (organism)", null, "SNOMED-CT", "414102007"), + CORYNEBACTERIUM_AURIMUCOSUM_ORGANISM("Corynebacterium aurimucosum (organism)", "Corynebacterium aurimucosum (organism)", "SNOMED-CT", "385503009"), - PANTOEA_SEPTICA_ORGANISM("Pantoea septica (organism)", null, "SNOMED-CT", "5681000146105"), + PEDIOCOCCUS_PENTOSACEUS_ORGANISM("Pediococcus pentosaceus (organism)", "Pediococcus pentosaceus (organism)", "SNOMED-CT", "243242006"), - GENUS_ROTHIA_ORGANISM("Genus Rothia (organism)", null, "SNOMED-CT", "90163001"), + PNEUMOCYSTIS_JIROVECII_ORGANISM("Pneumocystis jirovecii (organism)", "Pneumocystis jirovecii (organism)", "SNOMED-CT", "79909001"), - SALMONELLA_DERBY("Salmonella Derby", null, "SNOMED-CT", "37091006"), + CRYPTOCOCCUS_LAURENTII_ORGANISM("Cryptococcus laurentii (organism)", "Cryptococcus laurentii (organism)", "SNOMED-CT", "7299008"), - PROVIDENCIA_RETTGERI_ORGANISM("Providencia rettgeri (organism)", null, "SNOMED-CT", "14196002"), + LEGIONELLA_PNEUMOPHILA_SEROGROUP3_ORGANISM("Legionella pneumophila serogroup 3 (organism)", "Legionella pneumophila serogroup 3 (organism)", "SNOMED-CT", "103465003"), - ENTEROBACTER_AMNIGENUS_BIOGROUP_I_ORGANISM("Enterobacter amnigenus biogroup I (organism)", null, "SNOMED-CT", "114452005"), + SALMONELLA_MUENSTER("Salmonella Muenster", "Salmonella Muenster", "SNOMED-CT", "68916009"), - AEROMONAS_HYDROPHILA_ORGANISM("Aeromonas hydrophila (organism)", null, "SNOMED-CT", "85823000"), + GENUS_BACILLUS_ORGANISM("Genus Bacillus (organism)", "Genus Bacillus (organism)", "SNOMED-CT", "44762009"), - PARABURKHOLDERIA_FUNGORUM_ORGANISM("Paraburkholderia fungorum (organism)", null, "SNOMED-CT", "417285005"), + STREPTOCOCCUS_CONSTELLATUS_SUBSPECIES_PHARYNGIS_ORGANISM("Streptococcus constellatus subspecies pharyngis (organism)", "Streptococcus constellatus subspecies pharyngis (organism)", "SNOMED-CT", "415602002"), - CANDIDA_KEFYR_ORGANISM("Candida kefyr (organism)", null, "SNOMED-CT", "446237006"), + KLEBSIELLA_AEROGENES_ORGANISM("Klebsiella aerogenes (organism)", "Klebsiella aerogenes (organism)", "SNOMED-CT", "62592009"), - ACINETOBACTER_JOHNSONII_ORGANISM("Acinetobacter johnsonii (organism)", null, "SNOMED-CT", "252000"), + PLURALIBACTER_GERGOVIAE("Pluralibacter gergoviae", "Pluralibacter gergoviae", "SNOMED-CT", "716346000"), - TRICHOPHYTON_MENTAGROPHYTES_VAR_INTERDIGITALE_ORGANISM("Trichophyton mentagrophytes var. interdigitale (organism)", null, "SNOMED-CT", "76040007"), + SALMONELLA_AGONA("Salmonella Agona", "Salmonella Agona", "SNOMED-CT", "80627004"), - LEGIONELLA_PARISIENSIS_ORGANISM("Legionella parisiensis (organism)", null, "SNOMED-CT", "38322001"), + SALMONELLA_PARATYPHI_A("Salmonella Paratyphi A", "Salmonella Paratyphi A", "SNOMED-CT", "79128009"), - PROVIDENCIA_STUARTII_ORGANISM("Providencia stuartii (organism)", null, "SNOMED-CT", "1445008"), + GENUS_NEISSERIA_ORGANISM("Genus Neisseria (organism)", "Genus Neisseria (organism)", "SNOMED-CT", "59083001"), - CANDIDA_PARAPSILOSIS_COMPLEX_ORGANISM("Candida parapsilosis complex (organism)", null, "SNOMED-CT", "717979000"), + STREPTOCOCCUS_SALIVARIUS_GROUP_ORGANISM("Streptococcus salivarius group (organism)", "Streptococcus salivarius group (organism)", "SNOMED-CT", "127537007"), - CAMPYLOBACTER_COLI("Campylobacter coli", null, "SNOMED-CT", "40614002"), + ACINETOBACTER_SEIFERTII_ORGANISM("Acinetobacter seifertii (organism)", "Acinetobacter seifertii (organism)", "SNOMED-CT", "787184002"), - GENUS_STREPTOCOCCUS_ORGANISM("Genus Streptococcus (organism)", null, "SNOMED-CT", "58800005"), + ASPERGILLUS_OCHRACEUS_ORGANISM("Aspergillus ochraceus (organism)", "Aspergillus ochraceus (organism)", "SNOMED-CT", "60111002"), - PEDIOCOCCUS_ACIDILACTICI_ORGANISM("Pediococcus acidilactici (organism)", null, "SNOMED-CT", "243237003"), + CRONOBACTER_SAKAZAKII_ORGANISM("Cronobacter sakazakii (organism)", "Cronobacter sakazakii (organism)", "SNOMED-CT", "445562004"), - SALMONELLA_MONSCHAUI("Salmonella Monschaui", null, "SNOMED-CT", "65132007"), + ACINETOBACTER_JOHNSONII_ORGANISM("Acinetobacter johnsonii (organism)", "Acinetobacter johnsonii (organism)", "SNOMED-CT", "252000"), - CITROBACTER_FREUNDII_ORGANISM("Citrobacter freundii (organism)", null, "SNOMED-CT", "6265002"), + LEGIONELLA_CHERRII_ORGANISM("Legionella cherrii (organism)", "Legionella cherrii (organism)", "SNOMED-CT", "52462004"), - GENUS_ANAEROCOCCUS_ORGANISM("Genus Anaerococcus (organism)", null, "SNOMED-CT", "413518000"), + WEEKSELLA_VIROSA_ORGANISM("Weeksella virosa (organism)", "Weeksella virosa (organism)", "SNOMED-CT", "83326004"), - PROTEUS_HAUSERI_ORGANISM("Proteus hauseri (organism)", null, "SNOMED-CT", "417592004"), + ACTINOMYCES_TURICENSIS_ORGANISM("Actinomyces turicensis (organism)", "Actinomyces turicensis (organism)", "SNOMED-CT", "113422006"), - AGGREGATIBACTER_APHROPHILUS_ORGANISM("Aggregatibacter aphrophilus (organism)", null, "SNOMED-CT", "442683005"), + CANDIDA_PARAPSILOSIS_COMPLEX_ORGANISM("Candida parapsilosis complex (organism)", "Candida parapsilosis complex (organism)", "SNOMED-CT", "717979000"), - PSEUDOGLUTAMICIBACTER_CUMMINSII_ORGANISM("Pseudoglutamicibacter cumminsii (organism)", null, "SNOMED-CT", "113436001"), + BACTEROIDES_VULGATUS_ORGANISM("Bacteroides vulgatus (organism)", "Bacteroides vulgatus (organism)", "SNOMED-CT", "52798008"), - MOLD_ORGANISM("Mold (organism)", null, "SNOMED-CT", "84489001"), + STAPHYLOCOCCUS_LUGDUNENSIS_ORGANISM("Staphylococcus lugdunensis (organism)", "Staphylococcus lugdunensis (organism)", "SNOMED-CT", "103494005"), - GENUS_STAPHYLOCOCCUS_ORGANISM("Genus Staphylococcus (organism)", null, "SNOMED-CT", "65119002"), + GENUS_BURKHOLDERIA_ORGANISM("Genus Burkholderia (organism)", "Genus Burkholderia (organism)", "SNOMED-CT", "414324002"), - GRAM_POSITIVE_COCCUS_ORGANISM("Gram-positive coccus (organism)", null, "SNOMED-CT", "59206002"), + CITROBACTER_RODENTIUM("Citrobacter rodentium", "Citrobacter rodentium", "SNOMED-CT", "114444007"), - PROTEUS_MIRABILIS_ORGANISM("Proteus mirabilis (organism)", null, "SNOMED-CT", "73457008"), + CRONOBACTER_MUYTJENSII("Cronobacter muytjensii", "Cronobacter muytjensii", "SNOMED-CT", "445561006"), - ENTEROBACTER_AMNIGENUS_BIOGROUP_II_ORGANISM("Enterobacter amnigenus biogroup II (organism)", null, "SNOMED-CT", "114453000"), + PASTEURELLA_BETTYAE_ORGANISM("Pasteurella bettyae (organism)", "Pasteurella bettyae (organism)", "SNOMED-CT", "113902004"), - SALMONELLA_HADAR("Salmonella Hadar", null, "SNOMED-CT", "49491006"), + ACHROMOBACTER_DENITRIFICANS_ORGANISM("Achromobacter denitrificans (organism)", "Achromobacter denitrificans (organism)", "SNOMED-CT", "413414001"), - CLOSTRIDIUM_PARAPUTRIFICUM_ORGANISM("Clostridium paraputrificum (organism)", null, "SNOMED-CT", "41966004"), + BURKHOLDERIA_CEPACIA_ORGANISM("Burkholderia cepacia (organism)", "Burkholderia cepacia (organism)", "SNOMED-CT", "113669008"), - ELIZABETHKINGIA_MENINGOSEPTICA_ORGANISM("Elizabethkingia meningoseptica (organism)", null, "SNOMED-CT", "425774009"), + ENTEROBACTER_AMNIGENUS("Enterobacter amnigenus", "Enterobacter amnigenus", "SNOMED-CT", "84221003"), - AEROMONAS_SOBRIA_ORGANISM("Aeromonas sobria (organism)", null, "SNOMED-CT", "43731003"), + SALMONELLA_MUENCHEN("Salmonella Muenchen", "Salmonella Muenchen", "SNOMED-CT", "77584005"), - SALMONELLA_PARATYPHI_B_VAR_JAVA("Salmonella Paratyphi B var. Java", null, "SNOMED-CT", "128388007"), + SALMONELLA_STANLEYVILLE("Salmonella Stanleyville", "Salmonella Stanleyville", "SNOMED-CT", "47441000"), - ESCHERICHIA_COLI_SEROGROUP_O157_ORGANISM("Escherichia coli serogroup O157 (organism)", null, "SNOMED-CT", "407166006"), + RAOULTELLA_TERRIGENA_ORGANISM("Raoultella terrigena (organism)", "Raoultella terrigena (organism)", "SNOMED-CT", "416096003"), - GENUS_SERRATIA_ORGANISM("Genus Serratia (organism)", null, "SNOMED-CT", "42025004"), + NEISSERIA_MENINGITIDIS_ORGANISM("Neisseria meningitidis (organism)", "Neisseria meningitidis (organism)", "SNOMED-CT", "17872004"), - SALMONELLA_GOLDCOAST("Salmonella Goldcoast", null, "SNOMED-CT", "16820003"), + MYCOBACTERIUM_GORDONAE_ORGANISM("Mycobacterium gordonae (organism)", "Mycobacterium gordonae (organism)", "SNOMED-CT", "24871004"), - LACTOBACILLUS_PARACASEI_ORGANISM("Lactobacillus paracasei (organism)", null, "SNOMED-CT", "113792000"), + CLOSTRIDIUM_PARAPUTRIFICUM_ORGANISM("Clostridium paraputrificum (organism)", "Clostridium paraputrificum (organism)", "SNOMED-CT", "41966004"), - CANDIDA_PARAPSILOSIS_ORGANISM("Candida parapsilosis (organism)", null, "SNOMED-CT", "61302002"), + FAMILY_ENTEROBACTERIACEAE_ORGANISM("Family Enterobacteriaceae (organism)", "Family Enterobacteriaceae (organism)", "SNOMED-CT", "106544002"), - ENTEROCOCCUS_DURANS_ORGANISM("Enterococcus durans (organism)", null, "SNOMED-CT", "46464008"), + AEROMONAS_ICHTHIOSMIA_ORGANISM("Aeromonas ichthiosmia (organism)", "Aeromonas ichthiosmia (organism)", "SNOMED-CT", "115033002"), - NEISSERIA_SUBFLAVA_ORGANISM("Neisseria subflava (organism)", null, "SNOMED-CT", "77700001"), + STAPHYLOCOCCUS_XYLOSUS_ORGANISM("Staphylococcus xylosus (organism)", "Staphylococcus xylosus (organism)", "SNOMED-CT", "32737005"), - KLEBSIELLA_OXYTOCA_ORGANISM("Klebsiella oxytoca (organism)", null, "SNOMED-CT", "40886007"), + STREPTOCOCCUS_GALLOLYTICUS_ORGANISM("Streptococcus gallolyticus (organism)", "Streptococcus gallolyticus (organism)", "SNOMED-CT", "113985000"), - ENTEROCOCCUS_GALLINARUM_ORGANISM("Enterococcus gallinarum (organism)", null, "SNOMED-CT", "53233007"), + ENTEROBACTER_PYRINUS("Enterobacter pyrinus", "Enterobacter pyrinus", "SNOMED-CT", "114455007"), - GAMMA_HEMOLYTIC_STREPTOCOCCUS_ORGANISM("Gamma-hemolytic streptococcus (organism)", null, "SNOMED-CT", "22339002"), + MYCOBACTERIUM_TUBERCULOSIS_COMPLEX_ORGANISM("Mycobacterium tuberculosis complex (organism)", "Mycobacterium tuberculosis complex (organism)", "SNOMED-CT", "113858008"), - CITROBACTER_BRAAKII_ORGANISM("Citrobacter braakii (organism)", null, "SNOMED-CT", "114262000"), + ACINETOBACTER_LWOFFI_ORGANISM("Acinetobacter lwoffi (organism)", "Acinetobacter lwoffi (organism)", "SNOMED-CT", "83088009"), - CHRYSEOBACTERIUM_INDOLOGENES_ORGANISM("Chryseobacterium indologenes (organism)", null, "SNOMED-CT", "113549008"), + SALMONELLA_MANHATTAN("Salmonella Manhattan", "Salmonella Manhattan", "SNOMED-CT", "20073008"), - YERSINIA_PSEUDOTUBERCULOSIS_ORGANISM("Yersinia pseudotuberculosis (organism)", null, "SNOMED-CT", "90530002"), + AEROMONAS_CAVIAE_ORGANISM("Aeromonas caviae (organism)", "Aeromonas caviae (organism)", "SNOMED-CT", "115036005"), - SALMONELLA_MANCHESTER("Salmonella Manchester", null, "SNOMED-CT", "70605000"), + STENOTROPHOMONAS_MALTOPHILIA_ORGANISM("Stenotrophomonas maltophilia (organism)", "Stenotrophomonas maltophilia (organism)", "SNOMED-CT", "113697002"), - PSEUDOMONAS_CITRONELLOLIS_ORGANISM("Pseudomonas citronellolis (organism)", null, "SNOMED-CT", "31277003"), + KYTOCOCCUS_SCHROETERI_ORGANISM("Kytococcus schroeteri (organism)", "Kytococcus schroeteri (organism)", "SNOMED-CT", "428721003"), - BURKHOLDERIA_CARIBENSIS("Burkholderia caribensis", null, "SNOMED-CT", "431682004"), + SALMONELLA_POTSDAM("Salmonella Potsdam", "Salmonella Potsdam", "SNOMED-CT", "8544001"), - ACHROMOBACTER_DENITRIFICANS_ORGANISM("Achromobacter denitrificans (organism)", null, "SNOMED-CT", "413414001"), + YERSINIA_PSEUDOTUBERCULOSIS_ORGANISM("Yersinia pseudotuberculosis (organism)", "Yersinia pseudotuberculosis (organism)", "SNOMED-CT", "90530002"), - AEROMONAS_MEDIA_ORGANISM("Aeromonas media (organism)", null, "SNOMED-CT", "65192005"), + SHEWANELLA_ALGAE_ORGANISM("Shewanella algae (organism)", "Shewanella algae (organism)", "SNOMED-CT", "113702006"), - MYCOBACTERIUM_AFRICANUM_ORGANISM("Mycobacterium africanum (organism)", null, "SNOMED-CT", "51320008"), + GENUS_PANTOEA_ORGANISM("Genus Pantoea (organism)", "Genus Pantoea (organism)", "SNOMED-CT", "115013001"), - ABIOTROPHIA_DEFECTIVA_ORGANISM("Abiotrophia defectiva (organism)", null, "SNOMED-CT", "113714003"), + SALMONELLA_ADELAIDE("Salmonella Adelaide", "Salmonella Adelaide", "SNOMED-CT", "10343005"), - LEGIONELLA_RUBRILUCENS_ORGANISM("Legionella rubrilucens (organism)", null, "SNOMED-CT", "17298000"), + PROTEUS_PENNERI_ORGANISM("Proteus penneri (organism)", "Proteus penneri (organism)", "SNOMED-CT", "45298005"), - STAPHYLOCOCCUS_SACCHAROLYTICUS_ORGANISM("Staphylococcus saccharolyticus (organism)", null, "SNOMED-CT", "41103009"), + ACHROMOBACTER_RUHLANDII_ORGANISM("Achromobacter ruhlandii (organism)", "Achromobacter ruhlandii (organism)", "SNOMED-CT", "413421001"), - ACINETOBACTER_HAEMOLYTICUS_ORGANISM("Acinetobacter haemolyticus (organism)", null, "SNOMED-CT", "77045006"), + SALMONELLA_ENTERITIDIS_ORGANISM("Salmonella Enteritidis (organism)", "Salmonella Enteritidis (organism)", "SNOMED-CT", "73525009"), - ACINETOBACTER_RADIORESISTENS_ORGANISM("Acinetobacter radioresistens (organism)", null, "SNOMED-CT", "113381003"), + TOXIGENIC_CLOSTRIDIUM_DIFFICILE_ORGANISM("Toxigenic Clostridium difficile (organism)", "Toxigenic Clostridium difficile (organism)", "SNOMED-CT", "736050006"), - TOXIGENIC_CLOSTRIDIUM_DIFFICILE_ORGANISM("Toxigenic Clostridium difficile (organism)", null, "SNOMED-CT", "736050006"), + ESCHERICHIA_VULNERIS_ORGANISM("Escherichia vulneris (organism)", "Escherichia vulneris (organism)", "SNOMED-CT", "53013003"), - CHRYSEOMONAS_LUTEOLA_ORGANISM("Chryseomonas luteola (organism)", null, "SNOMED-CT", "33919008"), + ACINETOBACTER_JUNII_ORGANISM("Acinetobacter junii (organism)", "Acinetobacter junii (organism)", "SNOMED-CT", "13879009"), - MYCOBACTERIUM_BOVIS_SUBSPECIES_BOVIS_ORGANISM("Mycobacterium bovis subspecies bovis (organism)", null, "SNOMED-CT", "832924651000087107"), + OCHROBACTRUM_ANTHROPI_ORGANISM("Ochrobactrum anthropi (organism)", "Ochrobactrum anthropi (organism)", "SNOMED-CT", "116490002"), - LEGIONELLA_SANTICRUCIS_ORGANISM("Legionella santicrucis (organism)", null, "SNOMED-CT", "72814000"), + ACINETOBACTER_CALCOACETICUS_ORGANISM("Acinetobacter calcoaceticus (organism)", "Acinetobacter calcoaceticus (organism)", "SNOMED-CT", "82550008"), - GRAM_NEGATIVE_BACILLUS_ORGANISM("Gram-negative bacillus (organism)", null, "SNOMED-CT", "87172008"), + PSEUDOMONAS_FLUORESCENS_GROUP_ORGANISM("Pseudomonas fluorescens group (organism)", "Pseudomonas fluorescens group (organism)", "SNOMED-CT", "415197003"), - GENUS_ACHROMOBACTER_ORGANISM("Genus Achromobacter (organism)", null, "SNOMED-CT", "91620006"), + GENUS_CORYNEBACTERIUM_ORGANISM("Genus Corynebacterium (organism)", "Genus Corynebacterium (organism)", "SNOMED-CT", "77086004"), - LEGIONELLA_FEELEII_ORGANISM("Legionella feeleii (organism)", null, "SNOMED-CT", "17083009"), + LACTOBACILLUS_JENSENII_ORGANISM("Lactobacillus jensenii (organism)", "Lactobacillus jensenii (organism)", "SNOMED-CT", "65904004"), - CITROBACTER_AMALONATICUS_ORGANISM("Citrobacter amalonaticus (organism)", null, "SNOMED-CT", "55744003"), + SHIGELLA_SONNEI_ORGANISM("Shigella sonnei (organism)", "Shigella sonnei (organism)", "SNOMED-CT", "4298009"), - CANDIDA_RUGOSA_ORGANISM("Candida rugosa (organism)", null, "SNOMED-CT", "23773004"), + CANDIDA_RUGOSA_ORGANISM("Candida rugosa (organism)", "Candida rugosa (organism)", "SNOMED-CT", "23773004"), - SHEWANELLA_PUTREFACIENS_ORGANISM("Shewanella putrefaciens (organism)", null, "SNOMED-CT", "113700003"), + CANDIDA_AURIS_ORGANISM("Candida auris (organism)", "Candida auris (organism)", "SNOMED-CT", "3491000146109"), - BURKHOLDERIA_THAILANDENSIS_ORGANISM("Burkholderia thailandensis (organism)", null, "SNOMED-CT", "113678002"), + ROTHIA_DENTOCARIOSA_ORGANISM("Rothia dentocariosa (organism)", "Rothia dentocariosa (organism)", "SNOMED-CT", "35379007"), - KLEBSIELLA_PNEUMONIAE_SS_RHINOSCLEROMATIS_ORGANISM("Klebsiella pneumoniae ss. rhinoscleromatis (organism)", null, "SNOMED-CT", "17688001"), + SALMONELLA_DUISBURG("Salmonella Duisburg", "Salmonella Duisburg", "SNOMED-CT", "42410007"), - GRAM_POSITIVE_BACILLUS_ORGANISM("Gram-positive bacillus (organism)", null, "SNOMED-CT", "83514008"), + SERRATIA_LIQUEFACIENS_COMPLEX_ORGANISM("Serratia liquefaciens complex (organism)", "Serratia liquefaciens complex (organism)", "SNOMED-CT", "722258003"), - LEGIONELLA_PNEUMOPHILA_SEROGROUP9_ORGANISM("Legionella pneumophila serogroup 9 (organism)", null, "SNOMED-CT", "103471009"), + ACINETOBACTER_DIJKSHOORNIAE_ORGANISM("Acinetobacter dijkshoorniae (organism)", "Acinetobacter dijkshoorniae (organism)", "SNOMED-CT", "787183008"), - ANAEROBIC_GRAM_POSITIVE_COCCUS_ORGANISM("Anaerobic Gram-positive coccus (organism)", null, "SNOMED-CT", "243416009"), + LEGIONELLA_HACKELIAE_ORGANISM("Legionella hackeliae (organism)", "Legionella hackeliae (organism)", "SNOMED-CT", "58939000"), - SALMONELLA_BREDENEY("Salmonella Bredeney", null, "SNOMED-CT", "82364007"), + YERSINIA_ENTEROCOLITICA_SEROGROUP_O9_ORGANISM("Yersinia enterocolitica serogroup O:9 (organism)", "Yersinia enterocolitica serogroup O:9 (organism)", "SNOMED-CT", "103433001"), - CANDIDA_NORVEGENSIS_ORGANISM("Candida norvegensis (organism)", null, "SNOMED-CT", "243458007"), + PENICILLIUM_ORGANISM("Penicillium (organism)", "Penicillium (organism)", "SNOMED-CT", "42993004"), - SALMONELLA_GROUP_O18_ORGANISM("Salmonella group O:18 (organism)", null, "SNOMED-CT", "404294002"), + ACINETOBACTER_GUILLOUIAE_ORGANISM("Acinetobacter guillouiae (organism)", "Acinetobacter guillouiae (organism)", "SNOMED-CT", "700397005"), - YERSINIA_ENTEROCOLITICA_SEROGROUP_O5_ORGANISM("Yersinia enterocolitica serogroup O:5 (organism)", null, "SNOMED-CT", "103431004"), + LEGIONELLA_OAKRIDGENSIS_ORGANISM("Legionella oakridgensis (organism)", "Legionella oakridgensis (organism)", "SNOMED-CT", "638008"), - MYCOBACTERIUM_KANSASII_ORGANISM("Mycobacterium kansasii (organism)", null, "SNOMED-CT", "1507005"), + BACILLUS_LICHENIFORMIS_ORGANISM("Bacillus licheniformis (organism)", "Bacillus licheniformis (organism)", "SNOMED-CT", "74867004"), - BURKHOLDERIA_ANTHINA("Burkholderia anthina", null, "SNOMED-CT", "417565005"), + PROTEUS_HAUSERI_ORGANISM("Proteus hauseri (organism)", "Proteus hauseri (organism)", "SNOMED-CT", "417592004"), - CLOSTRIDIUM_INNOCUUM_ORGANISM("Clostridium innocuum (organism)", null, "SNOMED-CT", "19415008"), + ACTINOMYCES_ODONTOLYTICUS_ORGANISM("Actinomyces odontolyticus (organism)", "Actinomyces odontolyticus (organism)", "SNOMED-CT", "12069003"), - ACINETOBACTER_GENOSPECIES_ORGANISM("Acinetobacter genospecies (organism)", null, "SNOMED-CT", "131203002"), + ACINETOBACTER_CALCOACETICUS_ACINETOBACTER_BAUMANNII_COMPLEX_ORGANISM("Acinetobacter calcoaceticus-Acinetobacter baumannii complex (organism)", "Acinetobacter calcoaceticus-Acinetobacter baumannii complex (organism)", "SNOMED-CT", "113376007"), - ENTEROBACTER_HORMAECHEI_ORGANISM("Enterobacter hormaechei (organism)", null, "SNOMED-CT", "114454006"), + SALMONELLA_READING("Salmonella Reading", "Salmonella Reading", "SNOMED-CT", "63396002"), - ASPERGILLUS_FUMIGATUS_SPECIES_COMPLEX_ORGANISM("Aspergillus fumigatus species complex (organism)", null, "SNOMED-CT", "719029007"), + BACILLUS_PUMILUS_ORGANISM("Bacillus pumilus (organism)", "Bacillus pumilus (organism)", "SNOMED-CT", "16580009"), - STREPTOCOCCUS_GALLOLYTICUS_ORGANISM("Streptococcus gallolyticus (organism)", null, "SNOMED-CT", "113985000"), + BURKHOLDERIA_PSEUDOMALLEI_ORGANISM("Burkholderia pseudomallei (organism)", "Burkholderia pseudomallei (organism)", "SNOMED-CT", "116399000"), - SALMONELLA_PARATYPHI_C("Salmonella Paratyphi C", null, "SNOMED-CT", "32488009"), + ENTEROCOCCUS_CASSELIFLAVUS_ORGANISM("Enterococcus casseliflavus (organism)", "Enterococcus casseliflavus (organism)", "SNOMED-CT", "30949009"), - PEDIOCOCCUS_PENTOSACEUS_ORGANISM("Pediococcus pentosaceus (organism)", null, "SNOMED-CT", "243242006"), + GENUS_PASTEURELLA_ORGANISM("Genus Pasteurella (organism)", "Genus Pasteurella (organism)", "SNOMED-CT", "87579009"), - LEGIONELLA_PNEUMOPHILA_SEROGROUP6_ORGANISM("Legionella pneumophila serogroup 6 (organism)", null, "SNOMED-CT", "103468001"), + LEGIONELLA_PNEUMOPHILA_SEROGROUP5_ORGANISM("Legionella pneumophila serogroup 5 (organism)", "Legionella pneumophila serogroup 5 (organism)", "SNOMED-CT", "103467006"), - LEGIONELLA_PNEUMOPHILIA_SEROGROUP11_ORGANISM("Legionella pneumophilia serogroup 11 (organism)", null, "SNOMED-CT", "131323004"), + FLAVIMONAS_ORYZIHABITANS_ORGANISM("Flavimonas oryzihabitans (organism)", "Flavimonas oryzihabitans (organism)", "SNOMED-CT", "113931000"), - ASPERGILLUS_NIDULANS_GROUP_ORGANISM("Aspergillus nidulans Group (organism)", null, "SNOMED-CT", "415879008"), + SALMONELLA_SEROGROUP_E_ORGANISM("Salmonella, serogroup E (organism)", "Salmonella, serogroup E (organism)", "SNOMED-CT", "115409001"), - MORAXELLA_OSLOENSIS_ORGANISM("Moraxella osloensis (organism)", null, "SNOMED-CT", "72401008"), + VEILLONELLA_PARVULA_ORGANISM("Veillonella parvula (organism)", "Veillonella parvula (organism)", "SNOMED-CT", "90435009"), - LACTOBACILLUS_GASSERI_ORGANISM("Lactobacillus gasseri (organism)", null, "SNOMED-CT", "71158000"), + LEGIONELLA_PNEUMOPHILIA_SEROGROUP10_ORGANISM("Legionella pneumophilia serogroup 10 (organism)", "Legionella pneumophilia serogroup 10 (organism)", "SNOMED-CT", "131322009"), - CRONOBACTER_UNIVERSALIS_ORGANISM("Cronobacter universalis (organism)", null, "SNOMED-CT", "707335003"), + LEGIONELLA_SAINTHELENS_ORGANISM("Legionella sainthelens (organism)", "Legionella sainthelens (organism)", "SNOMED-CT", "87271006"), - AEROMONAS_BESTIARUM_ORGANISM("Aeromonas bestiarum (organism)", null, "SNOMED-CT", "115027006"), + SALMONELLA_HEIDELBERG("Salmonella Heidelberg", "Salmonella Heidelberg", "SNOMED-CT", "71865006"), - AEROMONAS_ICHTHIOSMIA_ORGANISM("Aeromonas ichthiosmia (organism)", null, "SNOMED-CT", "115033002"), + ENTEROBACTER_CLOACAE_SUBSP_CLOACAE("Enterobacter cloacae subsp. cloacae", "Enterobacter cloacae subsp. cloacae", "SNOMED-CT", "721950003"), - LEGIONELLA_SAINTHELENS_ORGANISM("Legionella sainthelens (organism)", null, "SNOMED-CT", "87271006"), + SALMONELLA_GALLINARUM("Salmonella Gallinarum", "Salmonella Gallinarum", "SNOMED-CT", "370576005"), - SALMONELLA_TENNESSEE("Salmonella Tennessee", null, "SNOMED-CT", "79153007"), + GENUS_ENTEROBACTER_ORGANISM("Genus Enterobacter (organism)", "Genus Enterobacter (organism)", "SNOMED-CT", "58683007"), - PSEUDOMONAS_FLUORESCENS_ORGANISM("Pseudomonas fluorescens (organism)", null, "SNOMED-CT", "39289003"), + PROTEUS_MIRABILIS_ORGANISM("Proteus mirabilis (organism)", "Proteus mirabilis (organism)", "SNOMED-CT", "73457008"), - KLEBSIELLA_PNEUMONIAE_ORGANISM("Klebsiella pneumoniae (organism)", null, "SNOMED-CT", "56415008"), + MYCOBACTERIUM_CHELONAE_ORGANISM("Mycobacterium chelonae (organism)", "Mycobacterium chelonae (organism)", "SNOMED-CT", "243377008"), - STREPTOCOCCUS_INTERMEDIUS_ORGANISM("Streptococcus intermedius (organism)", null, "SNOMED-CT", "62170002"), + MYCOBACTERIUM_AFRICANUM_ORGANISM("Mycobacterium africanum (organism)", "Mycobacterium africanum (organism)", "SNOMED-CT", "51320008"), - LACTOCOCCUS_LACTIS_SUBSPECIES_LACTIS_ORGANISM("Lactococcus lactis subspecies lactis (organism)", null, "SNOMED-CT", "38518005"), + BURKHOLDERIA_GLADIOLI_ORGANISM("Burkholderia gladioli (organism)", "Burkholderia gladioli (organism)", "SNOMED-CT", "113671008"), - SALMONELLA_KIAMBU("Salmonella Kiambu", null, "SNOMED-CT", "11901002"), + CLOSTRIDIUM_SEPTICUM_ORGANISM("Clostridium septicum (organism)", "Clostridium septicum (organism)", "SNOMED-CT", "33101000"), - PASTEURELLA_DAGMATIS_ORGANISM("Pasteurella dagmatis (organism)", null, "SNOMED-CT", "80948000"), + PASTEURELLA_MAIRII_ORGANISM("Pasteurella mairii (organism)", "Pasteurella mairii (organism)", "SNOMED-CT", "113905002"), - LECLERCIA_ADECARBOXYLATA_ORGANISM("Leclercia adecarboxylata (organism)", null, "SNOMED-CT", "57459006"), + SALMONELLA_LIVINGSTONE("Salmonella Livingstone", "Salmonella Livingstone", "SNOMED-CT", "66713000"), - LEGIONELLA_PNEUMOPHILA_SEROGROUP5_ORGANISM("Legionella pneumophila serogroup 5 (organism)", null, "SNOMED-CT", "103467006"), + GENUS_STENOTROPHOMONAS_ORGANISM("Genus Stenotrophomonas (organism)", "Genus Stenotrophomonas (organism)", "SNOMED-CT", "115656007"), - SALMONELLA_SPECIES("Salmonella species", null, "SNOMED-CT", "27268008"), + GENUS_PROTEUS_ORGANISM("Genus Proteus (organism)", "Genus Proteus (organism)", "SNOMED-CT", "50517009"), - CITROBACTER_SEDLAKII("Citrobacter sedlakii", null, "SNOMED-CT", "114265003"), + AEROMONAS_SOBRIA_ORGANISM("Aeromonas sobria (organism)", "Aeromonas sobria (organism)", "SNOMED-CT", "43731003"), - PSEUDOMONAS_AERUGINOSA_ORGANISM("Pseudomonas aeruginosa (organism)", null, "SNOMED-CT", "52499004"), + PASTEURELLA_PNEUMOTROPICA_ORGANISM("Pasteurella pneumotropica (organism)", "Pasteurella pneumotropica (organism)", "SNOMED-CT", "32562008"), - PROTEUS_PENNERI_ORGANISM("Proteus penneri (organism)", null, "SNOMED-CT", "45298005"), + RAOULTELLA_PLANTICOLA_ORGANISM("Raoultella planticola (organism)", "Raoultella planticola (organism)", "SNOMED-CT", "416264004"), - ESCHERICHIA_COLI_ORGANISM("Escherichia coli (organism)", null, "SNOMED-CT", "112283007"), + GENUS_ACHROMOBACTER_ORGANISM("Genus Achromobacter (organism)", "Genus Achromobacter (organism)", "SNOMED-CT", "91620006"), - CANDIDA_INCONSPICUA_ORGANISM("Candida inconspicua (organism)", null, "SNOMED-CT", "283871001"), + PROVIDENCIA_RETTGERI_ORGANISM("Providencia rettgeri (organism)", "Providencia rettgeri (organism)", "SNOMED-CT", "14196002"), - ASPERGILLUS_GLAUCUS("Aspergillus glaucus", null, "SNOMED-CT", "19556009"), + KOSAKONIA_RADICINCITANS("Kosakonia radicincitans", "Kosakonia radicincitans", "SNOMED-CT", "8181000146108"), - PAENIBACILLUS_MACERANS_ORGANISM("Paenibacillus macerans (organism)", null, "SNOMED-CT", "114101003"), + BURKHOLDERIA_AMBIFARIA("Burkholderia ambifaria", "Burkholderia ambifaria", "SNOMED-CT", "416467009"), - CRONOBACTER_SAKAZAKII_ORGANISM("Cronobacter sakazakii (organism)", null, "SNOMED-CT", "445562004"), + GARDNERELLA_VAGINALIS_ORGANISM("Gardnerella vaginalis (organism)", "Gardnerella vaginalis (organism)", "SNOMED-CT", "64071004"), - STREPTOCOCCUS_SALIVARIUS_ORGANISM("Streptococcus salivarius (organism)", null, "SNOMED-CT", "39888004"), + ACINETOBACTER_GENOSPECIES_ORGANISM("Acinetobacter genospecies (organism)", "Acinetobacter genospecies (organism)", "SNOMED-CT", "131203002"), - CRYPTOCOCCUS_LAURENTII_ORGANISM("Cryptococcus laurentii (organism)", null, "SNOMED-CT", "7299008"), + GENUS_CITROBACTER_ORGANISM("Genus Citrobacter (organism)", "Genus Citrobacter (organism)", "SNOMED-CT", "75972000"), - ACHROMOBACTER_SPANIUS_ORGANISM("Achromobacter spanius (organism)", null, "SNOMED-CT", "413422008"), + SALMONELLA_BOVISMORBIFICANS("Salmonella Bovismorbificans", "Salmonella Bovismorbificans", "SNOMED-CT", "81938008"), - LEGIONELLA_HACKELIAE_ORGANISM("Legionella hackeliae (organism)", null, "SNOMED-CT", "58939000"), + SALMONELLA_THOMPSON("Salmonella Thompson", "Salmonella Thompson", "SNOMED-CT", "4361005"), - GENUS_UREAPLASMA_ORGANISM("Genus Ureaplasma (organism)", null, "SNOMED-CT", "29680004"), + ACINETOBACTER_BAUMANNII_ORGANISM("Acinetobacter baumannii (organism)", "Acinetobacter baumannii (organism)", "SNOMED-CT", "91288006"), - LEGIONELLA_BRUNENSIS_ORGANISM("Legionella brunensis (organism)", null, "SNOMED-CT", "103448007"), + LACTOBACILLUS_CRISPATUS_ORGANISM("Lactobacillus crispatus (organism)", "Lactobacillus crispatus (organism)", "SNOMED-CT", "89237007"), - STREPTOCOCCUS_DYSGALACTIAE_SUBSPECIES_DYSGALACTIAE_ORGANISM("Streptococcus dysgalactiae subspecies dysgalactiae (organism)", null, "SNOMED-CT", "113982002"), + LEGIONELLA_CINCINNATIENSIS_ORGANISM("Legionella cincinnatiensis (organism)", "Legionella cincinnatiensis (organism)", "SNOMED-CT", "58923007"), - GENUS_FUSOBACTERIUM_ORGANISM("Genus Fusobacterium (organism)", null, "SNOMED-CT", "33562003"), + PSEUDOGLUTAMICIBACTER_CUMMINSII_ORGANISM("Pseudoglutamicibacter cumminsii (organism)", "Pseudoglutamicibacter cumminsii (organism)", "SNOMED-CT", "113436001"), - MYCOBACTERIUM_TUBERCULOSIS_ORGANISM("Mycobacterium tuberculosis (organism)", null, "SNOMED-CT", "113861009"), + BACILLUS_SUBTILIS_ORGANISM("Bacillus subtilis (organism)", "Bacillus subtilis (organism)", "SNOMED-CT", "83512007"), - GENUS_LEGIONELLA_ORGANISM("Genus Legionella (organism)", null, "SNOMED-CT", "7527002"), + ALCALIGENES_FAECALIS_SUBSPECIES_FAECALIS_ORGANISM("Alcaligenes faecalis subspecies faecalis (organism)", "Alcaligenes faecalis subspecies faecalis (organism)", "SNOMED-CT", "424719003"), - PEPTONIPHILUS_HAREI_ORGANISM("Peptoniphilus harei (organism)", null, "SNOMED-CT", "433373007"), + ALCALIGENES_FAECALIS_ORGANISM("Alcaligenes faecalis (organism)", "Alcaligenes faecalis (organism)", "SNOMED-CT", "25223004"), - AEROMONAS_SALMONICIDA_SS_SALMONICIDA_ORGANISM("Aeromonas salmonicida ss. salmonicida (organism)", null, "SNOMED-CT", "62520007"), + STREPTOCOCCUS_THORALTENSIS_ORGANISM("Streptococcus thoraltensis (organism)", "Streptococcus thoraltensis (organism)", "SNOMED-CT", "113997004"), - PROTEUS_MYXOFACIENS_ORGANISM("Proteus myxofaciens (organism)", null, "SNOMED-CT", "86145008"), + SALMONELLA_GROUP_O4_ORGANISM("Salmonella group O:4 (organism)", "Salmonella group O:4 (organism)", "SNOMED-CT", "398467008"), - INTERFERON_GAMMA_ASSAY_POSITIVE_FINDING("Interferon gamma assay positive (finding)", null, "SNOMED-CT", "440662009"), + GENUS_VEILLONELLA_ORGANISM("Genus Veillonella (organism)", "Genus Veillonella (organism)", "SNOMED-CT", "29875005"), - PREVOTELLA_INTERMEDIA_ORGANISM("Prevotella intermedia (organism)", null, "SNOMED-CT", "114142000"), + AEROCOCCUS_URINAEHOMINIS_ORGANISM("Aerococcus urinaehominis (organism)", "Aerococcus urinaehominis (organism)", "SNOMED-CT", "409819000"), - LEGIONELLA_PNEUMOPHILA_SEROGROUP1_ORGANISM("Legionella pneumophila serogroup 1 (organism)", null, "SNOMED-CT", "103463005"), + ASPERGILLUS_FLAVUS_GROUP_ORGANISM("Aspergillus flavus group (organism)", "Aspergillus flavus group (organism)", "SNOMED-CT", "243491003"), - ACINETOBACTER_SEIFERTII_ORGANISM("Acinetobacter seifertii (organism)", null, "SNOMED-CT", "787184002"), + LEGIONELLA_IMPLETISOLI_ORGANISM("Legionella impletisoli (organism)", "Legionella impletisoli (organism)", "SNOMED-CT", "5121000146103"), - ACTINOTIGNUM_SCHAALII_ORGANISM("Actinotignum schaalii (organism)", null, "SNOMED-CT", "716526006"), + PARABURKHOLDERIA_TUBERUM("Paraburkholderia tuberum", "Paraburkholderia tuberum", "SNOMED-CT", "431167005"), - OCHROBACTRUM_ANTHROPI_ORGANISM("Ochrobactrum anthropi (organism)", null, "SNOMED-CT", "116490002"), + BURKHOLDERIA_PLANTARII("Burkholderia plantarii", "Burkholderia plantarii", "SNOMED-CT", "113676003"), - ALCALIGENES_FAECALIS_SUBSPECIES_FAECALIS_ORGANISM("Alcaligenes faecalis subspecies faecalis (organism)", null, "SNOMED-CT", "424719003"), + GENUS_MYCOPLASMA_ORGANISM("Genus Mycoplasma (organism)", "Genus Mycoplasma (organism)", "SNOMED-CT", "78981005"), - LEGIONELLA_LONGBEACHAE_ORGANISM("Legionella longbeachae (organism)", null, "SNOMED-CT", "89605004"), + GENUS_PROVIDENCIA_ORGANISM("Genus Providencia (organism)", "Genus Providencia (organism)", "SNOMED-CT", "112284001"), - CANDIDA_MAGNOLIAE_ORGANISM("Candida magnoliae (organism)", null, "SNOMED-CT", "446239009"), + KLEBSIELLA_PNEUMONIAE_SS_RHINOSCLEROMATIS_ORGANISM("Klebsiella pneumoniae ss. rhinoscleromatis (organism)", "Klebsiella pneumoniae ss. rhinoscleromatis (organism)", "SNOMED-CT", "17688001"), - RAOULTELLA_TERRIGENA_ORGANISM("Raoultella terrigena (organism)", null, "SNOMED-CT", "416096003"), + MYCOBACTERIUM_ABSCESSUS_ORGANISM("Mycobacterium abscessus (organism)", "Mycobacterium abscessus (organism)", "SNOMED-CT", "113838007"), - SHIGELLA_FLEXNERI_ORGANISM("Shigella flexneri (organism)", null, "SNOMED-CT", "85729005"), + STREPTOCOCCUS_DYSGALACTIAE_SUBSPECIES_DYSGALACTIAE_ORGANISM("Streptococcus dysgalactiae subspecies dysgalactiae (organism)", "Streptococcus dysgalactiae subspecies dysgalactiae (organism)", "SNOMED-CT", "113982002"), - ASPERGILLUS_TAMARII_ORGANISM("Aspergillus tamarii (organism)", null, "SNOMED-CT", "3111000146107"), + SALMONELLA_SCHWARZENGRUND("Salmonella Schwarzengrund", "Salmonella Schwarzengrund", "SNOMED-CT", "45651006"), - KYTOCOCCUS_SCHROETERI_ORGANISM("Kytococcus schroeteri (organism)", null, "SNOMED-CT", "428721003"), + BACILLUS_CEREUS_ORGANISM("Bacillus cereus (organism)", "Bacillus cereus (organism)", "SNOMED-CT", "84408007"), - STREPTOCOCCUS_SANGUINIS_ORGANISM("Streptococcus sanguinis (organism)", null, "SNOMED-CT", "113993000"), + SALMONELLA_POONA("Salmonella Poona", "Salmonella Poona", "SNOMED-CT", "57101009"), - CRONOBACTER_MALONATICUS("Cronobacter malonaticus", null, "SNOMED-CT", "445560007"), + GENUS_ANAEROCOCCUS_ORGANISM("Genus Anaerococcus (organism)", "Genus Anaerococcus (organism)", "SNOMED-CT", "413518000"), - CORYNEBACTERIUM_JEIKEIUM_ORGANISM("Corynebacterium jeikeium (organism)", null, "SNOMED-CT", "63410006"), + MICROCOCCUS_LUTEUS_ORGANISM("Micrococcus luteus (organism)", "Micrococcus luteus (organism)", "SNOMED-CT", "48299003"), - AEROMONAS_MOLLUSCORUM_ORGANISM("Aeromonas molluscorum (organism)", null, "SNOMED-CT", "425862003"), + BIFIDOBACTERIUM_BREVE_ORGANISM("Bifidobacterium breve (organism)", "Bifidobacterium breve (organism)", "SNOMED-CT", "35011006"), - PREVOTELLA_DENTICOLA_ORGANISM("Prevotella denticola (organism)", null, "SNOMED-CT", "114138003"), + LEGIONELLA_FEELEII_ORGANISM("Legionella feeleii (organism)", "Legionella feeleii (organism)", "SNOMED-CT", "17083009"), - SALMONELLA_TYPHIMURIUM_VAR_COPENHAGEN("Salmonella Typhimurium var. Copenhagen", null, "SNOMED-CT", "370578006"), + PARABURKHOLDERIA_SACCHARI("Paraburkholderia sacchari", "Paraburkholderia sacchari", "SNOMED-CT", "431164003"), - STREPTOCOCCUS_ANGINOSUS_GROUP_ORGANISM("Streptococcus anginosus group (organism)", null, "SNOMED-CT", "415597009"), + STAPHYLOCOCCUS_HAEMOLYTICUS_ORGANISM("Staphylococcus haemolyticus (organism)", "Staphylococcus haemolyticus (organism)", "SNOMED-CT", "83452006"), - CANDIDA_ALBICANS_ORGANISM("Candida albicans (organism)", null, "SNOMED-CT", "53326005"), + FUSOBACTERIUM_NUCLEATUM_ORGANISM("Fusobacterium nucleatum (organism)", "Fusobacterium nucleatum (organism)", "SNOMED-CT", "32763000"), - ASPERGILLUS_ORGANISM("Aspergillus (organism)", null, "SNOMED-CT", "2429008"), + CORYNEBACTERIUM_ACCOLENS_ORGANISM("Corynebacterium accolens (organism)", "Corynebacterium accolens (organism)", "SNOMED-CT", "243254006"), - BACTEROIDES_CACCAE_ORGANISM("Bacteroides caccae (organism)", null, "SNOMED-CT", "14342006"), + ACINETOBACTER_BEREZINIAE_ORGANISM("Acinetobacter bereziniae (organism)", "Acinetobacter bereziniae (organism)", "SNOMED-CT", "700398000"), - ACINETOBACTER_TANDOII_ORGANISM("Acinetobacter tandoii (organism)", null, "SNOMED-CT", "424021002"), + AEROMONAS_MOLLUSCORUM_ORGANISM("Aeromonas molluscorum (organism)", "Aeromonas molluscorum (organism)", "SNOMED-CT", "425862003"), - SALMONELLA_THOMPSON("Salmonella Thompson", null, "SNOMED-CT", "4361005"), + SALMONELLA_INDIANA("Salmonella Indiana", "Salmonella Indiana", "SNOMED-CT", "12278000"), - MYCOBACTERIUM_MICROTI_ORGANISM("Mycobacterium microti (organism)", null, "SNOMED-CT", "70801007"), + GENUS_CANDIDA_ORGANISM("Genus Candida (organism)", "Genus Candida (organism)", "SNOMED-CT", "3265006"), - HAFNIA_ALVEI_ORGANISM("Hafnia alvei (organism)", null, "SNOMED-CT", "76694001"), + STREPTOCOCCUS_DYSGALACTIAE_ORGANISM("Streptococcus dysgalactiae (organism)", "Streptococcus dysgalactiae (organism)", "SNOMED-CT", "40812000"), - GENUS_AEROMONAS_ORGANISM("Genus Aeromonas (organism)", null, "SNOMED-CT", "88529008"), + GENUS_MYROIDES_ORGANISM("Genus Myroides (organism)", "Genus Myroides (organism)", "SNOMED-CT", "115127008"), - STREPTOCOCCUS_CONSTELLATUS_ORGANISM("Streptococcus constellatus (organism)", null, "SNOMED-CT", "76199005"), + SALMONELLA_MONTEVIDEO("Salmonella Montevideo", "Salmonella Montevideo", "SNOMED-CT", "80268001"), - LEGIONELLA_MORAVICA_ORGANISM("Legionella moravica (organism)", null, "SNOMED-CT", "103454008"), + SALMONELLA_PARATYPHI_C("Salmonella Paratyphi C", "Salmonella Paratyphi C", "SNOMED-CT", "32488009"), - ELIZABETHKINGIA_MIRICOLA_ORGANISM("Elizabethkingia miricola (organism)", null, "SNOMED-CT", "444815005"), + SALMONELLA_UGANDA("Salmonella Uganda", "Salmonella Uganda", "SNOMED-CT", "2434007"), - VEILLONELLA_PARVULA_ORGANISM("Veillonella parvula (organism)", null, "SNOMED-CT", "90435009"), + SERRATIA_LIQUEFACIENS_ORGANISM("Serratia liquefaciens (organism)", "Serratia liquefaciens (organism)", "SNOMED-CT", "23787004"), - DERMATOPHYTE_ORGANISM("Dermatophyte (organism)", null, "SNOMED-CT", "115651002"), + ASPERGILLUS_FUMIGATUS_ORGANISM("Aspergillus fumigatus (organism)", "Aspergillus fumigatus (organism)", "SNOMED-CT", "32684000"), - LACTOBACILLUS_FERMENTUM_ORGANISM("Lactobacillus fermentum (organism)", null, "SNOMED-CT", "65506008"), + SALMONELLA_LONDON("Salmonella London", "Salmonella London", "SNOMED-CT", "2291004"), - RAOULTELLA_PLANTICOLA_ORGANISM("Raoultella planticola (organism)", null, "SNOMED-CT", "416264004"), + LEGIONELLA_PARISIENSIS_ORGANISM("Legionella parisiensis (organism)", "Legionella parisiensis (organism)", "SNOMED-CT", "38322001"), - AEROCOCCUS_URINAEHOMINIS_ORGANISM("Aerococcus urinaehominis (organism)", null, "SNOMED-CT", "409819000"), + BURKHOLDERIA_CARIBENSIS("Burkholderia caribensis", "Burkholderia caribensis", "SNOMED-CT", "431682004"), - BIFIDOBACTERIUM_BREVE_ORGANISM("Bifidobacterium breve (organism)", null, "SNOMED-CT", "35011006"), + PEPTOSTREPTOCOCCUS_ANAEROBIUS_ORGANISM("Peptostreptococcus anaerobius (organism)", "Peptostreptococcus anaerobius (organism)", "SNOMED-CT", "19217002"), - UREAPLASMA_UREALYTICUM_ORGANISM("Ureaplasma urealyticum (organism)", null, "SNOMED-CT", "12006007"), + MUCOID_PSEUDOMONAS_AERUGINOSA_ORGANISM("Mucoid Pseudomonas aeruginosa (organism)", "Mucoid Pseudomonas aeruginosa (organism)", "SNOMED-CT", "733537009"), - GENUS_BREVUNDIMONAS_ORGANISM("Genus Brevundimonas (organism)", null, "SNOMED-CT", "115154006"), + TRICHOPHYTON_MENTAGROPHYTES_VAR_INTERDIGITALE_ORGANISM("Trichophyton mentagrophytes var. interdigitale (organism)", "Trichophyton mentagrophytes var. interdigitale (organism)", "SNOMED-CT", "76040007"), - GENUS_STENOTROPHOMONAS_ORGANISM("Genus Stenotrophomonas (organism)", null, "SNOMED-CT", "115656007"), + STREPTOCOCCUS_PNEUMONIAE_ORGANISM("Streptococcus pneumoniae (organism)", "Streptococcus pneumoniae (organism)", "SNOMED-CT", "9861002"), - SALMONELLA_POMONA("Salmonella Pomona", null, "SNOMED-CT", "112314009"), + CITROBACTER_AMALONATICUS_ORGANISM("Citrobacter amalonaticus (organism)", "Citrobacter amalonaticus (organism)", "SNOMED-CT", "55744003"), - SALMONELLA_DUBLIN("Salmonella Dublin", null, "SNOMED-CT", "62136003"), + GENUS_GEOTRICHUM_ORGANISM("Genus Geotrichum (organism)", "Genus Geotrichum (organism)", "SNOMED-CT", "34324005"), - SALMONELLA_MIKAWASIMA("Salmonella Mikawasima", null, "SNOMED-CT", "42709001"), + KLEBSIELLA_PNEUMONIAE_SS_OZAENAE_ORGANISM("Klebsiella pneumoniae ss. ozaenae (organism)", "Klebsiella pneumoniae ss. ozaenae (organism)", "SNOMED-CT", "65186004"), - ACINETOBACTER_GUILLOUIAE_ORGANISM("Acinetobacter guillouiae (organism)", null, "SNOMED-CT", "700397005"), + LECLERCIA_ADECARBOXYLATA_ORGANISM("Leclercia adecarboxylata (organism)", "Leclercia adecarboxylata (organism)", "SNOMED-CT", "57459006"), - SALMONELLA_NEWPORT("Salmonella Newport", null, "SNOMED-CT", "56077000"), + TATUMELLA_TERREA_ORGANISM("Tatumella terrea (organism)", "Tatumella terrea (organism)", "SNOMED-CT", "8301000146102"), - PASTEURELLA_MAIRII_ORGANISM("Pasteurella mairii (organism)", null, "SNOMED-CT", "113905002"), + SALMONELLA_ENTERICA_SUBSPECIES_DIARIZONAE("Salmonella enterica subspecies diarizonae", "Salmonella enterica subspecies diarizonae", "SNOMED-CT", "398428002"), - RHODOTORULA_RUBRA_ORGANISM("Rhodotorula rubra (organism)", null, "SNOMED-CT", "86724009"), + GENUS_CAPNOCYTOPHAGA_ORGANISM("Genus Capnocytophaga (organism)", "Genus Capnocytophaga (organism)", "SNOMED-CT", "22294008"), - KLEBSIELLA_PNEUMONIAE_SS_OZAENAE_ORGANISM("Klebsiella pneumoniae ss. ozaenae (organism)", null, "SNOMED-CT", "65186004"), + SERRATIA_UREILYTICA_ORGANISM("Serratia ureilytica (organism)", "Serratia ureilytica (organism)", "SNOMED-CT", "450416004"), - SALMONELLA_KUMASI("Salmonella Kumasi", null, "SNOMED-CT", "58946009"), + BURKHOLDERIA_STABILIS("Burkholderia stabilis", "Burkholderia stabilis", "SNOMED-CT", "416616001"), - ASPERGILLUS_NIVEUS_ORGANISM("Aspergillus niveus (organism)", null, "SNOMED-CT", "18651002"), + GRAM_NEGATIVE_BACILLUS_ORGANISM("Gram-negative bacillus (organism)", "Gram-negative bacillus (organism)", "SNOMED-CT", "87172008"), - SALMONELLA_ENTERICA_SUBSPECIES_DIARIZONAE("Salmonella enterica subspecies diarizonae", null, "SNOMED-CT", "398428002"), + MICROBACTERIUM_FLAVESCENS_ORGANISM("Microbacterium flavescens (organism)", "Microbacterium flavescens (organism)", "SNOMED-CT", "114061003"), - HAEMOPHILUS_PARAHAEMOLYTICUS_ORGANISM("Haemophilus parahaemolyticus (organism)", null, "SNOMED-CT", "89800007"), + ENTEROCOCCUS_MALODORATUS_ORGANISM("Enterococcus malodoratus (organism)", "Enterococcus malodoratus (organism)", "SNOMED-CT", "10262005"), - AEROMONAS_SIMIAE_ORGANISM("Aeromonas simiae (organism)", null, "SNOMED-CT", "426333004"), + PROVIDENCIA_STUARTII_ORGANISM("Providencia stuartii (organism)", "Providencia stuartii (organism)", "SNOMED-CT", "1445008"), - SALMONELLA_SEROGROUP_E_ORGANISM("Salmonella, serogroup E (organism)", null, "SNOMED-CT", "115409001"), + YERSINIA_ENTEROCOLITICA_ORGANISM("Yersinia enterocolitica (organism)", "Yersinia enterocolitica (organism)", "SNOMED-CT", "65255000"), - STAPHYLOCOCCUS_CAPITIS_ORGANISM("Staphylococcus capitis (organism)", null, "SNOMED-CT", "40347003"), + SALMONELLA_BAREILLY("Salmonella Bareilly", "Salmonella Bareilly", "SNOMED-CT", "8044005"), - NEOSARTORYA_HIRATSUKAE_ORGANISM("Neosartorya hiratsukae (organism)", null, "SNOMED-CT", "414835000"), + BACTEROIDES_CACCAE_ORGANISM("Bacteroides caccae (organism)", "Bacteroides caccae (organism)", "SNOMED-CT", "14342006"), - BIFIDOBACTERIUM_DENTIUM_ORGANISM("Bifidobacterium dentium (organism)", null, "SNOMED-CT", "36623007"), + STENOTROPHOMONAS_RHIZOPHILA_ORGANISM("Stenotrophomonas rhizophila (organism)", "Stenotrophomonas rhizophila (organism)", "SNOMED-CT", "416084005"), - GENUS_ENTEROBACTER_ORGANISM("Genus Enterobacter (organism)", null, "SNOMED-CT", "58683007"), + GENUS_BREVUNDIMONAS_ORGANISM("Genus Brevundimonas (organism)", "Genus Brevundimonas (organism)", "SNOMED-CT", "115154006"), - ACINETOBACTER_GENOSPECIES11_ORGANISM("Acinetobacter genospecies 11 (organism)", null, "SNOMED-CT", "113380002"), + BURKHOLDERIA_CEPACIA_COMPLEX_ORGANISM("Burkholderia cepacia complex (organism)", "Burkholderia cepacia complex (organism)", "SNOMED-CT", "131281002"), - MYCOBACTERIUM_CHELONAE_ORGANISM("Mycobacterium chelonae (organism)", null, "SNOMED-CT", "243377008"), + STREPTOCOCCUS_GALLOLYTICUS_SUBSPECIES_GALLOLYTICUS_ORGANISM("Streptococcus gallolyticus subspecies gallolyticus (organism)", "Streptococcus gallolyticus subspecies gallolyticus (organism)", "SNOMED-CT", "421544007"), - SALMONELLA_MUENCHEN("Salmonella Muenchen", null, "SNOMED-CT", "77584005"), + ASPERGILLUS_VERSICOLOR_ORGANISM("Aspergillus versicolor (organism)", "Aspergillus versicolor (organism)", "SNOMED-CT", "48315007"), - LACTOBACILLUS_CRISPATUS_ORGANISM("Lactobacillus crispatus (organism)", null, "SNOMED-CT", "89237007"), + SPHINGOBACTERIUM_MULTIVORUM_ORGANISM("Sphingobacterium multivorum (organism)", "Sphingobacterium multivorum (organism)", "SNOMED-CT", "51595006"), - GENUS_PSEUDOMONAS_ORGANISM("Genus Pseudomonas (organism)", null, "SNOMED-CT", "57032008"), + GRAM_POSITIVE_BACILLUS_ORGANISM("Gram-positive bacillus (organism)", "Gram-positive bacillus (organism)", "SNOMED-CT", "83514008"), - BREVUNDIMONAS_INTERMEDIA("Brevundimonas intermedia", null, "SNOMED-CT", "423923008"), + GENUS_SHIGELLA_ORGANISM("Genus Shigella (organism)", "Genus Shigella (organism)", "SNOMED-CT", "77352002"), - GENUS_RAOULTELLA_ORGANISM("Genus Raoultella (organism)", null, "SNOMED-CT", "417468005"), + STREPTOCOCCUS_CRISTATUS_ORGANISM("Streptococcus cristatus (organism)", "Streptococcus cristatus (organism)", "SNOMED-CT", "113980005"), - ACINETOBACTER_VARIABILIS_ORGANISM("Acinetobacter variabilis (organism)", null, "SNOMED-CT", "113384006"), + CANDIDA_GUILLIERMONDII_ORGANISM("Candida guilliermondii (organism)", "Candida guilliermondii (organism)", "SNOMED-CT", "16557001"), - MANNHEIMIA_HAEMOLYTICA_ORGANISM("Mannheimia haemolytica (organism)", null, "SNOMED-CT", "128385005"), + STREPTOCOCCUS_AGALACTIAE_SEROTYPE_IB_ORGANISM("Streptococcus agalactiae serotype Ib (organism)", "Streptococcus agalactiae serotype Ib (organism)", "SNOMED-CT", "698166003"), - STREPTOCOCCUS_ORALIS_ORGANISM("Streptococcus oralis (organism)", null, "SNOMED-CT", "19870004"), + ACHROMOBACTER_SPANIUS_ORGANISM("Achromobacter spanius (organism)", "Achromobacter spanius (organism)", "SNOMED-CT", "413422008"), - ASPERGILLUS_NIDULANS_ORGANISM("Aspergillus nidulans (organism)", null, "SNOMED-CT", "60264008"), + MYCOBACTERIUM_KANSASII_ORGANISM("Mycobacterium kansasii (organism)", "Mycobacterium kansasii (organism)", "SNOMED-CT", "1507005"), - RHIZOBIUM_RADIOBACTER_ORGANISM("Rhizobium radiobacter (organism)", null, "SNOMED-CT", "438107000"), + GENUS_RAOULTELLA_ORGANISM("Genus Raoultella (organism)", "Genus Raoultella (organism)", "SNOMED-CT", "417468005"), - STREPTOCOCCUS_PYOGENES_ORGANISM("Streptococcus pyogenes (organism)", null, "SNOMED-CT", "80166006"), + ENTEROBACTER_ASBURIAE_ORGANISM("Enterobacter asburiae (organism)", "Enterobacter asburiae (organism)", "SNOMED-CT", "33115003"), - BURKHOLDERIA_CEPACIA_ORGANISM("Burkholderia cepacia (organism)", null, "SNOMED-CT", "113669008"), + CORYNEBACTERIUM_AMYCOLATUM_ORGANISM("Corynebacterium amycolatum (organism)", "Corynebacterium amycolatum (organism)", "SNOMED-CT", "113611002"), - GENUS_MYCOPLASMA_ORGANISM("Genus Mycoplasma (organism)", null, "SNOMED-CT", "78981005"), + SALMONELLA_KENTUCKY("Salmonella Kentucky", "Salmonella Kentucky", "SNOMED-CT", "8455004"), - SALMONELLA_HEIDELBERG("Salmonella Heidelberg", null, "SNOMED-CT", "71865006"), + SALMONELLA_HADAR("Salmonella Hadar", "Salmonella Hadar", "SNOMED-CT", "49491006"), - MIXTA_CALIDA_ORGANISM("Mixta calida (organism)", null, "SNOMED-CT", "709310002"), + GEOTRICHUM_CANDIDUM_ORGANISM("Geotrichum candidum (organism)", "Geotrichum candidum (organism)", "SNOMED-CT", "41625002"), - CUPRIAVIDUS_PAUCULUS_ORGANISM("Cupriavidus pauculus (organism)", null, "SNOMED-CT", "429465001"), + VAGOCOCCUS_FLUVIALIS_ORGANISM("Vagococcus fluvialis (organism)", "Vagococcus fluvialis (organism)", "SNOMED-CT", "116418005"), - BURKHOLDERIA_VIETNAMIENSIS_ORGANISM("Burkholderia vietnamiensis (organism)", null, "SNOMED-CT", "113680008"), + CAMPYLOBACTER_COLI("Campylobacter coli", "Campylobacter coli", "SNOMED-CT", "40614002"), - LEGIONELLA_JAMESTOWNIENSIS_ORGANISM("Legionella jamestowniensis (organism)", null, "SNOMED-CT", "89709001"), + LEGIONELLA_JORDANIS_ORGANISM("Legionella jordanis (organism)", "Legionella jordanis (organism)", "SNOMED-CT", "39739007"), - CITROBACTER_FARMERI_ORGANISM("Citrobacter farmeri (organism)", null, "SNOMED-CT", "114263005"), + PEPTONIPHILUS_ASACCHAROLYTICUS_ORGANISM("Peptoniphilus asaccharolyticus (organism)", "Peptoniphilus asaccharolyticus (organism)", "SNOMED-CT", "433440001"), - ACHROMOBACTER_INSOLITUS_ORGANISM("Achromobacter insolitus (organism)", null, "SNOMED-CT", "413417008"), + SALMONELLA_TYPHIMURIUM_VAR_COPENHAGEN("Salmonella Typhimurium var. Copenhagen", "Salmonella Typhimurium var. Copenhagen", "SNOMED-CT", "370578006"), - SALMONELLA_SANDIEGO("Salmonella Sandiego", null, "SNOMED-CT", "112287008"), + STAPHYLOCOCCUS_INTERMEDIUS_ORGANISM("Staphylococcus intermedius (organism)", "Staphylococcus intermedius (organism)", "SNOMED-CT", "34605002"), - SALMONELLA_INFANTIS("Salmonella Infantis", null, "SNOMED-CT", "82071007"), + CITROBACTER_KOSERI("Citrobacter koseri", "Citrobacter koseri", "SNOMED-CT", "114264004"), - GENUS_BACILLUS_ORGANISM("Genus Bacillus (organism)", null, "SNOMED-CT", "44762009"), + SALMONELLA_ENTERICA_SUBSP_ARIZONAE_ORGANISM("Salmonella enterica subsp. arizonae (organism)", "Salmonella enterica subsp. arizonae (organism)", "SNOMED-CT", "397502001"), - SERRATIA_PROTEAMACULANS_ORGANISM("Serratia proteamaculans (organism)", null, "SNOMED-CT", "116135003"), + SALMONELLA_STANLEY("Salmonella Stanley", "Salmonella Stanley", "SNOMED-CT", "88091007"), - SALMONELLA_UGANDA("Salmonella Uganda", null, "SNOMED-CT", "2434007"), + LEGIONELLA_LONGBEACHAE_ORGANISM("Legionella longbeachae (organism)", "Legionella longbeachae (organism)", "SNOMED-CT", "89605004"), - GENUS_CAPNOCYTOPHAGA_ORGANISM("Genus Capnocytophaga (organism)", null, "SNOMED-CT", "22294008"), + ZYGOSACCHAROMYCES_BAILII_ORGANISM("Zygosaccharomyces bailii (organism)", "Zygosaccharomyces bailii (organism)", "SNOMED-CT", "442943004"), - PARABURKHOLDERIA_SACCHARI("Paraburkholderia sacchari", null, "SNOMED-CT", "431164003"), + ACTINOTIGNUM_SCHAALII_ORGANISM("Actinotignum schaalii (organism)", "Actinotignum schaalii (organism)", "SNOMED-CT", "716526006"), - PANTOEA_STEWARTII_ORGANISM("Pantoea stewartii (organism)", null, "SNOMED-CT", "131300002"), + MOLD_ORGANISM("Mold (organism)", "Mold (organism)", "SNOMED-CT", "84489001"), - PREVOTELLA_BUCCAE_ORGANISM("Prevotella buccae (organism)", null, "SNOMED-CT", "114134001"), + WANGIELLA_DERMATITIDIS_ORGANISM("Wangiella dermatitidis (organism)", "Wangiella dermatitidis (organism)", "SNOMED-CT", "20586007"), - CAMPYLOBACTER_UREOLYTICUS_ORGANISM("Campylobacter ureolyticus (organism)", null, "SNOMED-CT", "450602004"), + ACINETOBACTER_GERNERI_ORGANISM("Acinetobacter gerneri (organism)", "Acinetobacter gerneri (organism)", "SNOMED-CT", "424700008"), - ENTEROBACTER_KOBEI_ORGANISM("Enterobacter kobei (organism)", null, "SNOMED-CT", "114456008"), + ENTEROBACTER_CLOACAE_ORGANISM("Enterobacter cloacae (organism)", "Enterobacter cloacae (organism)", "SNOMED-CT", "14385002"), - BURKHOLDERIA_CALEDONICA("Burkholderia caledonica", null, "SNOMED-CT", "423159001"), + SERRATIA_PROTEAMACULANS_ORGANISM("Serratia proteamaculans (organism)", "Serratia proteamaculans (organism)", "SNOMED-CT", "116135003"), - SALMONELLA_SEROGROUP_D_ORGANISM("Salmonella, serogroup D (organism)", null, "SNOMED-CT", "115408009"), + CHRYSEOBACTERIUM_INDOLOGENES_ORGANISM("Chryseobacterium indologenes (organism)", "Chryseobacterium indologenes (organism)", "SNOMED-CT", "113549008"), - STAPHYLOCOCCUS_EPIDERMIDIS_ORGANISM("Staphylococcus epidermidis (organism)", null, "SNOMED-CT", "60875001"), + GAMMA_HEMOLYTIC_STREPTOCOCCUS_ORGANISM("Gamma-hemolytic streptococcus (organism)", "Gamma-hemolytic streptococcus (organism)", "SNOMED-CT", "22339002"), - STREPTOCOCCUS_DYSGALACTIAE_SUBSPECIES_EQUISIMILIS_ORGANISM("Streptococcus dysgalactiae subspecies equisimilis (organism)", null, "SNOMED-CT", "128338004"), + PARABACTEROIDES_DISTASONIS_ORGANISM("Parabacteroides distasonis (organism)", "Parabacteroides distasonis (organism)", "SNOMED-CT", "447512008"), - VAGOCOCCUS_FLUVIALIS_ORGANISM("Vagococcus fluvialis (organism)", null, "SNOMED-CT", "116418005"), + STAPHYLOCOCCUS_HOMINIS_SUBSPECIES_HOMINIS_ORGANISM("Staphylococcus hominis subspecies hominis (organism)", "Staphylococcus hominis subspecies hominis (organism)", "SNOMED-CT", "432505008"), - BURKHOLDERIA_AMBIFARIA("Burkholderia ambifaria", null, "SNOMED-CT", "416467009"), + LEGIONELLA_SANTICRUCIS_ORGANISM("Legionella santicrucis (organism)", "Legionella santicrucis (organism)", "SNOMED-CT", "72814000"), - ACINETOBACTER_BOUVETII_ORGANISM("Acinetobacter bouvetii (organism)", null, "SNOMED-CT", "424539001"), + GENUS_BACTEROIDES_ORGANISM("Genus Bacteroides (organism)", "Genus Bacteroides (organism)", "SNOMED-CT", "57522007"), - LEGIONELLA_CINCINNATIENSIS_ORGANISM("Legionella cincinnatiensis (organism)", null, "SNOMED-CT", "58923007"), + BACILLUS_CEREUS_GROUP_ORGANISM("Bacillus cereus group (organism)", "Bacillus cereus group (organism)", "SNOMED-CT", "413618005"), - MICROCOCCUS_LUTEUS_ORGANISM("Micrococcus luteus (organism)", null, "SNOMED-CT", "48299003"), + ACINETOBACTER_BOUVETII_ORGANISM("Acinetobacter bouvetii (organism)", "Acinetobacter bouvetii (organism)", "SNOMED-CT", "424539001"), - NEISSERIA_GONORRHOEAE_ORGANISM("Neisseria gonorrhoeae (organism)", null, "SNOMED-CT", "68704007"), + ACHROMOBACTER_XYLOSOXIDANS_XYLOSOXIDANS_ORGANISM("Achromobacter xylosoxidans xylosoxidans (organism)", "Achromobacter xylosoxidans xylosoxidans (organism)", "SNOMED-CT", "423897003"), - ASPERGILLUS_OCHRACEUS_ORGANISM("Aspergillus ochraceus (organism)", null, "SNOMED-CT", "60111002"), + ASPERGILLUS_SYDOWII_ORGANISM("Aspergillus sydowii (organism)", "Aspergillus sydowii (organism)", "SNOMED-CT", "46388006"), - CANDIDA_GUILLIERMONDII_ORGANISM("Candida guilliermondii (organism)", null, "SNOMED-CT", "16557001"), + INQUILINUS_LIMOSUS_ORGANISM("Inquilinus limosus (organism)", "Inquilinus limosus (organism)", "SNOMED-CT", "427977006"), - ENTEROBACTER_CLOACAE_ORGANISM("Enterobacter cloacae (organism)", null, "SNOMED-CT", "14385002"), + ENTEROBACTER_CANCEROGENUS("Enterobacter cancerogenus", "Enterobacter cancerogenus", "SNOMED-CT", "114451003"), - PSEUDOMONAS_FLUORESCENS_GROUP_ORGANISM("Pseudomonas fluorescens group (organism)", null, "SNOMED-CT", "415197003"), + PSEUDOMONAS_SPECIES_NOT_AERUGINOSA_ORGANISM("Pseudomonas species not aeruginosa (organism)", "Pseudomonas species not aeruginosa (organism)", "SNOMED-CT", "710336008"), - SALMONELLA_APAPA("Salmonella Apapa", null, "SNOMED-CT", "46399008"), + STAPHYLOCOCCUS_SIMULANS_ORGANISM("Staphylococcus simulans (organism)", "Staphylococcus simulans (organism)", "SNOMED-CT", "52122005"), - SALMONELLA_READING("Salmonella Reading", null, "SNOMED-CT", "63396002"), + MORAXELLA_NONLIQUEFACIENS_ORGANISM("Moraxella nonliquefaciens (organism)", "Moraxella nonliquefaciens (organism)", "SNOMED-CT", "46455003"), - PASTEURELLA_BETTYAE_ORGANISM("Pasteurella bettyae (organism)", null, "SNOMED-CT", "113902004"), + ENTEROBACTER_AMNIGENUS_BIOGROUP_I_ORGANISM("Enterobacter amnigenus biogroup I (organism)", "Enterobacter amnigenus biogroup I (organism)", "SNOMED-CT", "114452005"), - STAPHYLOCOCCUS_WARNERI_ORGANISM("Staphylococcus warneri (organism)", null, "SNOMED-CT", "63550006"), + CLOSTRIDIUM_INNOCUUM_ORGANISM("Clostridium innocuum (organism)", "Clostridium innocuum (organism)", "SNOMED-CT", "19415008"), - AEROMONAS_CAVIAE_ORGANISM("Aeromonas caviae (organism)", null, "SNOMED-CT", "115036005"), + ACINETOBACTER_HAEMOLYTICUS_ORGANISM("Acinetobacter haemolyticus (organism)", "Acinetobacter haemolyticus (organism)", "SNOMED-CT", "77045006"), - STREPTOCOCCUS_VIRIDANS_GROUP_ORGANISM("Streptococcus, viridans group (organism)", null, "SNOMED-CT", "31703004"), + AEROCOCCUS_URINAE_ORGANISM("Aerococcus urinae (organism)", "Aerococcus urinae (organism)", "SNOMED-CT", "243230001"), - SALMONELLA_POTSDAM("Salmonella Potsdam", null, "SNOMED-CT", "8544001"), + SALMONELLA_ALTONA("Salmonella Altona", "Salmonella Altona", "SNOMED-CT", "47229009"), - PLURALIBACTER_GERGOVIAE("Pluralibacter gergoviae", null, "SNOMED-CT", "716346000"), + UREAPLASMA_UREALYTICUM_ORGANISM("Ureaplasma urealyticum (organism)", "Ureaplasma urealyticum (organism)", "SNOMED-CT", "12006007"), - SALMONELLA_VIRCHOW("Salmonella Virchow", null, "SNOMED-CT", "5929008"), + AEROMONAS_SALMONICIDA_SS_SALMONICIDA_ORGANISM("Aeromonas salmonicida ss. salmonicida (organism)", "Aeromonas salmonicida ss. salmonicida (organism)", "SNOMED-CT", "62520007"), - KLEBSIELLA_PNEUMONIAE_SS_PNEUMONIAE_ORGANISM("Klebsiella pneumoniae ss. pneumoniae (organism)", null, "SNOMED-CT", "18400002"), + EUBACTERIUM_LIMOSUM_ORGANISM("Eubacterium limosum (organism)", "Eubacterium limosum (organism)", "SNOMED-CT", "87632000"), - GENUS_CANDIDA_ORGANISM("Genus Candida (organism)", null, "SNOMED-CT", "3265006"), + CANDIDA_TROPICALIS_ORGANISM("Candida tropicalis (organism)", "Candida tropicalis (organism)", "SNOMED-CT", "47885008"), - SERRATIA_UREILYTICA_ORGANISM("Serratia ureilytica (organism)", null, "SNOMED-CT", "450416004"), + STREPTOCOCCUS_PARASANGUINIS_ORGANISM("Streptococcus parasanguinis (organism)", "Streptococcus parasanguinis (organism)", "SNOMED-CT", "113990002"), - ENTEROCOCCUS_AVIUM_ORGANISM("Enterococcus avium (organism)", null, "SNOMED-CT", "87875008"), + ASPERGILLUS_ORGANISM("Aspergillus (organism)", "Aspergillus (organism)", "SNOMED-CT", "2429008"), - PROVIDENCIA_HEIMBACHAE_ORGANISM("Providencia heimbachae (organism)", null, "SNOMED-CT", "47300009"), + BORDETELLA_PERTUSSIS_ORGANISM("Bordetella pertussis (organism)", "Bordetella pertussis (organism)", "SNOMED-CT", "5247005"), - ASPERGILLUS_SYDOWII_ORGANISM("Aspergillus sydowii (organism)", null, "SNOMED-CT", "46388006"), + SALMONELLA_PARATYPHI_B("Salmonella Paratyphi B", "Salmonella Paratyphi B", "SNOMED-CT", "85908006"), - SALMONELLA_ENTERICA_SUBSP_ENTERICA_ORGANISM("Salmonella enterica subsp. enterica (organism)", null, "SNOMED-CT", "398508004"), + RAOULTELLA_ORNITHINOLYTICA_ORGANISM("Raoultella ornithinolytica (organism)", "Raoultella ornithinolytica (organism)", "SNOMED-CT", "416832000"), - CITROBACTER_FREUNDII_COMPLEX_ORGANISM("Citrobacter freundii complex (organism)", null, "SNOMED-CT", "782522004"), + STREPTOCOCCUS_PYOGENES_ORGANISM("Streptococcus pyogenes (organism)", "Streptococcus pyogenes (organism)", "SNOMED-CT", "80166006"), - BREVUNDIMONAS_SUBVIBRIOIDES("Brevundimonas subvibrioides", null, "SNOMED-CT", "423492004"), + STAPHYLOCOCCUS_AUREUS_ORGANISM("Staphylococcus aureus (organism)", "Staphylococcus aureus (organism)", "SNOMED-CT", "3092008"), - PNEUMOCYSTIS_JIROVECII_ORGANISM("Pneumocystis jirovecii (organism)", null, "SNOMED-CT", "79909001"), + SERRATIA_FICARIA_ORGANISM("Serratia ficaria (organism)", "Serratia ficaria (organism)", "SNOMED-CT", "802004"), - ASPERGILLUS_NIGER_GROUP_ORGANISM("Aspergillus niger group (organism)", null, "SNOMED-CT", "243494006"), + STREPTOCOCCUS_MITIS_ORGANISM("Streptococcus mitis (organism)", "Streptococcus mitis (organism)", "SNOMED-CT", "57997003"), - FUSOBACTERIUM_NUCLEATUM_ORGANISM("Fusobacterium nucleatum (organism)", null, "SNOMED-CT", "32763000"), + DELFTIA_ACIDOVORANS_ORGANISM("Delftia acidovorans (organism)", "Delftia acidovorans (organism)", "SNOMED-CT", "20432002"), - ASPERGILLUS_TERREUS_ORGANISM("Aspergillus terreus (organism)", null, "SNOMED-CT", "26406003"), + SERRATIA_MARCESCENS_ORGANISM("Serratia marcescens (organism)", "Serratia marcescens (organism)", "SNOMED-CT", "33522002"), - SERRATIA_MARCESCENS_ORGANISM("Serratia marcescens (organism)", null, "SNOMED-CT", "33522002"), + ENTEROCOCCUS_FAECALIS_ORGANISM("Enterococcus faecalis (organism)", "Enterococcus faecalis (organism)", "SNOMED-CT", "78065002"), - ACHROMOBACTER_RUHLANDII_ORGANISM("Achromobacter ruhlandii (organism)", null, "SNOMED-CT", "413421001"), + AEROMONAS_BESTIARUM_ORGANISM("Aeromonas bestiarum (organism)", "Aeromonas bestiarum (organism)", "SNOMED-CT", "115027006"), - SALMONELLA_LONDON("Salmonella London", null, "SNOMED-CT", "2291004"), + ENTEROHEMORRHAGIC_ESCHERICHIA_COLI_ORGANISM("Enterohemorrhagic Escherichia coli (organism)", "Enterohemorrhagic Escherichia coli (organism)", "SNOMED-CT", "116395006"), - BETA_HEMOLYTIC_STREPTOCOCCUS_GROUP_A_ORGANISM("Beta-hemolytic Streptococcus, group A (organism)", null, "SNOMED-CT", "413643004"), + SALMONELLA_DUBLIN("Salmonella Dublin", "Salmonella Dublin", "SNOMED-CT", "62136003"), - PASTEURELLA_STOMATIS_ORGANISM("Pasteurella stomatis (organism)", null, "SNOMED-CT", "46827009"), + CORYNEBACTERIUM_PROPINQUUM_ORGANISM("Corynebacterium propinquum (organism)", "Corynebacterium propinquum (organism)", "SNOMED-CT", "113612009"), - STAPHYLOCOCCUS_SAPROPHYTICUS("Staphylococcus saprophyticus", null, "SNOMED-CT", "19743000"), + LEGIONELLA_PNEUMOPHILA_SEROGROUP9_ORGANISM("Legionella pneumophila serogroup 9 (organism)", "Legionella pneumophila serogroup 9 (organism)", "SNOMED-CT", "103471009"), - CRONOBACTER_MUYTJENSII("Cronobacter muytjensii", null, "SNOMED-CT", "445561006"), + GENUS_ROTHIA_ORGANISM("Genus Rothia (organism)", "Genus Rothia (organism)", "SNOMED-CT", "90163001"), - PREVOTELLA_BERGENSIS_ORGANISM("Prevotella bergensis (organism)", null, "SNOMED-CT", "708941000"), + SALMONELLA_GROUP_O18_ORGANISM("Salmonella group O:18 (organism)", "Salmonella group O:18 (organism)", "SNOMED-CT", "404294002"), - STAPHYLOCOCCUS_AUREUS_ORGANISM("Staphylococcus aureus (organism)", null, "SNOMED-CT", "3092008"), + BACTEROIDES_OVATUS_ORGANISM("Bacteroides ovatus (organism)", "Bacteroides ovatus (organism)", "SNOMED-CT", "86936008"), - BACILLUS_SUBTILIS_ORGANISM("Bacillus subtilis (organism)", null, "SNOMED-CT", "83512007"), + STAPHYLOCOCCUS_HOMINIS_ORGANISM("Staphylococcus hominis (organism)", "Staphylococcus hominis (organism)", "SNOMED-CT", "44827007"), - ENTEROHEMORRHAGIC_ESCHERICHIA_COLI_ORGANISM("Enterohemorrhagic Escherichia coli (organism)", null, "SNOMED-CT", "116395006"), + SERRATIA_FONTICOLA_ORGANISM("Serratia fonticola (organism)", "Serratia fonticola (organism)", "SNOMED-CT", "112329006"), - SALMONELLA_BLOCKLEY("Salmonella Blockley", null, "SNOMED-CT", "53684004"), + NON_TOXIGENIC_CLOSTRIDIUM_DIFFICILE_ORGANISM("Non-Toxigenic Clostridium difficile (organism)", "Non-Toxigenic Clostridium difficile (organism)", "SNOMED-CT", "736051005"), - SALMONELLA_ENTERITIDIS_ORGANISM("Salmonella Enteritidis (organism)", null, "SNOMED-CT", "73525009"), + LACTOBACILLUS_RHAMNOSUS_ORGANISM("Lactobacillus rhamnosus (organism)", "Lactobacillus rhamnosus (organism)", "SNOMED-CT", "113798001"), - ASPERGILLUS_VERSICOLOR_ORGANISM("Aspergillus versicolor (organism)", null, "SNOMED-CT", "48315007"), + STAPHYLOCOCCUS_SAPROPHYTICUS("Staphylococcus saprophyticus", "Staphylococcus saprophyticus", "SNOMED-CT", "19743000"), - ZYGOSACCHAROMYCES_BAILII_ORGANISM("Zygosaccharomyces bailii (organism)", null, "SNOMED-CT", "442943004"), + STAPHYLOCOCCUS_EPIDERMIDIS_ORGANISM("Staphylococcus epidermidis (organism)", "Staphylococcus epidermidis (organism)", "SNOMED-CT", "60875001"), - BACILLUS_CIRCULANS_ORGANISM("Bacillus circulans (organism)", null, "SNOMED-CT", "71812004"), + AEROMONAS_EUCRENOPHILIA_ORGANISM("Aeromonas eucrenophilia (organism)", "Aeromonas eucrenophilia (organism)", "SNOMED-CT", "115030004"), - LEGIONELLA_BIRMINGHAMENSIS_ORGANISM("Legionella birminghamensis (organism)", null, "SNOMED-CT", "22592008"), + CITROBACTER_SEDLAKII("Citrobacter sedlakii", "Citrobacter sedlakii", "SNOMED-CT", "114265003"), - MICROBACTERIUM_FLAVESCENS_ORGANISM("Microbacterium flavescens (organism)", null, "SNOMED-CT", "114061003"), + ANAEROBIC_NON_SPORING_GRAM_POSITIVE_BACILLUS_ORGANISM("Anaerobic non-sporing Gram-positive bacillus (organism)", "Anaerobic non-sporing Gram-positive bacillus (organism)", "SNOMED-CT", "243399000"), - LEGIONELLA_BELIARDENSIS_ORGANISM("Legionella beliardensis (organism)", null, "SNOMED-CT", "432714000"), + SALMONELLA_SAINTPAUL("Salmonella Saintpaul", "Salmonella Saintpaul", "SNOMED-CT", "2820001"), - MYCOBACTERIUM_TUBERCULOSIS_COMPLEX_ORGANISM("Mycobacterium tuberculosis complex (organism)", null, "SNOMED-CT", "113858008"), + GENUS_LACTOBACILLUS_ORGANISM("Genus Lactobacillus (organism)", "Genus Lactobacillus (organism)", "SNOMED-CT", "43690008"), - CLOSTRIDIUM_PERFRINGENS_ORGANISM("Clostridium perfringens (organism)", null, "SNOMED-CT", "8331005"), + PASTEURELLA_AEROGENES_ORGANISM("Pasteurella aerogenes (organism)", "Pasteurella aerogenes (organism)", "SNOMED-CT", "87075007"), - STREPTOCOCCUS_MITIS_GROUP_ORGANISM("Streptococcus mitis group (organism)", null, "SNOMED-CT", "127539005"), + ACINETOBACTER_TJERNBERGIAE_ORGANISM("Acinetobacter tjernbergiae (organism)", "Acinetobacter tjernbergiae (organism)", "SNOMED-CT", "425109008"), - NEISSERIA_MENINGITIDIS_ORGANISM("Neisseria meningitidis (organism)", null, "SNOMED-CT", "17872004"), + GENUS_AEROMONAS_ORGANISM("Genus Aeromonas (organism)", "Genus Aeromonas (organism)", "SNOMED-CT", "88529008"), - PARVIMONAS_MICRA_ORGANISM("Parvimonas micra (organism)", null, "SNOMED-CT", "434293007"), + ACINETOBACTER_GENOSPECIES3_ORGANISM("Acinetobacter genospecies 3 (organism)", "Acinetobacter genospecies 3 (organism)", "SNOMED-CT", "113377003"), - GENUS_BURKHOLDERIA_ORGANISM("Genus Burkholderia (organism)", null, "SNOMED-CT", "414324002"), + GENUS_UREAPLASMA_ORGANISM("Genus Ureaplasma (organism)", "Genus Ureaplasma (organism)", "SNOMED-CT", "29680004"), - ENTEROBACTER_AMNIGENUS("Enterobacter amnigenus", null, "SNOMED-CT", "84221003"), + CORYNEBACTERIUM_STRIATUM_ORGANISM("Corynebacterium striatum (organism)", "Corynebacterium striatum (organism)", "SNOMED-CT", "63815007"), - LEGIONELLA_GORMANII_ORGANISM("Legionella gormanii (organism)", null, "SNOMED-CT", "113721003"), + LISTERIA_MONOCYTOGENES_ORGANISM("Listeria monocytogenes (organism)", "Listeria monocytogenes (organism)", "SNOMED-CT", "36094007"), - ACTINOMYCES_NEUII_ORGANISM("Actinomyces neuii (organism)", null, "SNOMED-CT", "877802991000087109"), + CHRYSEOMONAS_LUTEOLA_ORGANISM("Chryseomonas luteola (organism)", "Chryseomonas luteola (organism)", "SNOMED-CT", "33919008"), - GENUS_PROPIONIBACTERIUM_ORGANISM("Genus Propionibacterium (organism)", null, "SNOMED-CT", "34844008"), + ASPERGILLUS_NIGER_GROUP_ORGANISM("Aspergillus niger group (organism)", "Aspergillus niger group (organism)", "SNOMED-CT", "243494006"), - YERSINIA_ENTEROCOLITICA_SEROGROUP_O3_ORGANISM("Yersinia enterocolitica serogroup O:3 (organism)", null, "SNOMED-CT", "103430003"), + ENTEROCOCCUS_AVIUM_ORGANISM("Enterococcus avium (organism)", "Enterococcus avium (organism)", "SNOMED-CT", "87875008"), - SPHINGOBACTERIUM_MULTIVORUM_ORGANISM("Sphingobacterium multivorum (organism)", null, "SNOMED-CT", "51595006"), + LEGIONELLA_JAMESTOWNIENSIS_ORGANISM("Legionella jamestowniensis (organism)", "Legionella jamestowniensis (organism)", "SNOMED-CT", "89709001"), - STAPHYLOCOCCUS_HOMINIS_SUBSPECIES_HOMINIS_ORGANISM("Staphylococcus hominis subspecies hominis (organism)", null, "SNOMED-CT", "432505008"), + CORYNEBACTERIUM_JEIKEIUM_ORGANISM("Corynebacterium jeikeium (organism)", "Corynebacterium jeikeium (organism)", "SNOMED-CT", "63410006"), - LEGIONELLA_CHERRII_ORGANISM("Legionella cherrii (organism)", null, "SNOMED-CT", "52462004"), + MORAXELLA_CATARRHALIS_ORGANISM("Moraxella catarrhalis (organism)", "Moraxella catarrhalis (organism)", "SNOMED-CT", "24226003"), - ASPERGILLUS_NIGER_ORGANISM("Aspergillus niger (organism)", null, "SNOMED-CT", "89354002"), + PSEUDOMONAS_STUTZERI_ORGANISM("Pseudomonas stutzeri (organism)", "Pseudomonas stutzeri (organism)", "SNOMED-CT", "58024003"), - PEPTONIPHILUS_ASACCHAROLYTICUS_ORGANISM("Peptoniphilus asaccharolyticus (organism)", null, "SNOMED-CT", "433440001"), + HAEMOPHILUS_INFLUENZAE_ORGANISM("Haemophilus influenzae (organism)", "Haemophilus influenzae (organism)", "SNOMED-CT", "44470000"), - PROTEUS_VULGARIS_ORGANISM("Proteus vulgaris (organism)", null, "SNOMED-CT", "45834001"), + BACTEROIDES_UNIFORMIS_ORGANISM("Bacteroides uniformis (organism)", "Bacteroides uniformis (organism)", "SNOMED-CT", "59604009"), - LEGIONELLA_ERYTHRA_ORGANISM("Legionella erythra (organism)", null, "SNOMED-CT", "28109006"), + SALMONELLA_KIAMBU("Salmonella Kiambu", "Salmonella Kiambu", "SNOMED-CT", "11901002"), - GENUS_PROTEUS_ORGANISM("Genus Proteus (organism)", null, "SNOMED-CT", "50517009"), + MYCOBACTERIUM_AVIUM_ORGANISM("Mycobacterium avium (organism)", "Mycobacterium avium (organism)", "SNOMED-CT", "83723009"), - FUSOBACTERIUM_NECROPHORUM_ORGANISM("Fusobacterium necrophorum (organism)", null, "SNOMED-CT", "27274008"), + ACINETOBACTER_VARIABILIS_ORGANISM("Acinetobacter variabilis (organism)", "Acinetobacter variabilis (organism)", "SNOMED-CT", "113384006"), - STENOTROPHOMONAS_RHIZOPHILA_ORGANISM("Stenotrophomonas rhizophila (organism)", null, "SNOMED-CT", "416084005"), + SALMONELLA_KUMASI("Salmonella Kumasi", "Salmonella Kumasi", "SNOMED-CT", "58946009"), - BURKHOLDERIA_PLANTARII("Burkholderia plantarii", null, "SNOMED-CT", "113676003"), + SALMONELLA_MIKAWASIMA("Salmonella Mikawasima", "Salmonella Mikawasima", "SNOMED-CT", "42709001"), - SERRATIA_ENTOMOPHILA_ORGANISM("Serratia entomophila (organism)", null, "SNOMED-CT", "76656001"), + STAPHYLOCOCCUS_ARGENTEUS_ORGANISM("Staphylococcus argenteus (organism)", "Staphylococcus argenteus (organism)", "SNOMED-CT", "782316009"), - SALMONELLA_SENFTENBERG("Salmonella Senftenberg", null, "SNOMED-CT", "18163008"), + AEROMONAS_TROTA_ORGANISM("Aeromonas trota (organism)", "Aeromonas trota (organism)", "SNOMED-CT", "243316008"), - CORYNEBACTERIUM_AURIMUCOSUM_ORGANISM("Corynebacterium aurimucosum (organism)", null, "SNOMED-CT", "385503009"), + ACHROMOBACTER_INSOLITUS_ORGANISM("Achromobacter insolitus (organism)", "Achromobacter insolitus (organism)", "SNOMED-CT", "413417008"), - GENUS_NOCARDIA_ORGANISM("Genus Nocardia (organism)", null, "SNOMED-CT", "59674005"), + PREVOTELLA_DENTICOLA_ORGANISM("Prevotella denticola (organism)", "Prevotella denticola (organism)", "SNOMED-CT", "114138003"), - ASPERGILLUS_TERREUS_GROUP_ORGANISM("Aspergillus terreus group (organism)", null, "SNOMED-CT", "243500005"), + KLEBSIELLA_PNEUMONIAE_ORGANISM("Klebsiella pneumoniae (organism)", "Klebsiella pneumoniae (organism)", "SNOMED-CT", "56415008"), - FLAVIMONAS_ORYZIHABITANS_ORGANISM("Flavimonas oryzihabitans (organism)", null, "SNOMED-CT", "113931000"), + STAPHYLOCOCCUS_COAGULASE_NEGATIVE_ORGANISM("Staphylococcus, coagulase negative (organism)", "Staphylococcus, coagulase negative (organism)", "SNOMED-CT", "116197008"), - LEGIONELLA_DUMOFFII_ORGANISM("Legionella dumoffii (organism)", null, "SNOMED-CT", "113720002"), + SALMONELLA_CORVALLIS("Salmonella Corvallis", "Salmonella Corvallis", "SNOMED-CT", "45548005"), - CANDIDA_KRUSEI_ORGANISM("Candida krusei (organism)", null, "SNOMED-CT", "76995003"), + CANDIDA_NORVEGENSIS_ORGANISM("Candida norvegensis (organism)", "Candida norvegensis (organism)", "SNOMED-CT", "243458007"), - STREPTOCOCCUS_ANGINOSUS_ORGANISM("Streptococcus anginosus (organism)", null, "SNOMED-CT", "44304009"), + STREPTOCOCCUS_SALIVARIUS_SUBSPECIES_THERMOPHILUS_ORGANISM("Streptococcus salivarius subspecies thermophilus (organism)", "Streptococcus salivarius subspecies thermophilus (organism)", "SNOMED-CT", "23310006"), - ANAEROBIC_NON_SPORING_GRAM_POSITIVE_BACILLUS_ORGANISM("Anaerobic non-sporing Gram-positive bacillus (organism)", null, "SNOMED-CT", "243399000"), + STREPTOCOCCUS_ANGINOSUS_ORGANISM("Streptococcus anginosus (organism)", "Streptococcus anginosus (organism)", "SNOMED-CT", "44304009"), - STREPTOCOCCUS_THORALTENSIS_ORGANISM("Streptococcus thoraltensis (organism)", null, "SNOMED-CT", "113997004"), + GENUS_SERRATIA_ORGANISM("Genus Serratia (organism)", "Genus Serratia (organism)", "SNOMED-CT", "42025004"), - CORYNEBACTERIUM_TUBERCULOSTEARICUM_ORGANISM("Corynebacterium tuberculostearicum (organism)", null, "SNOMED-CT", "416356007"), + BURKHOLDERIA_THAILANDENSIS_ORGANISM("Burkholderia thailandensis (organism)", "Burkholderia thailandensis (organism)", "SNOMED-CT", "113678002"), - AEROCOCCUS_URINAE_ORGANISM("Aerococcus urinae (organism)", null, "SNOMED-CT", "243230001"), + STREPTOCOCCUS_SALIVARIUS_ORGANISM("Streptococcus salivarius (organism)", "Streptococcus salivarius (organism)", "SNOMED-CT", "39888004"), - SALMONELLA_POONA("Salmonella Poona", null, "SNOMED-CT", "57101009"), + BACTEROIDES_STERCORIS_ORGANISM("Bacteroides stercoris (organism)", "Bacteroides stercoris (organism)", "SNOMED-CT", "163009"), - BACTEROIDES_OVATUS_ORGANISM("Bacteroides ovatus (organism)", null, "SNOMED-CT", "86936008"), + SALMONELLA_BRAENDERUP("Salmonella Braenderup", "Salmonella Braenderup", "SNOMED-CT", "35225001"), - CORYNEBACTERIUM_DIPHTHERIAE_ORGANISM("Corynebacterium diphtheriae (organism)", null, "SNOMED-CT", "5851001"), + ESCHERICHIA_COLI_SEROGROUP_O157_ORGANISM("Escherichia coli serogroup O157 (organism)", "Escherichia coli serogroup O157 (organism)", "SNOMED-CT", "407166006"), - AEROMONAS_SCHUBERTII_ORGANISM("Aeromonas schubertii (organism)", null, "SNOMED-CT", "115039003"), + ANAEROBIC_GRAM_POSITIVE_COCCUS_ORGANISM("Anaerobic Gram-positive coccus (organism)", "Anaerobic Gram-positive coccus (organism)", "SNOMED-CT", "243416009"), - ENTEROBACTER_CLOACAE_SUBSPECIES_DISSOLVENS("Enterobacter cloacae subspecies dissolvens", null, "SNOMED-CT", "56813009"), + PROVIDENCIA_ALCALIFACIENS_ORGANISM("Providencia alcalifaciens (organism)", "Providencia alcalifaciens (organism)", "SNOMED-CT", "46349009"), - LEGIONELLA_PNEUMOPHILIA_SEROGROUP14_ORGANISM("Legionella pneumophilia serogroup 14 (organism)", null, "SNOMED-CT", "131326007"), + SALMONELLA_BLOCKLEY("Salmonella Blockley", "Salmonella Blockley", "SNOMED-CT", "53684004"), - ACTINOMYCES_NAESLUNDII_ORGANISM("Actinomyces naeslundii (organism)", null, "SNOMED-CT", "8940004"), + CANDIDA_KRUSEI_ORGANISM("Candida krusei (organism)", "Candida krusei (organism)", "SNOMED-CT", "76995003"), - WEEKSELLA_VIROSA_ORGANISM("Weeksella virosa (organism)", null, "SNOMED-CT", "83326004"), + ELIZABETHKINGIA_MENINGOSEPTICA_ORGANISM("Elizabethkingia meningoseptica (organism)", "Elizabethkingia meningoseptica (organism)", "SNOMED-CT", "425774009"), - ACINETOBACTER_CALCOACETICUS_ACINETOBACTER_BAUMANNII_COMPLEX_ORGANISM("Acinetobacter calcoaceticus-Acinetobacter baumannii complex (organism)", null, "SNOMED-CT", "113376007"), + ABIOTROPHIA_DEFECTIVA_ORGANISM("Abiotrophia defectiva (organism)", "Abiotrophia defectiva (organism)", "SNOMED-CT", "113714003"), - CORYNEBACTERIUM_PROPINQUUM_ORGANISM("Corynebacterium propinquum (organism)", null, "SNOMED-CT", "113612009"), + MORGANELLA_MORGANII_SUBSP_MORGANII_ORGANISM("Morganella morganii subsp morganii (organism)", "Morganella morganii subsp morganii (organism)", "SNOMED-CT", "243302003"), - SALMONELLA_SCHWARZENGRUND("Salmonella Schwarzengrund", null, "SNOMED-CT", "45651006"), + SHIGELLA_DYSENTERIAE_ORGANISM("Shigella dysenteriae (organism)", "Shigella dysenteriae (organism)", "SNOMED-CT", "43612004"), - KLUYVERA_INTERMEDIA("Kluyvera intermedia", null, "SNOMED-CT", "431977008"), + LEGIONELLA_WADSWORTHII_ORGANISM("Legionella wadsworthii (organism)", "Legionella wadsworthii (organism)", "SNOMED-CT", "8147000"), - SALMONELLA_CORVALLIS("Salmonella Corvallis", null, "SNOMED-CT", "45548005"), + CANDIDA_INCONSPICUA_ORGANISM("Candida inconspicua (organism)", "Candida inconspicua (organism)", "SNOMED-CT", "283871001"), - BREVUNDIMONAS_AURANTIACA("Brevundimonas aurantiaca", null, "SNOMED-CT", "423035009"), + ACINETOBACTER_RADIORESISTENS_ORGANISM("Acinetobacter radioresistens (organism)", "Acinetobacter radioresistens (organism)", "SNOMED-CT", "113381003"), - GEOTRICHUM_CANDIDUM_ORGANISM("Geotrichum candidum (organism)", null, "SNOMED-CT", "41625002"), + CORYNEBACTERIUM_DIPHTHERIAE_ORGANISM("Corynebacterium diphtheriae (organism)", "Corynebacterium diphtheriae (organism)", "SNOMED-CT", "5851001"), - LEGIONELLA_ANISA_ORGANISM("Legionella anisa (organism)", null, "SNOMED-CT", "18214000"), + BACTEROIDES_FRAGILIS_GROUP_ORGANISM("Bacteroides fragilis group (organism)", "Bacteroides fragilis group (organism)", "SNOMED-CT", "417375007"), - SALMONELLA_PARATYPHI_A("Salmonella Paratyphi A", null, "SNOMED-CT", "79128009"), + LEGIONELLA_MICDADEI_ORGANISM("Legionella micdadei (organism)", "Legionella micdadei (organism)", "SNOMED-CT", "116380009"), - SALMONELLA_BOVISMORBIFICANS("Salmonella Bovismorbificans", null, "SNOMED-CT", "81938008"), + GENUS_NOCARDIA_ORGANISM("Genus Nocardia (organism)", "Genus Nocardia (organism)", "SNOMED-CT", "59674005"), - PEPTOSTREPTOCOCCUS_ANAEROBIUS_ORGANISM("Peptostreptococcus anaerobius (organism)", null, "SNOMED-CT", "19217002"), + ENTEROBACTER_CLOACAE_COMPLEX_ORGANISM("Enterobacter cloacae complex (organism)", "Enterobacter cloacae complex (organism)", "SNOMED-CT", "414102007"), - ENTEROBACTER_CLOACAE_SUBSP_CLOACAE("Enterobacter cloacae subsp. cloacae", null, "SNOMED-CT", "721950003"), + LEGIONELLA_PNEUMOPHILA_SEROGROUP8_ORGANISM("Legionella pneumophila serogroup 8 (organism)", "Legionella pneumophila serogroup 8 (organism)", "SNOMED-CT", "103470005"), - PASTEURELLA_CANIS_ORGANISM("Pasteurella canis (organism)", null, "SNOMED-CT", "7784009"), + FUSOBACTERIUM_NECROPHORUM_ORGANISM("Fusobacterium necrophorum (organism)", "Fusobacterium necrophorum (organism)", "SNOMED-CT", "27274008"), - SERRATIA_ODORIFERA_ORGANISM("Serratia odorifera (organism)", null, "SNOMED-CT", "10413007"), + HAEMOPHILUS_INFLUENZAE_TYPE_B_ORGANISM("Haemophilus influenzae type b (organism)", "Haemophilus influenzae type b (organism)", "SNOMED-CT", "103442008"), - AEROMONAS_JANDEI_ORGANISM("Aeromonas jandei (organism)", null, "SNOMED-CT", "115034008"), + AEROMONAS_SCHUBERTII_ORGANISM("Aeromonas schubertii (organism)", "Aeromonas schubertii (organism)", "SNOMED-CT", "115039003"), - CANDIDA_SPECIES_NOT_CANDIDA_ALBICANS_ORGANISM("Candida species not Candida albicans (organism)", null, "SNOMED-CT", "714313009"), + PARVIMONAS_MICRA_ORGANISM("Parvimonas micra (organism)", "Parvimonas micra (organism)", "SNOMED-CT", "434293007"), - ACHROMOBACTER_XYLOSOXIDANS_ORGANISM("Achromobacter xylosoxidans (organism)", null, "SNOMED-CT", "413424009"), + ASPERGILLUS_TERREUS_GROUP_ORGANISM("Aspergillus terreus group (organism)", "Aspergillus terreus group (organism)", "SNOMED-CT", "243500005"), - ANAEROBIC_GRAM_POSITIVE_BACILLUS_ORGANISM("Anaerobic Gram-positive bacillus (organism)", null, "SNOMED-CT", "243398008"), + LEGIONELLA_MORAVICA_ORGANISM("Legionella moravica (organism)", "Legionella moravica (organism)", "SNOMED-CT", "103454008"), - STREPTOCOCCUS_VESTIBULARIS_ORGANISM("Streptococcus vestibularis (organism)", null, "SNOMED-CT", "113998009"), + AEROMONAS_SIMIAE_ORGANISM("Aeromonas simiae (organism)", "Aeromonas simiae (organism)", "SNOMED-CT", "426333004"), - STAPHYLOCOCCUS_COAGULASE_NEGATIVE_ORGANISM("Staphylococcus, coagulase negative (organism)", null, "SNOMED-CT", "116197008"), + AEROMONAS_MEDIA_ORGANISM("Aeromonas media (organism)", "Aeromonas media (organism)", "SNOMED-CT", "65192005"), - PREVOTELLA_ORIS_ORGANISM("Prevotella oris (organism)", null, "SNOMED-CT", "114147006"), + LEGIONELLA_ANISA_ORGANISM("Legionella anisa (organism)", "Legionella anisa (organism)", "SNOMED-CT", "18214000"), - SACCHAROMYCES_CEREVISIAE_ORGANISM("Saccharomyces cerevisiae (organism)", null, "SNOMED-CT", "58296003"), + LACTOBACILLUS_FERMENTUM_ORGANISM("Lactobacillus fermentum (organism)", "Lactobacillus fermentum (organism)", "SNOMED-CT", "65506008"), - STENOTROPHOMONAS_NITRITIREDUCENS_ORGANISM("Stenotrophomonas nitritireducens (organism)", null, "SNOMED-CT", "416746005"), + SALMONELLA_SENFTENBERG("Salmonella Senftenberg", "Salmonella Senftenberg", "SNOMED-CT", "18163008"), - ASPERGILLUS_USTUS_ORGANISM("Aspergillus ustus (organism)", null, "SNOMED-CT", "23179008"), + GENUS_ENTEROCOCCUS_ORGANISM("Genus Enterococcus (organism)", "Genus Enterococcus (organism)", "SNOMED-CT", "2785000"), - ASPERGILLUS_BRASILIENSIS_ORGANISM("Aspergillus brasiliensis (organism)", null, "SNOMED-CT", "3101000146105"), + ROTHIA_MUCILAGINOSA_ORGANISM("Rothia mucilaginosa (organism)", "Rothia mucilaginosa (organism)", "SNOMED-CT", "416544005"), - SHIGELLA_BOYDII_ORGANISM("Shigella boydii (organism)", null, "SNOMED-CT", "55462008"), + ENTEROCOCCUS_DURANS_ORGANISM("Enterococcus durans (organism)", "Enterococcus durans (organism)", "SNOMED-CT", "46464008"), - FINEGOLDIA_MAGNA_ORGANISM("Finegoldia magna (organism)", null, "SNOMED-CT", "417469002"), + STREPTOCOCCUS_CANIS_ORGANISM("Streptococcus canis (organism)", "Streptococcus canis (organism)", "SNOMED-CT", "88231003"), - ACINETOBACTER_SCHINDLERI_ORGANISM("Acinetobacter schindleri (organism)", null, "SNOMED-CT", "423732001"), + SERRATIA_ODORIFERA_ORGANISM("Serratia odorifera (organism)", "Serratia odorifera (organism)", "SNOMED-CT", "10413007"), - SALMONELLA_ALBANY("Salmonella Albany", null, "SNOMED-CT", "72033009"), + ENTEROCOCCUS_HIRAE_ORGANISM("Enterococcus hirae (organism)", "Enterococcus hirae (organism)", "SNOMED-CT", "73852008"), - BURKHOLDERIA_GLUMAE("Burkholderia glumae", null, "SNOMED-CT", "113673006"), + SALMONELLA_APAPA("Salmonella Apapa", "Salmonella Apapa", "SNOMED-CT", "46399008"), - STREPTOCOCCUS_PNEUMONIAE_ORGANISM("Streptococcus pneumoniae (organism)", null, "SNOMED-CT", "9861002"), + SALMONELLA_INFANTIS("Salmonella Infantis", "Salmonella Infantis", "SNOMED-CT", "82071007"), - PARABURKHOLDERIA_ANDROPOGONIS("Paraburkholderia andropogonis", null, "SNOMED-CT", "113667005"), + GENUS_STAPHYLOCOCCUS_ORGANISM("Genus Staphylococcus (organism)", "Genus Staphylococcus (organism)", "SNOMED-CT", "65119002"), - CANDIDA_GLABRATA_ORGANISM("Candida glabrata (organism)", null, "SNOMED-CT", "444877006"), + GENUS_KLEBSIELLA_ORGANISM("Genus Klebsiella (organism)", "Genus Klebsiella (organism)", "SNOMED-CT", "75032006"), - PASTEURELLA_AEROGENES_ORGANISM("Pasteurella aerogenes (organism)", null, "SNOMED-CT", "87075007"), + ACINETOBACTER_PITTII_ORGANISM("Acinetobacter pittii (organism)", "Acinetobacter pittii (organism)", "SNOMED-CT", "698244000"), - PANTOEA_DISPERSA_ORGANISM("Pantoea dispersa (organism)", null, "SNOMED-CT", "115017000"), + BACILLUS_MEGATERIUM_ORGANISM("Bacillus megaterium (organism)", "Bacillus megaterium (organism)", "SNOMED-CT", "79109002"), - SALMONELLA_STANLEYVILLE("Salmonella Stanleyville", null, "SNOMED-CT", "47441000"), + ACHROMOBACTER_PIECHAUDII_ORGANISM("Achromobacter piechaudii (organism)", "Achromobacter piechaudii (organism)", "SNOMED-CT", "413420000"), - LEGIONELLA_OAKRIDGENSIS_ORGANISM("Legionella oakridgensis (organism)", null, "SNOMED-CT", "638008"); + PREVOTELLA_BERGENSIS_ORGANISM("Prevotella bergensis (organism)", "Prevotella bergensis (organism)", "SNOMED-CT", "708941000"); private String value; @@ -1263,7 +1263,7 @@ public enum ErregernameDefiningcode implements EnumValueSet { private String code; - ErregernameDefiningcode(String value, String description, String terminologyId, String code) { + ErregernameDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -1271,18 +1271,18 @@ public enum ErregernameDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java new file mode 100644 index 000000000..6c64a33d7 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java @@ -0,0 +1,18 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class ErregertypisierungArtDerTypisierungElement { + @Path("/value|defining_code") + private ArtDerTypisierungDefiningCode value; + + public void setValue(ArtDerTypisierungDefiningCode value) { + this.value = value; + } + + public ArtDerTypisierungDefiningCode getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java index 39776d8e6..ac4cce423 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java @@ -9,50 +9,48 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.molekulare_typisierung.v0") public class ErregertypisierungCluster { - @Path("/items[at0009]/value|value") - private String bewertungValue; + @Path("/items[at0001]") + private List artDerTypisierung; - @Path("/items[at0002]/value|value") - private String kommentarValue; + @Path("/items[at0008]") + private List ergebnis; - @Path("/items[at0001]") - private List artDerTypisierung; + @Path("/items[at0009]/value|value") + private String bewertungValue; - @Path("/items[at0008]") - private List ergebnis; + @Path("/items[at0002]/value|value") + private String kommentarValue; - public void setBewertungValue(String bewertungValue) { - this.bewertungValue = bewertungValue; - } + public void setArtDerTypisierung( + List artDerTypisierung) { + this.artDerTypisierung = artDerTypisierung; + } - public String getBewertungValue() { - return this.bewertungValue; - } + public List getArtDerTypisierung() { + return this.artDerTypisierung ; + } - public void setKommentarValue(String kommentarValue) { - this.kommentarValue = kommentarValue; - } + public void setErgebnis(List ergebnis) { + this.ergebnis = ergebnis; + } - public String getKommentarValue() { - return this.kommentarValue; - } + public List getErgebnis() { + return this.ergebnis ; + } - public void setArtDerTypisierung( - List artDerTypisierung) { - this.artDerTypisierung = artDerTypisierung; - } + public void setBewertungValue(String bewertungValue) { + this.bewertungValue = bewertungValue; + } - public List getArtDerTypisierung( - ) { - return this.artDerTypisierung; - } + public String getBewertungValue() { + return this.bewertungValue ; + } - public void setErgebnis( - List ergebnis) { - this.ergebnis = ergebnis; - } + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } - public List getErgebnis() { - return this.ergebnis; - } + public String getKommentarValue() { + return this.kommentarValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungClusterContainment.java index 7652b20b2..634100d06 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungClusterContainment.java @@ -9,13 +9,13 @@ public class ErregertypisierungClusterContainment extends Containment { public SelectAqlField ERREGERTYPISIERUNG_CLUSTER = new AqlFieldImp(ErregertypisierungCluster.class, "", "ErregertypisierungCluster", ErregertypisierungCluster.class, this); - public SelectAqlField BEWERTUNG_VALUE = new AqlFieldImp(ErregertypisierungCluster.class, "/items[at0009]/value|value", "bewertungValue", String.class, this); + public ListSelectAqlField ART_DER_TYPISIERUNG = new ListAqlFieldImp(ErregertypisierungCluster.class, "/items[at0001]", "artDerTypisierung", ErregertypisierungArtDerTypisierungElement.class, this); - public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ErregertypisierungCluster.class, "/items[at0002]/value|value", "kommentarValue", String.class, this); + public ListSelectAqlField ERGEBNIS = new ListAqlFieldImp(ErregertypisierungCluster.class, "/items[at0008]", "ergebnis", ErregertypisierungErgebnisElement.class, this); - public ListSelectAqlField ART_DER_TYPISIERUNG = new ListAqlFieldImp(ErregertypisierungCluster.class, "/items[at0001]", "artDerTypisierung", EigenschaftenDesBeteiligtenErregersErregertypisierungArtDerTypisierungElement.class, this); + public SelectAqlField BEWERTUNG_VALUE = new AqlFieldImp(ErregertypisierungCluster.class, "/items[at0009]/value|value", "bewertungValue", String.class, this); - public ListSelectAqlField ERGEBNIS = new ListAqlFieldImp(ErregertypisierungCluster.class, "/items[at0008]", "ergebnis", EigenschaftenDesBeteiligtenErregersErregertypisierungErgebnisElement.class, this); + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ErregertypisierungCluster.class, "/items[at0002]/value|value", "kommentarValue", String.class, this); private ErregertypisierungClusterContainment() { super("openEHR-EHR-CLUSTER.molekulare_typisierung.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java new file mode 100644 index 000000000..7b8e76802 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java @@ -0,0 +1,19 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import com.nedap.archie.rm.datavalues.encapsulated.DvMultimedia; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class ErregertypisierungErgebnisElement { + @Path("/value") + private DvMultimedia value; + + public void setValue(DvMultimedia value) { + this.value = value; + } + + public DvMultimedia getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java new file mode 100644 index 000000000..13cd3b58f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java @@ -0,0 +1,31 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +import java.util.List; + +@Entity +public class EventsummaryBeteiligtePersonenCluster { + @Path("/items[at0011]/value|value") + private String artDerPersonValue; + + @Path("/items[at0010]") + private List idDerPerson; + + public void setArtDerPersonValue(String artDerPersonValue) { + this.artDerPersonValue = artDerPersonValue; + } + + public String getArtDerPersonValue() { + return this.artDerPersonValue ; + } + + public void setIdDerPerson(List idDerPerson) { + this.idDerPerson = idDerPerson; + } + + public List getIdDerPerson() { + return this.idDerPerson ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java index 8ae1a7059..0f0296f64 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java @@ -9,59 +9,59 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.eventsummary.v0") public class EventsummaryCluster { - @Path("/items[at0006]/value|value") - private String kommentarValue; + @Path("/items[at0001 and name/value='Fallidentifikation']/value|value") + private String fallidentifikationValue; - @Path("/items[at0004]/value|value") - private String fallKategorieValue; + @Path("/items[at0002 and name/value='Fall-Art']/value|value") + private String fallArtValue; - @Path("/items[at0001]/value|value") - private String fallidentifikationValue; + @Path("/items[at0007]") + private List beteiligtePersonen; - @Path("/items[at0002]/value|value") - private String fallArtValue; + @Path("/items[at0004 and name/value='Fall-Kategorie']/value|value") + private String fallKategorieValue; - @Path("/items[at0007]") - private List beteiligtePersonen; + @Path("/items[at0006]/value|value") + private String kommentarValue; - public void setKommentarValue(String kommentarValue) { - this.kommentarValue = kommentarValue; - } + public void setFallidentifikationValue(String fallidentifikationValue) { + this.fallidentifikationValue = fallidentifikationValue; + } - public String getKommentarValue() { - return this.kommentarValue; - } + public String getFallidentifikationValue() { + return this.fallidentifikationValue ; + } - public void setFallKategorieValue(String fallKategorieValue) { - this.fallKategorieValue = fallKategorieValue; - } + public void setFallArtValue(String fallArtValue) { + this.fallArtValue = fallArtValue; + } - public String getFallKategorieValue() { - return this.fallKategorieValue; - } + public String getFallArtValue() { + return this.fallArtValue ; + } - public void setFallidentifikationValue(String fallidentifikationValue) { - this.fallidentifikationValue = fallidentifikationValue; - } + public void setBeteiligtePersonen( + List beteiligtePersonen) { + this.beteiligtePersonen = beteiligtePersonen; + } - public String getFallidentifikationValue() { - return this.fallidentifikationValue; - } + public List getBeteiligtePersonen() { + return this.beteiligtePersonen ; + } - public void setFallArtValue(String fallArtValue) { - this.fallArtValue = fallArtValue; - } + public void setFallKategorieValue(String fallKategorieValue) { + this.fallKategorieValue = fallKategorieValue; + } - public String getFallArtValue() { - return this.fallArtValue; - } + public String getFallKategorieValue() { + return this.fallKategorieValue ; + } - public void setBeteiligtePersonen( - List beteiligtePersonen) { - this.beteiligtePersonen = beteiligtePersonen; - } + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } - public List getBeteiligtePersonen() { - return this.beteiligtePersonen; - } + public String getKommentarValue() { + return this.kommentarValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryClusterContainment.java index de35207a1..30afbff77 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryClusterContainment.java @@ -9,15 +9,15 @@ public class EventsummaryClusterContainment extends Containment { public SelectAqlField EVENTSUMMARY_CLUSTER = new AqlFieldImp(EventsummaryCluster.class, "", "EventsummaryCluster", EventsummaryCluster.class, this); - public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(EventsummaryCluster.class, "/items[at0006]/value|value", "kommentarValue", String.class, this); - - public SelectAqlField FALL_KATEGORIE_VALUE = new AqlFieldImp(EventsummaryCluster.class, "/items[at0004]/value|value", "fallKategorieValue", String.class, this); - public SelectAqlField FALLIDENTIFIKATION_VALUE = new AqlFieldImp(EventsummaryCluster.class, "/items[at0001]/value|value", "fallidentifikationValue", String.class, this); public SelectAqlField FALL_ART_VALUE = new AqlFieldImp(EventsummaryCluster.class, "/items[at0002]/value|value", "fallArtValue", String.class, this); - public ListSelectAqlField BETEILIGTE_PERSONEN = new ListAqlFieldImp(EventsummaryCluster.class, "/items[at0007]", "beteiligtePersonen", ContextEventsummaryBeteiligtePersonenCluster.class, this); + public ListSelectAqlField BETEILIGTE_PERSONEN = new ListAqlFieldImp(EventsummaryCluster.class, "/items[at0007]", "beteiligtePersonen", EventsummaryBeteiligtePersonenCluster.class, this); + + public SelectAqlField FALL_KATEGORIE_VALUE = new AqlFieldImp(EventsummaryCluster.class, "/items[at0004]/value|value", "fallKategorieValue", String.class, this); + + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(EventsummaryCluster.class, "/items[at0006]/value|value", "kommentarValue", String.class, this); private EventsummaryClusterContainment() { super("openEHR-EHR-CLUSTER.eventsummary.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java new file mode 100644 index 000000000..5e5d43887 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import org.ehrbase.client.annotations.Choice; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class EventsummaryIdDerPersonElement { + @Path("/value") + @Choice + private EventsummaryValueChoice value; + + public void setValue(EventsummaryValueChoice value) { + this.value = value; + } + + public EventsummaryValueChoice getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ContextEventsummaryChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueChoice.java similarity index 66% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ContextEventsummaryChoice.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueChoice.java index 2942e533b..e4db29d47 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ContextEventsummaryChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueChoice.java @@ -1,4 +1,4 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; -public interface ContextEventsummaryChoice { +public interface EventsummaryValueChoice { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ContextEventsummaryDvidentifier.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java similarity index 53% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ContextEventsummaryDvidentifier.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java index e3a86fd78..8caf0e5b8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ContextEventsummaryDvidentifier.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java @@ -7,15 +7,15 @@ @Entity @OptionFor("DV_IDENTIFIER") -public class ContextEventsummaryDvidentifier implements ContextEventsummaryChoice { - @Path("") - private DvIdentifier value; +public class EventsummaryValueDvIdentifier implements EventsummaryValueChoice { + @Path("") + private DvIdentifier value; - public void setValue(DvIdentifier value) { - this.value = value; - } + public void setValue(DvIdentifier value) { + this.value = value; + } - public DvIdentifier getValue() { - return this.value; - } + public DvIdentifier getValue() { + return this.value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java new file mode 100644 index 000000000..907ee5d9c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java @@ -0,0 +1,22 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +import java.net.URI; + +@Entity +@OptionFor("DV_URI") +public class EventsummaryValueDvUri implements EventsummaryValueChoice { + @Path("|value") + private URI valueValue; + + public void setValueValue(URI valueValue) { + this.valueValue = valueValue; + } + + public URI getValueValue() { + return this.valueValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/KeimzahlDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/KeimzahlDefiningcode.java deleted file mode 100644 index cd7e67c32..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/KeimzahlDefiningcode.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum KeimzahlDefiningcode implements EnumValueSet { - UNKNOWN("unknown", "unknown", "openehr", "253"), - - NO_INFORMATION("no information", "no information", "openehr", "271"), - - MASKED("masked", "masked", "openehr", "272"), - - NOT_APPLICABLE("not applicable", "not applicable", "openehr", "273"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - KeimzahlDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatAnzahlDerErregernachweiseElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatAnzahlDerErregernachweiseElement.java deleted file mode 100644 index 21f327d35..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatAnzahlDerErregernachweiseElement.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class LaboranalytResultatAnzahlDerErregernachweiseElement { - @Path("/value|magnitude") - private Long magnitude; - - public void setMagnitude(Long magnitude) { - this.magnitude = magnitude; - } - - public Long getMagnitude() { - return this.magnitude; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java index 3daab6a48..e3125e1b9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java @@ -10,69 +10,69 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") public class LaboranalytResultatCluster { - @Path("/items[at0024]/value|defining_code") - private AntibiotikumDefiningcode antibiotikumDefiningcode; + @Path("/items[at0024 and name/value='Antibiotikum']/value|defining_code") + private AntibiotikumDefiningCode antibiotikumDefiningCode; - @Path("/items[at0004]/value|value") - private String resistenzValue; + @Path("/items[at0001 and name/value='Minimale Hemmkonzentration']/value|magnitude") + private Double minimaleHemmkonzentrationMagnitude; - @Path("/items[at0003]/value|value") - private String kommentarValue; + @Path("/items[at0001 and name/value='Minimale Hemmkonzentration']/value|units") + private String minimaleHemmkonzentrationUnits; - @Path("/items[at0001]/value|magnitude") - private Double minimaleHemmkonzentrationMagnitude; + @Path("/items[at0014]") + private List analyseergebnisDetails; - @Path("/items[at0001]/value|units") - private String minimaleHemmkonzentrationUnits; + @Path("/items[at0004 and name/value='Resistenz']/value|value") + private String resistenzValue; - @Path("/items[at0014]") - private List analyseergebnisDetails; + @Path("/items[at0003]/value|value") + private String kommentarValue; - public void setAntibiotikumDefiningcode(AntibiotikumDefiningcode antibiotikumDefiningcode) { - this.antibiotikumDefiningcode = antibiotikumDefiningcode; - } + public void setAntibiotikumDefiningCode(AntibiotikumDefiningCode antibiotikumDefiningCode) { + this.antibiotikumDefiningCode = antibiotikumDefiningCode; + } - public AntibiotikumDefiningcode getAntibiotikumDefiningcode() { - return this.antibiotikumDefiningcode; - } + public AntibiotikumDefiningCode getAntibiotikumDefiningCode() { + return this.antibiotikumDefiningCode ; + } - public void setResistenzValue(String resistenzValue) { - this.resistenzValue = resistenzValue; - } + public void setMinimaleHemmkonzentrationMagnitude(Double minimaleHemmkonzentrationMagnitude) { + this.minimaleHemmkonzentrationMagnitude = minimaleHemmkonzentrationMagnitude; + } - public String getResistenzValue() { - return this.resistenzValue; - } + public Double getMinimaleHemmkonzentrationMagnitude() { + return this.minimaleHemmkonzentrationMagnitude ; + } - public void setKommentarValue(String kommentarValue) { - this.kommentarValue = kommentarValue; - } + public void setMinimaleHemmkonzentrationUnits(String minimaleHemmkonzentrationUnits) { + this.minimaleHemmkonzentrationUnits = minimaleHemmkonzentrationUnits; + } - public String getKommentarValue() { - return this.kommentarValue; - } + public String getMinimaleHemmkonzentrationUnits() { + return this.minimaleHemmkonzentrationUnits ; + } - public void setMinimaleHemmkonzentrationMagnitude(Double minimaleHemmkonzentrationMagnitude) { - this.minimaleHemmkonzentrationMagnitude = minimaleHemmkonzentrationMagnitude; - } + public void setAnalyseergebnisDetails(List analyseergebnisDetails) { + this.analyseergebnisDetails = analyseergebnisDetails; + } - public Double getMinimaleHemmkonzentrationMagnitude() { - return this.minimaleHemmkonzentrationMagnitude; - } + public List getAnalyseergebnisDetails() { + return this.analyseergebnisDetails ; + } - public void setMinimaleHemmkonzentrationUnits(String minimaleHemmkonzentrationUnits) { - this.minimaleHemmkonzentrationUnits = minimaleHemmkonzentrationUnits; - } + public void setResistenzValue(String resistenzValue) { + this.resistenzValue = resistenzValue; + } - public String getMinimaleHemmkonzentrationUnits() { - return this.minimaleHemmkonzentrationUnits; - } + public String getResistenzValue() { + return this.resistenzValue ; + } - public void setAnalyseergebnisDetails(List analyseergebnisDetails) { - this.analyseergebnisDetails = analyseergebnisDetails; - } + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } - public List getAnalyseergebnisDetails() { - return this.analyseergebnisDetails; - } + public String getKommentarValue() { + return this.kommentarValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatClusterContainment.java index 4c12afec4..b0d1702cd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatClusterContainment.java @@ -10,11 +10,7 @@ public class LaboranalytResultatClusterContainment extends Containment { public SelectAqlField LABORANALYT_RESULTAT_CLUSTER = new AqlFieldImp(LaboranalytResultatCluster.class, "", "LaboranalytResultatCluster", LaboranalytResultatCluster.class, this); - public SelectAqlField ANTIBIOTIKUM_DEFININGCODE = new AqlFieldImp(LaboranalytResultatCluster.class, "/items[at0024]/value|defining_code", "antibiotikumDefiningcode", AntibiotikumDefiningcode.class, this); - - public SelectAqlField RESISTENZ_VALUE = new AqlFieldImp(LaboranalytResultatCluster.class, "/items[at0004]/value|value", "resistenzValue", String.class, this); - - public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(LaboranalytResultatCluster.class, "/items[at0003]/value|value", "kommentarValue", String.class, this); + public SelectAqlField ANTIBIOTIKUM_DEFINING_CODE = new AqlFieldImp(LaboranalytResultatCluster.class, "/items[at0024]/value|defining_code", "antibiotikumDefiningCode", AntibiotikumDefiningCode.class, this); public SelectAqlField MINIMALE_HEMMKONZENTRATION_MAGNITUDE = new AqlFieldImp(LaboranalytResultatCluster.class, "/items[at0001]/value|magnitude", "minimaleHemmkonzentrationMagnitude", Double.class, this); @@ -22,6 +18,10 @@ public class LaboranalytResultatClusterContainment extends Containment { public ListSelectAqlField ANALYSEERGEBNIS_DETAILS = new ListAqlFieldImp(LaboranalytResultatCluster.class, "/items[at0014]", "analyseergebnisDetails", Cluster.class, this); + public SelectAqlField RESISTENZ_VALUE = new AqlFieldImp(LaboranalytResultatCluster.class, "/items[at0004]/value|value", "resistenzValue", String.class, this); + + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(LaboranalytResultatCluster.class, "/items[at0003]/value|value", "kommentarValue", String.class, this); + private LaboranalytResultatClusterContainment() { super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatKeimSubtypElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatKeimSubtypElement.java deleted file mode 100644 index a04e77e5e..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatKeimSubtypElement.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class LaboranalytResultatKeimSubtypElement { - @Path("/value|value") - private String value; - - public void setValue(String value) { - this.value = value; - } - - public String getValue() { - return this.value; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatResistenzmechanismusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatResistenzmechanismusCluster.java deleted file mode 100644 index 8fe19683b..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatResistenzmechanismusCluster.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class LaboranalytResultatResistenzmechanismusCluster { - @Path("/items[at0017]/value|value") - private String resistenzmechanismusBezeichnungValue; - - public void setResistenzmechanismusBezeichnungValue(String resistenzmechanismusBezeichnungValue) { - this.resistenzmechanismusBezeichnungValue = resistenzmechanismusBezeichnungValue; - } - - public String getResistenzmechanismusBezeichnungValue() { - return this.resistenzmechanismusBezeichnungValue; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/MreKlasseDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/MreKlasseDefiningcode.java index 657b871f1..cf5a13356 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/MreKlasseDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/MreKlasseDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum MreKlasseDefiningcode implements EnumValueSet { +public enum MreKlasseDefiningCode implements EnumValueSet { N3MRGN("3MRGN", "Multiresistente Gramnegative Bakterien (Resistenz gegen 3 der 4 Antibiotikagruppen)", "local", "at0065"), N2MRGN("2MRGN", "Multiresistente Gramnegative Bakterien (Resistenz gegen 2 der 4 Antibiotikagruppen)", "local", "at0048"), @@ -25,7 +25,7 @@ public enum MreKlasseDefiningcode implements EnumValueSet { private String code; - MreKlasseDefiningcode(String value, String description, String terminologyId, String code) { + MreKlasseDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -33,18 +33,18 @@ public enum MreKlasseDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java new file mode 100644 index 000000000..3196adc7e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java @@ -0,0 +1,18 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class SmicsErgebnisAnzahlDerErregernachweiseElement { + @Path("/value|magnitude") + private Long value; + + public void setValue(Long value) { + this.value = value; + } + + public Long getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java index 64d24cbba..299d5401a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java @@ -4,7 +4,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; @@ -13,238 +13,238 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.smics_befund.v1") public class SmicsErgebnisObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0016]/value|defining_code") - private ErregernameDefiningcode erregernameDefiningcode; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|defining_code") + private SmicsErgebniskategorieDefiningCode smicsErgebniskategorieDefiningCode; - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value") + private Boolean multispeziesValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.location.v1]") - private List standort; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value|value") + private TemporalAccessor beginnValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0021]/value|value") - private TemporalAccessor zeitpunktDesErstenErregernachweisesValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|value") + private TemporalAccessor beginnDerUntersuchungValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0020]/value|value") - private TemporalAccessor zeitpunktDesLetztenErregernachweisesValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|value") + private TemporalAccessor endeValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0013]/value|value") - private String transmissionswegValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0009]/value|value") + private TemporalAmount dauerValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0014]/value|value") - private String ubertragungswegValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.location.v1]") + private List standort; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[openEHR-EHR-CLUSTER.erregerdetails.v1]") - private ErregerdetailsCluster erregerdetails; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|value") + private String baumKommentarValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|defining_code") - private SmicsErgebniskategorieDefiningcode smicsErgebniskategorieDefiningcode; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0014]/value|value") + private String ubertragungswegValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value") - private Boolean multispeziesValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0013]/value|value") + private String transmissionswegValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0037]") - private List anzahlDerErregernachweise; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0038]/value|value") + private String artDerUbertragungKommentarValue; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0016]/value|defining_code") + private ErregernameDefiningCode erregernameDefiningCode; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value|value") - private TemporalAccessor beginnValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0037]") + private List anzahlDerErregernachweise; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|value") - private TemporalAccessor beginnDerUntersuchungValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[openEHR-EHR-CLUSTER.erregerdetails.v1]") + private ErregerdetailsCluster erregerdetails; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|value") - private TemporalAccessor endeValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[openEHR-EHR-CLUSTER.molekulare_typisierung.v0 and name/value='Erregertypisierung']") + private ErregertypisierungCluster erregertypisierung; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0009]/value|value") - private TemporalAmount dauerValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0021]/value|value") + private TemporalAccessor zeitpunktDesErstenErregernachweisesValue; - @Path("/subject") - private PartyProxy subject; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0020]/value|value") + private TemporalAccessor zeitpunktDesLetztenErregernachweisesValue; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[openEHR-EHR-CLUSTER.molekulare_typisierung.v0 and name/value='Erregertypisierung']") - private ErregertypisierungCluster erregertypisierung; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|value") - private String kommentarValue; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0038]/value|value") - private String kommentarValueArtDerUbertragung; + @Path("/language") + private Language language; - public void setErregernameDefiningcode(ErregernameDefiningcode erregernameDefiningcode) { - this.erregernameDefiningcode = erregernameDefiningcode; - } + public void setSmicsErgebniskategorieDefiningCode( + SmicsErgebniskategorieDefiningCode smicsErgebniskategorieDefiningCode) { + this.smicsErgebniskategorieDefiningCode = smicsErgebniskategorieDefiningCode; + } - public ErregernameDefiningcode getErregernameDefiningcode() { - return this.erregernameDefiningcode; - } + public SmicsErgebniskategorieDefiningCode getSmicsErgebniskategorieDefiningCode() { + return this.smicsErgebniskategorieDefiningCode ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setMultispeziesValue(Boolean multispeziesValue) { + this.multispeziesValue = multispeziesValue; + } - public Language getLanguage() { - return this.language; - } + public Boolean isMultispeziesValue() { + return this.multispeziesValue ; + } - public void setStandort(List standort) { - this.standort = standort; - } + public void setBeginnValue(TemporalAccessor beginnValue) { + this.beginnValue = beginnValue; + } - public List getStandort() { - return this.standort; - } + public TemporalAccessor getBeginnValue() { + return this.beginnValue ; + } - public void setZeitpunktDesErstenErregernachweisesValue( - TemporalAccessor zeitpunktDesErstenErregernachweisesValue) { - this.zeitpunktDesErstenErregernachweisesValue = zeitpunktDesErstenErregernachweisesValue; - } + public void setBeginnDerUntersuchungValue(TemporalAccessor beginnDerUntersuchungValue) { + this.beginnDerUntersuchungValue = beginnDerUntersuchungValue; + } - public TemporalAccessor getZeitpunktDesErstenErregernachweisesValue() { - return this.zeitpunktDesErstenErregernachweisesValue; - } + public TemporalAccessor getBeginnDerUntersuchungValue() { + return this.beginnDerUntersuchungValue ; + } - public void setZeitpunktDesLetztenErregernachweisesValue( - TemporalAccessor zeitpunktDesLetztenErregernachweisesValue) { - this.zeitpunktDesLetztenErregernachweisesValue = zeitpunktDesLetztenErregernachweisesValue; - } + public void setEndeValue(TemporalAccessor endeValue) { + this.endeValue = endeValue; + } - public TemporalAccessor getZeitpunktDesLetztenErregernachweisesValue() { - return this.zeitpunktDesLetztenErregernachweisesValue; - } + public TemporalAccessor getEndeValue() { + return this.endeValue ; + } - public void setTransmissionswegValue(String transmissionswegValue) { - this.transmissionswegValue = transmissionswegValue; - } + public void setDauerValue(TemporalAmount dauerValue) { + this.dauerValue = dauerValue; + } - public String getTransmissionswegValue() { - return this.transmissionswegValue; - } + public TemporalAmount getDauerValue() { + return this.dauerValue ; + } - public void setUbertragungswegValue(String ubertragungswegValue) { - this.ubertragungswegValue = ubertragungswegValue; - } + public void setStandort(List standort) { + this.standort = standort; + } - public String getUbertragungswegValue() { - return this.ubertragungswegValue; - } + public List getStandort() { + return this.standort ; + } - public void setErregerdetails(ErregerdetailsCluster erregerdetails) { - this.erregerdetails = erregerdetails; - } + public void setBaumKommentarValue(String baumKommentarValue) { + this.baumKommentarValue = baumKommentarValue; + } - public ErregerdetailsCluster getErregerdetails() { - return this.erregerdetails; - } + public String getBaumKommentarValue() { + return this.baumKommentarValue ; + } - public void setSmicsErgebniskategorieDefiningcode( - SmicsErgebniskategorieDefiningcode smicsErgebniskategorieDefiningcode) { - this.smicsErgebniskategorieDefiningcode = smicsErgebniskategorieDefiningcode; - } + public void setUbertragungswegValue(String ubertragungswegValue) { + this.ubertragungswegValue = ubertragungswegValue; + } - public SmicsErgebniskategorieDefiningcode getSmicsErgebniskategorieDefiningcode() { - return this.smicsErgebniskategorieDefiningcode; - } + public String getUbertragungswegValue() { + return this.ubertragungswegValue ; + } - public void setMultispeziesValue(Boolean multispeziesValue) { - this.multispeziesValue = multispeziesValue; - } + public void setTransmissionswegValue(String transmissionswegValue) { + this.transmissionswegValue = transmissionswegValue; + } - public Boolean isMultispeziesValue() { - return this.multispeziesValue; - } + public String getTransmissionswegValue() { + return this.transmissionswegValue ; + } - public void setAnzahlDerErregernachweise( - List anzahlDerErregernachweise) { - this.anzahlDerErregernachweise = anzahlDerErregernachweise; - } + public void setArtDerUbertragungKommentarValue(String artDerUbertragungKommentarValue) { + this.artDerUbertragungKommentarValue = artDerUbertragungKommentarValue; + } - public List getAnzahlDerErregernachweise() { - return this.anzahlDerErregernachweise; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue; - } - - public void setBeginnValue(TemporalAccessor beginnValue) { - this.beginnValue = beginnValue; - } - - public TemporalAccessor getBeginnValue() { - return this.beginnValue; - } - - public void setBeginnDerUntersuchungValue(TemporalAccessor beginnDerUntersuchungValue) { - this.beginnDerUntersuchungValue = beginnDerUntersuchungValue; - } - - public TemporalAccessor getBeginnDerUntersuchungValue() { - return this.beginnDerUntersuchungValue; - } - - public void setEndeValue(TemporalAccessor endeValue) { - this.endeValue = endeValue; - } - - public TemporalAccessor getEndeValue() { - return this.endeValue; - } - - public void setDauerValue(TemporalAmount dauerValue) { - this.dauerValue = dauerValue; - } - - public TemporalAmount getDauerValue() { - return this.dauerValue; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue; - } - - public void setErregertypisierung(ErregertypisierungCluster erregertypisierung) { - this.erregertypisierung = erregertypisierung; - } - - public ErregertypisierungCluster getErregertypisierung() { - return this.erregertypisierung; - } - - public void setKommentarValue(String kommentarValue) { - this.kommentarValue = kommentarValue; - } - - public String getKommentarValue() { - return this.kommentarValue; - } - - public void setKommentarValueArtDerUbertragung(String kommentarValueArtDerUbertragung) { - this.kommentarValueArtDerUbertragung = kommentarValueArtDerUbertragung; - } - - public String getKommentarValueArtDerUbertragung() { - return this.kommentarValueArtDerUbertragung; - } + public String getArtDerUbertragungKommentarValue() { + return this.artDerUbertragungKommentarValue ; + } + + public void setErregernameDefiningCode(ErregernameDefiningCode erregernameDefiningCode) { + this.erregernameDefiningCode = erregernameDefiningCode; + } + + public ErregernameDefiningCode getErregernameDefiningCode() { + return this.erregernameDefiningCode ; + } + + public void setAnzahlDerErregernachweise( + List anzahlDerErregernachweise) { + this.anzahlDerErregernachweise = anzahlDerErregernachweise; + } + + public List getAnzahlDerErregernachweise() { + return this.anzahlDerErregernachweise ; + } + + public void setErregerdetails(ErregerdetailsCluster erregerdetails) { + this.erregerdetails = erregerdetails; + } + + public ErregerdetailsCluster getErregerdetails() { + return this.erregerdetails ; + } + + public void setErregertypisierung(ErregertypisierungCluster erregertypisierung) { + this.erregertypisierung = erregertypisierung; + } + + public ErregertypisierungCluster getErregertypisierung() { + return this.erregertypisierung ; + } + + public void setZeitpunktDesErstenErregernachweisesValue( + TemporalAccessor zeitpunktDesErstenErregernachweisesValue) { + this.zeitpunktDesErstenErregernachweisesValue = zeitpunktDesErstenErregernachweisesValue; + } + + public TemporalAccessor getZeitpunktDesErstenErregernachweisesValue() { + return this.zeitpunktDesErstenErregernachweisesValue ; + } + + public void setZeitpunktDesLetztenErregernachweisesValue( + TemporalAccessor zeitpunktDesLetztenErregernachweisesValue) { + this.zeitpunktDesLetztenErregernachweisesValue = zeitpunktDesLetztenErregernachweisesValue; + } + + public TemporalAccessor getZeitpunktDesLetztenErregernachweisesValue() { + return this.zeitpunktDesLetztenErregernachweisesValue ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservationContainment.java index d6cd2d4c3..250aa2bd5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservationContainment.java @@ -6,7 +6,7 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; @@ -14,47 +14,47 @@ public class SmicsErgebnisObservationContainment extends Containment { public SelectAqlField SMICS_ERGEBNIS_OBSERVATION = new AqlFieldImp(SmicsErgebnisObservation.class, "", "SmicsErgebnisObservation", SmicsErgebnisObservation.class, this); - public SelectAqlField ERREGERNAME_DEFININGCODE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0016]/value|defining_code", "erregernameDefiningcode", ErregernameDefiningcode.class, this); + public SelectAqlField SMICS_ERGEBNISKATEGORIE_DEFINING_CODE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|defining_code", "smicsErgebniskategorieDefiningCode", SmicsErgebniskategorieDefiningCode.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(SmicsErgebnisObservation.class, "/language", "language", Language.class, this); + public SelectAqlField MULTISPEZIES_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value", "multispeziesValue", Boolean.class, this); - public ListSelectAqlField STANDORT = new ListAqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.location.v1]", "standort", StandortCluster.class, this); + public SelectAqlField BEGINN_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value|value", "beginnValue", TemporalAccessor.class, this); - public SelectAqlField ZEITPUNKT_DES_ERSTEN_ERREGERNACHWEISES_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0021]/value|value", "zeitpunktDesErstenErregernachweisesValue", TemporalAccessor.class, this); + public SelectAqlField BEGINN_DER_UNTERSUCHUNG_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|value", "beginnDerUntersuchungValue", TemporalAccessor.class, this); - public SelectAqlField ZEITPUNKT_DES_LETZTEN_ERREGERNACHWEISES_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0020]/value|value", "zeitpunktDesLetztenErregernachweisesValue", TemporalAccessor.class, this); + public SelectAqlField ENDE_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|value", "endeValue", TemporalAccessor.class, this); - public SelectAqlField TRANSMISSIONSWEG_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0013]/value|value", "transmissionswegValue", String.class, this); + public SelectAqlField DAUER_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0009]/value|value", "dauerValue", TemporalAmount.class, this); - public SelectAqlField UBERTRAGUNGSWEG_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0014]/value|value", "ubertragungswegValue", String.class, this); + public ListSelectAqlField STANDORT = new ListAqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.location.v1]", "standort", StandortCluster.class, this); - public SelectAqlField ERREGERDETAILS = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[openEHR-EHR-CLUSTER.erregerdetails.v1]", "erregerdetails", ErregerdetailsCluster.class, this); + public SelectAqlField BAUM_KOMMENTAR_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|value", "baumKommentarValue", String.class, this); - public SelectAqlField SMICS_ERGEBNISKATEGORIE_DEFININGCODE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|defining_code", "smicsErgebniskategorieDefiningcode", SmicsErgebniskategorieDefiningcode.class, this); + public SelectAqlField UBERTRAGUNGSWEG_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0014]/value|value", "ubertragungswegValue", String.class, this); - public SelectAqlField MULTISPEZIES_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value", "multispeziesValue", Boolean.class, this); + public SelectAqlField TRANSMISSIONSWEG_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0013]/value|value", "transmissionswegValue", String.class, this); - public ListSelectAqlField ANZAHL_DER_ERREGERNACHWEISE = new ListAqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0037]", "anzahlDerErregernachweise", LaboranalytResultatAnzahlDerErregernachweiseElement.class, this); + public SelectAqlField ART_DER_UBERTRAGUNG_KOMMENTAR_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0038]/value|value", "artDerUbertragungKommentarValue", String.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + public SelectAqlField ERREGERNAME_DEFINING_CODE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0016]/value|defining_code", "erregernameDefiningCode", ErregernameDefiningCode.class, this); - public SelectAqlField BEGINN_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value|value", "beginnValue", TemporalAccessor.class, this); + public ListSelectAqlField ANZAHL_DER_ERREGERNACHWEISE = new ListAqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0037]", "anzahlDerErregernachweise", SmicsErgebnisAnzahlDerErregernachweiseElement.class, this); - public SelectAqlField BEGINN_DER_UNTERSUCHUNG_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|value", "beginnDerUntersuchungValue", TemporalAccessor.class, this); + public SelectAqlField ERREGERDETAILS = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[openEHR-EHR-CLUSTER.erregerdetails.v1]", "erregerdetails", ErregerdetailsCluster.class, this); - public SelectAqlField ENDE_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|value", "endeValue", TemporalAccessor.class, this); + public SelectAqlField ERREGERTYPISIERUNG = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[openEHR-EHR-CLUSTER.molekulare_typisierung.v0]", "erregertypisierung", ErregertypisierungCluster.class, this); - public SelectAqlField DAUER_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0009]/value|value", "dauerValue", TemporalAmount.class, this); + public SelectAqlField ZEITPUNKT_DES_ERSTEN_ERREGERNACHWEISES_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0021]/value|value", "zeitpunktDesErstenErregernachweisesValue", TemporalAccessor.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(SmicsErgebnisObservation.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField ZEITPUNKT_DES_LETZTEN_ERREGERNACHWEISES_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0020]/value|value", "zeitpunktDesLetztenErregernachweisesValue", TemporalAccessor.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - public SelectAqlField ERREGERTYPISIERUNG = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[openEHR-EHR-CLUSTER.molekulare_typisierung.v0 and name/value='Erregertypisierung']", "erregertypisierung", ErregertypisierungCluster.class, this); + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|value", "kommentarValue", String.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(SmicsErgebnisObservation.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField KOMMENTAR_VALUE_ART_DER_UBERTRAGUNG = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0038]/value|value", "kommentarValueArtDerUbertragung", String.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(SmicsErgebnisObservation.class, "/language", "language", Language.class, this); private SmicsErgebnisObservationContainment() { super("openEHR-EHR-OBSERVATION.smics_befund.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebniskategorieDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebniskategorieDefiningcode.java index 3656e7674..9efb34492 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebniskategorieDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebniskategorieDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum SmicsErgebniskategorieDefiningcode implements EnumValueSet { +public enum SmicsErgebniskategorieDefiningCode implements EnumValueSet { ANDERE("Andere", "*", "local", "at0028"), HAUFUNG("Häufung", "*", "local", "at0026"), @@ -17,8 +17,8 @@ public enum SmicsErgebniskategorieDefiningcode implements EnumValueSet { private String code; - SmicsErgebniskategorieDefiningcode(String value, String description, String terminologyId, - String code) { + SmicsErgebniskategorieDefiningCode(String value, String description, String terminologyId, + String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -26,18 +26,18 @@ public enum SmicsErgebniskategorieDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java index 29693be02..adaa043c4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java @@ -10,69 +10,69 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") public class StandortCluster { - @Path("/items[at0029]/value|value") - private String zimmerValue; + @Path("/items[at0040]/value|value") + private String standorttypValue; - @Path("/items[at0027]/value|value") - private String stationValue; + @Path("/items[at0046]/value|value") + private String standortbeschreibungValue; - @Path("/items[at0047]") - private List details; + @Path("/items[at0048]/value|value") + private String standortschlusselValue; - @Path("/items[at0040]/value|value") - private String standorttypValue; + @Path("/items[at0027]/value|value") + private String stationValue; - @Path("/items[at0046]/value|value") - private String standortbeschreibungValue; + @Path("/items[at0029]/value|value") + private String zimmerValue; - @Path("/items[at0048]/value|value") - private String standortschlusselValue; + @Path("/items[at0047]") + private List details; - public void setZimmerValue(String zimmerValue) { - this.zimmerValue = zimmerValue; - } + public void setStandorttypValue(String standorttypValue) { + this.standorttypValue = standorttypValue; + } - public String getZimmerValue() { - return this.zimmerValue; - } + public String getStandorttypValue() { + return this.standorttypValue ; + } - public void setStationValue(String stationValue) { - this.stationValue = stationValue; - } + public void setStandortbeschreibungValue(String standortbeschreibungValue) { + this.standortbeschreibungValue = standortbeschreibungValue; + } - public String getStationValue() { - return this.stationValue; - } + public String getStandortbeschreibungValue() { + return this.standortbeschreibungValue ; + } - public void setDetails(List details) { - this.details = details; - } + public void setStandortschlusselValue(String standortschlusselValue) { + this.standortschlusselValue = standortschlusselValue; + } - public List getDetails() { - return this.details; - } + public String getStandortschlusselValue() { + return this.standortschlusselValue ; + } - public void setStandorttypValue(String standorttypValue) { - this.standorttypValue = standorttypValue; - } + public void setStationValue(String stationValue) { + this.stationValue = stationValue; + } - public String getStandorttypValue() { - return this.standorttypValue; - } + public String getStationValue() { + return this.stationValue ; + } - public void setStandortbeschreibungValue(String standortbeschreibungValue) { - this.standortbeschreibungValue = standortbeschreibungValue; - } + public void setZimmerValue(String zimmerValue) { + this.zimmerValue = zimmerValue; + } - public String getStandortbeschreibungValue() { - return this.standortbeschreibungValue; - } + public String getZimmerValue() { + return this.zimmerValue ; + } - public void setStandortschlusselValue(String standortschlusselValue) { - this.standortschlusselValue = standortschlusselValue; - } + public void setDetails(List details) { + this.details = details; + } - public String getStandortschlusselValue() { - return this.standortschlusselValue; - } + public List getDetails() { + return this.details ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortClusterContainment.java index 05698b69c..c418b4e35 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortClusterContainment.java @@ -10,18 +10,18 @@ public class StandortClusterContainment extends Containment { public SelectAqlField STANDORT_CLUSTER = new AqlFieldImp(StandortCluster.class, "", "StandortCluster", StandortCluster.class, this); - public SelectAqlField ZIMMER_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0029]/value|value", "zimmerValue", String.class, this); - - public SelectAqlField STATION_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0027]/value|value", "stationValue", String.class, this); - - public ListSelectAqlField DETAILS = new ListAqlFieldImp(StandortCluster.class, "/items[at0047]", "details", Cluster.class, this); - public SelectAqlField STANDORTTYP_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0040]/value|value", "standorttypValue", String.class, this); public SelectAqlField STANDORTBESCHREIBUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0046]/value|value", "standortbeschreibungValue", String.class, this); public SelectAqlField STANDORTSCHLUSSEL_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0048]/value|value", "standortschlusselValue", String.class, this); + public SelectAqlField STATION_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0027]/value|value", "stationValue", String.class, this); + + public SelectAqlField ZIMMER_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0029]/value|value", "zimmerValue", String.class, this); + + public ListSelectAqlField DETAILS = new ListAqlFieldImp(StandortCluster.class, "/items[at0047]", "details", Cluster.class, this); + private StandortClusterContainment() { super("openEHR-EHR-CLUSTER.location.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java index 6a719fdc6..fa40a4d12 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java @@ -10,13 +10,13 @@ import org.ehrbase.client.annotations.Id; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.AufnahmedatenAdminEntry; import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.EntlassungsdatenAdminEntry; -import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.FalltypDefiningcode; +import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.FalltypDefiningCode; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; import java.time.temporal.TemporalAccessor; @@ -26,138 +26,138 @@ @Archetype("openEHR-EHR-COMPOSITION.fall.v0") @Template("Stationärer Versorgungsfall") public class StationarerVersorgungsfallComposition { - @Id - private VersionUid versionUid; + @Path("/context/other_context[at0001]/items[at0005]/value|defining_code") + private FalltypDefiningCode falltypDefiningCode; - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; + @Path("/context/other_context[at0001]/items[at0004]/value|value") + private String fallklasseValue; - @Path("/content[openEHR-EHR-ADMIN_ENTRY.discharge_summary.v0]") - private EntlassungsdatenAdminEntry entlassungsdaten; + @Path("/context/other_context[at0001]/items[at0003 and name/value='Fall-Kennung']/value|value") + private String fallKennungValue; + + @Path("/context/other_context[at0001]/items[at0002]") + private List erweiterung; + + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; @Path("/context/participations") private List participations; - @Path("/language") - private Language language; + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + @Path("/context/location") + private String location; @Path("/context/health_care_facility") private PartyIdentified healthCareFacility; - @Path("/context/other_context[at0001]/items[at0005]/value|defining_code") - private FalltypDefiningcode falltypDefiningcode; - - @Path("/context/other_context[at0001]/items[at0004]/value|value") - private String fallklasseValue; - - @Path("/context/other_context[at0001]/items[at0003]/value|value") - private String fallKennungValue; - - @Path("/territory") - private Territory territory; + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; @Path("/content[openEHR-EHR-ADMIN_ENTRY.admission.v0 and name/value='Aufnahmedaten']") private AufnahmedatenAdminEntry aufnahmedaten; - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; + @Path("/content[openEHR-EHR-ADMIN_ENTRY.discharge_summary.v0]") + private EntlassungsdatenAdminEntry entlassungsdaten; @Path("/composer") private PartyProxy composer; - @Path("/context/setting|defining_code") - private SettingDefiningcode settingDefiningcode; + @Path("/language") + private Language language; @Path("/feeder_audit") private FeederAudit feederAudit; - @Path("/context/location") - private String location; - @Path("/category|defining_code") - private CategoryDefiningcode categoryDefiningcode; + private Category categoryDefiningCode; - @Path("/context/other_context[at0001]/items[at0002]") - private List erweiterung; + @Path("/territory") + private Territory territory; - public VersionUid getVersionUid() { - return this.versionUid ; + @Id + private VersionUid versionUid; + + public void setFalltypDefiningCode(FalltypDefiningCode falltypDefiningCode) { + this.falltypDefiningCode = falltypDefiningCode; } - public void setVersionUid(VersionUid versionUid) { - this.versionUid = versionUid; + public FalltypDefiningCode getFalltypDefiningCode() { + return this.falltypDefiningCode ; } - public void setEndTimeValue(TemporalAccessor endTimeValue) { - this.endTimeValue = endTimeValue; + public void setFallklasseValue(String fallklasseValue) { + this.fallklasseValue = fallklasseValue; } - public TemporalAccessor getEndTimeValue() { - return this.endTimeValue ; + public String getFallklasseValue() { + return this.fallklasseValue ; } - public void setEntlassungsdaten(EntlassungsdatenAdminEntry entlassungsdaten) { - this.entlassungsdaten = entlassungsdaten; + public void setFallKennungValue(String fallKennungValue) { + this.fallKennungValue = fallKennungValue; } - public EntlassungsdatenAdminEntry getEntlassungsdaten() { - return this.entlassungsdaten ; + public String getFallKennungValue() { + return this.fallKennungValue ; } - public void setParticipations(List participations) { - this.participations = participations; + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; } - public List getParticipations() { - return this.participations ; + public List getErweiterung() { + return this.erweiterung ; } - public void setLanguage(Language language) { - this.language = language; + public void setStartTimeValue(TemporalAccessor startTimeValue) { + this.startTimeValue = startTimeValue; } - public Language getLanguage() { - return this.language ; + public TemporalAccessor getStartTimeValue() { + return this.startTimeValue ; } - public void setHealthCareFacility(PartyIdentified healthCareFacility) { - this.healthCareFacility = healthCareFacility; + public void setParticipations(List participations) { + this.participations = participations; } - public PartyIdentified getHealthCareFacility() { - return this.healthCareFacility ; + public List getParticipations() { + return this.participations ; } - public void setFalltypDefiningcode(FalltypDefiningcode falltypDefiningcode) { - this.falltypDefiningcode = falltypDefiningcode; + public void setEndTimeValue(TemporalAccessor endTimeValue) { + this.endTimeValue = endTimeValue; } - public FalltypDefiningcode getFalltypDefiningcode() { - return this.falltypDefiningcode ; + public TemporalAccessor getEndTimeValue() { + return this.endTimeValue ; } - public void setFallklasseValue(String fallklasseValue) { - this.fallklasseValue = fallklasseValue; + public void setLocation(String location) { + this.location = location; } - public String getFallklasseValue() { - return this.fallklasseValue ; + public String getLocation() { + return this.location ; } - public void setFallKennungValue(String fallKennungValue) { - this.fallKennungValue = fallKennungValue; + public void setHealthCareFacility(PartyIdentified healthCareFacility) { + this.healthCareFacility = healthCareFacility; } - public String getFallKennungValue() { - return this.fallKennungValue ; + public PartyIdentified getHealthCareFacility() { + return this.healthCareFacility ; } - public void setTerritory(Territory territory) { - this.territory = territory; + public void setSettingDefiningCode(Setting settingDefiningCode) { + this.settingDefiningCode = settingDefiningCode; } - public Territory getTerritory() { - return this.territory ; + public Setting getSettingDefiningCode() { + return this.settingDefiningCode ; } public void setAufnahmedaten(AufnahmedatenAdminEntry aufnahmedaten) { @@ -168,12 +168,12 @@ public AufnahmedatenAdminEntry getAufnahmedaten() { return this.aufnahmedaten ; } - public void setStartTimeValue(TemporalAccessor startTimeValue) { - this.startTimeValue = startTimeValue; + public void setEntlassungsdaten(EntlassungsdatenAdminEntry entlassungsdaten) { + this.entlassungsdaten = entlassungsdaten; } - public TemporalAccessor getStartTimeValue() { - return this.startTimeValue ; + public EntlassungsdatenAdminEntry getEntlassungsdaten() { + return this.entlassungsdaten ; } public void setComposer(PartyProxy composer) { @@ -184,12 +184,12 @@ public PartyProxy getComposer() { return this.composer ; } - public void setSettingDefiningcode(SettingDefiningcode settingDefiningcode) { - this.settingDefiningcode = settingDefiningcode; + public void setLanguage(Language language) { + this.language = language; } - public SettingDefiningcode getSettingDefiningcode() { - return this.settingDefiningcode ; + public Language getLanguage() { + return this.language ; } public void setFeederAudit(FeederAudit feederAudit) { @@ -200,27 +200,27 @@ public FeederAudit getFeederAudit() { return this.feederAudit ; } - public void setLocation(String location) { - this.location = location; + public void setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; } - public String getLocation() { - return this.location ; + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; } - public void setCategoryDefiningcode(CategoryDefiningcode categoryDefiningcode) { - this.categoryDefiningcode = categoryDefiningcode; + public void setTerritory(Territory territory) { + this.territory = territory; } - public CategoryDefiningcode getCategoryDefiningcode() { - return this.categoryDefiningcode ; + public Territory getTerritory() { + return this.territory ; } - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; + public VersionUid getVersionUid() { + return this.versionUid ; } - public List getErweiterung() { - return this.erweiterung ; + public void setVersionUid(VersionUid versionUid) { + this.versionUid = versionUid; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallCompositionContainment.java index 9daa648d4..1a02d96ae 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallCompositionContainment.java @@ -5,57 +5,57 @@ 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 org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.AufnahmedatenAdminEntry; import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.EntlassungsdatenAdminEntry; -import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.FalltypDefiningcode; +import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.FalltypDefiningCode; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; + +import java.time.temporal.TemporalAccessor; public class StationarerVersorgungsfallCompositionContainment extends Containment { public SelectAqlField STATIONARER_VERSORGUNGSFALL_COMPOSITION = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "", "StationarerVersorgungsfallComposition", StationarerVersorgungsfallComposition.class, this); - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + public SelectAqlField FALLTYP_DEFINING_CODE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/other_context[at0001]/items[at0005]/value|defining_code", "falltypDefiningCode", FalltypDefiningCode.class, this); - public SelectAqlField ENTLASSUNGSDATEN = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/content[openEHR-EHR-ADMIN_ENTRY.discharge_summary.v0]", "entlassungsdaten", EntlassungsdatenAdminEntry.class, this); + public SelectAqlField FALLKLASSE_VALUE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/other_context[at0001]/items[at0004]/value|value", "fallklasseValue", String.class, this); - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/participations", "participations", Participation.class, this); + public SelectAqlField FALL_KENNUNG_VALUE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/other_context[at0001]/items[at0003]/value|value", "fallKennungValue", String.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/language", "language", Language.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/other_context[at0001]/items[at0002]", "erweiterung", Cluster.class, this); - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - public SelectAqlField FALLTYP_DEFININGCODE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/other_context[at0001]/items[at0005]/value|defining_code", "falltypDefiningcode", FalltypDefiningcode.class, this); + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/participations", "participations", Participation.class, this); - public SelectAqlField FALLKLASSE_VALUE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/other_context[at0001]/items[at0004]/value|value", "fallklasseValue", String.class, this); + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - public SelectAqlField FALL_KENNUNG_VALUE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/other_context[at0001]/items[at0003]/value|value", "fallKennungValue", String.class, this); + public SelectAqlField LOCATION = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/location", "location", String.class, this); - public SelectAqlField TERRITORY = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/territory", "territory", Territory.class, this); + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - public SelectAqlField AUFNAHMEDATEN = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/content[openEHR-EHR-ADMIN_ENTRY.admission.v0 and name/value='Aufnahmedaten']", "aufnahmedaten", AufnahmedatenAdminEntry.class, this); + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + public SelectAqlField AUFNAHMEDATEN = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/content[openEHR-EHR-ADMIN_ENTRY.admission.v0]", "aufnahmedaten", AufnahmedatenAdminEntry.class, this); + + public SelectAqlField ENTLASSUNGSDATEN = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/content[openEHR-EHR-ADMIN_ENTRY.discharge_summary.v0]", "entlassungsdaten", EntlassungsdatenAdminEntry.class, this); public SelectAqlField COMPOSER = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/composer", "composer", PartyProxy.class, this); - public SelectAqlField SETTING_DEFININGCODE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/setting|defining_code", "settingDefiningcode", SettingDefiningcode.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/language", "language", Language.class, this); public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - public SelectAqlField LOCATION = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/location", "location", String.class, this); - - public SelectAqlField CATEGORY_DEFININGCODE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/category|defining_code", "categoryDefiningcode", CategoryDefiningcode.class, this); + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/other_context[at0001]/items[at0002]", "erweiterung", Cluster.class, this); + public SelectAqlField TERRITORY = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/territory", "territory", Territory.class, this); private StationarerVersorgungsfallCompositionContainment() { super("openEHR-EHR-COMPOSITION.fall.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java index 7f81ee330..b76edd5a6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java @@ -2,52 +2,44 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; +import java.util.List; @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.admission.v0") public class AufnahmedatenAdminEntry { - @Path("/data[at0001]/items[at0132]") - private List vorherigerPatientenstandort; - - @Path("/language") - private Language language; + @Path("/data[at0001]/items[at0013 and name/value='Versorgungsfallgrund']/value|value") + private String versorgungsfallgrundValue; @Path("/data[at0001]/items[at0049]/value|value") private String artDerAufnahmeValue; - @Path("/subject") - private PartyProxy subject; + @Path("/data[at0001]/items[at0071]/value|value") + private TemporalAccessor datumUhrzeitDerAufnahmeValue; @Path("/data[at0001]/items[at0131]") private List zugewiesenerPatientenstandort; - @Path("/data[at0001]/items[at0013]/value|value") - private String versorgungsfallgrundValue; - - @Path("/data[at0001]/items[at0071]/value|value") - private TemporalAccessor datumUhrzeitDerAufnahmeValue; + @Path("/data[at0001]/items[at0132]") + private List vorherigerPatientenstandort; - public void setVorherigerPatientenstandort(List vorherigerPatientenstandort) { - this.vorherigerPatientenstandort = vorherigerPatientenstandort; - } + @Path("/subject") + private PartyProxy subject; - public List getVorherigerPatientenstandort() { - return this.vorherigerPatientenstandort ; - } + @Path("/language") + private Language language; - public void setLanguage(Language language) { - this.language = language; + public void setVersorgungsfallgrundValue(String versorgungsfallgrundValue) { + this.versorgungsfallgrundValue = versorgungsfallgrundValue; } - public Language getLanguage() { - return this.language ; + public String getVersorgungsfallgrundValue() { + return this.versorgungsfallgrundValue ; } public void setArtDerAufnahmeValue(String artDerAufnahmeValue) { @@ -58,12 +50,12 @@ public String getArtDerAufnahmeValue() { return this.artDerAufnahmeValue ; } - public void setSubject(PartyProxy subject) { - this.subject = subject; + public void setDatumUhrzeitDerAufnahmeValue(TemporalAccessor datumUhrzeitDerAufnahmeValue) { + this.datumUhrzeitDerAufnahmeValue = datumUhrzeitDerAufnahmeValue; } - public PartyProxy getSubject() { - return this.subject ; + public TemporalAccessor getDatumUhrzeitDerAufnahmeValue() { + return this.datumUhrzeitDerAufnahmeValue ; } public void setZugewiesenerPatientenstandort(List zugewiesenerPatientenstandort) { @@ -74,19 +66,27 @@ public List getZugewiesenerPatientenstandort() { return this.zugewiesenerPatientenstandort ; } - public void setVersorgungsfallgrundValue(String versorgungsfallgrundValue) { - this.versorgungsfallgrundValue = versorgungsfallgrundValue; + public void setVorherigerPatientenstandort(List vorherigerPatientenstandort) { + this.vorherigerPatientenstandort = vorherigerPatientenstandort; } - public String getVersorgungsfallgrundValue() { - return this.versorgungsfallgrundValue ; + public List getVorherigerPatientenstandort() { + return this.vorherigerPatientenstandort ; } - public void setDatumUhrzeitDerAufnahmeValue(TemporalAccessor datumUhrzeitDerAufnahmeValue) { - this.datumUhrzeitDerAufnahmeValue = datumUhrzeitDerAufnahmeValue; + public void setSubject(PartyProxy subject) { + this.subject = subject; } - public TemporalAccessor getDatumUhrzeitDerAufnahmeValue() { - return this.datumUhrzeitDerAufnahmeValue ; + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntryContainment.java index 59b728c95..e1a4972a7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntryContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntryContainment.java @@ -2,31 +2,31 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; public class AufnahmedatenAdminEntryContainment extends Containment { public SelectAqlField AUFNAHMEDATEN_ADMIN_ENTRY = new AqlFieldImp(AufnahmedatenAdminEntry.class, "", "AufnahmedatenAdminEntry", AufnahmedatenAdminEntry.class, this); - public ListSelectAqlField VORHERIGER_PATIENTENSTANDORT = new ListAqlFieldImp(AufnahmedatenAdminEntry.class, "/data[at0001]/items[at0132]", "vorherigerPatientenstandort", Cluster.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(AufnahmedatenAdminEntry.class, "/language", "language", Language.class, this); + public SelectAqlField VERSORGUNGSFALLGRUND_VALUE = new AqlFieldImp(AufnahmedatenAdminEntry.class, "/data[at0001]/items[at0013]/value|value", "versorgungsfallgrundValue", String.class, this); public SelectAqlField ART_DER_AUFNAHME_VALUE = new AqlFieldImp(AufnahmedatenAdminEntry.class, "/data[at0001]/items[at0049]/value|value", "artDerAufnahmeValue", String.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(AufnahmedatenAdminEntry.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField DATUM_UHRZEIT_DER_AUFNAHME_VALUE = new AqlFieldImp(AufnahmedatenAdminEntry.class, "/data[at0001]/items[at0071]/value|value", "datumUhrzeitDerAufnahmeValue", TemporalAccessor.class, this); public ListSelectAqlField ZUGEWIESENER_PATIENTENSTANDORT = new ListAqlFieldImp(AufnahmedatenAdminEntry.class, "/data[at0001]/items[at0131]", "zugewiesenerPatientenstandort", Cluster.class, this); - public SelectAqlField VERSORGUNGSFALLGRUND_VALUE = new AqlFieldImp(AufnahmedatenAdminEntry.class, "/data[at0001]/items[at0013]/value|value", "versorgungsfallgrundValue", String.class, this); + public ListSelectAqlField VORHERIGER_PATIENTENSTANDORT = new ListAqlFieldImp(AufnahmedatenAdminEntry.class, "/data[at0001]/items[at0132]", "vorherigerPatientenstandort", Cluster.class, this); - public SelectAqlField DATUM_UHRZEIT_DER_AUFNAHME_VALUE = new AqlFieldImp(AufnahmedatenAdminEntry.class, "/data[at0001]/items[at0071]/value|value", "datumUhrzeitDerAufnahmeValue", TemporalAccessor.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(AufnahmedatenAdminEntry.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(AufnahmedatenAdminEntry.class, "/language", "language", Language.class, this); private AufnahmedatenAdminEntryContainment() { super("openEHR-EHR-ADMIN_ENTRY.admission.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java index e7b647cd3..3236c4394 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java @@ -5,7 +5,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,69 +13,77 @@ @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.discharge_summary.v0") public class EntlassungsdatenAdminEntry { - @Path("/data[at0001]/items[at0066]") - private List letzterPatientenstandort; - - @Path("/data[at0001]/items[at0067]") - private List zugewiesenerPatientenstandort; + @Path("/data[at0001]/items[at0040]/value|value") + private String artDerEntlassungValue; @Path("/data[at0001]/items[at0002]/value|defining_code") - private KlinischerZustandDesPatientenDefiningcode klinischerZustandDesPatientenDefiningcode; + private KlinischerZustandDesPatientenDefiningCode klinischerZustandDesPatientenDefiningCode; - @Path("/language") - private Language language; + @Path("/data[at0001]/items[at0011 and name/value='Datum/Uhrzeit der Entlassung']/value|value") + private TemporalAccessor datumUhrzeitDerEntlassungValue; @Path("/data[at0001]/items[at0050]/value|value") private String zusatzlicheInformationenValue; + @Path("/data[at0001]/items[at0066]") + private List letzterPatientenstandort; + + @Path("/data[at0001]/items[at0067]") + private List zugewiesenerPatientenstandort; + @Path("/subject") private PartyProxy subject; - @Path("/data[at0001]/items[at0040]/value|value") - private String artDerEntlassungValue; + @Path("/language") + private Language language; - @Path("/data[at0001]/items[at0011]/value|value") - private TemporalAccessor datumUhrzeitDerEntlassungValue; + public void setArtDerEntlassungValue(String artDerEntlassungValue) { + this.artDerEntlassungValue = artDerEntlassungValue; + } - public void setLetzterPatientenstandort(List letzterPatientenstandort) { - this.letzterPatientenstandort = letzterPatientenstandort; + public String getArtDerEntlassungValue() { + return this.artDerEntlassungValue ; } - public List getLetzterPatientenstandort() { - return this.letzterPatientenstandort ; + public void setKlinischerZustandDesPatientenDefiningCode( + KlinischerZustandDesPatientenDefiningCode klinischerZustandDesPatientenDefiningCode) { + this.klinischerZustandDesPatientenDefiningCode = klinischerZustandDesPatientenDefiningCode; } - public void setZugewiesenerPatientenstandort(List zugewiesenerPatientenstandort) { - this.zugewiesenerPatientenstandort = zugewiesenerPatientenstandort; + public KlinischerZustandDesPatientenDefiningCode getKlinischerZustandDesPatientenDefiningCode() { + return this.klinischerZustandDesPatientenDefiningCode ; } - public List getZugewiesenerPatientenstandort() { - return this.zugewiesenerPatientenstandort ; + public void setDatumUhrzeitDerEntlassungValue(TemporalAccessor datumUhrzeitDerEntlassungValue) { + this.datumUhrzeitDerEntlassungValue = datumUhrzeitDerEntlassungValue; + } + + public TemporalAccessor getDatumUhrzeitDerEntlassungValue() { + return this.datumUhrzeitDerEntlassungValue ; } - public void setKlinischerZustandDesPatientenDefiningcode( - KlinischerZustandDesPatientenDefiningcode klinischerZustandDesPatientenDefiningcode) { - this.klinischerZustandDesPatientenDefiningcode = klinischerZustandDesPatientenDefiningcode; + public void setZusatzlicheInformationenValue(String zusatzlicheInformationenValue) { + this.zusatzlicheInformationenValue = zusatzlicheInformationenValue; } - public KlinischerZustandDesPatientenDefiningcode getKlinischerZustandDesPatientenDefiningcode() { - return this.klinischerZustandDesPatientenDefiningcode ; + public String getZusatzlicheInformationenValue() { + return this.zusatzlicheInformationenValue ; } - public void setLanguage(Language language) { - this.language = language; + public void setLetzterPatientenstandort(List letzterPatientenstandort) { + this.letzterPatientenstandort = letzterPatientenstandort; } - public Language getLanguage() { - return this.language ; + public List getLetzterPatientenstandort() { + return this.letzterPatientenstandort ; } - public void setZusatzlicheInformationenValue(String zusatzlicheInformationenValue) { - this.zusatzlicheInformationenValue = zusatzlicheInformationenValue; + public void setZugewiesenerPatientenstandort(List zugewiesenerPatientenstandort) { + this.zugewiesenerPatientenstandort = zugewiesenerPatientenstandort; } - public String getZusatzlicheInformationenValue() { - return this.zusatzlicheInformationenValue ; + public List getZugewiesenerPatientenstandort() { + return this.zugewiesenerPatientenstandort ; } public void setSubject(PartyProxy subject) { @@ -86,19 +94,11 @@ public PartyProxy getSubject() { return this.subject ; } - public void setArtDerEntlassungValue(String artDerEntlassungValue) { - this.artDerEntlassungValue = artDerEntlassungValue; - } - - public String getArtDerEntlassungValue() { - return this.artDerEntlassungValue ; - } - - public void setDatumUhrzeitDerEntlassungValue(TemporalAccessor datumUhrzeitDerEntlassungValue) { - this.datumUhrzeitDerEntlassungValue = datumUhrzeitDerEntlassungValue; + public void setLanguage(Language language) { + this.language = language; } - public TemporalAccessor getDatumUhrzeitDerEntlassungValue() { - return this.datumUhrzeitDerEntlassungValue ; + public Language getLanguage() { + return this.language ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntryContainment.java index 4115fa942..f2bad3c8c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntryContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntryContainment.java @@ -2,33 +2,33 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +import java.time.temporal.TemporalAccessor; public class EntlassungsdatenAdminEntryContainment extends Containment { public SelectAqlField ENTLASSUNGSDATEN_ADMIN_ENTRY = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "", "EntlassungsdatenAdminEntry", EntlassungsdatenAdminEntry.class, this); - public ListSelectAqlField LETZTER_PATIENTENSTANDORT = new ListAqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0066]", "letzterPatientenstandort", Cluster.class, this); - - public ListSelectAqlField ZUGEWIESENER_PATIENTENSTANDORT = new ListAqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0067]", "zugewiesenerPatientenstandort", Cluster.class, this); + public SelectAqlField ART_DER_ENTLASSUNG_VALUE = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0040]/value|value", "artDerEntlassungValue", String.class, this); - public SelectAqlField KLINISCHER_ZUSTAND_DES_PATIENTEN_DEFININGCODE = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0002]/value|defining_code", "klinischerZustandDesPatientenDefiningcode", KlinischerZustandDesPatientenDefiningcode.class, this); + public SelectAqlField KLINISCHER_ZUSTAND_DES_PATIENTEN_DEFINING_CODE = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0002]/value|defining_code", "klinischerZustandDesPatientenDefiningCode", KlinischerZustandDesPatientenDefiningCode.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/language", "language", Language.class, this); + public SelectAqlField DATUM_UHRZEIT_DER_ENTLASSUNG_VALUE = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0011]/value|value", "datumUhrzeitDerEntlassungValue", TemporalAccessor.class, this); public SelectAqlField ZUSATZLICHE_INFORMATIONEN_VALUE = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0050]/value|value", "zusatzlicheInformationenValue", String.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/subject", "subject", PartyProxy.class, this); + public ListSelectAqlField LETZTER_PATIENTENSTANDORT = new ListAqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0066]", "letzterPatientenstandort", Cluster.class, this); - public SelectAqlField ART_DER_ENTLASSUNG_VALUE = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0040]/value|value", "artDerEntlassungValue", String.class, this); + public ListSelectAqlField ZUGEWIESENER_PATIENTENSTANDORT = new ListAqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0067]", "zugewiesenerPatientenstandort", Cluster.class, this); - public SelectAqlField DATUM_UHRZEIT_DER_ENTLASSUNG_VALUE = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0011]/value|value", "datumUhrzeitDerEntlassungValue", TemporalAccessor.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/language", "language", Language.class, this); private EntlassungsdatenAdminEntryContainment() { super("openEHR-EHR-ADMIN_ENTRY.discharge_summary.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/FalltypDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/FalltypDefiningcode.java index 30b84b6f8..e61b550b1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/FalltypDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/FalltypDefiningcode.java @@ -1,9 +1,8 @@ package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition; -import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; -public enum FalltypDefiningcode implements EnumValueSet { +public enum FalltypDefiningCode implements EnumValueSet { VERSORGUNGSFALL("Versorgungsfall", "Versorgungsfall", "local", "at0006"); private String value; @@ -14,7 +13,7 @@ public enum FalltypDefiningcode implements EnumValueSet { private String code; - FalltypDefiningcode(String value, String description, String terminologyId, String code) { + FalltypDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/KlinischerZustandDesPatientenDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/KlinischerZustandDesPatientenDefiningcode.java index ab01415b0..7912afa2f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/KlinischerZustandDesPatientenDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/KlinischerZustandDesPatientenDefiningcode.java @@ -1,9 +1,8 @@ package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition; -import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; -public enum KlinischerZustandDesPatientenDefiningcode implements EnumValueSet { +public enum KlinischerZustandDesPatientenDefiningCode implements EnumValueSet { IDENTISCHER_ZUSTAND("Identischer Zustand", "Der Gesundheitszustand des Patienten ist identisch, wie bei der Aufnahme.", "local", "at0005"), UNBESTIMMT("Unbestimmt", "Unbestimmt.", "local", "at0008"), @@ -26,7 +25,7 @@ public enum KlinischerZustandDesPatientenDefiningcode implements EnumValueSet { private String code; - KlinischerZustandDesPatientenDefiningcode(String value, String description, String terminologyId, + KlinischerZustandDesPatientenDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java index d7404daac..8aa1c63a4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java @@ -9,14 +9,14 @@ import org.ehrbase.client.annotations.Id; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; -import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.ContextCodedTextDefiningcode; +import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.ContextCodedTextDefiningCode; import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesEvaluation; import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesObservation; import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesSection; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; import java.time.temporal.TemporalAccessor; @@ -26,182 +26,180 @@ @Archetype("openEHR-EHR-COMPOSITION.test_all_types.v1") @Template("test_all_types.en.v1") public class TestAllTypesEnV1Composition { - @Id - private VersionUid versionUid; + @Path("/context/other_context[at0004]/item[at0005]/value|defining_code") + private ContextCodedTextDefiningCode contextCodedTextDefiningCode; - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; - @Path("/context/participations") - private List participations; + @Path("/context/participations") + private List participations; - @Path("/language") - private Language language; + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; + @Path("/context/location") + private String location; - @Path("/territory") - private Territory territory; + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; - @Path("/context/other_context[at0004]/item[at0005]/value|defining_code") - private ContextCodedTextDefiningcode contextCodedTextDefiningcode; + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; + @Path("/content[openEHR-EHR-OBSERVATION.test_all_types.v1]") + private List testAllTypesTestAllTypes; - @Path("/content[openEHR-EHR-EVALUATION.test_all_types.v1]") - private List testAllTypes; + @Path("/content[openEHR-EHR-EVALUATION.test_all_types.v1]") + private List testAllTypesTestAllTypes2; - @Path("/content[openEHR-EHR-SECTION.test_all_types.v1]") - private List testAllTypesContentOpenehrEhrSectionTestAllTypesV1; + @Path("/content[openEHR-EHR-SECTION.test_all_types.v1]") + private List testAllTypesTestAllTypes3; - @Path("/composer") - private PartyProxy composer; + @Path("/composer") + private PartyProxy composer; - @Path("/context/setting|defining_code") - private SettingDefiningcode settingDefiningcode; + @Path("/language") + private Language language; - @Path("/feeder_audit") - private FeederAudit feederAudit; + @Path("/feeder_audit") + private FeederAudit feederAudit; - @Path("/content[openEHR-EHR-OBSERVATION.test_all_types.v1]") - private List testAllTypesContentOpenehrEhrObservationTestAllTypesV1; + @Path("/category|defining_code") + private Category categoryDefiningCode; - @Path("/context/location") - private String location; + @Path("/territory") + private Territory territory; - @Path("/category|defining_code") - private CategoryDefiningcode categoryDefiningcode; + @Id + private VersionUid versionUid; - public VersionUid getVersionUid() { - return this.versionUid; - } + public void setContextCodedTextDefiningCode( + ContextCodedTextDefiningCode contextCodedTextDefiningCode) { + this.contextCodedTextDefiningCode = contextCodedTextDefiningCode; + } - public void setVersionUid(VersionUid versionUid) { - this.versionUid = versionUid; - } + public ContextCodedTextDefiningCode getContextCodedTextDefiningCode() { + return this.contextCodedTextDefiningCode ; + } - public void setEndTimeValue(TemporalAccessor endTimeValue) { - this.endTimeValue = endTimeValue; - } + public void setStartTimeValue(TemporalAccessor startTimeValue) { + this.startTimeValue = startTimeValue; + } - public TemporalAccessor getEndTimeValue() { - return this.endTimeValue; - } + public TemporalAccessor getStartTimeValue() { + return this.startTimeValue ; + } - public void setParticipations(List participations) { - this.participations = participations; - } + public void setParticipations(List participations) { + this.participations = participations; + } - public List getParticipations() { - return this.participations; - } + public List getParticipations() { + return this.participations ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setEndTimeValue(TemporalAccessor endTimeValue) { + this.endTimeValue = endTimeValue; + } - public Language getLanguage() { - return this.language; - } + public TemporalAccessor getEndTimeValue() { + return this.endTimeValue ; + } - public void setHealthCareFacility(PartyIdentified healthCareFacility) { - this.healthCareFacility = healthCareFacility; - } + public void setLocation(String location) { + this.location = location; + } - public PartyIdentified getHealthCareFacility() { - return this.healthCareFacility; - } + public String getLocation() { + return this.location ; + } - public void setTerritory(Territory territory) { - this.territory = territory; - } + public void setHealthCareFacility(PartyIdentified healthCareFacility) { + this.healthCareFacility = healthCareFacility; + } - public Territory getTerritory() { - return this.territory; - } + public PartyIdentified getHealthCareFacility() { + return this.healthCareFacility ; + } - public void setContextCodedTextDefiningcode( - ContextCodedTextDefiningcode contextCodedTextDefiningcode) { - this.contextCodedTextDefiningcode = contextCodedTextDefiningcode; - } + public void setSettingDefiningCode(Setting settingDefiningCode) { + this.settingDefiningCode = settingDefiningCode; + } - public ContextCodedTextDefiningcode getContextCodedTextDefiningcode() { - return this.contextCodedTextDefiningcode; - } + public Setting getSettingDefiningCode() { + return this.settingDefiningCode ; + } - public void setStartTimeValue(TemporalAccessor startTimeValue) { - this.startTimeValue = startTimeValue; - } + public void setTestAllTypesTestAllTypes(List testAllTypesTestAllTypes) { + this.testAllTypesTestAllTypes = testAllTypesTestAllTypes; + } - public TemporalAccessor getStartTimeValue() { - return this.startTimeValue; - } + public List getTestAllTypesTestAllTypes() { + return this.testAllTypesTestAllTypes ; + } - public void setTestAllTypes(List testAllTypes) { - this.testAllTypes = testAllTypes; - } + public void setTestAllTypesTestAllTypes2(List testAllTypesTestAllTypes2) { + this.testAllTypesTestAllTypes2 = testAllTypesTestAllTypes2; + } - public List getTestAllTypes() { - return this.testAllTypes; - } + public List getTestAllTypesTestAllTypes2() { + return this.testAllTypesTestAllTypes2 ; + } - public void setTestAllTypesContentOpenehrEhrSectionTestAllTypesV1( - List testAllTypesContentOpenehrEhrSectionTestAllTypesV1) { - this.testAllTypesContentOpenehrEhrSectionTestAllTypesV1 = testAllTypesContentOpenehrEhrSectionTestAllTypesV1; - } + public void setTestAllTypesTestAllTypes3(List testAllTypesTestAllTypes3) { + this.testAllTypesTestAllTypes3 = testAllTypesTestAllTypes3; + } - public List getTestAllTypesContentOpenehrEhrSectionTestAllTypesV1() { - return this.testAllTypesContentOpenehrEhrSectionTestAllTypesV1; - } + public List getTestAllTypesTestAllTypes3() { + return this.testAllTypesTestAllTypes3 ; + } - public void setComposer(PartyProxy composer) { - this.composer = composer; - } + public void setComposer(PartyProxy composer) { + this.composer = composer; + } - public PartyProxy getComposer() { - return this.composer; - } + public PartyProxy getComposer() { + return this.composer ; + } - public void setSettingDefiningcode(SettingDefiningcode settingDefiningcode) { - this.settingDefiningcode = settingDefiningcode; - } + public void setLanguage(Language language) { + this.language = language; + } - public SettingDefiningcode getSettingDefiningcode() { - return this.settingDefiningcode; - } - - public void setFeederAudit(FeederAudit feederAudit) { - this.feederAudit = feederAudit; - } - - public FeederAudit getFeederAudit() { - return this.feederAudit; - } - - public void setTestAllTypesContentOpenehrEhrObservationTestAllTypesV1( - List testAllTypesContentOpenehrEhrObservationTestAllTypesV1) { - this.testAllTypesContentOpenehrEhrObservationTestAllTypesV1 = testAllTypesContentOpenehrEhrObservationTestAllTypesV1; - } - - public List getTestAllTypesContentOpenehrEhrObservationTestAllTypesV1() { - return this.testAllTypesContentOpenehrEhrObservationTestAllTypesV1; - } - - public void setLocation(String location) { - this.location = location; - } - - public String getLocation() { - return this.location; - } - - public void setCategoryDefiningcode(CategoryDefiningcode categoryDefiningcode) { - this.categoryDefiningcode = categoryDefiningcode; - } - - public CategoryDefiningcode getCategoryDefiningcode() { - return this.categoryDefiningcode; - } + public Language getLanguage() { + return this.language ; + } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + + public void setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } + + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } + + 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java index ef64a0a61..6fb006f81 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java @@ -9,49 +9,49 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; -import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.ContextCodedTextDefiningcode; +import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.ContextCodedTextDefiningCode; import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesEvaluation; import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesObservation; import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesSection; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import java.time.temporal.TemporalAccessor; public class TestAllTypesEnV1CompositionContainment extends Containment { public SelectAqlField TEST_ALL_TYPES_EN_V1_COMPOSITION = new AqlFieldImp(TestAllTypesEnV1Composition.class, "", "TestAllTypesEnV1Composition", TestAllTypesEnV1Composition.class, this); - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + public SelectAqlField CONTEXT_CODED_TEXT_DEFINING_CODE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/other_context[at0004]/item[at0005]/value|defining_code", "contextCodedTextDefiningCode", ContextCodedTextDefiningCode.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/context/participations", "participations", Participation.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/language", "language", Language.class, this); + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + public SelectAqlField LOCATION = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/location", "location", String.class, this); - public SelectAqlField TERRITORY = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/territory", "territory", Territory.class, this); + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - public SelectAqlField CONTEXT_CODED_TEXT_DEFININGCODE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/other_context[at0004]/item[at0005]/value|defining_code", "contextCodedTextDefiningcode", ContextCodedTextDefiningcode.class, this); + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + public ListSelectAqlField TEST_ALL_TYPES_TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-OBSERVATION.test_all_types.v1]", "testAllTypesTestAllTypes", TestAllTypesObservation.class, this); - public ListSelectAqlField TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-EVALUATION.test_all_types.v1]", "testAllTypes", TestAllTypesEvaluation.class, this); + public ListSelectAqlField TEST_ALL_TYPES_TEST_ALL_TYPES2 = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-EVALUATION.test_all_types.v1]", "testAllTypesTestAllTypes2", TestAllTypesEvaluation.class, this); - public ListSelectAqlField TEST_ALL_TYPES_CONTENT_OPENEHR_EHR_SECTION_TEST_ALL_TYPES_V1 = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-SECTION.test_all_types.v1]", "testAllTypesContentOpenehrEhrSectionTestAllTypesV1", TestAllTypesSection.class, this); + public ListSelectAqlField TEST_ALL_TYPES_TEST_ALL_TYPES3 = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-SECTION.test_all_types.v1]", "testAllTypesTestAllTypes3", TestAllTypesSection.class, this); public SelectAqlField COMPOSER = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/composer", "composer", PartyProxy.class, this); - public SelectAqlField SETTING_DEFININGCODE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/setting|defining_code", "settingDefiningcode", SettingDefiningcode.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/language", "language", Language.class, this); public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - public ListSelectAqlField TEST_ALL_TYPES_CONTENT_OPENEHR_EHR_OBSERVATION_TEST_ALL_TYPES_V1 = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-OBSERVATION.test_all_types.v1]", "testAllTypesContentOpenehrEhrObservationTestAllTypesV1", TestAllTypesObservation.class, this); + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - public SelectAqlField LOCATION = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/location", "location", String.class, this); - - public SelectAqlField CATEGORY_DEFININGCODE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/category|defining_code", "categoryDefiningcode", CategoryDefiningcode.class, this); + public SelectAqlField TERRITORY = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/territory", "territory", Territory.class, this); private TestAllTypesEnV1CompositionContainment() { super("openEHR-EHR-COMPOSITION.test_all_types.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ActiveDefiningcode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ActiveDefiningcode2.java deleted file mode 100644 index 13b8bd10c..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ActiveDefiningcode2.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum ActiveDefiningcode2 implements EnumValueSet { - ACTIVE("Active", "*", "local", "at0004"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - ActiveDefiningcode2(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ActiveDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CareflowStepDefiningCode.java similarity index 56% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ActiveDefiningcode.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CareflowStepDefiningCode.java index f6b862a5a..d30bacca9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ActiveDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CareflowStepDefiningCode.java @@ -2,8 +2,12 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum ActiveDefiningcode implements EnumValueSet { - ACTIVE("active", "active", "openehr", "245"); +public enum CareflowStepDefiningCode implements EnumValueSet { + PLANNED("Planned", "*", null, "at0003"), + + ACTIVE("Active", "*", null, "at0004"), + + COMPLETED("Completed", "*", null, "at0005"); private String value; @@ -13,7 +17,7 @@ public enum ActiveDefiningcode implements EnumValueSet { private String code; - ActiveDefiningcode(String value, String description, String terminologyId, String code) { + CareflowStepDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -21,18 +25,18 @@ public enum ActiveDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CompletedDefiningcode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CompletedDefiningcode2.java deleted file mode 100644 index 429e23090..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CompletedDefiningcode2.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum CompletedDefiningcode2 implements EnumValueSet { - COMPLETED("completed", "completed", "openehr", "532"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - CompletedDefiningcode2(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ContextCodedTextDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ContextCodedTextDefiningcode.java index abea511c5..1c7c49f69 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ContextCodedTextDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ContextCodedTextDefiningcode.java @@ -2,7 +2,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum ContextCodedTextDefiningcode implements EnumValueSet { +public enum ContextCodedTextDefiningCode implements EnumValueSet { VALUE1("value1", "*", "local", "at0006"), VALUE2("value2", "*", "local", "at0007"), @@ -17,8 +17,8 @@ public enum ContextCodedTextDefiningcode implements EnumValueSet { private String code; - ContextCodedTextDefiningcode(String value, String description, String terminologyId, - String code) { + ContextCodedTextDefiningCode(String value, String description, String terminologyId, + String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -26,18 +26,18 @@ public enum ContextCodedTextDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CompletedDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CurrentStateDefiningCode.java similarity index 56% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CompletedDefiningcode.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CurrentStateDefiningCode.java index 2815b69eb..c4ba1fc45 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CompletedDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CurrentStateDefiningCode.java @@ -2,8 +2,12 @@ import org.ehrbase.client.classgenerator.EnumValueSet; -public enum CompletedDefiningcode implements EnumValueSet { - COMPLETED("Completed", "*", "local", "at0005"); +public enum CurrentStateDefiningCode implements EnumValueSet { + COMPLETED("completed", "completed", null, "532"), + + PLANNED("planned", "planned", null, "526"), + + ACTIVE("active", "active", null, "245"); private String value; @@ -13,7 +17,7 @@ public enum CompletedDefiningcode implements EnumValueSet { private String code; - CompletedDefiningcode(String value, String description, String terminologyId, String code) { + CurrentStateDefiningCode(String value, String description, String terminologyId, String code) { this.value = value; this.description = description; this.terminologyId = terminologyId; @@ -21,18 +25,18 @@ public enum CompletedDefiningcode implements EnumValueSet { } public String getValue() { - return this.value; + return this.value ; } public String getDescription() { - return this.description; + return this.description ; } public String getTerminologyId() { - return this.terminologyId; + return this.terminologyId ; } public String getCode() { - return this.code; + return this.code ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/PlannedDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/PlannedDefiningcode.java deleted file mode 100644 index 2b4403ca1..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/PlannedDefiningcode.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum PlannedDefiningcode implements EnumValueSet { - PLANNED("Planned", "*", "local", "at0003"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - PlannedDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/PlannedDefiningcode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/PlannedDefiningcode2.java deleted file mode 100644 index d795d4711..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/PlannedDefiningcode2.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum PlannedDefiningcode2 implements EnumValueSet { - PLANNED("planned", "planned", "openehr", "526"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - PlannedDefiningcode2(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java index 534206022..ea3fda68b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java @@ -1,11 +1,11 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import com.nedap.archie.rm.datatypes.CodePhrase; import com.nedap.archie.rm.generic.PartyProxy; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.TransitionDefiningcode; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -13,151 +13,80 @@ @Entity @Archetype("openEHR-EHR-ACTION.test_all_types.v1") public class TestAllTypesAction { - @Path("/ism_transition[at0004]/transition|defining_code") - private TransitionDefiningcode transitionDefiningcode; + @Path("/description[at0001]/items[openEHR-EHR-CLUSTER.test_all_types.v1]") + private List testAllTypes; - @Path("/ism_transition[at0005]/transition|defining_code") - private TransitionDefiningcode transitionDefiningcodeCompleted; + @Path("/subject") + private PartyProxy subject; - @Path("/ism_transition[at0005]/careflow_step|defining_code") - private CompletedDefiningcode completedDefiningcode; + @Path("/language") + private Language language; - @Path("/ism_transition[at0005]/current_state|defining_code") - private CompletedDefiningcode2 completedDefiningcodeCurrentState; + @Path("/time|value") + private TemporalAccessor timeValue; - @Path("/language") - private Language language; + @Path("/ism_transition/careflow_step|defining_code") + private CareflowStepDefiningCode careflowStepDefiningCode; - @Path("/ism_transition[at0003]/careflow_step|defining_code") - private PlannedDefiningcode plannedDefiningcode; + @Path("/ism_transition/current_state|defining_code") + private CurrentStateDefiningCode currentStateDefiningCode; - @Path("/ism_transition[at0003]/transition|defining_code") - private TransitionDefiningcode transitionDefiningcodePlanned; + @Path("/ism_transition/transition|defining_code") + private CodePhrase transitionDefiningCode; - @Path("/description[at0001]/items[openEHR-EHR-CLUSTER.test_all_types.v1]") - private List testAllTypes; + public void setTestAllTypes(List testAllTypes) { + this.testAllTypes = testAllTypes; + } - @Path("/time|value") - private TemporalAccessor timeValue; + public List getTestAllTypes() { + return this.testAllTypes ; + } - @Path("/ism_transition[at0003]/current_state|defining_code") - private PlannedDefiningcode2 plannedDefiningcodeCurrentState; + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - @Path("/ism_transition[at0004]/current_state|defining_code") - private ActiveDefiningcode activeDefiningcode; + public PartyProxy getSubject() { + return this.subject ; + } - @Path("/ism_transition[at0004]/careflow_step|defining_code") - private ActiveDefiningcode2 activeDefiningcodeCareflowStep; + public void setLanguage(Language language) { + this.language = language; + } - @Path("/subject") - private PartyProxy subject; + public Language getLanguage() { + return this.language ; + } - public void setTransitionDefiningcode(TransitionDefiningcode transitionDefiningcode) { - this.transitionDefiningcode = transitionDefiningcode; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public TransitionDefiningcode getTransitionDefiningcode() { - return this.transitionDefiningcode; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setTransitionDefiningcodeCompleted( - TransitionDefiningcode transitionDefiningcodeCompleted) { - this.transitionDefiningcodeCompleted = transitionDefiningcodeCompleted; - } + public void setCareflowStepDefiningCode(CareflowStepDefiningCode careflowStepDefiningCode) { + this.careflowStepDefiningCode = careflowStepDefiningCode; + } - public TransitionDefiningcode getTransitionDefiningcodeCompleted() { - return this.transitionDefiningcodeCompleted; - } + public CareflowStepDefiningCode getCareflowStepDefiningCode() { + return this.careflowStepDefiningCode ; + } - public void setCompletedDefiningcode(CompletedDefiningcode completedDefiningcode) { - this.completedDefiningcode = completedDefiningcode; - } + public void setCurrentStateDefiningCode(CurrentStateDefiningCode currentStateDefiningCode) { + this.currentStateDefiningCode = currentStateDefiningCode; + } - public CompletedDefiningcode getCompletedDefiningcode() { - return this.completedDefiningcode; - } + public CurrentStateDefiningCode getCurrentStateDefiningCode() { + return this.currentStateDefiningCode ; + } - public void setCompletedDefiningcodeCurrentState( - CompletedDefiningcode2 completedDefiningcodeCurrentState) { - this.completedDefiningcodeCurrentState = completedDefiningcodeCurrentState; - } + public void setTransitionDefiningCode(CodePhrase transitionDefiningCode) { + this.transitionDefiningCode = transitionDefiningCode; + } - public CompletedDefiningcode2 getCompletedDefiningcodeCurrentState() { - return this.completedDefiningcodeCurrentState; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language; - } - - public void setPlannedDefiningcode(PlannedDefiningcode plannedDefiningcode) { - this.plannedDefiningcode = plannedDefiningcode; - } - - public PlannedDefiningcode getPlannedDefiningcode() { - return this.plannedDefiningcode; - } - - public void setTransitionDefiningcodePlanned( - TransitionDefiningcode transitionDefiningcodePlanned) { - this.transitionDefiningcodePlanned = transitionDefiningcodePlanned; - } - - public TransitionDefiningcode getTransitionDefiningcodePlanned() { - return this.transitionDefiningcodePlanned; - } - - public void setTestAllTypes(List testAllTypes) { - this.testAllTypes = testAllTypes; - } - - public List getTestAllTypes() { - return this.testAllTypes; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue; - } - - public void setPlannedDefiningcodeCurrentState( - PlannedDefiningcode2 plannedDefiningcodeCurrentState) { - this.plannedDefiningcodeCurrentState = plannedDefiningcodeCurrentState; - } - - public PlannedDefiningcode2 getPlannedDefiningcodeCurrentState() { - return this.plannedDefiningcodeCurrentState; - } - - public void setActiveDefiningcode(ActiveDefiningcode activeDefiningcode) { - this.activeDefiningcode = activeDefiningcode; - } - - public ActiveDefiningcode getActiveDefiningcode() { - return this.activeDefiningcode; - } - - public void setActiveDefiningcodeCareflowStep( - ActiveDefiningcode2 activeDefiningcodeCareflowStep) { - this.activeDefiningcodeCareflowStep = activeDefiningcodeCareflowStep; - } - - public ActiveDefiningcode2 getActiveDefiningcodeCareflowStep() { - return this.activeDefiningcodeCareflowStep; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject; - } + public CodePhrase getTransitionDefiningCode() { + return this.transitionDefiningCode ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java index 25a7a6d50..7d368cdc7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java @@ -1,44 +1,32 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import com.nedap.archie.rm.datatypes.CodePhrase; import com.nedap.archie.rm.generic.PartyProxy; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.TransitionDefiningcode; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class TestAllTypesActionContainment extends Containment { public SelectAqlField TEST_ALL_TYPES_ACTION = new AqlFieldImp(TestAllTypesAction.class, "", "TestAllTypesAction", TestAllTypesAction.class, this); - public SelectAqlField TRANSITION_DEFININGCODE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition[at0004]/transition|defining_code", "transitionDefiningcode", TransitionDefiningcode.class, this); - - public SelectAqlField TRANSITION_DEFININGCODE_COMPLETED = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition[at0005]/transition|defining_code", "transitionDefiningcodeCompleted", TransitionDefiningcode.class, this); - - public SelectAqlField COMPLETED_DEFININGCODE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition[at0005]/careflow_step|defining_code", "completedDefiningcode", CompletedDefiningcode.class, this); + public ListSelectAqlField TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesAction.class, "/description[at0001]/items[openEHR-EHR-CLUSTER.test_all_types.v1]", "testAllTypes", TestAllTypesCluster.class, this); - public SelectAqlField COMPLETED_DEFININGCODE_CURRENT_STATE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition[at0005]/current_state|defining_code", "completedDefiningcodeCurrentState", CompletedDefiningcode2.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(TestAllTypesAction.class, "/subject", "subject", PartyProxy.class, this); public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesAction.class, "/language", "language", Language.class, this); - public SelectAqlField PLANNED_DEFININGCODE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition[at0003]/careflow_step|defining_code", "plannedDefiningcode", PlannedDefiningcode.class, this); - - public SelectAqlField TRANSITION_DEFININGCODE_PLANNED = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition[at0003]/transition|defining_code", "transitionDefiningcodePlanned", TransitionDefiningcode.class, this); - - public ListSelectAqlField TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesAction.class, "/description[at0001]/items[openEHR-EHR-CLUSTER.test_all_types.v1]", "testAllTypes", TestAllTypesCluster.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(TestAllTypesAction.class, "/time|value", "timeValue", TemporalAccessor.class, this); - public SelectAqlField PLANNED_DEFININGCODE_CURRENT_STATE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition[at0003]/current_state|defining_code", "plannedDefiningcodeCurrentState", PlannedDefiningcode2.class, this); + public SelectAqlField CAREFLOW_STEP_DEFINING_CODE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition/careflow_step|defining_code", "careflowStepDefiningCode", CareflowStepDefiningCode.class, this); - public SelectAqlField ACTIVE_DEFININGCODE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition[at0004]/current_state|defining_code", "activeDefiningcode", ActiveDefiningcode.class, this); + public SelectAqlField CURRENT_STATE_DEFINING_CODE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition/current_state|defining_code", "currentStateDefiningCode", CurrentStateDefiningCode.class, this); - public SelectAqlField ACTIVE_DEFININGCODE_CAREFLOW_STEP = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition[at0004]/careflow_step|defining_code", "activeDefiningcodeCareflowStep", ActiveDefiningcode2.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(TestAllTypesAction.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField TRANSITION_DEFINING_CODE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition/transition|defining_code", "transitionDefiningCode", CodePhrase.class, this); private TestAllTypesActionContainment() { super("openEHR-EHR-ACTION.test_all_types.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java index 323105563..00d3559b9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java @@ -4,41 +4,41 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.test_all_types.v1") public class TestAllTypesAdminEntry { - @Path("/subject") - private PartyProxy subject; + @Path("/data[at0001]/item[at0002]/value|magnitude") + private Long count3Magnitude; - @Path("/language") - private Language language; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/item[at0002]/value|magnitude") - private Long count3Magnitude; + @Path("/language") + private Language language; - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setCount3Magnitude(Long count3Magnitude) { + this.count3Magnitude = count3Magnitude; + } - public PartyProxy getSubject() { - return this.subject; - } + public Long getCount3Magnitude() { + return this.count3Magnitude ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public Language getLanguage() { - return this.language; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setCount3Magnitude(Long count3Magnitude) { - this.count3Magnitude = count3Magnitude; - } + public void setLanguage(Language language) { + this.language = language; + } - public Long getCount3Magnitude() { - return this.count3Magnitude; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java index 0772ba8db..cf5fe733a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java @@ -4,17 +4,17 @@ import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; public class TestAllTypesAdminEntryContainment extends Containment { public SelectAqlField TEST_ALL_TYPES_ADMIN_ENTRY = new AqlFieldImp(TestAllTypesAdminEntry.class, "", "TestAllTypesAdminEntry", TestAllTypesAdminEntry.class, this); + public SelectAqlField COUNT3_MAGNITUDE = new AqlFieldImp(TestAllTypesAdminEntry.class, "/data[at0001]/item[at0002]/value|magnitude", "count3Magnitude", Long.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(TestAllTypesAdminEntry.class, "/subject", "subject", PartyProxy.class, this); public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesAdminEntry.class, "/language", "language", Language.class, this); - public SelectAqlField COUNT3_MAGNITUDE = new AqlFieldImp(TestAllTypesAdminEntry.class, "/data[at0001]/item[at0002]/value|magnitude", "count3Magnitude", Long.class, this); - private TestAllTypesAdminEntryContainment() { super("openEHR-EHR-ADMIN_ENTRY.test_all_types.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvcount.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvcount.java index 2afecf624..f3eb69f6c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvcount.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvcount.java @@ -6,15 +6,15 @@ @Entity @OptionFor("DV_COUNT") -public class TestAllTypesChoiceDvcount implements TestAllTypesChoiceChoice { - @Path("|magnitude") - private Long choiceMagnitude; +public class TestAllTypesChoiceDvCount implements TestAllTypesChoiceChoice { + @Path("|magnitude") + private Long choiceMagnitude; - public void setChoiceMagnitude(Long choiceMagnitude) { - this.choiceMagnitude = choiceMagnitude; - } + public void setChoiceMagnitude(Long choiceMagnitude) { + this.choiceMagnitude = choiceMagnitude; + } - public Long getChoiceMagnitude() { - return this.choiceMagnitude; - } + public Long getChoiceMagnitude() { + return this.choiceMagnitude ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvquantity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvquantity.java index 1b3f805ec..9892cb1a3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvquantity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvquantity.java @@ -6,26 +6,26 @@ @Entity @OptionFor("DV_QUANTITY") -public class TestAllTypesChoiceDvquantity implements TestAllTypesChoiceChoice { - @Path("|magnitude") - private Double choiceMagnitude; +public class TestAllTypesChoiceDvQuantity implements TestAllTypesChoiceChoice { + @Path("|magnitude") + private Double choiceMagnitude; - @Path("|units") - private String choiceUnits; + @Path("|units") + private String choiceUnits; - public void setChoiceMagnitude(Double choiceMagnitude) { - this.choiceMagnitude = choiceMagnitude; - } + public void setChoiceMagnitude(Double choiceMagnitude) { + this.choiceMagnitude = choiceMagnitude; + } - public Double getChoiceMagnitude() { - return this.choiceMagnitude; - } + public Double getChoiceMagnitude() { + return this.choiceMagnitude ; + } - public void setChoiceUnits(String choiceUnits) { - this.choiceUnits = choiceUnits; - } + public void setChoiceUnits(String choiceUnits) { + this.choiceUnits = choiceUnits; + } - public String getChoiceUnits() { - return this.choiceUnits; - } + public String getChoiceUnits() { + return this.choiceUnits ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java index 1763781d6..9eab3f38f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java @@ -1,6 +1,5 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; -import com.nedap.archie.rm.datavalues.DataValue; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -8,25 +7,14 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.test_all_types.v1") public class TestAllTypesCluster { - @Path("/items[at0001]/items[at0002]/items[at0003]/value") - private DataValue value; + @Path("/items[at0001]/items[at0002]/items[at0003]/value|value") + private Boolean boolean2Value; - @Path("/items[at0001]/items[at0002]/items[at0003]/value|value") - private Boolean boolean2Value; + public void setBoolean2Value(Boolean boolean2Value) { + this.boolean2Value = boolean2Value; + } - public void setValue(DataValue value) { - this.value = value; - } - - public DataValue getValue() { - return this.value; - } - - public void setBoolean2Value(Boolean boolean2Value) { - this.boolean2Value = boolean2Value; - } - - public Boolean isBoolean2Value() { - return this.boolean2Value; - } + public Boolean isBoolean2Value() { + return this.boolean2Value ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java index dd292f6b8..810b3e6ca 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java @@ -1,6 +1,5 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; -import com.nedap.archie.rm.datavalues.DataValue; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; @@ -8,9 +7,7 @@ public class TestAllTypesClusterContainment extends Containment { public SelectAqlField TEST_ALL_TYPES_CLUSTER = new AqlFieldImp(TestAllTypesCluster.class, "", "TestAllTypesCluster", TestAllTypesCluster.class, this); - public SelectAqlField VALUE = new AqlFieldImp(TestAllTypesCluster.class, "/items[at0001]/items[at0002]/items[at0003]/value", "value", DataValue.class, this); - - public SelectAqlField BOOLEAN2_VALUE = new AqlFieldImp(TestAllTypesCluster.class, "/items[at0001]/items[at0002]/items[at0003]/value\\n", "boolean2Value", Boolean.class, this); + public SelectAqlField BOOLEAN2_VALUE = new AqlFieldImp(TestAllTypesCluster.class, "/items[at0001]/items[at0002]/items[at0003]/value|value", "boolean2Value", Boolean.class, this); private TestAllTypesClusterContainment() { super("openEHR-EHR-CLUSTER.test_all_types.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java index c427a6405..3503bddd3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java @@ -1,104 +1,225 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; -import com.nedap.archie.rm.datavalues.quantity.DvInterval; import com.nedap.archie.rm.generic.PartyProxy; 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.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.net.URI; +import java.time.temporal.TemporalAccessor; @Entity @Archetype("openEHR-EHR-EVALUATION.test_all_types.v1") public class TestAllTypesEvaluation { - @Path("/data[at0001]/items[at0004]/value") - private DvInterval intervalQuantity; + @Path("/data[at0001]/items[at0002]/value|value") + private URI uriValue; - @Path("/data[at0001]/items[at0006]/items[at0007]/items[at0008]/items[at0010]/value|value") - private String text2Value; + @Path("/data[at0001]/items[at0003]/value/upper|magnitude") + private Long upperMagnitude; - @Path("/data[at0001]/items[at0003]/value") - private DvInterval intervalCount; + @Path("/data[at0001]/items[at0003]/value/lower|magnitude") + private Long lowerMagnitude; - @Path("/data[at0001]/items[at0005]/value") - private DvInterval intervalDatetime; + @Path("/data[at0001]/items[at0003]/value/lower_included") + private Boolean intervalCountLowerIncluded; - @Path("/data[at0001]/items[at0002]/value|value") - private URI uriValue; + @Path("/data[at0001]/items[at0003]/value/upper_included") + private Boolean intervalCountUpperIncluded; - @Path("/language") - private Language language; + @Path("/data[at0001]/items[at0004]/value/upper|magnitude") + private Double upperMagnitude2; - @Path("/data[at0001]/items[at0009]/value") - @Choice - private TestAllTypesChoiceChoice choice; + @Path("/data[at0001]/items[at0004]/value/upper|units") + private String upperUnits; - @Path("/subject") - private PartyProxy subject; + @Path("/data[at0001]/items[at0004]/value/lower|magnitude") + private Double lowerMagnitude2; - public void setIntervalQuantity(DvInterval intervalQuantity) { - this.intervalQuantity = intervalQuantity; - } + @Path("/data[at0001]/items[at0004]/value/lower|units") + private String lowerUnits; - public DvInterval getIntervalQuantity() { - return this.intervalQuantity; - } + @Path("/data[at0001]/items[at0004]/value/lower_included") + private Boolean intervalQuantityLowerIncluded; - public void setText2Value(String text2Value) { - this.text2Value = text2Value; - } + @Path("/data[at0001]/items[at0004]/value/upper_included") + private Boolean intervalQuantityUpperIncluded; - public String getText2Value() { - return this.text2Value; - } + @Path("/data[at0001]/items[at0005]/value/upper|value") + private TemporalAccessor intervalDatetimeUpperValue; - public void setIntervalCount(DvInterval intervalCount) { - this.intervalCount = intervalCount; - } + @Path("/data[at0001]/items[at0005]/value/lower|value") + private TemporalAccessor intervalDatetimeLowerValue; - public DvInterval getIntervalCount() { - return this.intervalCount; - } + @Path("/data[at0001]/items[at0005]/value/lower_included") + private Boolean intervalDatetimeLowerIncluded; - public void setIntervalDatetime(DvInterval intervalDatetime) { - this.intervalDatetime = intervalDatetime; - } + @Path("/data[at0001]/items[at0005]/value/upper_included") + private Boolean intervalDatetimeUpperIncluded; - public DvInterval getIntervalDatetime() { - return this.intervalDatetime; - } + @Path("/data[at0001]/items[at0006]/items[at0007]/items[at0008]/items[at0010]/value|value") + private String text2Value; - public void setUriValue(URI uriValue) { - this.uriValue = uriValue; - } + @Path("/subject") + private PartyProxy subject; - public URI getUriValue() { - return this.uriValue; - } + @Path("/language") + private Language language; - public void setLanguage(Language language) { - this.language = language; - } + @Path("/data[at0001]/items[at0009]/value") + @Choice + private TestAllTypesChoiceChoice choice; - public Language getLanguage() { - return this.language; - } + public void setUriValue(URI uriValue) { + this.uriValue = uriValue; + } - public void setChoice(TestAllTypesChoiceChoice choice) { - this.choice = choice; - } + public URI getUriValue() { + return this.uriValue ; + } - public TestAllTypesChoiceChoice getChoice() { - return this.choice; - } + public void setUpperMagnitude(Long upperMagnitude) { + this.upperMagnitude = upperMagnitude; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public Long getUpperMagnitude() { + return this.upperMagnitude ; + } - public PartyProxy getSubject() { - return this.subject; - } + public void setLowerMagnitude(Long lowerMagnitude) { + this.lowerMagnitude = lowerMagnitude; + } + + public Long getLowerMagnitude() { + return this.lowerMagnitude ; + } + + public void setIntervalCountLowerIncluded(Boolean intervalCountLowerIncluded) { + this.intervalCountLowerIncluded = intervalCountLowerIncluded; + } + + public Boolean isIntervalCountLowerIncluded() { + return this.intervalCountLowerIncluded ; + } + + public void setIntervalCountUpperIncluded(Boolean intervalCountUpperIncluded) { + this.intervalCountUpperIncluded = intervalCountUpperIncluded; + } + + public Boolean isIntervalCountUpperIncluded() { + return this.intervalCountUpperIncluded ; + } + + public void setUpperMagnitude2(Double upperMagnitude2) { + this.upperMagnitude2 = upperMagnitude2; + } + + public Double getUpperMagnitude2() { + return this.upperMagnitude2 ; + } + + public void setUpperUnits(String upperUnits) { + this.upperUnits = upperUnits; + } + + public String getUpperUnits() { + return this.upperUnits ; + } + + public void setLowerMagnitude2(Double lowerMagnitude2) { + this.lowerMagnitude2 = lowerMagnitude2; + } + + public Double getLowerMagnitude2() { + return this.lowerMagnitude2 ; + } + + public void setLowerUnits(String lowerUnits) { + this.lowerUnits = lowerUnits; + } + + public String getLowerUnits() { + return this.lowerUnits ; + } + + public void setIntervalQuantityLowerIncluded(Boolean intervalQuantityLowerIncluded) { + this.intervalQuantityLowerIncluded = intervalQuantityLowerIncluded; + } + + public Boolean isIntervalQuantityLowerIncluded() { + return this.intervalQuantityLowerIncluded ; + } + + public void setIntervalQuantityUpperIncluded(Boolean intervalQuantityUpperIncluded) { + this.intervalQuantityUpperIncluded = intervalQuantityUpperIncluded; + } + + public Boolean isIntervalQuantityUpperIncluded() { + return this.intervalQuantityUpperIncluded ; + } + + public void setIntervalDatetimeUpperValue(TemporalAccessor intervalDatetimeUpperValue) { + this.intervalDatetimeUpperValue = intervalDatetimeUpperValue; + } + + public TemporalAccessor getIntervalDatetimeUpperValue() { + return this.intervalDatetimeUpperValue ; + } + + public void setIntervalDatetimeLowerValue(TemporalAccessor intervalDatetimeLowerValue) { + this.intervalDatetimeLowerValue = intervalDatetimeLowerValue; + } + + public TemporalAccessor getIntervalDatetimeLowerValue() { + return this.intervalDatetimeLowerValue ; + } + + public void setIntervalDatetimeLowerIncluded(Boolean intervalDatetimeLowerIncluded) { + this.intervalDatetimeLowerIncluded = intervalDatetimeLowerIncluded; + } + + public Boolean isIntervalDatetimeLowerIncluded() { + return this.intervalDatetimeLowerIncluded ; + } + + public void setIntervalDatetimeUpperIncluded(Boolean intervalDatetimeUpperIncluded) { + this.intervalDatetimeUpperIncluded = intervalDatetimeUpperIncluded; + } + + public Boolean isIntervalDatetimeUpperIncluded() { + return this.intervalDatetimeUpperIncluded ; + } + + public void setText2Value(String text2Value) { + this.text2Value = text2Value; + } + + public String getText2Value() { + return this.text2Value ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setChoice(TestAllTypesChoiceChoice choice) { + this.choice = choice; + } + + public TestAllTypesChoiceChoice getChoice() { + return this.choice ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java index fe03192ef..6a2a8bc3e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java @@ -1,33 +1,55 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; -import com.nedap.archie.rm.datavalues.quantity.DvInterval; import com.nedap.archie.rm.generic.PartyProxy; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.net.URI; +import java.time.temporal.TemporalAccessor; public class TestAllTypesEvaluationContainment extends Containment { public SelectAqlField TEST_ALL_TYPES_EVALUATION = new AqlFieldImp(TestAllTypesEvaluation.class, "", "TestAllTypesEvaluation", TestAllTypesEvaluation.class, this); - public SelectAqlField INTERVAL_QUANTITY = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0004]/value", "intervalQuantity", DvInterval.class, this); + public SelectAqlField URI_VALUE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0002]/value|value", "uriValue", URI.class, this); - public SelectAqlField TEXT2_VALUE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0006]/items[at0007]/items[at0008]/items[at0010]/value|value", "text2Value", String.class, this); + public SelectAqlField UPPER_MAGNITUDE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0003]/value/upper|magnitude", "upperMagnitude", Long.class, this); - public SelectAqlField INTERVAL_COUNT = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0003]/value", "intervalCount", DvInterval.class, this); + public SelectAqlField LOWER_MAGNITUDE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0003]/value/lower|magnitude", "lowerMagnitude", Long.class, this); - public SelectAqlField INTERVAL_DATETIME = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0005]/value", "intervalDatetime", DvInterval.class, this); + public SelectAqlField INTERVAL_COUNT_LOWER_INCLUDED = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0003]/value/lower_included", "intervalCountLowerIncluded", Boolean.class, this); - public SelectAqlField URI_VALUE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0002]/value|value", "uriValue", URI.class, this); + public SelectAqlField INTERVAL_COUNT_UPPER_INCLUDED = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0003]/value/upper_included", "intervalCountUpperIncluded", Boolean.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField UPPER_MAGNITUDE2 = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0004]/value/upper|magnitude", "upperMagnitude2", Double.class, this); - public SelectAqlField CHOICE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0009]/value", "choice", TestAllTypesChoiceChoice.class, this); + public SelectAqlField UPPER_UNITS = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0004]/value/upper|units", "upperUnits", String.class, this); + + public SelectAqlField LOWER_MAGNITUDE2 = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0004]/value/lower|magnitude", "lowerMagnitude2", Double.class, this); + + public SelectAqlField LOWER_UNITS = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0004]/value/lower|units", "lowerUnits", String.class, this); + + public SelectAqlField INTERVAL_QUANTITY_LOWER_INCLUDED = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0004]/value/lower_included", "intervalQuantityLowerIncluded", Boolean.class, this); + + public SelectAqlField INTERVAL_QUANTITY_UPPER_INCLUDED = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0004]/value/upper_included", "intervalQuantityUpperIncluded", Boolean.class, this); + + public SelectAqlField INTERVAL_DATETIME_UPPER_VALUE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0005]/value/upper|value", "intervalDatetimeUpperValue", TemporalAccessor.class, this); + + public SelectAqlField INTERVAL_DATETIME_LOWER_VALUE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0005]/value/lower|value", "intervalDatetimeLowerValue", TemporalAccessor.class, this); + + public SelectAqlField INTERVAL_DATETIME_LOWER_INCLUDED = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0005]/value/lower_included", "intervalDatetimeLowerIncluded", Boolean.class, this); + + public SelectAqlField INTERVAL_DATETIME_UPPER_INCLUDED = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0005]/value/upper_included", "intervalDatetimeUpperIncluded", Boolean.class, this); + + public SelectAqlField TEXT2_VALUE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0006]/items[at0007]/items[at0008]/items[at0010]/value|value", "text2Value", String.class, this); public SelectAqlField SUBJECT = new AqlFieldImp(TestAllTypesEvaluation.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesEvaluation.class, "/language", "language", Language.class, this); + + public SelectAqlField CHOICE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0009]/value", "choice", TestAllTypesChoiceChoice.class, this); + private TestAllTypesEvaluationContainment() { super("openEHR-EHR-EVALUATION.test_all_types.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java index f86f4790b..42cc9ef6d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java @@ -1,11 +1,11 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; -import com.nedap.archie.rm.datastructures.ItemStructure; +import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; import com.nedap.archie.rm.generic.PartyProxy; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.Temporal; import java.time.temporal.TemporalAccessor; @@ -13,80 +13,80 @@ @Entity @Archetype("openEHR-EHR-INSTRUCTION.test_all_types.v1") public class TestAllTypesInstruction { - @Path("/narrative|value") - private String narrativeValue; + @Path("/activities[at0001]/description[at0002]/items[at0003]/value|value") + private Temporal partialDateValue; - @Path("/language") - private Language language; + @Path("/activities[at0001]/description[at0002]/items[at0004]/value|value") + private TemporalAccessor partialDatetimeValue; - @Path("/activities[at0001]/description") - private ItemStructure description; + @Path("/activities[at0001]/timing") + private DvParsable timing; - @Path("/activities[at0001]/description[at0002]/items[at0003]/value|value") - private Temporal partialDateValue; + @Path("/subject") + private PartyProxy subject; - @Path("/subject") - private PartyProxy subject; + @Path("/narrative|value") + private String narrativeValue; - @Path("/activities[at0001]/action_archetype_id") - private String currentActivity; + @Path("/language") + private Language language; - @Path("/activities[at0001]/description[at0002]/items[at0004]/value|value") - private TemporalAccessor partialDatetimeValue; + @Path("/expiry_time|value") + private TemporalAccessor expiryTimeValue; - public void setNarrativeValue(String narrativeValue) { - this.narrativeValue = narrativeValue; - } + public void setPartialDateValue(Temporal partialDateValue) { + this.partialDateValue = partialDateValue; + } - public String getNarrativeValue() { - return this.narrativeValue; - } + public Temporal getPartialDateValue() { + return this.partialDateValue ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setPartialDatetimeValue(TemporalAccessor partialDatetimeValue) { + this.partialDatetimeValue = partialDatetimeValue; + } - public Language getLanguage() { - return this.language; - } + public TemporalAccessor getPartialDatetimeValue() { + return this.partialDatetimeValue ; + } - public void setDescription(ItemStructure description) { - this.description = description; - } + public void setTiming(DvParsable timing) { + this.timing = timing; + } - public ItemStructure getDescription() { - return this.description; - } + public DvParsable getTiming() { + return this.timing ; + } - public void setPartialDateValue(Temporal partialDateValue) { - this.partialDateValue = partialDateValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public Temporal getPartialDateValue() { - return this.partialDateValue; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setNarrativeValue(String narrativeValue) { + this.narrativeValue = narrativeValue; + } - public PartyProxy getSubject() { - return this.subject; - } + public String getNarrativeValue() { + return this.narrativeValue ; + } - public void setCurrentActivity(String currentActivity) { - this.currentActivity = currentActivity; - } + public void setLanguage(Language language) { + this.language = language; + } - public String getCurrentActivity() { - return this.currentActivity; - } + public Language getLanguage() { + return this.language ; + } - public void setPartialDatetimeValue(TemporalAccessor partialDatetimeValue) { - this.partialDatetimeValue = partialDatetimeValue; - } + public void setExpiryTimeValue(TemporalAccessor expiryTimeValue) { + this.expiryTimeValue = expiryTimeValue; + } - public TemporalAccessor getPartialDatetimeValue() { - return this.partialDatetimeValue; - } + public TemporalAccessor getExpiryTimeValue() { + return this.expiryTimeValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java index c6686c487..f93134202 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java @@ -1,11 +1,11 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; -import com.nedap.archie.rm.datastructures.ItemStructure; +import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; import com.nedap.archie.rm.generic.PartyProxy; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.Temporal; import java.time.temporal.TemporalAccessor; @@ -13,19 +13,19 @@ public class TestAllTypesInstructionContainment extends Containment { public SelectAqlField TEST_ALL_TYPES_INSTRUCTION = new AqlFieldImp(TestAllTypesInstruction.class, "", "TestAllTypesInstruction", TestAllTypesInstruction.class, this); - public SelectAqlField NARRATIVE_VALUE = new AqlFieldImp(TestAllTypesInstruction.class, "/narrative|value", "narrativeValue", String.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesInstruction.class, "/language", "language", Language.class, this); + public SelectAqlField PARTIAL_DATE_VALUE = new AqlFieldImp(TestAllTypesInstruction.class, "/activities[at0001]/description[at0002]/items[at0003]/value|value", "partialDateValue", Temporal.class, this); - public SelectAqlField DESCRIPTION = new AqlFieldImp(TestAllTypesInstruction.class, "/activities[at0001]/description", "description", ItemStructure.class, this); + public SelectAqlField PARTIAL_DATETIME_VALUE = new AqlFieldImp(TestAllTypesInstruction.class, "/activities[at0001]/description[at0002]/items[at0004]/value|value", "partialDatetimeValue", TemporalAccessor.class, this); - public SelectAqlField PARTIAL_DATE_VALUE = new AqlFieldImp(TestAllTypesInstruction.class, "/activities[at0001]/description[at0002]/items[at0003]/value|value", "partialDateValue", Temporal.class, this); + public SelectAqlField TIMING = new AqlFieldImp(TestAllTypesInstruction.class, "/activities[at0001]/timing", "timing", DvParsable.class, this); public SelectAqlField SUBJECT = new AqlFieldImp(TestAllTypesInstruction.class, "/subject", "subject", PartyProxy.class, this); - public SelectAqlField CURRENT_ACTIVITY = new AqlFieldImp(TestAllTypesInstruction.class, "/activities[at0001]/action_archetype_id", "currentActivity", String.class, this); + public SelectAqlField NARRATIVE_VALUE = new AqlFieldImp(TestAllTypesInstruction.class, "/narrative|value", "narrativeValue", String.class, this); - public SelectAqlField PARTIAL_DATETIME_VALUE = new AqlFieldImp(TestAllTypesInstruction.class, "/activities[at0001]/description[at0002]/items[at0004]/value|value", "partialDatetimeValue", TemporalAccessor.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesInstruction.class, "/language", "language", Language.class, this); + + public SelectAqlField EXPIRY_TIME_VALUE = new AqlFieldImp(TestAllTypesInstruction.class, "/expiry_time|value", "expiryTimeValue", TemporalAccessor.class, this); private TestAllTypesInstructionContainment() { super("openEHR-EHR-INSTRUCTION.test_all_types.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java index 1ed8b6800..5b46eaba2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java @@ -10,7 +10,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.Temporal; import java.time.temporal.TemporalAccessor; @@ -19,234 +19,234 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.test_all_types.v1") public class TestAllTypesObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0019]/value") - private DvMultimedia multimediaAny; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value") + private String textValue; - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|defining_code") + private CodePhrase codedTextDefiningCode; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0012]/value|value") - private TemporalAccessor timeValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value|defining_code") + private CodePhrase codedTextTerminologyDefiningCode; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0020]/value") - private DvParsable parsableAny; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|magnitude") + private Double quantityMagnitude; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0021]/value") - private DvIdentifier identifier; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|units") + private String quantityUnits; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value") - private String textValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|magnitude") + private Long countMagnitude; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|defining_code") - private CodePhrase codedTextDefiningcode; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0009]/value|value") + private Temporal dateValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/value") - private DvProportion proportionAny; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0010]/value|value") + private TemporalAccessor datetimeValue; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValueTime; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|value") + private TemporalAccessor datetimeAnyValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value|defining_code") - private CodePhrase codedTextTerminologyDefiningcode; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0012]/value|value") + private TemporalAccessor arbolTimeValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|magnitude") - private Double quantityMagnitude; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0013]/value") + private DvOrdinal ordinal; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|units") - private String quantityUnits; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0017]/value|value") + private Boolean booleanValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|magnitude") - private Long countMagnitude; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0018]/value|value") + private TemporalAmount durationAnyValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0009]/value|value") - private Temporal dateValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0019]/value") + private DvMultimedia multimediaAny; - @Path("/subject") - private PartyProxy subject; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0020]/value") + private DvParsable parsableAny; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0021]/value") + private DvIdentifier identifier; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0018]/value|value") - private TemporalAmount durationAnyValue; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/value") + private DvProportion proportionAny; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0013]/value") - private DvOrdinal ordinal; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor cualquierEventoTimeValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0017]/value|value") - private Boolean booleanValue; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0010]/value|value") - private TemporalAccessor datetimeValue; + @Path("/subject") + private PartyProxy subject; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|value") - private TemporalAccessor datetimeAnyValue; + @Path("/language") + private Language language; - public void setMultimediaAny(DvMultimedia multimediaAny) { - this.multimediaAny = multimediaAny; - } + public void setTextValue(String textValue) { + this.textValue = textValue; + } - public DvMultimedia getMultimediaAny() { - return this.multimediaAny; - } + public String getTextValue() { + return this.textValue ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setCodedTextDefiningCode(CodePhrase codedTextDefiningCode) { + this.codedTextDefiningCode = codedTextDefiningCode; + } - public Language getLanguage() { - return this.language; - } + public CodePhrase getCodedTextDefiningCode() { + return this.codedTextDefiningCode ; + } - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } + public void setCodedTextTerminologyDefiningCode(CodePhrase codedTextTerminologyDefiningCode) { + this.codedTextTerminologyDefiningCode = codedTextTerminologyDefiningCode; + } - public TemporalAccessor getTimeValue() { - return this.timeValue; - } + public CodePhrase getCodedTextTerminologyDefiningCode() { + return this.codedTextTerminologyDefiningCode ; + } - public void setParsableAny(DvParsable parsableAny) { - this.parsableAny = parsableAny; - } + public void setQuantityMagnitude(Double quantityMagnitude) { + this.quantityMagnitude = quantityMagnitude; + } - public DvParsable getParsableAny() { - return this.parsableAny; - } + public Double getQuantityMagnitude() { + return this.quantityMagnitude ; + } - public void setIdentifier(DvIdentifier identifier) { - this.identifier = identifier; - } + public void setQuantityUnits(String quantityUnits) { + this.quantityUnits = quantityUnits; + } - public DvIdentifier getIdentifier() { - return this.identifier; - } + public String getQuantityUnits() { + return this.quantityUnits ; + } - public void setTextValue(String textValue) { - this.textValue = textValue; - } + public void setCountMagnitude(Long countMagnitude) { + this.countMagnitude = countMagnitude; + } - public String getTextValue() { - return this.textValue; - } + public Long getCountMagnitude() { + return this.countMagnitude ; + } - public void setCodedTextDefiningcode(CodePhrase codedTextDefiningcode) { - this.codedTextDefiningcode = codedTextDefiningcode; - } + public void setDateValue(Temporal dateValue) { + this.dateValue = dateValue; + } - public CodePhrase getCodedTextDefiningcode() { - return this.codedTextDefiningcode; - } + public Temporal getDateValue() { + return this.dateValue ; + } - public void setProportionAny(DvProportion proportionAny) { - this.proportionAny = proportionAny; - } + public void setDatetimeValue(TemporalAccessor datetimeValue) { + this.datetimeValue = datetimeValue; + } - public DvProportion getProportionAny() { - return this.proportionAny; - } + public TemporalAccessor getDatetimeValue() { + return this.datetimeValue ; + } - public void setTimeValueTime(TemporalAccessor timeValueTime) { - this.timeValueTime = timeValueTime; - } + public void setDatetimeAnyValue(TemporalAccessor datetimeAnyValue) { + this.datetimeAnyValue = datetimeAnyValue; + } - public TemporalAccessor getTimeValueTime() { - return this.timeValueTime; - } + public TemporalAccessor getDatetimeAnyValue() { + return this.datetimeAnyValue ; + } - public void setCodedTextTerminologyDefiningcode(CodePhrase codedTextTerminologyDefiningcode) { - this.codedTextTerminologyDefiningcode = codedTextTerminologyDefiningcode; - } + public void setArbolTimeValue(TemporalAccessor arbolTimeValue) { + this.arbolTimeValue = arbolTimeValue; + } - public CodePhrase getCodedTextTerminologyDefiningcode() { - return this.codedTextTerminologyDefiningcode; - } + public TemporalAccessor getArbolTimeValue() { + return this.arbolTimeValue ; + } - public void setQuantityMagnitude(Double quantityMagnitude) { - this.quantityMagnitude = quantityMagnitude; - } + public void setOrdinal(DvOrdinal ordinal) { + this.ordinal = ordinal; + } - public Double getQuantityMagnitude() { - return this.quantityMagnitude; - } + public DvOrdinal getOrdinal() { + return this.ordinal ; + } - public void setQuantityUnits(String quantityUnits) { - this.quantityUnits = quantityUnits; - } + public void setBooleanValue(Boolean booleanValue) { + this.booleanValue = booleanValue; + } - public String getQuantityUnits() { - return this.quantityUnits; - } + public Boolean isBooleanValue() { + return this.booleanValue ; + } - public void setCountMagnitude(Long countMagnitude) { - this.countMagnitude = countMagnitude; - } + public void setDurationAnyValue(TemporalAmount durationAnyValue) { + this.durationAnyValue = durationAnyValue; + } - public Long getCountMagnitude() { - return this.countMagnitude; - } + public TemporalAmount getDurationAnyValue() { + return this.durationAnyValue ; + } - public void setDateValue(Temporal dateValue) { - this.dateValue = dateValue; - } + public void setMultimediaAny(DvMultimedia multimediaAny) { + this.multimediaAny = multimediaAny; + } - public Temporal getDateValue() { - return this.dateValue; - } + public DvMultimedia getMultimediaAny() { + return this.multimediaAny ; + } - public void setSubject(PartyProxy subject) { - this.subject = subject; - } + public void setParsableAny(DvParsable parsableAny) { + this.parsableAny = parsableAny; + } - public PartyProxy getSubject() { - return this.subject; - } + public DvParsable getParsableAny() { + return this.parsableAny ; + } - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } + public void setIdentifier(DvIdentifier identifier) { + this.identifier = identifier; + } - public TemporalAccessor getOriginValue() { - return this.originValue; - } + public DvIdentifier getIdentifier() { + return this.identifier ; + } - public void setDurationAnyValue(TemporalAmount durationAnyValue) { - this.durationAnyValue = durationAnyValue; - } + public void setProportionAny(DvProportion proportionAny) { + this.proportionAny = proportionAny; + } - public TemporalAmount getDurationAnyValue() { - return this.durationAnyValue; - } + public DvProportion getProportionAny() { + return this.proportionAny ; + } - public void setOrdinal(DvOrdinal ordinal) { - this.ordinal = ordinal; - } + public void setCualquierEventoTimeValue(TemporalAccessor cualquierEventoTimeValue) { + this.cualquierEventoTimeValue = cualquierEventoTimeValue; + } - public DvOrdinal getOrdinal() { - return this.ordinal; - } + public TemporalAccessor getCualquierEventoTimeValue() { + return this.cualquierEventoTimeValue ; + } - public void setBooleanValue(Boolean booleanValue) { - this.booleanValue = booleanValue; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public Boolean isBooleanValue() { - return this.booleanValue; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setDatetimeValue(TemporalAccessor datetimeValue) { - this.datetimeValue = datetimeValue; - } + public void setSubject(PartyProxy subject) { + this.subject = subject; + } - public TemporalAccessor getDatetimeValue() { - return this.datetimeValue; - } + public PartyProxy getSubject() { + return this.subject ; + } - public void setDatetimeAnyValue(TemporalAccessor datetimeAnyValue) { - this.datetimeAnyValue = datetimeAnyValue; - } + public void setLanguage(Language language) { + this.language = language; + } - public TemporalAccessor getDatetimeAnyValue() { - return this.datetimeAnyValue; - } + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java index e8d1b5903..59ac9fa85 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java @@ -10,7 +10,7 @@ import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.Temporal; import java.time.temporal.TemporalAccessor; @@ -19,25 +19,11 @@ public class TestAllTypesObservationContainment extends Containment { public SelectAqlField TEST_ALL_TYPES_OBSERVATION = new AqlFieldImp(TestAllTypesObservation.class, "", "TestAllTypesObservation", TestAllTypesObservation.class, this); - public SelectAqlField MULTIMEDIA_ANY = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0019]/value", "multimediaAny", DvMultimedia.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesObservation.class, "/language", "language", Language.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0012]/value|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField PARSABLE_ANY = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0020]/value", "parsableAny", DvParsable.class, this); - - public SelectAqlField IDENTIFIER = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0021]/value", "identifier", DvIdentifier.class, this); - public SelectAqlField TEXT_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value", "textValue", String.class, this); - public SelectAqlField CODED_TEXT_DEFININGCODE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|defining_code", "codedTextDefiningcode", CodePhrase.class, this); + public SelectAqlField CODED_TEXT_DEFINING_CODE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|defining_code", "codedTextDefiningCode", CodePhrase.class, this); - public SelectAqlField PROPORTION_ANY = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/value", "proportionAny", DvProportion.class, this); - - public SelectAqlField TIME_VALUE_TIME = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValueTime", TemporalAccessor.class, this); - - public SelectAqlField CODED_TEXT_TERMINOLOGY_DEFININGCODE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value|defining_code", "codedTextTerminologyDefiningcode", CodePhrase.class, this); + public SelectAqlField CODED_TEXT_TERMINOLOGY_DEFINING_CODE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value|defining_code", "codedTextTerminologyDefiningCode", CodePhrase.class, this); public SelectAqlField QUANTITY_MAGNITUDE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|magnitude", "quantityMagnitude", Double.class, this); @@ -47,19 +33,33 @@ public class TestAllTypesObservationContainment extends Containment { public SelectAqlField DATE_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0009]/value|value", "dateValue", Temporal.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(TestAllTypesObservation.class, "/subject", "subject", PartyProxy.class, this); + public SelectAqlField DATETIME_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0010]/value|value", "datetimeValue", TemporalAccessor.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + public SelectAqlField DATETIME_ANY_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|value", "datetimeAnyValue", TemporalAccessor.class, this); - public SelectAqlField DURATION_ANY_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0018]/value|value", "durationAnyValue", TemporalAmount.class, this); + public SelectAqlField ARBOL_TIME_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0012]/value|value", "arbolTimeValue", TemporalAccessor.class, this); public SelectAqlField ORDINAL = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0013]/value", "ordinal", DvOrdinal.class, this); public SelectAqlField BOOLEAN_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0017]/value|value", "booleanValue", Boolean.class, this); - public SelectAqlField DATETIME_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0010]/value|value", "datetimeValue", TemporalAccessor.class, this); + public SelectAqlField DURATION_ANY_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0018]/value|value", "durationAnyValue", TemporalAmount.class, this); - public SelectAqlField DATETIME_ANY_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|value", "datetimeAnyValue", TemporalAccessor.class, this); + public SelectAqlField MULTIMEDIA_ANY = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0019]/value", "multimediaAny", DvMultimedia.class, this); + + public SelectAqlField PARSABLE_ANY = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0020]/value", "parsableAny", DvParsable.class, this); + + public SelectAqlField IDENTIFIER = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0021]/value", "identifier", DvIdentifier.class, this); + + public SelectAqlField PROPORTION_ANY = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/value", "proportionAny", DvProportion.class, this); + + public SelectAqlField CUALQUIER_EVENTO_TIME_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/time|value", "cualquierEventoTimeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(TestAllTypesObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesObservation.class, "/language", "language", Language.class, this); private TestAllTypesObservationContainment() { super("openEHR-EHR-OBSERVATION.test_all_types.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java index 986440d1d..8fe03586f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java @@ -9,36 +9,36 @@ @Entity @Archetype("openEHR-EHR-SECTION.test_all_types.v1") public class TestAllTypesSection { - @Path("/items[at0001]/items[at0002]/items[openEHR-EHR-ACTION.test_all_types.v1]") - private List testAllTypes; + @Path("/items[at0001]/items[at0002]/items[openEHR-EHR-INSTRUCTION.test_all_types.v1]") + private List section3TestAllTypes; - @Path("/items[at0001]/items[at0002]/items[openEHR-EHR-INSTRUCTION.test_all_types.v1]") - private List testAllTypesSection3; + @Path("/items[at0001]/items[at0002]/items[openEHR-EHR-ACTION.test_all_types.v1]") + private List section3TestAllTypes2; - @Path("/items[at0001]/items[openEHR-EHR-ADMIN_ENTRY.test_all_types.v1]") - private List testAllTypesSection2; + @Path("/items[at0001]/items[openEHR-EHR-ADMIN_ENTRY.test_all_types.v1]") + private List section2TestAllTypes; - public void setTestAllTypes(List testAllTypes) { - this.testAllTypes = testAllTypes; - } + public void setSection3TestAllTypes(List section3TestAllTypes) { + this.section3TestAllTypes = section3TestAllTypes; + } - public List getTestAllTypes() { - return this.testAllTypes; - } + public List getSection3TestAllTypes() { + return this.section3TestAllTypes ; + } - public void setTestAllTypesSection3(List testAllTypesSection3) { - this.testAllTypesSection3 = testAllTypesSection3; - } + public void setSection3TestAllTypes2(List section3TestAllTypes2) { + this.section3TestAllTypes2 = section3TestAllTypes2; + } - public List getTestAllTypesSection3() { - return this.testAllTypesSection3; - } + public List getSection3TestAllTypes2() { + return this.section3TestAllTypes2 ; + } - public void setTestAllTypesSection2(List testAllTypesSection2) { - this.testAllTypesSection2 = testAllTypesSection2; - } + public void setSection2TestAllTypes(List section2TestAllTypes) { + this.section2TestAllTypes = section2TestAllTypes; + } - public List getTestAllTypesSection2() { - return this.testAllTypesSection2; - } + public List getSection2TestAllTypes() { + return this.section2TestAllTypes ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSectionContainment.java index d27549110..7bedd1cf3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSectionContainment.java @@ -7,19 +7,19 @@ import org.ehrbase.client.aql.field.SelectAqlField; public class TestAllTypesSectionContainment extends Containment { - public SelectAqlField TEST_ALL_TYPES_SECTION = new AqlFieldImp(TestAllTypesSection.class, "", "TestAllTypesSection", TestAllTypesSection.class, this); + public SelectAqlField TEST_ALL_TYPES_SECTION = new AqlFieldImp(TestAllTypesSection.class, "", "TestAllTypesSection", TestAllTypesSection.class, this); - public ListSelectAqlField TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesSection.class, "/items[at0001]/items[at0002]/items[openEHR-EHR-ACTION.test_all_types.v1]", "testAllTypes", TestAllTypesAction.class, this); + public ListSelectAqlField SECTION3_TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesSection.class, "/items[at0001]/items[at0002]/items[openEHR-EHR-INSTRUCTION.test_all_types.v1]", "section3TestAllTypes", TestAllTypesInstruction.class, this); - public ListSelectAqlField TEST_ALL_TYPES_SECTION3 = new ListAqlFieldImp(TestAllTypesSection.class, "/items[at0001]/items[at0002]/items[openEHR-EHR-INSTRUCTION.test_all_types.v1]", "testAllTypesSection3", TestAllTypesInstruction.class, this); + public ListSelectAqlField SECTION3_TEST_ALL_TYPES2 = new ListAqlFieldImp(TestAllTypesSection.class, "/items[at0001]/items[at0002]/items[openEHR-EHR-ACTION.test_all_types.v1]", "section3TestAllTypes2", TestAllTypesAction.class, this); - public ListSelectAqlField TEST_ALL_TYPES_SECTION2 = new ListAqlFieldImp(TestAllTypesSection.class, "/items[at0001]/items[openEHR-EHR-ADMIN_ENTRY.test_all_types.v1]", "testAllTypesSection2", TestAllTypesAdminEntry.class, this); + public ListSelectAqlField SECTION2_TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesSection.class, "/items[at0001]/items[openEHR-EHR-ADMIN_ENTRY.test_all_types.v1]", "section2TestAllTypes", TestAllTypesAdminEntry.class, this); - private TestAllTypesSectionContainment() { - super("openEHR-EHR-SECTION.test_all_types.v1"); - } + private TestAllTypesSectionContainment() { + super("openEHR-EHR-SECTION.test_all_types.v1"); + } - public static TestAllTypesSectionContainment getInstance() { - return new TestAllTypesSectionContainment(); - } + public static TestAllTypesSectionContainment getInstance() { + return new TestAllTypesSectionContainment(); + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java index f64087f96..c55be9d86 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java @@ -9,12 +9,12 @@ import org.ehrbase.client.annotations.Id; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.BefundObservation; import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.FallidentifikationCluster; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; import java.time.temporal.TemporalAccessor; @@ -24,179 +24,179 @@ @Archetype("openEHR-EHR-COMPOSITION.report-result.v1") @Template("Virologischer Befund") public class VirologischerBefundComposition { - @Id - private VersionUid versionUid; + @Path("/context/other_context[at0001]/items[at0002]/value|value") + private String berichtIdValue; - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; + @Path("/context/other_context[at0001]/items[at0005]/value|value") + private String statusValue; - @Path("/content[openEHR-EHR-OBSERVATION.laboratory_test_result.v1 and name/value='Befund']") - private BefundObservation befund; + @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]") + private FallidentifikationCluster fallidentifikation; - @Path("/context/participations") - private List participations; + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; - @Path("/language") - private Language language; + @Path("/context/participations") + private List participations; - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; - @Path("/context/other_context[at0001]/items[at0005]/value|value") - private String statusValue; + @Path("/context/location") + private String location; - @Path("/context/other_context[at0001]/items[at0002]/value|value") - private String berichtIdValue; + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; - @Path("/territory") - private Territory territory; + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; + @Path("/content[openEHR-EHR-OBSERVATION.laboratory_test_result.v1 and name/value='Befund']") + private BefundObservation befund; - @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]") - private FallidentifikationCluster fallidentifikation; + @Path("/composer") + private PartyProxy composer; - @Path("/composer") - private PartyProxy composer; + @Path("/language") + private Language language; - @Path("/context/setting|defining_code") - private SettingDefiningcode settingDefiningcode; + @Path("/feeder_audit") + private FeederAudit feederAudit; - @Path("/feeder_audit") - private FeederAudit feederAudit; + @Path("/category|defining_code") + private Category categoryDefiningCode; - @Path("/context/location") - private String location; + @Path("/territory") + private Territory territory; - @Path("/category|defining_code") - private CategoryDefiningcode categoryDefiningcode; + @Id + private VersionUid versionUid; - public VersionUid getVersionUid() { - return this.versionUid; - } + public void setBerichtIdValue(String berichtIdValue) { + this.berichtIdValue = berichtIdValue; + } - public void setVersionUid(VersionUid versionUid) { - this.versionUid = versionUid; - } + public String getBerichtIdValue() { + return this.berichtIdValue ; + } - public void setEndTimeValue(TemporalAccessor endTimeValue) { - this.endTimeValue = endTimeValue; - } + public void setStatusValue(String statusValue) { + this.statusValue = statusValue; + } - public TemporalAccessor getEndTimeValue() { - return this.endTimeValue; - } + public String getStatusValue() { + return this.statusValue ; + } - public void setBefund(BefundObservation befund) { - this.befund = befund; - } + public void setFallidentifikation(FallidentifikationCluster fallidentifikation) { + this.fallidentifikation = fallidentifikation; + } - public BefundObservation getBefund() { - return this.befund; - } + public FallidentifikationCluster getFallidentifikation() { + return this.fallidentifikation ; + } - public void setParticipations(List participations) { - this.participations = participations; - } + public void setStartTimeValue(TemporalAccessor startTimeValue) { + this.startTimeValue = startTimeValue; + } - public List getParticipations() { - return this.participations; - } + public TemporalAccessor getStartTimeValue() { + return this.startTimeValue ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setParticipations(List participations) { + this.participations = participations; + } - public Language getLanguage() { - return this.language; - } + public List getParticipations() { + return this.participations ; + } - public void setHealthCareFacility(PartyIdentified healthCareFacility) { - this.healthCareFacility = healthCareFacility; - } + public void setEndTimeValue(TemporalAccessor endTimeValue) { + this.endTimeValue = endTimeValue; + } - public PartyIdentified getHealthCareFacility() { - return this.healthCareFacility; - } + public TemporalAccessor getEndTimeValue() { + return this.endTimeValue ; + } - public void setStatusValue(String statusValue) { - this.statusValue = statusValue; - } + public void setLocation(String location) { + this.location = location; + } - public String getStatusValue() { - return this.statusValue; - } + public String getLocation() { + return this.location ; + } - public void setBerichtIdValue(String berichtIdValue) { - this.berichtIdValue = berichtIdValue; - } + public void setHealthCareFacility(PartyIdentified healthCareFacility) { + this.healthCareFacility = healthCareFacility; + } - public String getBerichtIdValue() { - return this.berichtIdValue; - } + public PartyIdentified getHealthCareFacility() { + return this.healthCareFacility ; + } - public void setTerritory(Territory territory) { - this.territory = territory; - } + public void setSettingDefiningCode(Setting settingDefiningCode) { + this.settingDefiningCode = settingDefiningCode; + } - public Territory getTerritory() { - return this.territory; - } + public Setting getSettingDefiningCode() { + return this.settingDefiningCode ; + } - public void setStartTimeValue(TemporalAccessor startTimeValue) { - this.startTimeValue = startTimeValue; - } + public void setBefund(BefundObservation befund) { + this.befund = befund; + } - public TemporalAccessor getStartTimeValue() { - return this.startTimeValue; - } + public BefundObservation getBefund() { + return this.befund ; + } - public void setFallidentifikation(FallidentifikationCluster fallidentifikation) { - this.fallidentifikation = fallidentifikation; - } + public void setComposer(PartyProxy composer) { + this.composer = composer; + } - public FallidentifikationCluster getFallidentifikation() { - return this.fallidentifikation; - } + public PartyProxy getComposer() { + return this.composer ; + } - public void setComposer(PartyProxy composer) { - this.composer = composer; - } + public void setLanguage(Language language) { + this.language = language; + } - public PartyProxy getComposer() { - return this.composer; - } + public Language getLanguage() { + return this.language ; + } - public void setSettingDefiningcode(SettingDefiningcode settingDefiningcode) { - this.settingDefiningcode = settingDefiningcode; - } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } - public SettingDefiningcode getSettingDefiningcode() { - return this.settingDefiningcode; - } + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } - public void setFeederAudit(FeederAudit feederAudit) { - this.feederAudit = feederAudit; - } + public void setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } - public FeederAudit getFeederAudit() { - return this.feederAudit; - } + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } - public void setLocation(String location) { - this.location = location; - } + public void setTerritory(Territory territory) { + this.territory = territory; + } - public String getLocation() { - return this.location; - } + public Territory getTerritory() { + return this.territory ; + } - public void setCategoryDefiningcode(CategoryDefiningcode categoryDefiningcode) { - this.categoryDefiningcode = categoryDefiningcode; - } + public VersionUid getVersionUid() { + return this.versionUid ; + } - public CategoryDefiningcode getCategoryDefiningcode() { - return this.categoryDefiningcode; - } + public void setVersionUid(VersionUid versionUid) { + this.versionUid = versionUid; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundCompositionContainment.java index 641c1c412..8b7a26cc8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundCompositionContainment.java @@ -9,47 +9,47 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Territory; import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.BefundObservation; import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.FallidentifikationCluster; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; import java.time.temporal.TemporalAccessor; public class VirologischerBefundCompositionContainment extends Containment { public SelectAqlField VIROLOGISCHER_BEFUND_COMPOSITION = new AqlFieldImp(VirologischerBefundComposition.class, "", "VirologischerBefundComposition", VirologischerBefundComposition.class, this); - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(VirologischerBefundComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(VirologischerBefundComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); - public SelectAqlField BEFUND = new AqlFieldImp(VirologischerBefundComposition.class, "/content[openEHR-EHR-OBSERVATION.laboratory_test_result.v1 and name/value='Befund']", "befund", BefundObservation.class, this); + public SelectAqlField STATUS_VALUE = new AqlFieldImp(VirologischerBefundComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "statusValue", String.class, this); - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(VirologischerBefundComposition.class, "/context/participations", "participations", Participation.class, this); + public SelectAqlField FALLIDENTIFIKATION = new AqlFieldImp(VirologischerBefundComposition.class, "/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]", "fallidentifikation", FallidentifikationCluster.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(VirologischerBefundComposition.class, "/language", "language", Language.class, this); + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(VirologischerBefundComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(VirologischerBefundComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(VirologischerBefundComposition.class, "/context/participations", "participations", Participation.class, this); - public SelectAqlField STATUS_VALUE = new AqlFieldImp(VirologischerBefundComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "statusValue", String.class, this); + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(VirologischerBefundComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(VirologischerBefundComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); + public SelectAqlField LOCATION = new AqlFieldImp(VirologischerBefundComposition.class, "/context/location", "location", String.class, this); - public SelectAqlField TERRITORY = new AqlFieldImp(VirologischerBefundComposition.class, "/territory", "territory", Territory.class, this); + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(VirologischerBefundComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(VirologischerBefundComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(VirologischerBefundComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - public SelectAqlField FALLIDENTIFIKATION = new AqlFieldImp(VirologischerBefundComposition.class, "/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]", "fallidentifikation", FallidentifikationCluster.class, this); + public SelectAqlField BEFUND = new AqlFieldImp(VirologischerBefundComposition.class, "/content[openEHR-EHR-OBSERVATION.laboratory_test_result.v1]", "befund", BefundObservation.class, this); public SelectAqlField COMPOSER = new AqlFieldImp(VirologischerBefundComposition.class, "/composer", "composer", PartyProxy.class, this); - public SelectAqlField SETTING_DEFININGCODE = new AqlFieldImp(VirologischerBefundComposition.class, "/context/setting|defining_code", "settingDefiningcode", SettingDefiningcode.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(VirologischerBefundComposition.class, "/language", "language", Language.class, this); public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(VirologischerBefundComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - public SelectAqlField LOCATION = new AqlFieldImp(VirologischerBefundComposition.class, "/context/location", "location", String.class, this); + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(VirologischerBefundComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - public SelectAqlField CATEGORY_DEFININGCODE = new AqlFieldImp(VirologischerBefundComposition.class, "/category|defining_code", "categoryDefiningcode", CategoryDefiningcode.class, this); + public SelectAqlField TERRITORY = new AqlFieldImp(VirologischerBefundComposition.class, "/territory", "territory", Territory.class, this); private VirologischerBefundCompositionContainment() { super("openEHR-EHR-COMPOSITION.report-result.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java index 184e2757e..9099f3b0c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java @@ -10,36 +10,36 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.anatomical_location.v1") public class AnatomischeLokalisationCluster { - @Path("/items[at0053]") - private List alternativeStruktur; + @Path("/items[at0001]/value|value") + private String nameDerKorperstelleValue; - @Path("/items[at0001]/value|value") - private String nameDerKorperstelleValue; + @Path("/items[at0053]") + private List alternativeStruktur; - @Path("/items[at0054]") - private List multimedialeDarstellung; + @Path("/items[at0054]") + private List multimedialeDarstellung; - public void setAlternativeStruktur(List alternativeStruktur) { - this.alternativeStruktur = alternativeStruktur; - } + public void setNameDerKorperstelleValue(String nameDerKorperstelleValue) { + this.nameDerKorperstelleValue = nameDerKorperstelleValue; + } - public List getAlternativeStruktur() { - return this.alternativeStruktur; - } + public String getNameDerKorperstelleValue() { + return this.nameDerKorperstelleValue ; + } - public void setNameDerKorperstelleValue(String nameDerKorperstelleValue) { - this.nameDerKorperstelleValue = nameDerKorperstelleValue; - } + public void setAlternativeStruktur(List alternativeStruktur) { + this.alternativeStruktur = alternativeStruktur; + } - public String getNameDerKorperstelleValue() { - return this.nameDerKorperstelleValue; - } + public List getAlternativeStruktur() { + return this.alternativeStruktur ; + } - public void setMultimedialeDarstellung(List multimedialeDarstellung) { - this.multimedialeDarstellung = multimedialeDarstellung; - } + public void setMultimedialeDarstellung(List multimedialeDarstellung) { + this.multimedialeDarstellung = multimedialeDarstellung; + } - public List getMultimedialeDarstellung() { - return this.multimedialeDarstellung; - } + public List getMultimedialeDarstellung() { + return this.multimedialeDarstellung ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationClusterContainment.java index 49cb196bc..bcbf15dde 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationClusterContainment.java @@ -10,10 +10,10 @@ public class AnatomischeLokalisationClusterContainment extends Containment { public SelectAqlField ANATOMISCHE_LOKALISATION_CLUSTER = new AqlFieldImp(AnatomischeLokalisationCluster.class, "", "AnatomischeLokalisationCluster", AnatomischeLokalisationCluster.class, this); - public ListSelectAqlField ALTERNATIVE_STRUKTUR = new ListAqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0053]", "alternativeStruktur", Cluster.class, this); - public SelectAqlField NAME_DER_KORPERSTELLE_VALUE = new AqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0001]/value|value", "nameDerKorperstelleValue", String.class, this); + public ListSelectAqlField ALTERNATIVE_STRUKTUR = new ListAqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0053]", "alternativeStruktur", Cluster.class, this); + public ListSelectAqlField MULTIMEDIALE_DARSTELLUNG = new ListAqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0054]", "multimedialeDarstellung", Cluster.class, this); private AnatomischeLokalisationClusterContainment() { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java new file mode 100644 index 000000000..62246249d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java @@ -0,0 +1,18 @@ +package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class BefundAnforderungElement { + @Path("/value|value") + private String value; + + public void setValue(String value) { + this.value = value; + } + + public String getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java index ef27dc68e..7bce3303d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java @@ -6,7 +6,7 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -14,203 +14,203 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.laboratory_test_result.v1") public class BefundObservation { - @Path("/protocol[at0004]/items[at0110]") - private List testDetails; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value") + private String labortestBezeichnungValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.specimen.v1]") - private List probe; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.specimen.v1]") + private List probe; - @Path("/language") - private Language language; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_panel.v0 and name/value='Kultur']") + private List kultur; - @Path("/protocol[at0004]/items[at0094]/items[openEHR-EHR-CLUSTER.location.v1 and name/value='Einsenderstandort']") - private EinsenderstandortCluster einsenderstandort; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0122]") + private List strukturierteTestdiagnostik; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_panel.v0 and name/value='Kultur']") - private List kultur; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0118]") + private List multimediaDarstellung; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0118]") - private List multimediaDarstellung; + @Path("/data[at0001]/events[at0002]/state[at0112]/items[at0114]") + private List strukturierteErfassungDerStorfaktoren; - @Path("/protocol[at0004]/items[at0094]/items[at0062]/value") - private DvIdentifier auftragsIdDesAnforderndenEinsendendenSystems; + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; - @Path("/protocol[at0004]/items[at0094]/items[at0063]/value") - private DvIdentifier auftragsIdEmpfanger; + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value") - private String labortestBezeichnungValue; + @Path("/protocol[at0004]/items[openEHR-EHR-CLUSTER.location.v1 and name/value='Empfängerstandort']") + private EmpfangerstandortCluster empfangerstandort; - @Path("/data[at0001]/events[at0002]/state[at0112]/items[at0114]") - private List strukturierteErfassungDerStorfaktoren; + @Path("/protocol[at0004]/items[at0094]/items[at0106 and name/value='Anforderung']") + private List anforderung; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0122]") - private List strukturierteTestdiagnostik; + @Path("/protocol[at0004]/items[at0094]/items[at0062]/value") + private DvIdentifier auftragsIdDesAnforderndenEinsendendenSystems; - @Path("/protocol[at0004]/items[openEHR-EHR-CLUSTER.location.v1 and name/value='Empfängerstandort']") - private EmpfangerstandortCluster empfangerstandort; + @Path("/protocol[at0004]/items[at0094]/items[at0063]/value") + private DvIdentifier auftragsIdEmpfanger; - @Path("/protocol[at0004]/items[at0117]") - private List erweiterung; + @Path("/protocol[at0004]/items[at0094]/items[openEHR-EHR-CLUSTER.location.v1 and name/value='Einsenderstandort']") + private EinsenderstandortCluster einsenderstandort; - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; + @Path("/protocol[at0004]/items[at0094]/items[at0035]") + private List verteilerliste; - @Path("/protocol[at0004]/items[at0094]/items[at0106]") - private List anforderung; + @Path("/protocol[at0004]/items[at0110]") + private List testDetails; - @Path("/subject") - private PartyProxy subject; + @Path("/protocol[at0004]/items[at0117]") + private List erweiterung; - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; + @Path("/subject") + private PartyProxy subject; - @Path("/protocol[at0004]/items[at0094]/items[at0035]") - private List verteilerliste; + @Path("/language") + private Language language; - public void setTestDetails(List testDetails) { - this.testDetails = testDetails; - } + public void setLabortestBezeichnungValue(String labortestBezeichnungValue) { + this.labortestBezeichnungValue = labortestBezeichnungValue; + } - public List getTestDetails() { - return this.testDetails; - } + public String getLabortestBezeichnungValue() { + return this.labortestBezeichnungValue ; + } - public void setProbe(List probe) { - this.probe = probe; - } + public void setProbe(List probe) { + this.probe = probe; + } - public List getProbe() { - return this.probe; - } + public List getProbe() { + return this.probe ; + } - public void setLanguage(Language language) { - this.language = language; - } + public void setKultur(List kultur) { + this.kultur = kultur; + } - public Language getLanguage() { - return this.language; - } + public List getKultur() { + return this.kultur ; + } - public void setEinsenderstandort(EinsenderstandortCluster einsenderstandort) { - this.einsenderstandort = einsenderstandort; - } + public void setStrukturierteTestdiagnostik(List strukturierteTestdiagnostik) { + this.strukturierteTestdiagnostik = strukturierteTestdiagnostik; + } - public EinsenderstandortCluster getEinsenderstandort() { - return this.einsenderstandort; - } + public List getStrukturierteTestdiagnostik() { + return this.strukturierteTestdiagnostik ; + } - public void setKultur(List kultur) { - this.kultur = kultur; - } + public void setMultimediaDarstellung(List multimediaDarstellung) { + this.multimediaDarstellung = multimediaDarstellung; + } - public List getKultur() { - return this.kultur; - } + public List getMultimediaDarstellung() { + return this.multimediaDarstellung ; + } - public void setMultimediaDarstellung(List multimediaDarstellung) { - this.multimediaDarstellung = multimediaDarstellung; - } + public void setStrukturierteErfassungDerStorfaktoren( + List strukturierteErfassungDerStorfaktoren) { + this.strukturierteErfassungDerStorfaktoren = strukturierteErfassungDerStorfaktoren; + } - public List getMultimediaDarstellung() { - return this.multimediaDarstellung; - } + public List getStrukturierteErfassungDerStorfaktoren() { + return this.strukturierteErfassungDerStorfaktoren ; + } - public void setAuftragsIdDesAnforderndenEinsendendenSystems( - DvIdentifier auftragsIdDesAnforderndenEinsendendenSystems) { - this.auftragsIdDesAnforderndenEinsendendenSystems = auftragsIdDesAnforderndenEinsendendenSystems; - } + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } - public DvIdentifier getAuftragsIdDesAnforderndenEinsendendenSystems() { - return this.auftragsIdDesAnforderndenEinsendendenSystems; - } + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } - public void setAuftragsIdEmpfanger(DvIdentifier auftragsIdEmpfanger) { - this.auftragsIdEmpfanger = auftragsIdEmpfanger; - } + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } - public DvIdentifier getAuftragsIdEmpfanger() { - return this.auftragsIdEmpfanger; - } + public TemporalAccessor getOriginValue() { + return this.originValue ; + } - public void setLabortestBezeichnungValue(String labortestBezeichnungValue) { - this.labortestBezeichnungValue = labortestBezeichnungValue; - } + public void setEmpfangerstandort(EmpfangerstandortCluster empfangerstandort) { + this.empfangerstandort = empfangerstandort; + } - public String getLabortestBezeichnungValue() { - return this.labortestBezeichnungValue; - } + public EmpfangerstandortCluster getEmpfangerstandort() { + return this.empfangerstandort ; + } - public void setStrukturierteErfassungDerStorfaktoren( - List strukturierteErfassungDerStorfaktoren) { - this.strukturierteErfassungDerStorfaktoren = strukturierteErfassungDerStorfaktoren; - } + public void setAnforderung(List anforderung) { + this.anforderung = anforderung; + } - public List getStrukturierteErfassungDerStorfaktoren() { - return this.strukturierteErfassungDerStorfaktoren; - } + public List getAnforderung() { + return this.anforderung ; + } - public void setStrukturierteTestdiagnostik(List strukturierteTestdiagnostik) { - this.strukturierteTestdiagnostik = strukturierteTestdiagnostik; - } + public void setAuftragsIdDesAnforderndenEinsendendenSystems( + DvIdentifier auftragsIdDesAnforderndenEinsendendenSystems) { + this.auftragsIdDesAnforderndenEinsendendenSystems = auftragsIdDesAnforderndenEinsendendenSystems; + } - public List getStrukturierteTestdiagnostik() { - return this.strukturierteTestdiagnostik; - } + public DvIdentifier getAuftragsIdDesAnforderndenEinsendendenSystems() { + return this.auftragsIdDesAnforderndenEinsendendenSystems ; + } - public void setEmpfangerstandort(EmpfangerstandortCluster empfangerstandort) { - this.empfangerstandort = empfangerstandort; - } + public void setAuftragsIdEmpfanger(DvIdentifier auftragsIdEmpfanger) { + this.auftragsIdEmpfanger = auftragsIdEmpfanger; + } - public EmpfangerstandortCluster getEmpfangerstandort() { - return this.empfangerstandort; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue; - } - - public void setAnforderung(List anforderung) { - this.anforderung = anforderung; - } - - public List getAnforderung() { - return this.anforderung; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue; - } - - public void setVerteilerliste(List verteilerliste) { - this.verteilerliste = verteilerliste; - } - - public List getVerteilerliste() { - return this.verteilerliste; - } + public DvIdentifier getAuftragsIdEmpfanger() { + return this.auftragsIdEmpfanger ; + } + + public void setEinsenderstandort(EinsenderstandortCluster einsenderstandort) { + this.einsenderstandort = einsenderstandort; + } + + public EinsenderstandortCluster getEinsenderstandort() { + return this.einsenderstandort ; + } + + public void setVerteilerliste(List verteilerliste) { + this.verteilerliste = verteilerliste; + } + + public List getVerteilerliste() { + return this.verteilerliste ; + } + + public void setTestDetails(List testDetails) { + this.testDetails = testDetails; + } + + public List getTestDetails() { + return this.testDetails ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservationContainment.java index 59a13b678..16f93ec91 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservationContainment.java @@ -8,48 +8,48 @@ import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import java.time.temporal.TemporalAccessor; public class BefundObservationContainment extends Containment { public SelectAqlField BEFUND_OBSERVATION = new AqlFieldImp(BefundObservation.class, "", "BefundObservation", BefundObservation.class, this); - public ListSelectAqlField TEST_DETAILS = new ListAqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0110]", "testDetails", Cluster.class, this); + public SelectAqlField LABORTEST_BEZEICHNUNG_VALUE = new AqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value", "labortestBezeichnungValue", String.class, this); public ListSelectAqlField PROBE = new ListAqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.specimen.v1]", "probe", ProbeCluster.class, this); - public SelectAqlField LANGUAGE = new AqlFieldImp(BefundObservation.class, "/language", "language", Language.class, this); - - public SelectAqlField EINSENDERSTANDORT = new AqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0094]/items[openEHR-EHR-CLUSTER.location.v1 and name/value='Einsenderstandort']", "einsenderstandort", EinsenderstandortCluster.class, this); + public ListSelectAqlField KULTUR = new ListAqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_panel.v0]", "kultur", KulturCluster.class, this); - public ListSelectAqlField KULTUR = new ListAqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_panel.v0 and name/value='Kultur']", "kultur", KulturCluster.class, this); + public ListSelectAqlField STRUKTURIERTE_TESTDIAGNOSTIK = new ListAqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0122]", "strukturierteTestdiagnostik", Cluster.class, this); public ListSelectAqlField MULTIMEDIA_DARSTELLUNG = new ListAqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0118]", "multimediaDarstellung", Cluster.class, this); - public SelectAqlField AUFTRAGS_ID_DES_ANFORDERNDEN_EINSENDENDEN_SYSTEMS = new AqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0094]/items[at0062]/value", "auftragsIdDesAnforderndenEinsendendenSystems", DvIdentifier.class, this); + public ListSelectAqlField STRUKTURIERTE_ERFASSUNG_DER_STORFAKTOREN = new ListAqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/state[at0112]/items[at0114]", "strukturierteErfassungDerStorfaktoren", Cluster.class, this); - public SelectAqlField AUFTRAGS_ID_EMPFANGER = new AqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0094]/items[at0063]/value", "auftragsIdEmpfanger", DvIdentifier.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - public SelectAqlField LABORTEST_BEZEICHNUNG_VALUE = new AqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value", "labortestBezeichnungValue", String.class, this); + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(BefundObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - public ListSelectAqlField STRUKTURIERTE_ERFASSUNG_DER_STORFAKTOREN = new ListAqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/state[at0112]/items[at0114]", "strukturierteErfassungDerStorfaktoren", Cluster.class, this); + public SelectAqlField EMPFANGERSTANDORT = new AqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[openEHR-EHR-CLUSTER.location.v1]", "empfangerstandort", EmpfangerstandortCluster.class, this); - public ListSelectAqlField STRUKTURIERTE_TESTDIAGNOSTIK = new ListAqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0122]", "strukturierteTestdiagnostik", Cluster.class, this); + public ListSelectAqlField ANFORDERUNG = new ListAqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0094]/items[at0106]", "anforderung", BefundAnforderungElement.class, this); - public SelectAqlField EMPFANGERSTANDORT = new AqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[openEHR-EHR-CLUSTER.location.v1 and name/value='Empfängerstandort']", "empfangerstandort", EmpfangerstandortCluster.class, this); + public SelectAqlField AUFTRAGS_ID_DES_ANFORDERNDEN_EINSENDENDEN_SYSTEMS = new AqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0094]/items[at0062]/value", "auftragsIdDesAnforderndenEinsendendenSystems", DvIdentifier.class, this); - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0117]", "erweiterung", Cluster.class, this); + public SelectAqlField AUFTRAGS_ID_EMPFANGER = new AqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0094]/items[at0063]/value", "auftragsIdEmpfanger", DvIdentifier.class, this); - public SelectAqlField TIME_VALUE = new AqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + public SelectAqlField EINSENDERSTANDORT = new AqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0094]/items[openEHR-EHR-CLUSTER.location.v1]", "einsenderstandort", EinsenderstandortCluster.class, this); - public ListSelectAqlField ANFORDERUNG = new ListAqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0094]/items[at0106]", "anforderung", EmpfangerstandortAnforderungElement.class, this); + public ListSelectAqlField VERTEILERLISTE = new ListAqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0094]/items[at0035]", "verteilerliste", Cluster.class, this); - public SelectAqlField SUBJECT = new AqlFieldImp(BefundObservation.class, "/subject", "subject", PartyProxy.class, this); + public ListSelectAqlField TEST_DETAILS = new ListAqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0110]", "testDetails", Cluster.class, this); - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(BefundObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0117]", "erweiterung", Cluster.class, this); - public ListSelectAqlField VERTEILERLISTE = new ListAqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0094]/items[at0035]", "verteilerliste", Cluster.class, this); + public SelectAqlField SUBJECT = new AqlFieldImp(BefundObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(BefundObservation.class, "/language", "language", Language.class, this); private BefundObservationContainment() { super("openEHR-EHR-OBSERVATION.laboratory_test_result.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java index e0e7233c8..4213ba5c0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java @@ -10,47 +10,47 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") public class EinsenderstandortCluster { - @Path("/items[at0047]") - private List details; + @Path("/items[at0040]/value|value") + private String standorttypValue; - @Path("/items[at0040]/value|value") - private String standorttypValue; + @Path("/items[at0046]/value|value") + private String standortbeschreibungValue; - @Path("/items[at0046]/value|value") - private String standortbeschreibungValue; + @Path("/items[at0048]/value|value") + private String standortschlusselValue; - @Path("/items[at0048]/value|value") - private String standortschlusselValue; + @Path("/items[at0047]") + private List details; - public void setDetails(List details) { - this.details = details; - } + public void setStandorttypValue(String standorttypValue) { + this.standorttypValue = standorttypValue; + } - public List getDetails() { - return this.details; - } + public String getStandorttypValue() { + return this.standorttypValue ; + } - public void setStandorttypValue(String standorttypValue) { - this.standorttypValue = standorttypValue; - } + public void setStandortbeschreibungValue(String standortbeschreibungValue) { + this.standortbeschreibungValue = standortbeschreibungValue; + } - public String getStandorttypValue() { - return this.standorttypValue; - } + public String getStandortbeschreibungValue() { + return this.standortbeschreibungValue ; + } - public void setStandortbeschreibungValue(String standortbeschreibungValue) { - this.standortbeschreibungValue = standortbeschreibungValue; - } + public void setStandortschlusselValue(String standortschlusselValue) { + this.standortschlusselValue = standortschlusselValue; + } - public String getStandortbeschreibungValue() { - return this.standortbeschreibungValue; - } + public String getStandortschlusselValue() { + return this.standortschlusselValue ; + } - public void setStandortschlusselValue(String standortschlusselValue) { - this.standortschlusselValue = standortschlusselValue; - } + public void setDetails(List details) { + this.details = details; + } - public String getStandortschlusselValue() { - return this.standortschlusselValue; - } + public List getDetails() { + return this.details ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortClusterContainment.java index 64255a360..9b23adb08 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortClusterContainment.java @@ -10,14 +10,14 @@ public class EinsenderstandortClusterContainment extends Containment { public SelectAqlField EINSENDERSTANDORT_CLUSTER = new AqlFieldImp(EinsenderstandortCluster.class, "", "EinsenderstandortCluster", EinsenderstandortCluster.class, this); - public ListSelectAqlField DETAILS = new ListAqlFieldImp(EinsenderstandortCluster.class, "/items[at0047]", "details", Cluster.class, this); - public SelectAqlField STANDORTTYP_VALUE = new AqlFieldImp(EinsenderstandortCluster.class, "/items[at0040]/value|value", "standorttypValue", String.class, this); public SelectAqlField STANDORTBESCHREIBUNG_VALUE = new AqlFieldImp(EinsenderstandortCluster.class, "/items[at0046]/value|value", "standortbeschreibungValue", String.class, this); public SelectAqlField STANDORTSCHLUSSEL_VALUE = new AqlFieldImp(EinsenderstandortCluster.class, "/items[at0048]/value|value", "standortschlusselValue", String.class, this); + public ListSelectAqlField DETAILS = new ListAqlFieldImp(EinsenderstandortCluster.class, "/items[at0047]", "details", Cluster.class, this); + private EinsenderstandortClusterContainment() { super("openEHR-EHR-CLUSTER.location.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortAnforderungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortAnforderungElement.java deleted file mode 100644 index 0cc33ba08..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortAnforderungElement.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class EmpfangerstandortAnforderungElement { - @Path("/value|value") - private String value; - - public void setValue(String value) { - this.value = value; - } - - public String getValue() { - return this.value; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java index db79c6f18..fa3f90fe9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java @@ -10,47 +10,47 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") public class EmpfangerstandortCluster { - @Path("/items[at0047]") - private List details; + @Path("/items[at0040]/value|value") + private String standorttypValue; - @Path("/items[at0040]/value|value") - private String standorttypValue; + @Path("/items[at0046]/value|value") + private String standortbeschreibungValue; - @Path("/items[at0046]/value|value") - private String standortbeschreibungValue; + @Path("/items[at0048]/value|value") + private String standortschlusselValue; - @Path("/items[at0048]/value|value") - private String standortschlusselValue; + @Path("/items[at0047]") + private List details; - public void setDetails(List details) { - this.details = details; - } + public void setStandorttypValue(String standorttypValue) { + this.standorttypValue = standorttypValue; + } - public List getDetails() { - return this.details; - } + public String getStandorttypValue() { + return this.standorttypValue ; + } - public void setStandorttypValue(String standorttypValue) { - this.standorttypValue = standorttypValue; - } + public void setStandortbeschreibungValue(String standortbeschreibungValue) { + this.standortbeschreibungValue = standortbeschreibungValue; + } - public String getStandorttypValue() { - return this.standorttypValue; - } + public String getStandortbeschreibungValue() { + return this.standortbeschreibungValue ; + } - public void setStandortbeschreibungValue(String standortbeschreibungValue) { - this.standortbeschreibungValue = standortbeschreibungValue; - } + public void setStandortschlusselValue(String standortschlusselValue) { + this.standortschlusselValue = standortschlusselValue; + } - public String getStandortbeschreibungValue() { - return this.standortbeschreibungValue; - } + public String getStandortschlusselValue() { + return this.standortschlusselValue ; + } - public void setStandortschlusselValue(String standortschlusselValue) { - this.standortschlusselValue = standortschlusselValue; - } + public void setDetails(List details) { + this.details = details; + } - public String getStandortschlusselValue() { - return this.standortschlusselValue; - } + public List getDetails() { + return this.details ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortClusterContainment.java index 9d3e10b27..e80ff8d5e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortClusterContainment.java @@ -10,14 +10,14 @@ public class EmpfangerstandortClusterContainment extends Containment { public SelectAqlField EMPFANGERSTANDORT_CLUSTER = new AqlFieldImp(EmpfangerstandortCluster.class, "", "EmpfangerstandortCluster", EmpfangerstandortCluster.class, this); - public ListSelectAqlField DETAILS = new ListAqlFieldImp(EmpfangerstandortCluster.class, "/items[at0047]", "details", Cluster.class, this); - public SelectAqlField STANDORTTYP_VALUE = new AqlFieldImp(EmpfangerstandortCluster.class, "/items[at0040]/value|value", "standorttypValue", String.class, this); public SelectAqlField STANDORTBESCHREIBUNG_VALUE = new AqlFieldImp(EmpfangerstandortCluster.class, "/items[at0046]/value|value", "standortbeschreibungValue", String.class, this); public SelectAqlField STANDORTSCHLUSSEL_VALUE = new AqlFieldImp(EmpfangerstandortCluster.class, "/items[at0048]/value|value", "standortschlusselValue", String.class, this); + public ListSelectAqlField DETAILS = new ListAqlFieldImp(EmpfangerstandortCluster.class, "/items[at0047]", "details", Cluster.class, this); + private EmpfangerstandortClusterContainment() { super("openEHR-EHR-CLUSTER.location.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java index 2c758a5a0..18c429907 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java @@ -7,14 +7,14 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.case_identification.v0") public class FallidentifikationCluster { - @Path("/items[at0001]/value|value") - private String fallKennungValue; + @Path("/items[at0001]/value|value") + private String fallKennungValue; - public void setFallKennungValue(String fallKennungValue) { - this.fallKennungValue = fallKennungValue; - } + public void setFallKennungValue(String fallKennungValue) { + this.fallKennungValue = fallKennungValue; + } - public String getFallKennungValue() { - return this.fallKennungValue; - } + public String getFallKennungValue() { + return this.fallKennungValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java index 052a0685b..380317944 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java @@ -9,14 +9,14 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_panel.v0") public class KulturCluster { - @Path("/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Pro Virus']") - private List proVirus; + @Path("/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Pro Virus']") + private List proVirus; - public void setProVirus(List proVirus) { - this.proVirus = proVirus; - } + public void setProVirus(List proVirus) { + this.proVirus = proVirus; + } - public List getProVirus() { - return this.proVirus; - } + public List getProVirus() { + return this.proVirus ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturClusterContainment.java index 4da077cdb..54b358bc0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturClusterContainment.java @@ -7,15 +7,15 @@ import org.ehrbase.client.aql.field.SelectAqlField; public class KulturClusterContainment extends Containment { - public SelectAqlField KULTUR_CLUSTER = new AqlFieldImp(KulturCluster.class, "", "KulturCluster", KulturCluster.class, this); + public SelectAqlField KULTUR_CLUSTER = new AqlFieldImp(KulturCluster.class, "", "KulturCluster", KulturCluster.class, this); - public ListSelectAqlField PRO_VIRUS = new ListAqlFieldImp(KulturCluster.class, "/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Pro Virus']", "proVirus", ProVirusCluster.class, this); + public ListSelectAqlField PRO_VIRUS = new ListAqlFieldImp(KulturCluster.class, "/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]", "proVirus", ProVirusCluster.class, this); - private KulturClusterContainment() { - super("openEHR-EHR-CLUSTER.laboratory_test_panel.v0"); - } + private KulturClusterContainment() { + super("openEHR-EHR-CLUSTER.laboratory_test_panel.v0"); + } - public static KulturClusterContainment getInstance() { - return new KulturClusterContainment(); - } + public static KulturClusterContainment getInstance() { + return new KulturClusterContainment(); + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java index 0c311e916..eddfec517 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java @@ -3,7 +3,6 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.DvIdentifier; import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -12,70 +11,91 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") public class ProVirusCluster { - @Path("/items[at0024]/value|value") - private String virusValue; + @Path("/items[at0027]/value|magnitude") + private Long analyseergebnisReihenfolgeMagnitude; - @Path("/items[at0003]/value|value") - private String kommentarValue; + @Path("/items[at0024 and name/value='Virus']/value|value") + private String virusValue; - @Path("/items[at0001]/value") - @Choice - private ProVirusNachweisChoice nachweis; + @Path("/items[at0001 and name/value='Nachweis']/value|value") + private String nachweisValue; - @Path("/items[at0026]/value") - private DvIdentifier zugehorigeLaborprobe; + @Path("/items[at0001 and name/value='Viruslast (ct-Wert)']/value|magnitude") + private Double viruslastCtWertMagnitude; - @Path("/items[at0027]/value|magnitude") - private Long analyseergebnisReihenfolgeMagnitude; + @Path("/items[at0001 and name/value='Viruslast (ct-Wert)']/value|units") + private String viruslastCtWertUnits; - @Path("/items[at0014]") - private List analyseergebnisDetails; + @Path("/items[at0014]") + private List analyseergebnisDetails; - public void setVirusValue(String virusValue) { - this.virusValue = virusValue; - } + @Path("/items[at0026 and name/value='Zugehörige Laborprobe']/value") + private DvIdentifier zugehorigeLaborprobe; - public String getVirusValue() { - return this.virusValue; - } + @Path("/items[at0003]/value|value") + private String kommentarValue; - public void setKommentarValue(String kommentarValue) { - this.kommentarValue = kommentarValue; - } + public void setAnalyseergebnisReihenfolgeMagnitude(Long analyseergebnisReihenfolgeMagnitude) { + this.analyseergebnisReihenfolgeMagnitude = analyseergebnisReihenfolgeMagnitude; + } - public String getKommentarValue() { - return this.kommentarValue; - } + public Long getAnalyseergebnisReihenfolgeMagnitude() { + return this.analyseergebnisReihenfolgeMagnitude ; + } - public void setNachweis(ProVirusNachweisChoice nachweis) { - this.nachweis = nachweis; - } + public void setVirusValue(String virusValue) { + this.virusValue = virusValue; + } - public ProVirusNachweisChoice getNachweis() { - return this.nachweis; - } + public String getVirusValue() { + return this.virusValue ; + } - public void setZugehorigeLaborprobe(DvIdentifier zugehorigeLaborprobe) { - this.zugehorigeLaborprobe = zugehorigeLaborprobe; - } + public void setNachweisValue(String nachweisValue) { + this.nachweisValue = nachweisValue; + } - public DvIdentifier getZugehorigeLaborprobe() { - return this.zugehorigeLaborprobe; - } + public String getNachweisValue() { + return this.nachweisValue ; + } - public void setAnalyseergebnisReihenfolgeMagnitude(Long analyseergebnisReihenfolgeMagnitude) { - this.analyseergebnisReihenfolgeMagnitude = analyseergebnisReihenfolgeMagnitude; - } + public void setViruslastCtWertMagnitude(Double viruslastCtWertMagnitude) { + this.viruslastCtWertMagnitude = viruslastCtWertMagnitude; + } - public Long getAnalyseergebnisReihenfolgeMagnitude() { - return this.analyseergebnisReihenfolgeMagnitude; - } + public Double getViruslastCtWertMagnitude() { + return this.viruslastCtWertMagnitude ; + } - public void setAnalyseergebnisDetails(List analyseergebnisDetails) { - this.analyseergebnisDetails = analyseergebnisDetails; - } + public void setViruslastCtWertUnits(String viruslastCtWertUnits) { + this.viruslastCtWertUnits = viruslastCtWertUnits; + } - public List getAnalyseergebnisDetails() { - return this.analyseergebnisDetails; - } + public String getViruslastCtWertUnits() { + return this.viruslastCtWertUnits ; + } + + public void setAnalyseergebnisDetails(List analyseergebnisDetails) { + this.analyseergebnisDetails = analyseergebnisDetails; + } + + public List getAnalyseergebnisDetails() { + return this.analyseergebnisDetails ; + } + + public void setZugehorigeLaborprobe(DvIdentifier zugehorigeLaborprobe) { + this.zugehorigeLaborprobe = zugehorigeLaborprobe; + } + + public DvIdentifier getZugehorigeLaborprobe() { + return this.zugehorigeLaborprobe ; + } + + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } + + public String getKommentarValue() { + return this.kommentarValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusClusterContainment.java index 104f590cb..1dd79eedb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusClusterContainment.java @@ -11,18 +11,22 @@ public class ProVirusClusterContainment extends Containment { public SelectAqlField PRO_VIRUS_CLUSTER = new AqlFieldImp(ProVirusCluster.class, "", "ProVirusCluster", ProVirusCluster.class, this); - public SelectAqlField VIRUS_VALUE = new AqlFieldImp(ProVirusCluster.class, "/items[at0024]/value|value", "virusValue", String.class, this); + public SelectAqlField ANALYSEERGEBNIS_REIHENFOLGE_MAGNITUDE = new AqlFieldImp(ProVirusCluster.class, "/items[at0027]/value|magnitude", "analyseergebnisReihenfolgeMagnitude", Long.class, this); - public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ProVirusCluster.class, "/items[at0003]/value|value", "kommentarValue", String.class, this); + public SelectAqlField VIRUS_VALUE = new AqlFieldImp(ProVirusCluster.class, "/items[at0024]/value|value", "virusValue", String.class, this); - public SelectAqlField NACHWEIS = new AqlFieldImp(ProVirusCluster.class, "/items[at0001]/value", "nachweis", ProVirusNachweisChoice.class, this); + public SelectAqlField NACHWEIS_VALUE = new AqlFieldImp(ProVirusCluster.class, "/items[at0001]/value|value", "nachweisValue", String.class, this); - public SelectAqlField ZUGEHORIGE_LABORPROBE = new AqlFieldImp(ProVirusCluster.class, "/items[at0026]/value", "zugehorigeLaborprobe", DvIdentifier.class, this); + public SelectAqlField VIRUSLAST_CT_WERT_MAGNITUDE = new AqlFieldImp(ProVirusCluster.class, "/items[at0001]/value|magnitude", "viruslastCtWertMagnitude", Double.class, this); - public SelectAqlField ANALYSEERGEBNIS_REIHENFOLGE_MAGNITUDE = new AqlFieldImp(ProVirusCluster.class, "/items[at0027]/value|magnitude", "analyseergebnisReihenfolgeMagnitude", Long.class, this); + public SelectAqlField VIRUSLAST_CT_WERT_UNITS = new AqlFieldImp(ProVirusCluster.class, "/items[at0001]/value|units", "viruslastCtWertUnits", String.class, this); public ListSelectAqlField ANALYSEERGEBNIS_DETAILS = new ListAqlFieldImp(ProVirusCluster.class, "/items[at0014]", "analyseergebnisDetails", Cluster.class, this); + public SelectAqlField ZUGEHORIGE_LABORPROBE = new AqlFieldImp(ProVirusCluster.class, "/items[at0026]/value", "zugehorigeLaborprobe", DvIdentifier.class, this); + + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ProVirusCluster.class, "/items[at0003]/value|value", "kommentarValue", String.class, this); + private ProVirusClusterContainment() { super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusNachweisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusNachweisChoice.java deleted file mode 100644 index 7faedb341..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusNachweisChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; - -public interface ProVirusNachweisChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusNachweisDvquantity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusNachweisDvquantity.java deleted file mode 100644 index 5abf4effc..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusNachweisDvquantity.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_QUANTITY") -public class ProVirusNachweisDvquantity implements ProVirusNachweisChoice { - @Path("|magnitude") - private Double viruslastCtWertMagnitude; - - @Path("|units") - private String viruslastCtWertUnits; - - public void setViruslastCtWertMagnitude(Double viruslastCtWertMagnitude) { - this.viruslastCtWertMagnitude = viruslastCtWertMagnitude; - } - - public Double getViruslastCtWertMagnitude() { - return this.viruslastCtWertMagnitude; - } - - public void setViruslastCtWertUnits(String viruslastCtWertUnits) { - this.viruslastCtWertUnits = viruslastCtWertUnits; - } - - public String getViruslastCtWertUnits() { - return this.viruslastCtWertUnits; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusNachweisDvtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusNachweisDvtext.java deleted file mode 100644 index 4d5857f46..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusNachweisDvtext.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class ProVirusNachweisDvtext implements ProVirusNachweisChoice { - @Path("|value") - private String nachweisValue; - - public void setNachweisValue(String nachweisValue) { - this.nachweisValue = nachweisValue; - } - - public String getNachweisValue() { - return this.nachweisValue; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java index 76fe4239d..a83d704fe 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java @@ -12,202 +12,202 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.specimen.v1") public class ProbeCluster { - @Path("/items[at0079]/value|value") - private String kommentarDesProbennehmersValue; + @Path("/items[at0029]/value|value") + private String probenartValue; - @Path("/items[at0071]") - private List angabenZumProbennehmer; + @Path("/items[at0001]/value") + private DvIdentifier laborprobenidentifikator; - @Path("/items[at0093]") - private List angabenZumTransport; + @Path("/items[at0088]/value") + private DvIdentifier externerIdentifikator; - @Path("/items[at0088]/value") - private DvIdentifier externerIdentifikator; + @Path("/items[at0034]/value|value") + private TemporalAccessor zeitpunktDesProbeneingangsValue; - @Path("/items[at0087]/value|value") - private String probenentnahmestelleValue; + @Path("/items[at0027]") + private List physischeEigenschaften; - @Path("/items[at0083]") - private List zusatzlicheAngabenZurProbennahme; + @Path("/items[at0079]/value|value") + private String kommentarDesProbennehmersValue; - @Path("/items[at0085]") - private List behalterDetails; + @Path("/items[at0087]/value|value") + private String probenentnahmestelleValue; - @Path("/items[at0096]") - private List digitaleDarstellung; + @Path("/items[openEHR-EHR-CLUSTER.anatomical_location.v1]") + private AnatomischeLokalisationCluster anatomischeLokalisation; - @Path("/items[at0003]/value") - private DvIdentifier identifikatorDerUbergeordnetenProbe; + @Path("/items[at0015]/value|value") + private TemporalAccessor zeitpunktDerProbenentnahmeValue; - @Path("/items[at0034]/value|value") - private TemporalAccessor zeitpunktDesProbeneingangsValue; + @Path("/items[at0070]/value") + private DvIdentifier identifikatorDesProbennehmers; - @Path("/items[at0045]/value|value") - private String kommentarValue; + @Path("/items[at0071]") + private List angabenZumProbennehmer; - @Path("/items[at0029]/value|value") - private String probenartValue; + @Path("/items[at0083]") + private List zusatzlicheAngabenZurProbennahme; - @Path("/items[openEHR-EHR-CLUSTER.anatomical_location.v1]") - private AnatomischeLokalisationCluster anatomischeLokalisation; + @Path("/items[at0085]") + private List behalterDetails; - @Path("/items[at0001]/value") - private DvIdentifier laborprobenidentifikator; + @Path("/items[at0068]") + private List angabenZurVerarbeitung; - @Path("/items[at0068]") - private List angabenZurVerarbeitung; + @Path("/items[at0093]") + private List angabenZumTransport; - @Path("/items[at0070]/value") - private DvIdentifier identifikatorDesProbennehmers; + @Path("/items[at0096]") + private List digitaleDarstellung; - @Path("/items[at0027]") - private List physischeEigenschaften; + @Path("/items[at0003]/value") + private DvIdentifier identifikatorDerUbergeordnetenProbe; - @Path("/items[at0015]/value|value") - private TemporalAccessor zeitpunktDerProbenentnahmeValue; + @Path("/items[at0045]/value|value") + private String kommentarValue; - public void setKommentarDesProbennehmersValue(String kommentarDesProbennehmersValue) { - this.kommentarDesProbennehmersValue = kommentarDesProbennehmersValue; - } + public void setProbenartValue(String probenartValue) { + this.probenartValue = probenartValue; + } - public String getKommentarDesProbennehmersValue() { - return this.kommentarDesProbennehmersValue; - } + public String getProbenartValue() { + return this.probenartValue ; + } - public void setAngabenZumProbennehmer(List angabenZumProbennehmer) { - this.angabenZumProbennehmer = angabenZumProbennehmer; - } + public void setLaborprobenidentifikator(DvIdentifier laborprobenidentifikator) { + this.laborprobenidentifikator = laborprobenidentifikator; + } - public List getAngabenZumProbennehmer() { - return this.angabenZumProbennehmer; - } + public DvIdentifier getLaborprobenidentifikator() { + return this.laborprobenidentifikator ; + } - public void setAngabenZumTransport(List angabenZumTransport) { - this.angabenZumTransport = angabenZumTransport; - } + public void setExternerIdentifikator(DvIdentifier externerIdentifikator) { + this.externerIdentifikator = externerIdentifikator; + } - public List getAngabenZumTransport() { - return this.angabenZumTransport; - } + public DvIdentifier getExternerIdentifikator() { + return this.externerIdentifikator ; + } - public void setExternerIdentifikator(DvIdentifier externerIdentifikator) { - this.externerIdentifikator = externerIdentifikator; - } + public void setZeitpunktDesProbeneingangsValue(TemporalAccessor zeitpunktDesProbeneingangsValue) { + this.zeitpunktDesProbeneingangsValue = zeitpunktDesProbeneingangsValue; + } - public DvIdentifier getExternerIdentifikator() { - return this.externerIdentifikator; - } + public TemporalAccessor getZeitpunktDesProbeneingangsValue() { + return this.zeitpunktDesProbeneingangsValue ; + } - public void setProbenentnahmestelleValue(String probenentnahmestelleValue) { - this.probenentnahmestelleValue = probenentnahmestelleValue; - } + public void setPhysischeEigenschaften(List physischeEigenschaften) { + this.physischeEigenschaften = physischeEigenschaften; + } - public String getProbenentnahmestelleValue() { - return this.probenentnahmestelleValue; - } + public List getPhysischeEigenschaften() { + return this.physischeEigenschaften ; + } - public void setZusatzlicheAngabenZurProbennahme(List zusatzlicheAngabenZurProbennahme) { - this.zusatzlicheAngabenZurProbennahme = zusatzlicheAngabenZurProbennahme; - } + public void setKommentarDesProbennehmersValue(String kommentarDesProbennehmersValue) { + this.kommentarDesProbennehmersValue = kommentarDesProbennehmersValue; + } - public List getZusatzlicheAngabenZurProbennahme() { - return this.zusatzlicheAngabenZurProbennahme; - } + public String getKommentarDesProbennehmersValue() { + return this.kommentarDesProbennehmersValue ; + } - public void setBehalterDetails(List behalterDetails) { - this.behalterDetails = behalterDetails; - } + public void setProbenentnahmestelleValue(String probenentnahmestelleValue) { + this.probenentnahmestelleValue = probenentnahmestelleValue; + } - public List getBehalterDetails() { - return this.behalterDetails; - } + public String getProbenentnahmestelleValue() { + return this.probenentnahmestelleValue ; + } - public void setDigitaleDarstellung(List digitaleDarstellung) { - this.digitaleDarstellung = digitaleDarstellung; - } + public void setAnatomischeLokalisation(AnatomischeLokalisationCluster anatomischeLokalisation) { + this.anatomischeLokalisation = anatomischeLokalisation; + } - public List getDigitaleDarstellung() { - return this.digitaleDarstellung; - } + public AnatomischeLokalisationCluster getAnatomischeLokalisation() { + return this.anatomischeLokalisation ; + } - public void setIdentifikatorDerUbergeordnetenProbe( - DvIdentifier identifikatorDerUbergeordnetenProbe) { - this.identifikatorDerUbergeordnetenProbe = identifikatorDerUbergeordnetenProbe; - } + public void setZeitpunktDerProbenentnahmeValue(TemporalAccessor zeitpunktDerProbenentnahmeValue) { + this.zeitpunktDerProbenentnahmeValue = zeitpunktDerProbenentnahmeValue; + } - public DvIdentifier getIdentifikatorDerUbergeordnetenProbe() { - return this.identifikatorDerUbergeordnetenProbe; - } + public TemporalAccessor getZeitpunktDerProbenentnahmeValue() { + return this.zeitpunktDerProbenentnahmeValue ; + } - public void setZeitpunktDesProbeneingangsValue(TemporalAccessor zeitpunktDesProbeneingangsValue) { - this.zeitpunktDesProbeneingangsValue = zeitpunktDesProbeneingangsValue; - } + public void setIdentifikatorDesProbennehmers(DvIdentifier identifikatorDesProbennehmers) { + this.identifikatorDesProbennehmers = identifikatorDesProbennehmers; + } - public TemporalAccessor getZeitpunktDesProbeneingangsValue() { - return this.zeitpunktDesProbeneingangsValue; - } + public DvIdentifier getIdentifikatorDesProbennehmers() { + return this.identifikatorDesProbennehmers ; + } - public void setKommentarValue(String kommentarValue) { - this.kommentarValue = kommentarValue; - } + public void setAngabenZumProbennehmer(List angabenZumProbennehmer) { + this.angabenZumProbennehmer = angabenZumProbennehmer; + } - public String getKommentarValue() { - return this.kommentarValue; - } + public List getAngabenZumProbennehmer() { + return this.angabenZumProbennehmer ; + } - public void setProbenartValue(String probenartValue) { - this.probenartValue = probenartValue; - } + public void setZusatzlicheAngabenZurProbennahme(List zusatzlicheAngabenZurProbennahme) { + this.zusatzlicheAngabenZurProbennahme = zusatzlicheAngabenZurProbennahme; + } - public String getProbenartValue() { - return this.probenartValue; - } + public List getZusatzlicheAngabenZurProbennahme() { + return this.zusatzlicheAngabenZurProbennahme ; + } - public void setAnatomischeLokalisation(AnatomischeLokalisationCluster anatomischeLokalisation) { - this.anatomischeLokalisation = anatomischeLokalisation; - } - - public AnatomischeLokalisationCluster getAnatomischeLokalisation() { - return this.anatomischeLokalisation; - } - - public void setLaborprobenidentifikator(DvIdentifier laborprobenidentifikator) { - this.laborprobenidentifikator = laborprobenidentifikator; - } - - public DvIdentifier getLaborprobenidentifikator() { - return this.laborprobenidentifikator; - } - - public void setAngabenZurVerarbeitung(List angabenZurVerarbeitung) { - this.angabenZurVerarbeitung = angabenZurVerarbeitung; - } - - public List getAngabenZurVerarbeitung() { - return this.angabenZurVerarbeitung; - } - - public void setIdentifikatorDesProbennehmers(DvIdentifier identifikatorDesProbennehmers) { - this.identifikatorDesProbennehmers = identifikatorDesProbennehmers; - } - - public DvIdentifier getIdentifikatorDesProbennehmers() { - return this.identifikatorDesProbennehmers; - } - - public void setPhysischeEigenschaften(List physischeEigenschaften) { - this.physischeEigenschaften = physischeEigenschaften; - } - - public List getPhysischeEigenschaften() { - return this.physischeEigenschaften; - } - - public void setZeitpunktDerProbenentnahmeValue(TemporalAccessor zeitpunktDerProbenentnahmeValue) { - this.zeitpunktDerProbenentnahmeValue = zeitpunktDerProbenentnahmeValue; - } - - public TemporalAccessor getZeitpunktDerProbenentnahmeValue() { - return this.zeitpunktDerProbenentnahmeValue; - } + public void setBehalterDetails(List behalterDetails) { + this.behalterDetails = behalterDetails; + } + + public List getBehalterDetails() { + return this.behalterDetails ; + } + + public void setAngabenZurVerarbeitung(List angabenZurVerarbeitung) { + this.angabenZurVerarbeitung = angabenZurVerarbeitung; + } + + public List getAngabenZurVerarbeitung() { + return this.angabenZurVerarbeitung ; + } + + public void setAngabenZumTransport(List angabenZumTransport) { + this.angabenZumTransport = angabenZumTransport; + } + + public List getAngabenZumTransport() { + return this.angabenZumTransport ; + } + + public void setDigitaleDarstellung(List digitaleDarstellung) { + this.digitaleDarstellung = digitaleDarstellung; + } + + public List getDigitaleDarstellung() { + return this.digitaleDarstellung ; + } + + public void setIdentifikatorDerUbergeordnetenProbe( + DvIdentifier identifikatorDerUbergeordnetenProbe) { + this.identifikatorDerUbergeordnetenProbe = identifikatorDerUbergeordnetenProbe; + } + + public DvIdentifier getIdentifikatorDerUbergeordnetenProbe() { + return this.identifikatorDerUbergeordnetenProbe ; + } + + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } + + public String getKommentarValue() { + return this.kommentarValue ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeClusterContainment.java index e7ed9ccf4..fbb3e0fe9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeClusterContainment.java @@ -13,41 +13,41 @@ public class ProbeClusterContainment extends Containment { public SelectAqlField PROBE_CLUSTER = new AqlFieldImp(ProbeCluster.class, "", "ProbeCluster", ProbeCluster.class, this); - public SelectAqlField KOMMENTAR_DES_PROBENNEHMERS_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0079]/value|value", "kommentarDesProbennehmersValue", String.class, this); - - public ListSelectAqlField ANGABEN_ZUM_PROBENNEHMER = new ListAqlFieldImp(ProbeCluster.class, "/items[at0071]", "angabenZumProbennehmer", Cluster.class, this); + public SelectAqlField PROBENART_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0029]/value|value", "probenartValue", String.class, this); - public ListSelectAqlField ANGABEN_ZUM_TRANSPORT = new ListAqlFieldImp(ProbeCluster.class, "/items[at0093]", "angabenZumTransport", Cluster.class, this); + public SelectAqlField LABORPROBENIDENTIFIKATOR = new AqlFieldImp(ProbeCluster.class, "/items[at0001]/value", "laborprobenidentifikator", DvIdentifier.class, this); public SelectAqlField EXTERNER_IDENTIFIKATOR = new AqlFieldImp(ProbeCluster.class, "/items[at0088]/value", "externerIdentifikator", DvIdentifier.class, this); - public SelectAqlField PROBENENTNAHMESTELLE_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0087]/value|value", "probenentnahmestelleValue", String.class, this); + public SelectAqlField ZEITPUNKT_DES_PROBENEINGANGS_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0034]/value|value", "zeitpunktDesProbeneingangsValue", TemporalAccessor.class, this); - public ListSelectAqlField ZUSATZLICHE_ANGABEN_ZUR_PROBENNAHME = new ListAqlFieldImp(ProbeCluster.class, "/items[at0083]", "zusatzlicheAngabenZurProbennahme", Cluster.class, this); + public ListSelectAqlField PHYSISCHE_EIGENSCHAFTEN = new ListAqlFieldImp(ProbeCluster.class, "/items[at0027]", "physischeEigenschaften", Cluster.class, this); - public ListSelectAqlField BEHALTER_DETAILS = new ListAqlFieldImp(ProbeCluster.class, "/items[at0085]", "behalterDetails", Cluster.class, this); + public SelectAqlField KOMMENTAR_DES_PROBENNEHMERS_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0079]/value|value", "kommentarDesProbennehmersValue", String.class, this); - public ListSelectAqlField DIGITALE_DARSTELLUNG = new ListAqlFieldImp(ProbeCluster.class, "/items[at0096]", "digitaleDarstellung", Cluster.class, this); + public SelectAqlField PROBENENTNAHMESTELLE_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0087]/value|value", "probenentnahmestelleValue", String.class, this); - public SelectAqlField IDENTIFIKATOR_DER_UBERGEORDNETEN_PROBE = new AqlFieldImp(ProbeCluster.class, "/items[at0003]/value", "identifikatorDerUbergeordnetenProbe", DvIdentifier.class, this); + public SelectAqlField ANATOMISCHE_LOKALISATION = new AqlFieldImp(ProbeCluster.class, "/items[openEHR-EHR-CLUSTER.anatomical_location.v1]", "anatomischeLokalisation", AnatomischeLokalisationCluster.class, this); - public SelectAqlField ZEITPUNKT_DES_PROBENEINGANGS_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0034]/value|value", "zeitpunktDesProbeneingangsValue", TemporalAccessor.class, this); + public SelectAqlField ZEITPUNKT_DER_PROBENENTNAHME_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0015]/value|value", "zeitpunktDerProbenentnahmeValue", TemporalAccessor.class, this); - public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0045]/value|value", "kommentarValue", String.class, this); + public SelectAqlField IDENTIFIKATOR_DES_PROBENNEHMERS = new AqlFieldImp(ProbeCluster.class, "/items[at0070]/value", "identifikatorDesProbennehmers", DvIdentifier.class, this); - public SelectAqlField PROBENART_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0029]/value|value", "probenartValue", String.class, this); + public ListSelectAqlField ANGABEN_ZUM_PROBENNEHMER = new ListAqlFieldImp(ProbeCluster.class, "/items[at0071]", "angabenZumProbennehmer", Cluster.class, this); - public SelectAqlField ANATOMISCHE_LOKALISATION = new AqlFieldImp(ProbeCluster.class, "/items[openEHR-EHR-CLUSTER.anatomical_location.v1]", "anatomischeLokalisation", AnatomischeLokalisationCluster.class, this); + public ListSelectAqlField ZUSATZLICHE_ANGABEN_ZUR_PROBENNAHME = new ListAqlFieldImp(ProbeCluster.class, "/items[at0083]", "zusatzlicheAngabenZurProbennahme", Cluster.class, this); - public SelectAqlField LABORPROBENIDENTIFIKATOR = new AqlFieldImp(ProbeCluster.class, "/items[at0001]/value", "laborprobenidentifikator", DvIdentifier.class, this); + public ListSelectAqlField BEHALTER_DETAILS = new ListAqlFieldImp(ProbeCluster.class, "/items[at0085]", "behalterDetails", Cluster.class, this); public ListSelectAqlField ANGABEN_ZUR_VERARBEITUNG = new ListAqlFieldImp(ProbeCluster.class, "/items[at0068]", "angabenZurVerarbeitung", Cluster.class, this); - public SelectAqlField IDENTIFIKATOR_DES_PROBENNEHMERS = new AqlFieldImp(ProbeCluster.class, "/items[at0070]/value", "identifikatorDesProbennehmers", DvIdentifier.class, this); + public ListSelectAqlField ANGABEN_ZUM_TRANSPORT = new ListAqlFieldImp(ProbeCluster.class, "/items[at0093]", "angabenZumTransport", Cluster.class, this); - public ListSelectAqlField PHYSISCHE_EIGENSCHAFTEN = new ListAqlFieldImp(ProbeCluster.class, "/items[at0027]", "physischeEigenschaften", Cluster.class, this); + public ListSelectAqlField DIGITALE_DARSTELLUNG = new ListAqlFieldImp(ProbeCluster.class, "/items[at0096]", "digitaleDarstellung", Cluster.class, this); - public SelectAqlField ZEITPUNKT_DER_PROBENENTNAHME_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0015]/value|value", "zeitpunktDerProbenentnahmeValue", TemporalAccessor.class, this); + public SelectAqlField IDENTIFIKATOR_DER_UBERGEORDNETEN_PROBE = new AqlFieldImp(ProbeCluster.class, "/items[at0003]/value", "identifikatorDerUbergeordnetenProbe", DvIdentifier.class, this); + + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0045]/value|value", "kommentarValue", String.class, this); private ProbeClusterContainment() { super("openEHR-EHR-CLUSTER.specimen.v1"); diff --git a/client/src/test/java/org/ehrbase/client/flattener/FlattenerTest.java b/client/src/test/java/org/ehrbase/client/flattener/FlattenerTest.java index 212010de5..125ee7df8 100644 --- a/client/src/test/java/org/ehrbase/client/flattener/FlattenerTest.java +++ b/client/src/test/java/org/ehrbase/client/flattener/FlattenerTest.java @@ -28,29 +28,26 @@ import org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.AlternativeEventsComposition; import org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.KorpergewichtAnyEventEnIntervalEvent; import org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.KorpergewichtAnyEventEnPointEvent; -import org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.KorpergewichtBirthEnEvent; +import org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.KorpergewichtBirthEnPointEvent; import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.CoronaAnamneseComposition; -import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.VorhandenDefiningcode; +import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.VorhandenDefiningCode; import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.EhrbaseBloodPressureSimpleDeV0Composition; -import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.KorotkoffSoundsDefiningcode; +import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.KorotkoffSoundsDefiningCode; import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.EhrbaseMultiOccurrenceDeV1Composition; import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureAnyEventPointEvent; import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementChoice; -import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementDvcodedtext; -import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementDvtext; +import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementDvCodedText; +import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementDvText; import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureObservation; -import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.LocationOfMeasurementDefiningcode; +import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.LocationOfMeasurementDefiningCode; import org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.EpisodeOfCareComposition; import org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition.EpisodeofcareAdminEntry; import org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition.EpisodeofcareTeamElement; -import org.ehrbase.client.classgenerator.examples.shareddefinition.MathFunctionDefiningcode; -import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.TestAllTypesEnV1Composition; -import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesChoiceDvcount; +import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; import org.ehrbase.client.templateprovider.TestDataTemplateProvider; import org.ehrbase.serialisation.jsonencoding.CanonicalJson; -import org.ehrbase.serialisation.xmlencoding.CanonicalXML; import org.ehrbase.test_data.composition.CompositionTestDataCanonicalJson; -import org.ehrbase.test_data.composition.CompositionTestDataCanonicalXML; +import org.junit.Ignore; import org.junit.Test; import java.io.IOException; @@ -112,7 +109,7 @@ public void testFlattenEhrbaseBloodPressureSimpleDeV0() { assertThat(actual.getBloodPressureTrainingSample().get(0).getSubject()).isNotNull().extracting(Object::getClass).isEqualTo(PartySelf.class); assertThat(actual.getBloodPressureTrainingSample().get(0).getSystolicMagnitude()).isEqualTo(22d); assertThat(actual.getBloodPressureTrainingSample().get(0).getSystolicUnits()).isEqualTo("mm[Hg]"); - assertThat(actual.getBloodPressureTrainingSample().get(0).getKorotkoffSoundsDefiningcode()).isEqualTo(KorotkoffSoundsDefiningcode.FIFTH_SOUND); + assertThat(actual.getBloodPressureTrainingSample().get(0).getKorotkoffSoundsDefiningCode() ).isEqualTo(KorotkoffSoundsDefiningCode.FIFTH_SOUND); } @@ -133,25 +130,17 @@ public void testFlattenEhrbaseMultiOccurrenceDeV1() { .containsExactlyInAnyOrder(11d, 22d); BodyTemperatureLocationOfMeasurementChoice locationOfMeasurement1 = bodyTemperature1.getLocationOfMeasurement(); - assertThat(locationOfMeasurement1.getClass()).isEqualTo(BodyTemperatureLocationOfMeasurementDvcodedtext.class); - assertThat(((BodyTemperatureLocationOfMeasurementDvcodedtext) locationOfMeasurement1).getLocationOfMeasurementDefiningcode()).isEqualTo(LocationOfMeasurementDefiningcode.FOREHEAD); + assertThat(locationOfMeasurement1.getClass()).isEqualTo(BodyTemperatureLocationOfMeasurementDvCodedText.class); + assertThat(((BodyTemperatureLocationOfMeasurementDvCodedText) locationOfMeasurement1).getLocationOfMeasurementDefiningCode()).isEqualTo(LocationOfMeasurementDefiningCode.FOREHEAD); BodyTemperatureObservation bodyTemperature2 = actual.getBodyTemperature().get(1); BodyTemperatureLocationOfMeasurementChoice locationOfMeasurement2 = bodyTemperature2.getLocationOfMeasurement(); - assertThat(locationOfMeasurement2.getClass()).isEqualTo(BodyTemperatureLocationOfMeasurementDvtext.class); - assertThat(((BodyTemperatureLocationOfMeasurementDvtext) locationOfMeasurement2).getLocationOfMeasurementValue()).isEqualTo("location"); + assertThat(locationOfMeasurement2.getClass()).isEqualTo(BodyTemperatureLocationOfMeasurementDvText.class); + assertThat(((BodyTemperatureLocationOfMeasurementDvText) locationOfMeasurement2).getLocationOfMeasurementValue()).isEqualTo("location"); } - @Test - public void testFlattenAllTypes() throws IOException { - Composition composition = new CanonicalXML().unmarshal(IOUtils.toString(CompositionTestDataCanonicalXML.ALL_TYPES.getStream(), StandardCharsets.UTF_8), Composition.class); - Flattener cut = new Flattener(new TestDataTemplateProvider()); - TestAllTypesEnV1Composition actual = cut.flatten(composition, TestAllTypesEnV1Composition.class); - assertThat(actual).isNotNull(); - assertThat(actual.getTestAllTypes().get(0).getChoice().getClass()).isEqualTo(TestAllTypesChoiceDvcount.class); - assertThat(((TestAllTypesChoiceDvcount) actual.getTestAllTypes().get(0).getChoice()).getChoiceMagnitude()).isEqualTo(148L); - } + @Test public void testFlattenCorona() throws IOException { @@ -161,7 +150,7 @@ public void testFlattenCorona() throws IOException { assertThat(actual).isNotNull(); assertThat(actual.getSymptome()).isNotNull(); assertThat(actual.getSymptome().getHeiserkeit()).isNotNull(); - assertThat(actual.getSymptome().getHeiserkeit().getVorhandenDefiningcode()).isEqualTo(VorhandenDefiningcode.NICHT_VORHANDEN); + assertThat(actual.getSymptome().getHeiserkeit().getVorhandenDefiningCode()).isEqualTo(VorhandenDefiningCode.NICHT_VORHANDEN); } @Test @@ -171,7 +160,7 @@ public void testFlattenAltEvents() { AlternativeEventsComposition actual = cut.flatten(composition, AlternativeEventsComposition.class); assertThat(actual).isNotNull(); assertThat(actual.getKorpergewicht()).size().isEqualTo(1); - KorpergewichtBirthEnEvent birthEn = actual.getKorpergewicht().get(0).getBirthEn(); + KorpergewichtBirthEnPointEvent birthEn = actual.getKorpergewicht().get(0).getBirthEn(); assertThat(birthEn.getTimeValue()).isEqualTo(OffsetDateTime.of(1990, 11, 2, 12, 0, 0, 0, ZoneOffset.UTC)); assertThat(birthEn.getGewichtMagnitude()).isEqualTo(30d); assertThat(birthEn.getGewichtUnits()).isEqualTo("kg"); @@ -188,11 +177,12 @@ public void testFlattenAltEvents() { assertThat(anyEventEnIntervalEvents.get(0).getTimeValue()).isEqualTo(OffsetDateTime.of(2015, 11, 2, 12, 0, 0, 0, ZoneOffset.UTC)); assertThat(anyEventEnIntervalEvents.get(0).getGewichtMagnitude()).isEqualTo(60d); assertThat(anyEventEnIntervalEvents.get(0).getGewichtUnits()).isEqualTo("kg"); - assertThat(anyEventEnIntervalEvents.get(0).getMathFunctionDefiningcode()).isEqualTo(MathFunctionDefiningcode.MEAN); + assertThat(anyEventEnIntervalEvents.get(0).getMathFunctionDefiningCode()).isEqualTo(MathFunction.MEAN); assertThat(anyEventEnIntervalEvents.get(0).getWidthValue()).isEqualTo(Duration.ofDays(30)); } @Test + @Ignore public void testFlattenEpisodeOfCare() { Composition composition = (Composition) new Unflattener(new TestDataTemplateProvider()).unflatten(buildEpisodeOfCareComposition()); Flattener cut = new Flattener(new TestDataTemplateProvider()); @@ -201,7 +191,7 @@ public void testFlattenEpisodeOfCare() { assertThat(actual.getEpisodeofcare()).size().isEqualTo(1); EpisodeofcareAdminEntry episodeofcareAdminEntry = actual.getEpisodeofcare().get(0); - assertThat(episodeofcareAdminEntry.getIdentifier()).extracting(e -> e.getValue().getId()).containsExactlyInAnyOrder("123", "456"); + assertThat(episodeofcareAdminEntry.getIdentifier()).extracting(e -> e.getValue().getId() ).containsExactlyInAnyOrder("123", "456"); assertThat(episodeofcareAdminEntry.getTeam()).extracting(EpisodeofcareTeamElement::getValue).containsExactlyInAnyOrder(URI.create("https://github.com/ehrbase")); diff --git a/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java b/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java index 3157bc04a..afc4d793a 100644 --- a/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java +++ b/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java @@ -32,6 +32,7 @@ import org.ehrbase.serialisation.flatencoding.FlatJson; import org.ehrbase.serialisation.jsonencoding.JacksonUtil; import org.ehrbase.test_data.composition.CompositionTestDataSimSDTJson; +import org.junit.Ignore; import org.junit.Test; import java.io.IOException; @@ -69,6 +70,7 @@ public TestCase( } @Test + @Ignore public void testRoundTrip() throws IOException { List testCaseList = new ArrayList<>(); diff --git a/client/src/test/java/org/ehrbase/client/flattener/UnflattenerTest.java b/client/src/test/java/org/ehrbase/client/flattener/UnflattenerTest.java index 6f887c7bc..0b73e1197 100644 --- a/client/src/test/java/org/ehrbase/client/flattener/UnflattenerTest.java +++ b/client/src/test/java/org/ehrbase/client/flattener/UnflattenerTest.java @@ -20,7 +20,6 @@ import com.nedap.archie.rm.archetyped.Locatable; import com.nedap.archie.rm.composition.AdminEntry; import com.nedap.archie.rm.composition.Composition; -import com.nedap.archie.rm.composition.Evaluation; import com.nedap.archie.rm.composition.Observation; import com.nedap.archie.rm.datastructures.Element; import com.nedap.archie.rm.datastructures.IntervalEvent; @@ -45,13 +44,9 @@ import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.EhrbaseBloodPressureSimpleDeV0Composition; import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.EhrbaseMultiOccurrenceDeV1Composition; import org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.EpisodeOfCareComposition; -import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.TestAllTypesEnV1Composition; -import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesChoiceDvquantity; import org.ehrbase.client.templateprovider.TestDataTemplateProvider; import org.ehrbase.serialisation.jsonencoding.CanonicalJson; -import org.ehrbase.serialisation.xmlencoding.CanonicalXML; import org.ehrbase.test_data.composition.CompositionTestDataCanonicalJson; -import org.ehrbase.test_data.composition.CompositionTestDataCanonicalXML; import org.junit.Test; import java.io.IOException; @@ -199,27 +194,7 @@ public void testUnflattenEhrbaseMultiOccurrenceDeV1() { assertThat(dvText.getValue()).isEqualTo("location"); } - @Test - public void testUnflattenAllTypes() throws IOException { - Composition composition = new CanonicalXML().unmarshal(IOUtils.toString(CompositionTestDataCanonicalXML.ALL_TYPES.getStream(), StandardCharsets.UTF_8), Composition.class); - Flattener flattener = new Flattener(new TestDataTemplateProvider()); - TestAllTypesEnV1Composition testAllTypesEnV1 = flattener.flatten(composition, TestAllTypesEnV1Composition.class); - - TestAllTypesChoiceDvquantity choiceDvquantity = new TestAllTypesChoiceDvquantity(); - choiceDvquantity.setChoiceMagnitude(22d); - choiceDvquantity.setChoiceUnits("mm[Hg]"); - testAllTypesEnV1.getTestAllTypes().get(0).setChoice(choiceDvquantity); - Unflattener cut = new Unflattener(new TestDataTemplateProvider()); - Composition actual = (Composition) cut.unflatten(testAllTypesEnV1); - assertThat(actual).isNotNull(); - Evaluation evaluation = (Evaluation) actual.itemAtPath("/content[openEHR-EHR-EVALUATION.test_all_types.v1]"); - assertThat(evaluation).isNotNull(); - DvQuantity dvquantity = (DvQuantity) evaluation.itemAtPath("/data[at0001]/items[at0009]/value"); - assertThat(dvquantity).isNotNull(); - assertThat(dvquantity.getMagnitude()).isEqualTo(22d); - assertThat(dvquantity.getUnits()).isEqualTo("mm[Hg]"); - } @Test public void testUnflattenAltEvent() { diff --git a/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/CoronaTestIT.java b/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/CoronaTestIT.java index 5c17f674c..fcf79fe9c 100644 --- a/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/CoronaTestIT.java +++ b/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/CoronaTestIT.java @@ -43,13 +43,12 @@ import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.ReisefallObservationContainment; import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.RisikogebietSectionContainment; import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.SymptomeSectionContainment; -import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.VorhandenDefiningcode; +import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.VorhandenDefiningCode; import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.PatientenaufenthaltCompositionContainment; import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.AbteilungsfallClusterContainment; import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.StandortClusterContainment; -import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.StandortschlusselDefiningcode; +import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.StandortschlusselDefiningCode; import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.VersorgungsortAdminEntryContainment; -import org.ehrbase.client.classgenerator.examples.shareddefinition.Language; import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.StationarerVersorgungsfallCompositionContainment; import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.AufnahmedatenAdminEntryContainment; import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.EntlassungsdatenAdminEntryContainment; @@ -59,6 +58,7 @@ import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.KulturClusterContainment; import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.ProVirusClusterContainment; import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.ProbeClusterContainment; +import org.ehrbase.client.classgenerator.shareddefinition.Language; import org.ehrbase.client.flattener.Flattener; import org.ehrbase.client.openehrclient.OpenEhrClient; import org.ehrbase.client.templateprovider.TestDataTemplateProvider; @@ -116,20 +116,20 @@ public void testCorona() throws IOException { ); - EntityQuery> entityQuery = Query.buildEntityQuery( + EntityQuery> entityQuery = Query.buildEntityQuery( containmentExpression, - hustenObservationContainment.VORHANDEN_DEFININGCODE, - fieberOderErhohteKorpertemperaturObservationContainment.VORHANDEN_DEFININGCODE, - heiserkeitObservationContainment.VORHANDEN_DEFININGCODE, + hustenObservationContainment.VORHANDEN_DEFINING_CODE, + fieberOderErhohteKorpertemperaturObservationContainment.VORHANDEN_DEFINING_CODE, + heiserkeitObservationContainment.VORHANDEN_DEFINING_CODE, coronaAnamneseCompositionContainment.LANGUAGE ); Parameter ehrIdParameter = entityQuery.buildParameter(); entityQuery.where(Condition.equal(EhrFields.EHR_ID(), ehrIdParameter)); /* Select - o0/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value/defining_code as F0, - o1/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value/defining_code as F1, - o2/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value/defining_code as F2, + o0/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value/defining_Code as F0, + o1/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value/defining_Code as F1, + o2/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value/defining_Code as F2, c3/language as F3 from EHR e contains ( COMPOSITION c3[openEHR-EHR-COMPOSITION.report.v1] contains @@ -143,11 +143,11 @@ public void testCorona() throws IOException { ) where e/ehr_id/value = $parm0 */ - List> actual = openEhrClient.aqlEndpoint().execute(entityQuery, ehrIdParameter.setValue(ehr)); + List> actual = openEhrClient.aqlEndpoint().execute(entityQuery, ehrIdParameter.setValue(ehr)); assertThat(actual).extracting(Record4::value1, Record4::value2, Record4::value3, Record4::value4) .containsExactlyInAnyOrder( - new Tuple(VorhandenDefiningcode.VORHANDEN, VorhandenDefiningcode.VORHANDEN, VorhandenDefiningcode.NICHT_VORHANDEN, Language.DE) + new Tuple(VorhandenDefiningCode.VORHANDEN, VorhandenDefiningCode.VORHANDEN, VorhandenDefiningCode.NICHT_VORHANDEN, Language.DE) ); @@ -193,9 +193,9 @@ public void testCoronaWithJoin() throws IOException { // @formatter:on - EntityQuery> entityQuery = Query.buildEntityQuery( + EntityQuery> entityQuery = Query.buildEntityQuery( containmentExpression, - hustenObservationContainment.VORHANDEN_DEFININGCODE, + hustenObservationContainment.VORHANDEN_DEFINING_CODE, coronaAnamneseCompositionContainment.LANGUAGE, reisefallObservationContainment.LANGUAGE ); @@ -204,7 +204,7 @@ public void testCoronaWithJoin() throws IOException { /* Select - o0/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value/defining_code as F0, + o0/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value/defining_Code as F0, c1/language as F1, o2/language as F2 from EHR e @@ -217,14 +217,15 @@ public void testCoronaWithJoin() throws IOException { ) where e/ehr_id/value = $parm0 */ - List> actual = openEhrClient.aqlEndpoint().execute(entityQuery, ehrIdParameter.setValue(ehr)); + List> actual = openEhrClient.aqlEndpoint().execute(entityQuery, ehrIdParameter.setValue(ehr)); assertThat(actual).extracting(Record3::value1, Record3::value2, Record3::value3) - .containsExactlyInAnyOrder(new Tuple(VorhandenDefiningcode.VORHANDEN, Language.DE, Language.DE)); + .containsExactlyInAnyOrder(new Tuple(VorhandenDefiningCode.VORHANDEN, Language.DE, Language.DE)); } + /** * see https://wiki.vitagroup.ag/display/NUM/Research+Repository * containment test: @@ -232,6 +233,7 @@ public void testCoronaWithJoin() throws IOException { * contains ADMIN_ENTRY m[openEHR-EHR-ADMIN_ENTRY.hospitalization.v0] * contains CLUSTER k[openEHR-EHR-CLUSTER.location.v1] */ + @Test public void testNUMResearchCase_1_2(){ UUID ehr = openEhrClient.ehrEndpoint().createEhr(); @@ -247,22 +249,23 @@ public void testNUMResearchCase_1_2(){ patientenaufenthaltCompositionContainment.setContains(versorgungsortAdminEntryContainment); //select set values from test data - EntityQuery> entityQuery = Query.buildEntityQuery( + EntityQuery> entityQuery = Query.buildEntityQuery( patientenaufenthaltCompositionContainment, standortClusterContainment.STANDORTTYP_VALUE, standortClusterContainment.STANDORTBESCHREIBUNG_VALUE, - standortClusterContainment.STANDORTSCHLUSSEL_DEFININGCODE); + standortClusterContainment.STANDORTSCHLUSSEL_DEFINING_CODE); Parameter ehrIdParameter = entityQuery.buildParameter(); entityQuery.where(Condition.equal(EhrFields.EHR_ID(), ehrIdParameter)); - List> actual = openEhrClient.aqlEndpoint().execute(entityQuery, ehrIdParameter.setValue(ehr)); + List> actual = openEhrClient.aqlEndpoint().execute(entityQuery, ehrIdParameter.setValue(ehr)); assertThat(actual).extracting(Record3::value1, Record3::value2, Record3::value3) - .containsExactlyInAnyOrder(new Tuple("Test", "Beschreibung", StandortschlusselDefiningcode.ANGIOLOGIE)); + .containsExactlyInAnyOrder(new Tuple("Test", "Beschreibung", StandortschlusselDefiningCode.ANGIOLOGIE)); } + /** * see https://wiki.vitagroup.ag/display/NUM/Research+Repository * @@ -332,6 +335,7 @@ public void testNUMResearchCase_3() throws IOException { * and ADMIN_ENTRY u[openEHR-EHR-ADMIN_ENTRY.hospitalization.v0] * contains (CLUSTER a[openEHR-EHR-CLUSTER.location.v1])) */ + @Test public void testNUMResearchCase_5(){ UUID ehr = openEhrClient.ehrEndpoint().createEhr(); @@ -373,6 +377,8 @@ public void testNUMResearchCase_5(){ } + + /** * see https://wiki.vitagroup.ag/display/NUM/Research+Repository * @@ -383,6 +389,7 @@ public void testNUMResearchCase_5(){ * ADMIN_ENTRY p[openEHR-EHR-ADMIN_ENTRY.admission.v0] and * ADMIN_ENTRY b[openEHR-EHR-ADMIN_ENTRY.discharge_summary.v0]) */ + @Test public void testNUMResearchCase_6(){ UUID ehr = openEhrClient.ehrEndpoint().createEhr(); @@ -436,7 +443,6 @@ public void testNUMResearchCase_6(){ * CLUSTER q[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]) */ @Test -// @Ignore public void testNUMResearchCase_8() { VirologischerBefundComposition virologischerBefundComposition = TestData.buildTestVirologischerBefundComposition(); diff --git a/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestAqlEndpointTestIT.java b/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestAqlEndpointTestIT.java index db4b85889..3f19b08b7 100644 --- a/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestAqlEndpointTestIT.java +++ b/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestAqlEndpointTestIT.java @@ -38,8 +38,8 @@ import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.EhrbaseBloodPressureSimpleDeV0CompositionContainment; import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.BloodPressureTrainingSampleObservation; import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.BloodPressureTrainingSampleObservationContainment; -import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.CuffSizeDefiningcode; -import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.KorotkoffSoundsDefiningcode; +import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.CuffSizeDefiningCode; +import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.KorotkoffSoundsDefiningCode; import org.ehrbase.client.openehrclient.OpenEhrClient; import org.ehrbase.client.openehrclient.VersionUid; import org.junit.BeforeClass; @@ -142,22 +142,22 @@ public void testExecuteEntityQuery() { containmentComposition.setContains(containmentObservation); - EntityQuery> entityQuery = Query.buildEntityQuery( + EntityQuery> entityQuery = Query.buildEntityQuery( containmentComposition, containmentComposition.START_TIME_VALUE, containmentObservation.BLOOD_PRESSURE_TRAINING_SAMPLE_OBSERVATION, - containmentObservation.CUFF_SIZE_DEFININGCODE + containmentObservation.CUFF_SIZE_DEFINING_CODE ); Parameter ehrIdParameter = entityQuery.buildParameter(); entityQuery.where(Condition.equal(EhrFields.EHR_ID(), ehrIdParameter)); - List> actual = openEhrClient.aqlEndpoint().execute(entityQuery, ehrIdParameter.setValue(ehr)); + List> actual = openEhrClient.aqlEndpoint().execute(entityQuery, ehrIdParameter.setValue(ehr)); assertThat(actual).size().isEqualTo(2); - Record3 record1 = actual.get(0); + Record3 record1 = actual.get(0); assertThat(record1.value1()).isEqualTo(OffsetDateTime.of(2019, 04, 03, 22, 00, 00, 00, ZoneOffset.UTC)); - assertThat(record1.value2().getKorotkoffSoundsDefiningcode()).isEqualTo(KorotkoffSoundsDefiningcode.FIFTH_SOUND); - assertThat(record1.value3()).isEqualTo(CuffSizeDefiningcode.ADULT); + assertThat(record1.value2().getKorotkoffSoundsDefiningCode()).isEqualTo(KorotkoffSoundsDefiningCode.FIFTH_SOUND); + assertThat(record1.value3()).isEqualTo(CuffSizeDefiningCode.ADULT); } diff --git a/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestCompositionEndpointIT.java b/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestCompositionEndpointIT.java index e51356445..8b8083a13 100644 --- a/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestCompositionEndpointIT.java +++ b/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestCompositionEndpointIT.java @@ -25,20 +25,20 @@ import org.ehrbase.client.Integration; import org.ehrbase.client.TestData; import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.EhrbaseBloodPressureSimpleDeV0Composition; -import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.KorotkoffSoundsDefiningcode; +import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.KorotkoffSoundsDefiningCode; import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.EhrbaseMultiOccurrenceDeV1Composition; import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureAnyEventPointEvent; import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementChoice; -import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementDvcodedtext; -import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementDvtext; +import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementDvCodedText; +import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementDvText; import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureObservation; -import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.LocationOfMeasurementDefiningcode; +import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.LocationOfMeasurementDefiningCode; import org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.EpisodeOfCareComposition; import org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition.EpisodeofcareAdminEntry; import org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition.EpisodeofcareTeamElement; -import org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode; import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.VirologischerBefundComposition; import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.ProVirusCluster; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; import org.ehrbase.client.exception.OptimisticLockException; import org.ehrbase.client.flattener.Flattener; import org.ehrbase.client.openehrclient.CompositionEndpoint; @@ -48,6 +48,7 @@ import org.ehrbase.serialisation.jsonencoding.CanonicalJson; import org.ehrbase.test_data.composition.CompositionTestDataCanonicalJson; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -82,7 +83,7 @@ public void testSaveCompositionEntity() { assertThat(bloodPressureSimpleDeV0.getVersionUid()).isNotNull(); assertThat(bloodPressureSimpleDeV0.getVersionUid().getVersion()).isEqualTo(1L); - bloodPressureSimpleDeV0.setSettingDefiningcode(SettingDefiningcode.EMERGENCY_CARE); + bloodPressureSimpleDeV0.setSettingDefiningCode(Setting.EMERGENCY_CARE); openEhrClient.compositionEndpoint(ehr).mergeCompositionEntity(bloodPressureSimpleDeV0); assertThat(bloodPressureSimpleDeV0.getVersionUid()).isNotNull(); assertThat(bloodPressureSimpleDeV0.getVersionUid().getVersion()).isEqualTo(2L); @@ -121,7 +122,7 @@ public void testFind() { assertThat(actual.get().getBloodPressureTrainingSample().get(0).getSubject()).isNotNull().extracting(Object::getClass).isEqualTo(PartySelf.class); assertThat(actual.get().getBloodPressureTrainingSample().get(0).getSystolicMagnitude()).isEqualTo(22d); assertThat(actual.get().getBloodPressureTrainingSample().get(0).getSystolicUnits()).isEqualTo("mm[Hg]"); - assertThat(actual.get().getBloodPressureTrainingSample().get(0).getKorotkoffSoundsDefiningcode()).isEqualTo(KorotkoffSoundsDefiningcode.FIFTH_SOUND); + assertThat(actual.get().getBloodPressureTrainingSample().get(0).getKorotkoffSoundsDefiningCode()).isEqualTo(KorotkoffSoundsDefiningCode.FIFTH_SOUND); } @Test @@ -141,17 +142,18 @@ public void testEhrbaseMultiOccurrenceDeV1() { .containsExactlyInAnyOrder(11d, 22d); BodyTemperatureLocationOfMeasurementChoice locationOfMeasurement1 = bodyTemperature1.getLocationOfMeasurement(); - assertThat(locationOfMeasurement1.getClass()).isEqualTo(BodyTemperatureLocationOfMeasurementDvcodedtext.class); - assertThat(((BodyTemperatureLocationOfMeasurementDvcodedtext) locationOfMeasurement1).getLocationOfMeasurementDefiningcode()).isEqualTo(LocationOfMeasurementDefiningcode.FOREHEAD); + assertThat(locationOfMeasurement1.getClass()).isEqualTo(BodyTemperatureLocationOfMeasurementDvCodedText.class); + assertThat(((BodyTemperatureLocationOfMeasurementDvCodedText) locationOfMeasurement1).getLocationOfMeasurementDefiningCode()).isEqualTo(LocationOfMeasurementDefiningCode.FOREHEAD); BodyTemperatureObservation bodyTemperature2 = actual.get().getBodyTemperature().get(1); BodyTemperatureLocationOfMeasurementChoice locationOfMeasurement2 = bodyTemperature2.getLocationOfMeasurement(); - assertThat(locationOfMeasurement2.getClass()).isEqualTo(BodyTemperatureLocationOfMeasurementDvtext.class); - assertThat(((BodyTemperatureLocationOfMeasurementDvtext) locationOfMeasurement2).getLocationOfMeasurementValue()).isEqualTo("location"); + assertThat(locationOfMeasurement2.getClass()).isEqualTo(BodyTemperatureLocationOfMeasurementDvText.class); + assertThat(((BodyTemperatureLocationOfMeasurementDvText) locationOfMeasurement2).getLocationOfMeasurementValue()).isEqualTo("location"); } @Test + @Ignore public void testEpisodeOfCare() { UUID ehr = openEhrClient.ehrEndpoint().createEhr(); diff --git a/generator/pom.xml b/generator/pom.xml index fe49536af..5f5b09663 100644 --- a/generator/pom.xml +++ b/generator/pom.xml @@ -115,7 +115,7 @@ libs/ false - org.ehrbase.client.classgenerator.ClassGenerator + org.ehrbase.client.classgenerator.ClassGeneratorRunner diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java deleted file mode 100644 index 3d1800de9..000000000 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java +++ /dev/null @@ -1,489 +0,0 @@ -/* - * - * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School - * * This file is part of Project EHRbase - * * - * * Licensed under the Apache License, Version 2.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * * - * * http://www.apache.org/licenses/LICENSE-2.0 - * * - * * Unless required by applicable law or agreed to in writing, software - * * distributed under the License is distributed on an "AS IS" BASIS, - * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * * See the License for the specific language governing permissions and - * * limitations under the License. - * - */ - -package org.ehrbase.client.classgenerator; - -import com.nedap.archie.rm.datatypes.CodePhrase; -import com.nedap.archie.rminfo.ArchieRMInfoLookup; -import com.nedap.archie.rminfo.RMTypeInfo; -import com.squareup.javapoet.AnnotationSpec; -import com.squareup.javapoet.ClassName; -import com.squareup.javapoet.FieldSpec; -import com.squareup.javapoet.JavaFile; -import com.squareup.javapoet.MethodSpec; -import com.squareup.javapoet.ParameterizedTypeName; -import com.squareup.javapoet.TypeName; -import com.squareup.javapoet.TypeSpec; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.DefaultParser; -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.RandomStringUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.reflect.FieldUtils; -import org.apache.commons.text.CaseUtils; -import org.apache.xmlbeans.XmlException; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Choice; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Id; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.config.RmClassGeneratorConfig; -import org.ehrbase.client.flattener.PathExtractor; -import org.ehrbase.client.introspect.TemplateIntrospect; -import org.ehrbase.client.introspect.node.ArchetypeNode; -import org.ehrbase.client.introspect.node.ChoiceNode; -import org.ehrbase.client.introspect.node.EndNode; -import org.ehrbase.client.introspect.node.EntityNode; -import org.ehrbase.client.introspect.node.Node; -import org.ehrbase.client.introspect.node.SlotNode; -import org.ehrbase.client.introspect.node.TemplateNode; -import org.ehrbase.client.openehrclient.VersionUid; -import org.ehrbase.serialisation.util.SnakeCase; -import org.ehrbase.terminology.client.terminology.ValueSet; -import org.ehrbase.util.reflection.ReflectionHelper; -import org.openehr.schemas.v1.OPERATIONALTEMPLATE; -import org.openehr.schemas.v1.TemplateDocument; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.lang.model.SourceVersion; -import javax.lang.model.element.Modifier; -import java.io.IOException; -import java.lang.reflect.Field; -import java.nio.file.Paths; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - -public class ClassGenerator { - - private static final Options OPTIONS = new Options(); - private static final ArchieRMInfoLookup RM_INFO_LOOKUP = ArchieRMInfoLookup.getInstance(); - public static final String ABBREV_MARKER = "_"; - public static final int CLASS_NAME_MAX_WIDTH = 80; - private static final Map, RmClassGeneratorConfig> configMap = ReflectionHelper.buildMap(RmClassGeneratorConfig.class); - - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - - private Map currentFieldNameMap = new HashMap<>(); - private Map currentClassNameMap = new HashMap<>(); - private Map currentTypeSpec; - private Map currentEnums; - - private ClassGeneratorResult currentResult; - private String currentPackageName; - private String currentMainClass; - private String currentArchetypeName = ""; - - - private static String normalise(String name, boolean capitalizeFirstLetter) { - if (StringUtils.isBlank(name) || name.equals("_")) { - return RandomStringUtils.randomAlphabetic(10); - } - String normalisedString = StringUtils.strip(StringUtils.stripAccents(name).replace("ß", "ss").replaceAll("[^A-Za-z0-9]", "_"), "_"); - return CaseUtils.toCamelCase(normalisedString, capitalizeFirstLetter, '_'); - } - - public static void main(String[] args) throws IOException, XmlException { - - - OPTIONS.addOption("opt", true, "path to opt file"); - OPTIONS.addOption("package", true, "package name"); - OPTIONS.addOption("out", true, "path to output directory"); - OPTIONS.addOption("h", false, "show help"); - - CommandLineParser parser = new DefaultParser(); - CommandLine cmd = null; - try { - cmd = parser.parse(OPTIONS, args); - } catch (ParseException e) { - System.out.println(String.format("Error parsing commandline %s", e.getMessage())); - showHelp(); - } - - if (cmd.hasOption("h")) { - showHelp(); - } - - if (!cmd.hasOption("opt") || !cmd.hasOption("package") || !cmd.hasOption("out")) { - showHelp(); - } - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(Paths.get(cmd.getOptionValue("opt")).toFile()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(cmd.getOptionValue("package"), template); - - java.nio.file.Path fsRoot = Paths.get(cmd.getOptionValue("out")); - - List generateFiles = generate.writeFiles(fsRoot); - FieldGenerator fieldGenerator = new FieldGenerator(); - fieldGenerator.generate(generateFiles).writeFiles(fsRoot); - } - - private static void showHelp() { - - HelpFormatter formatter = new HelpFormatter(); - - formatter.printHelp("java -jar client-library.jar ", OPTIONS); - - System.exit(0); - - } - - public ClassGeneratorResult generate(String packageName, OPERATIONALTEMPLATE operationalTemplate) { - currentTypeSpec = new HashMap<>(); - currentEnums = new HashMap<>(); - currentResult = new ClassGeneratorResult(); - currentPackageName = packageName; - currentMainClass = ""; - ArchetypeNode root = new TemplateIntrospect(operationalTemplate).getRoot(); - String templateId = operationalTemplate.getTemplateId().getValue(); - - TemplateNode templateNode = new TemplateNode(templateId, root.getArchetypeId(), root.getChildren(), templateId, operationalTemplate.getDefinition().getRmTypeName()); - TypeSpec build = build(templateNode).build(); - currentResult.addClass(currentPackageName + "." + currentMainClass.toLowerCase(), build); - return currentResult; - } - - private TypeSpec.Builder build(EntityNode archetypeNode) { - Map oldFieldNameMap = currentFieldNameMap; - currentFieldNameMap = new HashMap<>(); - String name; - if (ArchetypeNode.class.isAssignableFrom(archetypeNode.getClass())) { - currentArchetypeName = ""; - } - name = new SnakeCase(archetypeNode.getName()).camelToSnake() + "_" + archetypeNode.getRmName(); - - String className = buildClassName(name, true); - if (ArchetypeNode.class.isAssignableFrom(archetypeNode.getClass())) { - currentArchetypeName = archetypeNode.getName(); - } - TypeSpec.Builder classBuilder = TypeSpec.classBuilder(className); - if (StringUtils.isBlank(currentMainClass)) { - currentMainClass = className; - } - classBuilder.addModifiers(Modifier.PUBLIC); - classBuilder.addAnnotation(AnnotationSpec.builder(Entity.class).build()); - - if (archetypeNode instanceof ArchetypeNode) { - AnnotationSpec archetypeAnnotation = AnnotationSpec.builder(Archetype.class).addMember(Archetype.VALUE, "$S", ((ArchetypeNode) archetypeNode).getArchetypeId()).build(); - classBuilder.addAnnotation(archetypeAnnotation); - } - - if (archetypeNode instanceof TemplateNode) { - AnnotationSpec templateAnnotation = AnnotationSpec.builder(Template.class).addMember(Template.VALUE, "$S", ((TemplateNode) archetypeNode).getTemplateId()).build(); - classBuilder.addAnnotation(templateAnnotation); - - addVersionUid(classBuilder); - - } - - for (Map.Entry entry : archetypeNode.getChildren().entrySet()) { - if (entry.getValue() instanceof EndNode) { - addSimpleField(classBuilder, entry.getKey(), (EndNode) entry.getValue()); - } else if (entry.getValue() instanceof EntityNode) { - addComplexField(classBuilder, entry.getKey(), (EntityNode) entry.getValue()); - } else if (entry.getValue() instanceof ChoiceNode) { - addChoiceField(classBuilder, entry.getKey(), (ChoiceNode) entry.getValue()); - } - } - currentFieldNameMap = oldFieldNameMap; - return classBuilder; - } - - private void addVersionUid(TypeSpec.Builder classBuilder) { - FieldSpec versionUid = FieldSpec.builder(VersionUid.class, "versionUid", Modifier.PRIVATE).addAnnotation(Id.class).build(); - classBuilder.addField(versionUid); - classBuilder.addMethod(buildGetter(versionUid)); - classBuilder.addMethod(buildSetter(versionUid)); - currentFieldNameMap.put("versionUid", 1); - } - - private void addChoiceField(TypeSpec.Builder classBuilder, String path, ChoiceNode choiceNode) { - - TypeSpec interfaceSpec = TypeSpec.interfaceBuilder(buildClassName(choiceNode.getName() + "_choice", true)) - .addModifiers(Modifier.PUBLIC) - .build(); - - String interfacePackage = currentPackageName + "." + currentMainClass.toLowerCase() + ".definition"; - currentResult.addClass(interfacePackage, interfaceSpec); - TypeName interfaceClassName = ClassName.get(interfacePackage, interfaceSpec.name); - - for (Node node : choiceNode.getNodes()) { - Map oldFieldNameMap = currentFieldNameMap; - currentFieldNameMap = new HashMap<>(); - TypeSpec typeSpec; - if (EndNode.class.isAssignableFrom(node.getClass())) { - EndNode endNode = (EndNode) node; - RMTypeInfo typeInfo = RM_INFO_LOOKUP.getTypeInfo(endNode.getClazz()); - TypeSpec.Builder builder = TypeSpec.classBuilder(buildClassName(choiceNode.getName() + "_" + endNode.getClazz().getSimpleName(), true)) - .addSuperinterface(interfaceClassName) - .addModifiers(Modifier.PUBLIC) - .addAnnotation(AnnotationSpec.builder(Entity.class).build()) - .addAnnotation(AnnotationSpec.builder(OptionFor.class).addMember(OptionFor.VALUE, "$S", typeInfo.getRmName()).build()); - addSimpleField(builder, "", endNode); - typeSpec = builder.build(); - } else if (EntityNode.class.isAssignableFrom(node.getClass())) { - TypeSpec.Builder builder = build((EntityNode) node); - builder - .addSuperinterface(interfaceClassName) - .addAnnotation(AnnotationSpec.builder(OptionFor.class).addMember(OptionFor.VALUE, "$S", ((EntityNode) node).getRmName()).build()); - typeSpec = builder.build(); - } else { - logger.warn("Unhandled Option {}:{}", node.getName(), node.getClass()); - typeSpec = null; - } - - if (typeSpec != null) { - currentResult.addClass(currentPackageName + "." + currentMainClass.toLowerCase() + ".definition", typeSpec); - } - currentFieldNameMap = oldFieldNameMap; - } - - if (choiceNode.isMulti()) { - interfaceClassName = ParameterizedTypeName.get(ClassName.get(List.class), interfaceClassName); - } - - addField(classBuilder, path, choiceNode.getName(), interfaceClassName, new ValueSet(ValueSet.LOCAL, ValueSet.LOCAL, Collections.emptySet()), true); - } - - private void addSimpleField(TypeSpec.Builder classBuilder, String path, EndNode endNode) { - - if (endNode.getClazz() == null) { - logger.warn("No class for path {} ", path); - return; - } - RmClassGeneratorConfig classGeneratorConfig = configMap.get(endNode.getClazz()); - if (classGeneratorConfig == null && !endNode.getClazz().getName().contains("java.lang")) { - logger.debug("No ClassGenerator for {}", endNode.getClazz()); - } - if (classGeneratorConfig == null || !classGeneratorConfig.isExpandField() || endNode instanceof SlotNode) { - - TypeName className = ClassName.get(Optional.ofNullable(endNode.getClazz()).orElse(Object.class)); - if (endNode.isMulti()) { - className = ParameterizedTypeName.get(ClassName.get(List.class), className); - } - - addField(classBuilder, path, endNode.getName(), className, endNode.getValuset(), false); - } else { - Map fieldMap = Arrays.stream(FieldUtils.getAllFields(endNode.getClazz())).filter(f -> !f.isSynthetic()).collect(Collectors.toMap(Field::getName, f -> f)); - Set expandFields = classGeneratorConfig.getExpandFields(); - expandFields.forEach(fieldName -> addField(classBuilder, path + "|" + new SnakeCase(fieldName).camelToSnake(), endNode.getName() + "_" + fieldName, ClassName.get(fieldMap.get(fieldName).getType()), endNode.getValuset(), false)); - } - } - - private void addComplexField(TypeSpec.Builder classBuilder, String path, EntityNode node) { - final TypeSpec subSpec; - if (currentTypeSpec.containsKey(node)) { - subSpec = currentTypeSpec.get(node); - } else { - subSpec = build(node).build(); - currentTypeSpec.put(node, subSpec); - } - - - String subSpecPackage = currentPackageName + "." + currentMainClass.toLowerCase() + ".definition"; - - currentResult.addClass(subSpecPackage, subSpec); - TypeName className = ClassName.get(subSpecPackage, subSpec.name); - if (node.isMulti()) { - className = ParameterizedTypeName.get(ClassName.get(List.class), className); - } - addField(classBuilder, path, node.getName(), className, new ValueSet(ValueSet.LOCAL, ValueSet.LOCAL, Collections.emptySet()), false); - } - - /** - * Manipulate the fieldName to remove or replace illegal characters - * - * @param fieldName - * @return normalized fieldName for Java naming convention - */ - private String toEnumName(String fieldName) { - fieldName = sanitizeNumber(fieldName); - return new SnakeCase(normalise(fieldName, false)).camelToUpperSnake(); - } - - private String sanitizeNumber(String fieldName) { - if (!Character.isAlphabetic(fieldName.charAt(0))) { - if (Character.isLowerCase(fieldName.charAt(0))) { - fieldName = "n" + fieldName; - } else { - fieldName = "N" + fieldName; - } - } - return fieldName; - } - - private TypeSpec buildEnumValueSet(String name, ValueSet valueSet) { - TypeSpec.Builder enumBuilder = TypeSpec - .enumBuilder(buildClassName(name, false)) - .addSuperinterface(EnumValueSet.class) - .addModifiers(Modifier.PUBLIC); - FieldSpec fieldSpec1 = FieldSpec.builder(ClassName.get(String.class), "value").addModifiers(Modifier.PRIVATE).build(); - enumBuilder.addField(fieldSpec1); - FieldSpec fieldSpec2 = FieldSpec.builder(ClassName.get(String.class), "description").addModifiers(Modifier.PRIVATE).build(); - enumBuilder.addField(fieldSpec2); - FieldSpec fieldSpec3 = FieldSpec.builder(ClassName.get(String.class), "terminologyId").addModifiers(Modifier.PRIVATE).build(); - enumBuilder.addField(fieldSpec3); - FieldSpec fieldSpec4 = FieldSpec.builder(ClassName.get(String.class), "code").addModifiers(Modifier.PRIVATE).build(); - enumBuilder.addField(fieldSpec4); - - MethodSpec constructor = buildConstructor(fieldSpec1, fieldSpec2, fieldSpec3, fieldSpec4); - enumBuilder.addMethod(constructor); - valueSet.getTherms().forEach(t -> { - String fieldName = extractSubName(t.getValue()); - enumBuilder.addEnumConstant(toEnumName(fieldName), TypeSpec.anonymousClassBuilder("$S, $S, $S, $S", t.getValue(), t.getDescription(), valueSet.getTerminologyId(), t.getCode()).build()); - }); - - enumBuilder.addMethod(buildGetter(fieldSpec1)); - enumBuilder.addMethod(buildGetter(fieldSpec2)); - enumBuilder.addMethod(buildGetter(fieldSpec3)); - enumBuilder.addMethod(buildGetter(fieldSpec4)); - return enumBuilder.build(); - } - - private MethodSpec buildConstructor(FieldSpec... fieldSpecs) { - MethodSpec.Builder builder = MethodSpec.constructorBuilder(); - for (FieldSpec fieldSpec : fieldSpecs) { - builder.addParameter(fieldSpec.type, fieldSpec.name) - .addStatement("this.$N = $N", fieldSpec.name, fieldSpec.name); - } - return builder.build(); - } - - private void addField(TypeSpec.Builder classBuilder, String path, String name, TypeName className, ValueSet valueSet, boolean addChoiceAnnotation) { - - - if (CodePhrase.class.getName().equals(className.toString()) && CollectionUtils.isNotEmpty(valueSet.getTherms())) { - - final TypeSpec enumValueSet = currentEnums.computeIfAbsent(valueSet, vs -> buildEnumValueSet(name, vs)); - - String enumPackage; - if (valueSet.getId().equals("local") || valueSet.getTerminologyId().equals("local")) { - enumPackage = currentPackageName + "." + currentMainClass.toLowerCase() + ".definition"; - } else { - enumPackage = currentPackageName + ".shareddefinition"; - } - currentResult.addClass(enumPackage, enumValueSet); - className = ClassName.get(enumPackage, enumValueSet.name); - } - - PathExtractor pathExtractor = new PathExtractor(path); - String parentPath = pathExtractor.getParentPath(); - String childPath = pathExtractor.getChildPath(); - String fieldName = buildFieldName(parentPath + TemplateIntrospect.TERM_DIVIDER + childPath + TemplateIntrospect.TERM_DIVIDER + name); - FieldSpec.Builder builder = FieldSpec.builder(className, fieldName) - .addAnnotation(AnnotationSpec.builder(Path.class).addMember(Path.VALUE, "$S", path).build()) - .addModifiers(Modifier.PRIVATE); - - if (addChoiceAnnotation) { - builder.addAnnotation(Choice.class); - } - - FieldSpec fieldSpec = builder - .build(); - classBuilder.addField(fieldSpec); - - classBuilder.addMethod(buildSetter(fieldSpec)); - classBuilder.addMethod(buildGetter(fieldSpec)); - } - - private String buildFieldName(String name) { - String[] strings = Arrays.stream(name.split(TemplateIntrospect.TERM_DIVIDER)).filter(StringUtils::isNotBlank).toArray(String[]::new); - - String fieldName = ""; - String nonNormalized = ""; - for (int i = 0; i < strings.length; i++) { - nonNormalized = nonNormalized + "_" + strings[strings.length - (i + 1)]; - fieldName = normalise(nonNormalized, false); - if (!currentFieldNameMap.containsKey(fieldName) && SourceVersion.isName(fieldName)) { - break; - } - } - - if (currentFieldNameMap.containsKey(fieldName)) { - currentFieldNameMap.put(fieldName, currentFieldNameMap.get(fieldName) + 1); - fieldName = fieldName + currentFieldNameMap.get(fieldName); - } else { - currentFieldNameMap.put(fieldName, 1); - } - fieldName = sanitizeNumber(fieldName); - return fieldName; - } - - String buildClassName(String name, boolean addArchetypeName) { - String[] strings = Arrays.stream(name.split(TemplateIntrospect.TERM_DIVIDER)).filter(StringUtils::isNotBlank).toArray(String[]::new); - String fieldName = ""; - String nonNormalized = ""; - for (int i = 0; i < strings.length; i++) { - nonNormalized = nonNormalized + "_" + strings[strings.length - (i + 1)]; - if (addArchetypeName) { - nonNormalized = new SnakeCase(currentArchetypeName).camelToSnake() + "_" + nonNormalized; - } - fieldName = StringUtils.abbreviate(normalise(nonNormalized, true), ABBREV_MARKER, CLASS_NAME_MAX_WIDTH); - if (!currentClassNameMap.containsKey(fieldName) && SourceVersion.isName(fieldName)) { - break; - } - } - - if (currentClassNameMap.containsKey(fieldName)) { - currentClassNameMap.put(fieldName, currentClassNameMap.get(fieldName) + 1); - fieldName = fieldName + currentClassNameMap.get(fieldName); - } else { - currentClassNameMap.put(fieldName, 1); - } - fieldName = sanitizeNumber(fieldName); - return fieldName; - } - - private MethodSpec buildSetter(FieldSpec fieldSpec) { - - return MethodSpec.methodBuilder("set" + StringUtils.capitalize(fieldSpec.name)).addModifiers(Modifier.PUBLIC) - .addStatement(" this.$N = $N", fieldSpec.name, fieldSpec.name) - .addParameter(fieldSpec.type, fieldSpec.name).build(); - } - - private MethodSpec buildGetter(FieldSpec fieldSpec) { - String prefix; - if (Boolean.class.getTypeName().equals(fieldSpec.type.toString())) { - prefix = "is"; - } else { - prefix = "get"; - } - return MethodSpec.methodBuilder(prefix + StringUtils.capitalize(fieldSpec.name)).addModifiers(Modifier.PUBLIC) - .addStatement(" return this.$N ", fieldSpec.name) - .returns(fieldSpec.type).build(); - } - - private String extractSubName(String name) { - String[] strings = name.split(TemplateIntrospect.TERM_DIVIDER); - return strings[strings.length - 1]; - } -} diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorConfig.java b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorConfig.java index 30928c6cd..9aaad542b 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorConfig.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorConfig.java @@ -19,5 +19,4 @@ package org.ehrbase.client.classgenerator; -public class ClassGeneratorConfig { -} +public class ClassGeneratorConfig {} diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java index 3511989ee..462aa79fb 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java @@ -142,7 +142,6 @@ private void addVersionUid(TypeSpec.Builder classBuilder) { private TypeSpec.Builder build(Context context, WebTemplateNode next) { - String className = defaultNamingStrategy.buildClassName(context, next, false, false); context.currentFieldNameMap.push(new HashMap<>()); @@ -165,11 +164,9 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { classBuilder.addAnnotation(archetypeAnnotation); } - - if (next.getChildren().stream().anyMatch(n -> n.getRmType().equals("EVENT"))) { WebTemplateNode event = - next.getChildren().stream().filter(n -> n.getRmType().equals("EVENT")).findAny().get(); + next.getChildren().stream().filter(n -> n.getRmType().equals("EVENT")).findAny().get(); WebTemplateNode pointEvent = new WebTemplateNode(event); WebTemplateNode intervalEvent = new WebTemplateNode(event); pointEvent.setRmType("POINT_EVENT"); @@ -194,9 +191,10 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { } Map> choices = next.getChoicesInChildren(); List children = - next.getChildren().stream() - .filter(c -> choices.values().stream().flatMap(List::stream).noneMatch(l -> l.equals(c))) - .collect(Collectors.toList()); + next.getChildren().stream() + .filter( + c -> choices.values().stream().flatMap(List::stream).noneMatch(l -> l.equals(c))) + .collect(Collectors.toList()); for (WebTemplateNode child : children) { Deque filtersNodes = pushToUnfiltered(context, child); @@ -210,15 +208,13 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { } else if (!choices.containsKey(child.getAqlPath())) { addComplexField(context, classBuilder, relativPath, child); } - if (!CollectionUtils.isEmpty(filtersNodes)){ + if (!CollectionUtils.isEmpty(filtersNodes)) { filtersNodes.forEach(n -> context.unFilteredNodeDeque.poll()); } } for (List choice : choices.values()) { - - WebTemplateNode node = choice.get(0); WebTemplateNode relativeNode = buildRelativeNode(context, node); Deque filtersNodes = pushToUnfiltered(context, node); @@ -227,16 +223,17 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { if (context.currentTypeSpec.containsKey(relativeNode)) { interfaceSpec = context.currentTypeSpec.get(relativeNode); String interfacePackage = - context.currentPackageName - + "." - + context.currentMainClass.toLowerCase() - + ".definition"; + context.currentPackageName + + "." + + context.currentMainClass.toLowerCase() + + ".definition"; context.classes.put(interfacePackage, interfaceSpec); interfaceClassName = ClassName.get(interfacePackage, interfaceSpec.name); } else { interfaceSpec = - TypeSpec.interfaceBuilder(defaultNamingStrategy.buildClassName(context, choice.get(0), true, false)) + TypeSpec.interfaceBuilder( + defaultNamingStrategy.buildClassName(context, choice.get(0), true, false)) .addModifiers(Modifier.PUBLIC) .build(); context.currentTypeSpec.put(relativeNode, interfaceSpec); @@ -247,7 +244,7 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { + context.currentMainClass.toLowerCase() + ".definition"; context.classes.put(interfacePackage, interfaceSpec); - interfaceClassName = ClassName.get(interfacePackage, interfaceSpec.name); + interfaceClassName = ClassName.get(interfacePackage, interfaceSpec.name); for (WebTemplateNode child : choice) { TypeSpec.Builder build = build(context, child); @@ -265,8 +262,7 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { ParameterizedTypeName.get(ClassName.get(List.class), interfaceClassName); } String relativPath = - FlatPath.removeStart( - new FlatPath(node.getAqlPath()), new FlatPath(next.getAqlPath())) + FlatPath.removeStart(new FlatPath(node.getAqlPath()), new FlatPath(next.getAqlPath())) .toString(); addField( context, @@ -277,7 +273,7 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { new ValueSet(ValueSet.LOCAL, ValueSet.LOCAL, Collections.emptySet()), true); - if (!CollectionUtils.isEmpty(filtersNodes)){ + if (!CollectionUtils.isEmpty(filtersNodes)) { filtersNodes.forEach(n -> context.unFilteredNodeDeque.poll()); } } @@ -285,11 +281,10 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { context.currentArchetypeName.poll(); } - if (children.isEmpty() && choices.isEmpty()){ + if (children.isEmpty() && choices.isEmpty()) { addSimpleField(context, classBuilder, "", next); } - context.currentFieldNameMap.poll(); context.nodeDeque.poll(); @@ -300,12 +295,11 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { private Deque pushToUnfiltered(Context context, WebTemplateNode node) { Deque filtersNodes = context.webTemplate.findFiltersNodes(node); if (!CollectionUtils.isEmpty(filtersNodes)) { - filtersNodes.descendingIterator().forEachRemaining(context.unFilteredNodeDeque::push); + filtersNodes.descendingIterator().forEachRemaining(context.unFilteredNodeDeque::push); } return filtersNodes; } - private void addComplexField( Context context, TypeSpec.Builder classBuilder, String path, WebTemplateNode node) { @@ -372,7 +366,7 @@ private void addSimpleField( if (classGeneratorConfig == null || !classGeneratorConfig.isExpandField()) { TypeName className = ClassName.get(Optional.ofNullable(clazz).orElse(Object.class)); - if (endNode.getMax() != 1) { + if (endNode.isMulti() && !context.nodeDeque.peek().getRmType().equals("ELEMENT")) { className = ParameterizedTypeName.get(ClassName.get(List.class), className); } @@ -477,10 +471,7 @@ private void addField( } } - String fieldName = - defaultNamingStrategy.buildFieldName( - context, - path, node); + String fieldName = defaultNamingStrategy.buildFieldName(context, path, node); FieldSpec.Builder builder = FieldSpec.builder(className, fieldName) .addAnnotation( @@ -531,7 +522,7 @@ private TypeSpec buildEnumValueSet(Context context, WebTemplateNode node, ValueS .forEach( t -> { enumBuilder.addEnumConstant( - defaultNamingStrategy.toEnumName(t.getValue()), + defaultNamingStrategy.toEnumName(t.getValue()), TypeSpec.anonymousClassBuilder( "$S, $S, $S, $S", t.getValue(), @@ -558,8 +549,6 @@ private MethodSpec buildConstructor(FieldSpec... fieldSpecs) { return builder.build(); } - - private MethodSpec buildSetter(FieldSpec fieldSpec) { return MethodSpec.methodBuilder("set" + StringUtils.capitalize(fieldSpec.name)) diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorResult.java b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorResult.java index b36620fa7..d28785cae 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorResult.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorResult.java @@ -32,48 +32,44 @@ import java.util.Map; public class ClassGeneratorResult { - private final MultiValuedMap classes = new ArrayListValuedHashMap<>(); + private final MultiValuedMap classes = new ArrayListValuedHashMap<>(); - public void addClass(String path, TypeSpec typeSpec) { - classes.put(path, typeSpec); - } + public void addClass(String path, TypeSpec typeSpec) { + classes.put(path, typeSpec); + } - public Map> getClasses() { - return classes.asMap(); - } + public Map> getClasses() { + return classes.asMap(); + } - public List writeFiles(Path root) throws IOException { - List javaFiles = createFiles(); + public List writeFiles(Path root) throws IOException { + List javaFiles = createFiles(); - for (JavaFile j : javaFiles) { - j.writeTo(root); - } - return javaFiles; + for (JavaFile j : javaFiles) { + j.writeTo(root); } + return javaFiles; + } - public List createFiles() { - List files = new ArrayList<>(); + public List createFiles() { + List files = new ArrayList<>(); - for (Map.Entry> entry : classes.asMap().entrySet()) { - String s = entry.getKey(); - Collection typeSpecs = entry.getValue(); - List filesInternal = createFilesInternal(s, typeSpecs); - files.addAll(filesInternal); - } - return files; + for (Map.Entry> entry : classes.asMap().entrySet()) { + String s = entry.getKey(); + Collection typeSpecs = entry.getValue(); + List filesInternal = createFilesInternal(s, typeSpecs); + files.addAll(filesInternal); } + return files; + } + private List createFilesInternal(String packageName, Collection typeSpecs) { + List files = new ArrayList<>(); + for (TypeSpec t : typeSpecs) { - private List createFilesInternal(String packageName, Collection typeSpecs) { - List files = new ArrayList<>(); - for (TypeSpec t : typeSpecs) { - - - JavaFile javaFile = JavaFile.builder(packageName, t) - .build(); - files.add(javaFile); - } - return files; + JavaFile javaFile = JavaFile.builder(packageName, t).build(); + files.add(javaFile); } - + return files; + } } diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorRunner.java b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorRunner.java new file mode 100644 index 000000000..845ae3714 --- /dev/null +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorRunner.java @@ -0,0 +1,85 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.client.classgenerator; + +import com.squareup.javapoet.JavaFile; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.CommandLineParser; +import org.apache.commons.cli.DefaultParser; +import org.apache.commons.cli.HelpFormatter; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.apache.xmlbeans.XmlException; +import org.ehrbase.webtemplate.parser.OPTParser; +import org.openehr.schemas.v1.OPERATIONALTEMPLATE; +import org.openehr.schemas.v1.TemplateDocument; + +import java.io.IOException; +import java.nio.file.Paths; +import java.util.List; + +public class ClassGeneratorRunner { + private static final Options OPTIONS = new Options(); + + public static void main(String[] args) throws IOException, XmlException { + + OPTIONS.addOption("opt", true, "path to opt file"); + OPTIONS.addOption("package", true, "package name"); + OPTIONS.addOption("out", true, "path to output directory"); + OPTIONS.addOption("h", false, "show help"); + + CommandLineParser parser = new DefaultParser(); + CommandLine cmd = null; + try { + cmd = parser.parse(OPTIONS, args); + } catch (ParseException e) { + System.out.println(String.format("Error parsing commandline %s", e.getMessage())); + showHelp(); + } + + if (cmd.hasOption("h")) { + showHelp(); + } + + if (!cmd.hasOption("opt") || !cmd.hasOption("package") || !cmd.hasOption("out")) { + showHelp(); + } + OPERATIONALTEMPLATE template = + TemplateDocument.Factory.parse(Paths.get(cmd.getOptionValue("opt")).toFile()).getTemplate(); + ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGeneratorResult generate = + cut.generate(cmd.getOptionValue("package"), new OPTParser(template).parse()); + + java.nio.file.Path fsRoot = Paths.get(cmd.getOptionValue("out")); + + List generateFiles = generate.writeFiles(fsRoot); + FieldGenerator fieldGenerator = new FieldGenerator(); + fieldGenerator.generate(generateFiles).writeFiles(fsRoot); + } + + private static void showHelp() { + + HelpFormatter formatter = new HelpFormatter(); + + formatter.printHelp("java -jar client-library.jar ", OPTIONS); + + System.exit(0); + } +} diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java b/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java index db7123068..855f25635 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java @@ -43,7 +43,7 @@ String buildClassName( String name = replaceElementName(context, node); if (context.nodeDeque.isEmpty()) { - name = context.webTemplate.getTemplateId(); + name = new SnakeCase(context.webTemplate.getTemplateId()).camelToSnake(); } else { if (!node.isArchetype() && !isEnum) { diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/FieldGenerator.java b/generator/src/main/java/org/ehrbase/client/classgenerator/FieldGenerator.java index a3e4f5170..222bf64b4 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/FieldGenerator.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/FieldGenerator.java @@ -19,7 +19,14 @@ package org.ehrbase.client.classgenerator; -import com.squareup.javapoet.*; +import com.squareup.javapoet.AnnotationSpec; +import com.squareup.javapoet.ClassName; +import com.squareup.javapoet.FieldSpec; +import com.squareup.javapoet.JavaFile; +import com.squareup.javapoet.MethodSpec; +import com.squareup.javapoet.ParameterizedTypeName; +import com.squareup.javapoet.TypeName; +import com.squareup.javapoet.TypeSpec; import org.apache.commons.lang3.StringUtils; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Path; @@ -29,89 +36,125 @@ import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.serialisation.util.SnakeCase; +import org.ehrbase.webtemplate.parser.FlatPath; import javax.lang.model.element.Modifier; import java.util.List; public class FieldGenerator { - public static final String NEW_FIELD_DEFINITION = "new $T<$T>($T.class, $S, $S, $T.class, this)"; - - public ClassGeneratorResult generate(List files) { - ClassGeneratorResult result = new ClassGeneratorResult(); - - files.stream() - .filter(javaFile -> containsAnnotation(javaFile.typeSpec.annotations, Archetype.class)) - .forEach(c -> result.addClass(c.packageName, buildFieldClass(c.typeSpec))); - return result; - } - - - private String extractAnnotationValue(List annotationSpecs, Class annotation) { - return annotationSpecs.stream() - .filter(a -> a.type.toString().equals(annotation.getName())) - .map(a -> a.members.get("value")).map(s -> s.get(0)) - .map(Object::toString).map(s -> StringUtils.substringBetween(s, "\"")) - .findAny().orElse(""); - } - - private boolean containsAnnotation(List annotationSpecs, Class annotation) { - return annotationSpecs.stream() - .map(a -> a.type) - .map(TypeName::toString) - .anyMatch(s -> s.equals(annotation.getName())); - } - - private TypeSpec buildFieldClass(TypeSpec c) { - TypeSpec.Builder builder = TypeSpec.classBuilder(c.name + "Containment"); - builder - .superclass(ClassName.get(Containment.class)) - .addModifiers(Modifier.PUBLIC); - MethodSpec constructor = MethodSpec - .constructorBuilder() - .addModifiers(Modifier.PRIVATE) - .addStatement("super($S)", extractAnnotationValue(c.annotations, Archetype.class)) - .build(); - builder.addMethod(constructor); - builder.addMethod(MethodSpec.methodBuilder("getInstance") - .addModifiers(Modifier.PUBLIC) - .addModifiers(Modifier.STATIC) - .returns(ClassName.get("", c.name + "Containment")) - .addStatement("return new $T()", ClassName.get("", c.name + "Containment")) - .build()); - FieldSpec.Builder selfField; - - - ClassName baseClassName = ClassName.get("", c.name); - selfField = FieldSpec.builder(ParameterizedTypeName.get(ClassName.get(SelectAqlField.class), baseClassName), new SnakeCase(c.name).camelToUpperSnake(), Modifier.PUBLIC); - selfField.initializer(NEW_FIELD_DEFINITION, ClassName.get(AqlFieldImp.class), baseClassName, baseClassName, "", c.name, baseClassName); - builder.addField(selfField.build()); - - c.fieldSpecs.stream() - .filter(javaFile -> containsAnnotation(javaFile.annotations, Path.class)) - .forEach(f -> builder.addField(buildAQLField(baseClassName, f.name, extractAnnotationValue(f.annotations, Path.class), f.type))); - - return builder.build(); - } - - private FieldSpec buildAQLField(ClassName baseClass, String name, String path, TypeName type) { - final FieldSpec.Builder builder; - - if (ParameterizedTypeName.class.isAssignableFrom(type.getClass())) { - TypeName typeName = ParameterizedTypeName.get(ClassName.get(ListSelectAqlField.class), unwarap((ParameterizedTypeName) type)); - builder = FieldSpec.builder(typeName, new SnakeCase(name).camelToUpperSnake(), Modifier.PUBLIC); - builder.initializer(NEW_FIELD_DEFINITION, ClassName.get(ListAqlFieldImp.class), unwarap((ParameterizedTypeName) type), baseClass, path, name, unwarap((ParameterizedTypeName) type)); - } else { - TypeName typeName = ParameterizedTypeName.get(ClassName.get(SelectAqlField.class), type); - builder = FieldSpec.builder(typeName, new SnakeCase(name).camelToUpperSnake(), Modifier.PUBLIC); - builder.initializer(NEW_FIELD_DEFINITION, ClassName.get(AqlFieldImp.class), type, baseClass, path, name, type); - } - return builder.build(); - } - - - private TypeName unwarap(ParameterizedTypeName field) { - return field.typeArguments.get(0); + public static final String NEW_FIELD_DEFINITION = "new $T<$T>($T.class, $S, $S, $T.class, this)"; + + public ClassGeneratorResult generate(List files) { + ClassGeneratorResult result = new ClassGeneratorResult(); + + files.stream() + .filter(javaFile -> containsAnnotation(javaFile.typeSpec.annotations, Archetype.class)) + .forEach(c -> result.addClass(c.packageName, buildFieldClass(c.typeSpec))); + return result; + } + + private String extractAnnotationValue(List annotationSpecs, Class annotation) { + return annotationSpecs.stream() + .filter(a -> a.type.toString().equals(annotation.getName())) + .map(a -> a.members.get("value")) + .map(s -> s.get(0)) + .map(Object::toString) + .map(s -> StringUtils.substringBetween(s, "\"")) + .findAny() + .orElse(""); + } + + private boolean containsAnnotation(List annotationSpecs, Class annotation) { + return annotationSpecs.stream() + .map(a -> a.type) + .map(TypeName::toString) + .anyMatch(s -> s.equals(annotation.getName())); + } + + private TypeSpec buildFieldClass(TypeSpec c) { + TypeSpec.Builder builder = TypeSpec.classBuilder(c.name + "Containment"); + builder.superclass(ClassName.get(Containment.class)).addModifiers(Modifier.PUBLIC); + MethodSpec constructor = + MethodSpec.constructorBuilder() + .addModifiers(Modifier.PRIVATE) + .addStatement("super($S)", extractAnnotationValue(c.annotations, Archetype.class)) + .build(); + builder.addMethod(constructor); + builder.addMethod( + MethodSpec.methodBuilder("getInstance") + .addModifiers(Modifier.PUBLIC) + .addModifiers(Modifier.STATIC) + .returns(ClassName.get("", c.name + "Containment")) + .addStatement("return new $T()", ClassName.get("", c.name + "Containment")) + .build()); + FieldSpec.Builder selfField; + + ClassName baseClassName = ClassName.get("", c.name); + selfField = + FieldSpec.builder( + ParameterizedTypeName.get(ClassName.get(SelectAqlField.class), baseClassName), + new SnakeCase(c.name).camelToUpperSnake(), + Modifier.PUBLIC); + selfField.initializer( + NEW_FIELD_DEFINITION, + ClassName.get(AqlFieldImp.class), + baseClassName, + baseClassName, + "", + c.name, + baseClassName); + builder.addField(selfField.build()); + + c.fieldSpecs.stream() + .filter(javaFile -> containsAnnotation(javaFile.annotations, Path.class)) + .forEach( + f -> + builder.addField( + buildAQLField( + baseClassName, + f.name, + new FlatPath(extractAnnotationValue(f.annotations, Path.class)) + .format(false), + f.type))); + + return builder.build(); + } + + private FieldSpec buildAQLField(ClassName baseClass, String name, String path, TypeName type) { + final FieldSpec.Builder builder; + + if (ParameterizedTypeName.class.isAssignableFrom(type.getClass())) { + TypeName typeName = + ParameterizedTypeName.get( + ClassName.get(ListSelectAqlField.class), unwarap((ParameterizedTypeName) type)); + builder = + FieldSpec.builder(typeName, new SnakeCase(name).camelToUpperSnake(), Modifier.PUBLIC); + builder.initializer( + NEW_FIELD_DEFINITION, + ClassName.get(ListAqlFieldImp.class), + unwarap((ParameterizedTypeName) type), + baseClass, + path, + name, + unwarap((ParameterizedTypeName) type)); + } else { + TypeName typeName = ParameterizedTypeName.get(ClassName.get(SelectAqlField.class), type); + builder = + FieldSpec.builder(typeName, new SnakeCase(name).camelToUpperSnake(), Modifier.PUBLIC); + builder.initializer( + NEW_FIELD_DEFINITION, + ClassName.get(AqlFieldImp.class), + type, + baseClass, + path, + name, + type); } + return builder.build(); + } + private TypeName unwarap(ParameterizedTypeName field) { + return field.typeArguments.get(0); + } } diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/RecordGenerator.java b/generator/src/main/java/org/ehrbase/client/classgenerator/RecordGenerator.java index 7b6ecd2e6..b0537fb2d 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/RecordGenerator.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/RecordGenerator.java @@ -19,7 +19,16 @@ package org.ehrbase.client.classgenerator; -import com.squareup.javapoet.*; +import com.squareup.javapoet.ArrayTypeName; +import com.squareup.javapoet.ClassName; +import com.squareup.javapoet.CodeBlock; +import com.squareup.javapoet.JavaFile; +import com.squareup.javapoet.MethodSpec; +import com.squareup.javapoet.ParameterizedTypeName; +import com.squareup.javapoet.TypeName; +import com.squareup.javapoet.TypeSpec; +import com.squareup.javapoet.TypeVariableName; +import com.squareup.javapoet.WildcardTypeName; import org.ehrbase.client.aql.containment.ContainmentExpression; import org.ehrbase.client.aql.field.AqlField; import org.ehrbase.client.aql.field.SelectAqlField; @@ -37,139 +46,212 @@ public class RecordGenerator { - public static final int MAX_RECORD_SIZE = 21; - public static final Path DIRECTORY = Paths.get(".", "client/src/main/java/"); - public static final String RECORD_PACKAGE_NAME = "org.ehrbase.client.aql.record"; - public static final String QUERY_PACKAGE_NAME = "org.ehrbase.client.aql.query"; + public static final int MAX_RECORD_SIZE = 21; + public static final Path DIRECTORY = Paths.get(".", "client/src/main/java/"); + public static final String RECORD_PACKAGE_NAME = "org.ehrbase.client.aql.record"; + public static final String QUERY_PACKAGE_NAME = "org.ehrbase.client.aql.query"; - private RecordGenerator() { + private RecordGenerator() {} - } - - private void generate() throws IOException { - HashMap typeSpecHashMap = new HashMap<>(); - - for (int n = 1; n <= MAX_RECORD_SIZE; n++) { - TypeSpec typeSpec = buildRecordN(n); - typeSpecHashMap.put(n, typeSpec); - } - - buildAbstractRecordImp(typeSpecHashMap); - - buildQuery(typeSpecHashMap); - } + private void generate() throws IOException { + HashMap typeSpecHashMap = new HashMap<>(); - private void buildQuery(HashMap typeSpecHashMap) throws IOException { - TypeSpec.Builder builder = TypeSpec.interfaceBuilder("Query"); - builder.addTypeVariable(TypeVariableName.get("T", Record.class)); - builder.addModifiers(Modifier.PUBLIC); - builder.addMethod(MethodSpec.methodBuilder("buildAql").addModifiers(Modifier.ABSTRACT, Modifier.PUBLIC).returns(String.class).build()); - builder.addMethod(MethodSpec.methodBuilder("fields").addModifiers(Modifier.ABSTRACT, Modifier.PUBLIC).returns(ArrayTypeName.of(ParameterizedTypeName.get(ClassName.get(AqlField.class), TypeName.OBJECT))).build()); - - builder.addMethod(MethodSpec.methodBuilder("buildEntityQuery") - .addModifiers(Modifier.STATIC, Modifier.PUBLIC) - .addParameter(ContainmentExpression.class, "containment") - .addParameter(ArrayTypeName.of(ParameterizedTypeName.get(ClassName.get(SelectAqlField.class), WildcardTypeName.subtypeOf(Object.class))), "selectFields") - .addCode("return new EntityQuery<>(containment, selectFields);") - .varargs(true) - .returns(ParameterizedTypeName.get(EntityQuery.class, Record.class) - ).build()); - - builder.addMethod(MethodSpec.methodBuilder("buildNativeQuery") - .addModifiers(Modifier.STATIC, Modifier.PUBLIC) - .addParameter(String.class, "aql") - .addParameter(ArrayTypeName.of(ParameterizedTypeName.get(ClassName.get(Class.class), WildcardTypeName.subtypeOf(Object.class))), "expected") - .addCode(CodeBlock.builder().addStatement("return new NativeQuery<>(aql, $T.stream(expected).map(AqlField::create).toArray($T[]::new))", ClassName.get(Arrays.class), ClassName.get(AqlField.class)).build()) - .varargs(true) - .returns(ParameterizedTypeName.get(NativeQuery.class, Record.class) - ).build()); - - for (int n = 1; n <= MAX_RECORD_SIZE; n++) { - TypeSpec recordNTypeSpec = typeSpecHashMap.get(n); - builder.addMethod(buildEntityQueryMethod(recordNTypeSpec)); - builder.addMethod(buildNativeQueryMethod(recordNTypeSpec)); - } - - TypeSpec typeSpec = builder.build(); - - - JavaFile javaFile = JavaFile.builder(QUERY_PACKAGE_NAME, typeSpec).build(); - javaFile.writeTo(DIRECTORY); + for (int n = 1; n <= MAX_RECORD_SIZE; n++) { + TypeSpec typeSpec = buildRecordN(n); + typeSpecHashMap.put(n, typeSpec); } - private MethodSpec buildEntityQueryMethod(TypeSpec recordNTypeSpec) { - MethodSpec.Builder methodBuilder = MethodSpec.methodBuilder("buildEntityQuery"); - methodBuilder.addModifiers(Modifier.PUBLIC, Modifier.STATIC); - recordNTypeSpec.typeVariables.forEach(methodBuilder::addTypeVariable); - methodBuilder.returns(ParameterizedTypeName.get(ClassName.get(EntityQuery.class), ParameterizedTypeName.get(ClassName.get(RECORD_PACKAGE_NAME, recordNTypeSpec.name), recordNTypeSpec.typeVariables.toArray(TypeName[]::new)))); - methodBuilder.addParameter(ContainmentExpression.class, "containment"); - recordNTypeSpec.typeVariables.forEach(t -> methodBuilder.addParameter(ParameterizedTypeName.get(ClassName.get(SelectAqlField.class), t), "selectField" + t.name.replace("T", ""))); - - String vars = recordNTypeSpec.typeVariables.stream().map(t -> "selectField" + t.name.replace("T", "")).collect(Collectors.joining(",")); - - methodBuilder.addCode("return new EntityQuery<>(containment," + vars + ");"); - - return methodBuilder.build(); - } - - private MethodSpec buildNativeQueryMethod(TypeSpec recordNTypeSpec) { - MethodSpec.Builder methodBuilder = MethodSpec.methodBuilder("buildNativeQuery"); - methodBuilder.addModifiers(Modifier.PUBLIC, Modifier.STATIC); - recordNTypeSpec.typeVariables.forEach(methodBuilder::addTypeVariable); - methodBuilder.returns(ParameterizedTypeName.get(ClassName.get(NativeQuery.class), ParameterizedTypeName.get(ClassName.get(RECORD_PACKAGE_NAME, recordNTypeSpec.name), recordNTypeSpec.typeVariables.toArray(TypeName[]::new)))); - methodBuilder.addParameter(String.class, "aql"); - recordNTypeSpec.typeVariables.forEach(t -> methodBuilder.addParameter(ParameterizedTypeName.get(ClassName.get(Class.class), t), "expected" + t.name.replace("T", ""))); - - String vars = recordNTypeSpec.typeVariables.stream().map(t -> "AqlField.create(expected" + t.name.replace("T", "") + ")").collect(Collectors.joining(",")); - - methodBuilder.addCode("return new NativeQuery<>(aql," + vars + ");"); - - return methodBuilder.build(); + buildAbstractRecordImp(typeSpecHashMap); + + buildQuery(typeSpecHashMap); + } + + private void buildQuery(HashMap typeSpecHashMap) throws IOException { + TypeSpec.Builder builder = TypeSpec.interfaceBuilder("Query"); + builder.addTypeVariable(TypeVariableName.get("T", Record.class)); + builder.addModifiers(Modifier.PUBLIC); + builder.addMethod( + MethodSpec.methodBuilder("buildAql") + .addModifiers(Modifier.ABSTRACT, Modifier.PUBLIC) + .returns(String.class) + .build()); + builder.addMethod( + MethodSpec.methodBuilder("fields") + .addModifiers(Modifier.ABSTRACT, Modifier.PUBLIC) + .returns( + ArrayTypeName.of( + ParameterizedTypeName.get(ClassName.get(AqlField.class), TypeName.OBJECT))) + .build()); + + builder.addMethod( + MethodSpec.methodBuilder("buildEntityQuery") + .addModifiers(Modifier.STATIC, Modifier.PUBLIC) + .addParameter(ContainmentExpression.class, "containment") + .addParameter( + ArrayTypeName.of( + ParameterizedTypeName.get( + ClassName.get(SelectAqlField.class), + WildcardTypeName.subtypeOf(Object.class))), + "selectFields") + .addCode("return new EntityQuery<>(containment, selectFields);") + .varargs(true) + .returns(ParameterizedTypeName.get(EntityQuery.class, Record.class)) + .build()); + + builder.addMethod( + MethodSpec.methodBuilder("buildNativeQuery") + .addModifiers(Modifier.STATIC, Modifier.PUBLIC) + .addParameter(String.class, "aql") + .addParameter( + ArrayTypeName.of( + ParameterizedTypeName.get( + ClassName.get(Class.class), WildcardTypeName.subtypeOf(Object.class))), + "expected") + .addCode( + CodeBlock.builder() + .addStatement( + "return new NativeQuery<>(aql, $T.stream(expected).map(AqlField::create).toArray($T[]::new))", + ClassName.get(Arrays.class), + ClassName.get(AqlField.class)) + .build()) + .varargs(true) + .returns(ParameterizedTypeName.get(NativeQuery.class, Record.class)) + .build()); + + for (int n = 1; n <= MAX_RECORD_SIZE; n++) { + TypeSpec recordNTypeSpec = typeSpecHashMap.get(n); + builder.addMethod(buildEntityQueryMethod(recordNTypeSpec)); + builder.addMethod(buildNativeQueryMethod(recordNTypeSpec)); } - private void buildAbstractRecordImp(HashMap typeSpecHashMap) throws IOException { - TypeSpec.Builder builder = TypeSpec.classBuilder("AbstractRecordImp"); - builder.addModifiers(Modifier.ABSTRACT); - for (int n = 1; n <= MAX_RECORD_SIZE; n++) { - TypeVariableName typeVariable = TypeVariableName.get("T" + n); - builder.addTypeVariable(typeVariable); - TypeSpec recordNTypeSpec = typeSpecHashMap.get(n); - builder.addSuperinterface(ParameterizedTypeName.get(ClassName.get(RECORD_PACKAGE_NAME, recordNTypeSpec.name), recordNTypeSpec.typeVariables.toArray(TypeName[]::new))); - - - builder.addMethod(MethodSpec.methodBuilder("value" + n).addModifiers(Modifier.PUBLIC).addCode(CodeBlock.builder().addStatement("return ($T) value(" + (n - 1) + ")", typeVariable).build()).returns(typeVariable).build()); - builder.addMethod(MethodSpec.methodBuilder("field" + n).addModifiers(Modifier.PUBLIC).addCode(CodeBlock.builder().addStatement("return ($T) field(" + (n - 1) + ")", ParameterizedTypeName.get(ClassName.get(AqlField.class), typeVariable)).build()).returns(ParameterizedTypeName.get(ClassName.get(AqlField.class), typeVariable)).build()); - - } - TypeSpec typeSpec = builder.build(); - - JavaFile javaFile = JavaFile.builder(RECORD_PACKAGE_NAME, typeSpec).build(); - javaFile.writeTo(DIRECTORY); + TypeSpec typeSpec = builder.build(); + + JavaFile javaFile = JavaFile.builder(QUERY_PACKAGE_NAME, typeSpec).build(); + javaFile.writeTo(DIRECTORY); + } + + private MethodSpec buildEntityQueryMethod(TypeSpec recordNTypeSpec) { + MethodSpec.Builder methodBuilder = MethodSpec.methodBuilder("buildEntityQuery"); + methodBuilder.addModifiers(Modifier.PUBLIC, Modifier.STATIC); + recordNTypeSpec.typeVariables.forEach(methodBuilder::addTypeVariable); + methodBuilder.returns( + ParameterizedTypeName.get( + ClassName.get(EntityQuery.class), + ParameterizedTypeName.get( + ClassName.get(RECORD_PACKAGE_NAME, recordNTypeSpec.name), + recordNTypeSpec.typeVariables.toArray(TypeName[]::new)))); + methodBuilder.addParameter(ContainmentExpression.class, "containment"); + recordNTypeSpec.typeVariables.forEach( + t -> + methodBuilder.addParameter( + ParameterizedTypeName.get(ClassName.get(SelectAqlField.class), t), + "selectField" + t.name.replace("T", ""))); + + String vars = + recordNTypeSpec.typeVariables.stream() + .map(t -> "selectField" + t.name.replace("T", "")) + .collect(Collectors.joining(",")); + + methodBuilder.addCode("return new EntityQuery<>(containment," + vars + ");"); + + return methodBuilder.build(); + } + + private MethodSpec buildNativeQueryMethod(TypeSpec recordNTypeSpec) { + MethodSpec.Builder methodBuilder = MethodSpec.methodBuilder("buildNativeQuery"); + methodBuilder.addModifiers(Modifier.PUBLIC, Modifier.STATIC); + recordNTypeSpec.typeVariables.forEach(methodBuilder::addTypeVariable); + methodBuilder.returns( + ParameterizedTypeName.get( + ClassName.get(NativeQuery.class), + ParameterizedTypeName.get( + ClassName.get(RECORD_PACKAGE_NAME, recordNTypeSpec.name), + recordNTypeSpec.typeVariables.toArray(TypeName[]::new)))); + methodBuilder.addParameter(String.class, "aql"); + recordNTypeSpec.typeVariables.forEach( + t -> + methodBuilder.addParameter( + ParameterizedTypeName.get(ClassName.get(Class.class), t), + "expected" + t.name.replace("T", ""))); + + String vars = + recordNTypeSpec.typeVariables.stream() + .map(t -> "AqlField.create(expected" + t.name.replace("T", "") + ")") + .collect(Collectors.joining(",")); + + methodBuilder.addCode("return new NativeQuery<>(aql," + vars + ");"); + + return methodBuilder.build(); + } + + private void buildAbstractRecordImp(HashMap typeSpecHashMap) + throws IOException { + TypeSpec.Builder builder = TypeSpec.classBuilder("AbstractRecordImp"); + builder.addModifiers(Modifier.ABSTRACT); + for (int n = 1; n <= MAX_RECORD_SIZE; n++) { + TypeVariableName typeVariable = TypeVariableName.get("T" + n); + builder.addTypeVariable(typeVariable); + TypeSpec recordNTypeSpec = typeSpecHashMap.get(n); + builder.addSuperinterface( + ParameterizedTypeName.get( + ClassName.get(RECORD_PACKAGE_NAME, recordNTypeSpec.name), + recordNTypeSpec.typeVariables.toArray(TypeName[]::new))); + + builder.addMethod( + MethodSpec.methodBuilder("value" + n) + .addModifiers(Modifier.PUBLIC) + .addCode( + CodeBlock.builder() + .addStatement("return ($T) value(" + (n - 1) + ")", typeVariable) + .build()) + .returns(typeVariable) + .build()); + builder.addMethod( + MethodSpec.methodBuilder("field" + n) + .addModifiers(Modifier.PUBLIC) + .addCode( + CodeBlock.builder() + .addStatement( + "return ($T) field(" + (n - 1) + ")", + ParameterizedTypeName.get(ClassName.get(AqlField.class), typeVariable)) + .build()) + .returns(ParameterizedTypeName.get(ClassName.get(AqlField.class), typeVariable)) + .build()); } - - private TypeSpec buildRecordN(int n) throws IOException { - TypeSpec.Builder builder = TypeSpec.interfaceBuilder("Record" + n); - builder.addSuperinterface(Record.class); - builder.addModifiers(Modifier.PUBLIC); - - for (int i = 1; i <= n; i++) { - TypeVariableName typeVariable = TypeVariableName.get("T" + i); - builder.addTypeVariable(typeVariable); - builder.addMethod(MethodSpec.methodBuilder("value" + i).addModifiers(Modifier.ABSTRACT, Modifier.PUBLIC).returns(typeVariable).build()); - builder.addMethod(MethodSpec.methodBuilder("field" + i).addModifiers(Modifier.ABSTRACT, Modifier.PUBLIC).returns(ParameterizedTypeName.get(ClassName.get(AqlField.class), typeVariable)).build()); - } - - TypeSpec typeSpec = builder.build(); - - JavaFile javaFile = JavaFile.builder(RECORD_PACKAGE_NAME, typeSpec).build(); - javaFile.writeTo(DIRECTORY); - return typeSpec; + TypeSpec typeSpec = builder.build(); + + JavaFile javaFile = JavaFile.builder(RECORD_PACKAGE_NAME, typeSpec).build(); + javaFile.writeTo(DIRECTORY); + } + + private TypeSpec buildRecordN(int n) throws IOException { + TypeSpec.Builder builder = TypeSpec.interfaceBuilder("Record" + n); + builder.addSuperinterface(Record.class); + builder.addModifiers(Modifier.PUBLIC); + + for (int i = 1; i <= n; i++) { + TypeVariableName typeVariable = TypeVariableName.get("T" + i); + builder.addTypeVariable(typeVariable); + builder.addMethod( + MethodSpec.methodBuilder("value" + i) + .addModifiers(Modifier.ABSTRACT, Modifier.PUBLIC) + .returns(typeVariable) + .build()); + builder.addMethod( + MethodSpec.methodBuilder("field" + i) + .addModifiers(Modifier.ABSTRACT, Modifier.PUBLIC) + .returns(ParameterizedTypeName.get(ClassName.get(AqlField.class), typeVariable)) + .build()); } + TypeSpec typeSpec = builder.build(); - public static void main(String[] args) throws IOException { - new RecordGenerator().generate(); - } - + JavaFile javaFile = JavaFile.builder(RECORD_PACKAGE_NAME, typeSpec).build(); + javaFile.writeTo(DIRECTORY); + return typeSpec; + } + public static void main(String[] args) throws IOException { + new RecordGenerator().generate(); + } } diff --git a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java index 4179a16a2..be331d33b 100644 --- a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java +++ b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java @@ -45,9 +45,9 @@ public class ClassGeneratorNewTest { - public static final String PACKAGE_NAME = "org.ehrbase.client.classgenerator.examples2"; + public static final String PACKAGE_NAME = "org.ehrbase.client.classgenerator.examples"; - private static final boolean WRITE_FILES = true; + private static final boolean WRITE_FILES = false; @Test public void testGenerate() throws IOException, XmlException { @@ -80,17 +80,17 @@ public void testGenerate() throws IOException, XmlException { new Tuple("commentValue", "java.lang.String"), new Tuple( "cuffSizeDefiningCode", - "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.CuffSizeDefiningCode"), + "org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.CuffSizeDefiningCode"), new Tuple( "korotkoffSoundsDefiningCode", - "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.KorotkoffSoundsDefiningCode"), + "org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.KorotkoffSoundsDefiningCode"), new Tuple("systolicMagnitude", "java.lang.Double"), new Tuple("systolicUnits", "java.lang.String"), new Tuple("diastolicMagnitude", "java.lang.Double"), new Tuple("diastolicUnits", "java.lang.String"), new Tuple( "positionDefiningCode", - "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.PositionDefiningCode"), + "org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.PositionDefiningCode"), new Tuple("tiltMagnitude", "java.lang.Double"), new Tuple("tiltUnits", "java.lang.String"), new Tuple("meanArterialPressureMagnitude", "java.lang.Double"), @@ -102,7 +102,7 @@ public void testGenerate() throws IOException, XmlException { new Tuple("pulsePressureUnits", "java.lang.String"), new Tuple( "locationOfMeasurementDefiningCode", - "org.ehrbase.client.classgenerator.examples2.ehrbasebloodpressuresimpledev0composition.definition.LocationOfMeasurementDefiningCode"), + "org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.LocationOfMeasurementDefiningCode"), new Tuple("modelValue", "java.lang.String"), new Tuple("serialNumberValue", "java.lang.String"), new Tuple("dateLastServicedValue", "java.time.temporal.TemporalAccessor"), @@ -122,11 +122,11 @@ public void testGenerate() throws IOException, XmlException { new Tuple("territory", "org.ehrbase.client.classgenerator.shareddefinition.Territory"), new Tuple( "bloodPressureTrainingSample", - "java.util.List"), + "java.util.List"), // new Tuple("location", "java.lang.String"), new Tuple( "deviceDetailsTrainingSample", - "java.util.List"), + "java.util.List"), new Tuple( "categoryDefiningCode", "org.ehrbase.client.classgenerator.shareddefinition.Category"), @@ -188,43 +188,43 @@ public void testGenerateAltEvents() throws IOException, XmlException { new Tuple("gewichtUnits", "java.lang.String"), new Tuple( "confoundingFactorsEn", - "java.util.List"), + "java.util.List"), new Tuple("commentEnValue", "java.lang.String"), new Tuple( "stateOfDressEnDefiningCode", - "org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition.StateOfDressEnDefiningCode"), + "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.StateOfDressEnDefiningCode"), new Tuple("value", "java.lang.String"), new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), new Tuple("gewichtMagnitude", "java.lang.Double"), new Tuple("gewichtUnits", "java.lang.String"), new Tuple( "confoundingFactorsEn", - "java.util.List"), + "java.util.List"), new Tuple("commentEnValue", "java.lang.String"), new Tuple( "stateOfDressEnDefiningCode", - "org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition.StateOfDressEnDefiningCode"), + "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.StateOfDressEnDefiningCode"), new Tuple("value", "java.lang.String"), new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), new Tuple("gewichtMagnitude", "java.lang.Double"), new Tuple("gewichtUnits", "java.lang.String"), new Tuple( "confoundingFactorsEn", - "java.util.List"), + "java.util.List"), new Tuple("widthValue", "java.time.temporal.TemporalAmount"), new Tuple("commentEnValue", "java.lang.String"), new Tuple( "stateOfDressEnDefiningCode", - "org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition.StateOfDressEnDefiningCode"), + "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.StateOfDressEnDefiningCode"), new Tuple( "mathFunctionDefiningCode", "org.ehrbase.client.classgenerator.shareddefinition.MathFunction"), new Tuple( "birthEn", - "org.ehrbase.client.classgenerator.examples2.alternativeeventscomposition.definition.KorpergewichtBirthEnPointEvent"), + "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.KorpergewichtBirthEnPointEvent"), new Tuple( "anyEventEn", - "java.util.List"), + "java.util.List"), new Tuple("extensionEn", "java.util.List"), new Tuple("language", "org.ehrbase.client.classgenerator.shareddefinition.Language"), new Tuple("originValue", "java.time.temporal.TemporalAccessor"), @@ -244,7 +244,7 @@ public void testGenerateAltEvents() throws IOException, XmlException { "org.ehrbase.client.classgenerator.shareddefinition.Setting"), new Tuple( "korpergewicht", - "java.util.List"), + "java.util.List"), new Tuple("erweiterung", "java.util.List"), new Tuple("location", "java.lang.String"), new Tuple( @@ -268,7 +268,7 @@ public void testGenerateDiagnose() throws IOException, XmlException { Set derDiagnoseDefiningCode = generate .getClasses() - .get("org.ehrbase.client.classgenerator.examples2.diagnosecomposition.definition") + .get("org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition") .stream() .filter(t -> t.name.equals("NameDesProblemsDerDiagnoseDefiningCode")) .findAny() @@ -459,6 +459,46 @@ public void testGenerateD4LQuestionnaire() throws IOException, XmlException { assertThat(fieldSpecs).size().isEqualTo(248); } + @Test + public void testGeneratePatientenaufenthalt() throws IOException, XmlException { + OPERATIONALTEMPLATE template = + TemplateDocument.Factory.parse(OperationalTemplateTestData.PATIENTEN_AUFENTHALT.getStream()) + .getTemplate(); + ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); + + List fieldSpecs = + generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs) + .flatMap(List::stream) + .collect(Collectors.toList()); + + assertThat(fieldSpecs).size().isEqualTo(42); + writeFiles(generate); + } + + @Test + public void testGenerateStationaererVersorgungsfall() throws IOException, XmlException { + OPERATIONALTEMPLATE template = + TemplateDocument.Factory.parse(OperationalTemplateTestData.EPISODE_SUMMARY.getStream()) + .getTemplate(); + ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); + + List fieldSpecs = + generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs) + .flatMap(List::stream) + .collect(Collectors.toList()); + + assertThat(fieldSpecs).size().isEqualTo(33); + writeFiles(generate); + } + @Test public void testGenerateBefundDerBlutgasanalyse() throws IOException, XmlException { OPERATIONALTEMPLATE template = @@ -467,12 +507,17 @@ public void testGenerateBefundDerBlutgasanalyse() throws IOException, XmlExcepti .getTemplate(); ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); - List fieldSpecs = generate.getClasses().values().stream() + List fieldSpecs = + generate.getClasses().values().stream() .flatMap(Collection::stream) .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).map(f -> f.name).collect(Collectors.toList()); + .map(t -> t.fieldSpecs) + .flatMap(List::stream) + .map(f -> f.name) + .collect(Collectors.toList()); - assertThat(fieldSpecs).containsExactlyInAnyOrder( + assertThat(fieldSpecs) + .containsExactlyInAnyOrder( "versionUid", "endTimeValue", "participations", @@ -524,8 +569,7 @@ public void testGenerateBefundDerBlutgasanalyse() throws IOException, XmlExcepti "probendetail", "subject", "originValue", - "laborWelchesDenUntersuchungsauftragAnnimmt" - ); + "laborWelchesDenUntersuchungsauftragAnnimmt"); writeFiles(generate); } @@ -563,11 +607,11 @@ public void testGenerateMultiOccurrence() throws IOException, XmlException { new Tuple("subject", "com.nedap.archie.rm.generic.PartyProxy"), new Tuple( "locationOfMeasurementDefiningCode", - "org.ehrbase.client.classgenerator.examples2.ehrbasemultioccurrencedev1composition.definition.LocationOfMeasurementDefiningCode"), + "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.LocationOfMeasurementDefiningCode"), new Tuple("locationOfMeasurementValue", "java.lang.String"), new Tuple( "bodyExposureDefiningCode", - "org.ehrbase.client.classgenerator.examples2.ehrbasemultioccurrencedev1composition.definition.BodyExposureDefiningCode"), + "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyExposureDefiningCode"), new Tuple("bodyExposureValue", "java.lang.String"), new Tuple("temperatureMagnitude", "java.lang.Double"), new Tuple("temperatureUnits", "java.lang.String"), @@ -581,7 +625,7 @@ public void testGenerateMultiOccurrence() throws IOException, XmlException { new Tuple("territory", "org.ehrbase.client.classgenerator.shareddefinition.Territory"), new Tuple( "bodyTemperature", - "java.util.List"), + "java.util.List"), new Tuple("location", "java.lang.String"), new Tuple("startTimeValue", "java.time.temporal.TemporalAccessor"), new Tuple("currentDayOfMenstrualCycleMagnitude", "java.lang.Long"), @@ -590,13 +634,13 @@ public void testGenerateMultiOccurrence() throws IOException, XmlException { "java.util.List"), new Tuple( "bodyExposure", - "org.ehrbase.client.classgenerator.examples2.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureBodyExposureChoice"), + "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureBodyExposureChoice"), new Tuple( "bodyExposure", - "org.ehrbase.client.classgenerator.examples2.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureBodyExposureChoice"), + "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureBodyExposureChoice"), new Tuple( "locationOfMeasurement", - "org.ehrbase.client.classgenerator.examples2.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementChoice"), + "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementChoice"), new Tuple( "categoryDefiningCode", "org.ehrbase.client.classgenerator.shareddefinition.Category"), @@ -616,7 +660,7 @@ public void testGenerateMultiOccurrence() throws IOException, XmlException { "org.ehrbase.client.classgenerator.shareddefinition.MathFunction"), new Tuple( "anyEvent", - "java.util.List"), + "java.util.List"), new Tuple( "participations", "java.util.List"), new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit")); @@ -653,12 +697,18 @@ public void testGenerateVirologyFinding() throws IOException, XmlException { ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); - List fieldSpecs = generate.getClasses().values().stream() + List fieldSpecs = + generate.getClasses().values().stream() .flatMap(Collection::stream) .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).map(f -> f.name).collect(Collectors.toList()); + .map(t -> t.fieldSpecs) + .flatMap(List::stream) + .map(f -> f.name) + .collect(Collectors.toList()); - assertThat(fieldSpecs).containsExactlyInAnyOrder("alternativeStruktur", + assertThat(fieldSpecs) + .containsExactlyInAnyOrder( + "alternativeStruktur", "nameDerKorperstelleValue", "multimedialeDarstellung", "kommentarDesProbennehmersValue", @@ -766,12 +816,17 @@ public void testGenerateSchwangerschaftsstatus() throws IOException, XmlExceptio ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); - List fieldSpecs = generate.getClasses().values().stream() + List fieldSpecs = + generate.getClasses().values().stream() .flatMap(Collection::stream) .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).map(f -> f.name).collect(Collectors.toList()); + .map(t -> t.fieldSpecs) + .flatMap(List::stream) + .map(f -> f.name) + .collect(Collectors.toList()); - assertThat(fieldSpecs).containsExactlyInAnyOrder( + assertThat(fieldSpecs) + .containsExactlyInAnyOrder( "versionUid", "endTimeValue", "participations", @@ -793,9 +848,7 @@ public void testGenerateSchwangerschaftsstatus() throws IOException, XmlExceptio "originValue", "language", "erweiterungen", - "statusDefiningCode" - ); - + "statusDefiningCode"); Optional status1 = generate.getClasses().values().stream() @@ -818,15 +871,6 @@ public void testGenerateSchwangerschaftsstatus() throws IOException, XmlExceptio writeFiles(generate); } - @Test - public void testCreateName() { - ClassGenerator cut = new ClassGenerator(); - String className = - cut.buildClassName("/_state structure/*_confounding factors(en)_ELEMENT", true); - - assertThat(className).isEqualTo("ConfoundingFactorsEnElement"); - } - @Test public void testGenerateReactCare() throws IOException, XmlException { OPERATIONALTEMPLATE template = diff --git a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java deleted file mode 100644 index dc860fc8e..000000000 --- a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java +++ /dev/null @@ -1,753 +0,0 @@ -/* - * - * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School - * * This file is part of Project EHRbase - * * - * * Licensed under the Apache License, Version 2.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * * - * * http://www.apache.org/licenses/LICENSE-2.0 - * * - * * Unless required by applicable law or agreed to in writing, software - * * distributed under the License is distributed on an "AS IS" BASIS, - * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * * See the License for the specific language governing permissions and - * * limitations under the License. - * - */ - -package org.ehrbase.client.classgenerator; - -import com.squareup.javapoet.FieldSpec; -import com.squareup.javapoet.JavaFile; -import com.squareup.javapoet.TypeSpec; -import org.apache.commons.io.FileUtils; -import org.apache.xmlbeans.XmlException; -import org.assertj.core.groups.Tuple; -import org.ehrbase.test_data.operationaltemplate.OperationalTemplateTestData; -import org.junit.Ignore; -import org.junit.Test; -import org.openehr.schemas.v1.OPERATIONALTEMPLATE; -import org.openehr.schemas.v1.TemplateDocument; - -import java.io.IOException; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Collection; -import java.util.List; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - -import static org.assertj.core.api.Assertions.assertThat; - -@Ignore -public class ClassGeneratorTest { - - public static final String PACKAGE_NAME = "org.ehrbase.client.classgenerator.examples"; - - private static final boolean WRITE_FILES = false; - - @Test - public void testGenerate() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.BLOOD_PRESSURE_SIMPLE.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = null; - try { - - generate = cut.generate(PACKAGE_NAME, template); - } catch (Throwable t) { - System.out.println(t.getStackTrace()); - } - - - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); - - - assertThat(fieldSpecs) - .extracting(f -> f.name, f -> f.type.toString()) - .containsExactlyInAnyOrder( - new Tuple("versionUid", "org.ehrbase.client.openehrclient.VersionUid"), - new Tuple("device", "java.util.List"), - new Tuple("language", "org.ehrbase.client.classgenerator.examples.shareddefinition.Language"), - new Tuple("levelOfExertion", "java.util.List"), - new Tuple("commentValue", "java.lang.String"), - new Tuple("cuffSizeDefiningcode", "org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.CuffSizeDefiningcode"), - new Tuple("korotkoffSoundsDefiningcode", "org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.KorotkoffSoundsDefiningcode"), - new Tuple("systolicMagnitude", "java.lang.Double"), - new Tuple("systolicUnits", "java.lang.String"), - new Tuple("diastolicMagnitude", "java.lang.Double"), - new Tuple("diastolicUnits", "java.lang.String"), - new Tuple("positionDefiningcode", "org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.PositionDefiningcode"), - new Tuple("tiltMagnitude", "java.lang.Double"), - new Tuple("tiltUnits", "java.lang.String"), - new Tuple("meanArterialPressureMagnitude", "java.lang.Double"), - new Tuple("meanArterialPressureUnits", "java.lang.String"), - new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("subject", "com.nedap.archie.rm.generic.PartyProxy"), - new Tuple("originValue", "java.time.temporal.TemporalAccessor"), - new Tuple("pulsePressureMagnitude", "java.lang.Double"), - new Tuple("pulsePressureUnits", "java.lang.String"), - new Tuple("locationOfMeasurementDefiningcode", "org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.LocationOfMeasurementDefiningcode"), - new Tuple("modelValue", "java.lang.String"), - new Tuple("serialNumberValue", "java.lang.String"), - new Tuple("dateLastServicedValue", "java.time.temporal.TemporalAccessor"), - new Tuple("dateLastCalibrationValue", "java.time.temporal.TemporalAccessor"), - new Tuple("nameValue", "java.lang.String"), - new Tuple("descriptionValue", "java.lang.String"), - new Tuple("components", "java.util.List"), - new Tuple("servicedByValue", "java.lang.String"), - new Tuple("manufacturerValue", "java.lang.String"), - new Tuple("endTimeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("language", "org.ehrbase.client.classgenerator.examples.shareddefinition.Language"), - new Tuple("healthCareFacility", "com.nedap.archie.rm.generic.PartyIdentified"), - new Tuple("composer", "com.nedap.archie.rm.generic.PartyProxy"), - new Tuple("settingDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode"), - new Tuple("territory", "org.ehrbase.client.classgenerator.examples.shareddefinition.Territory"), - new Tuple("bloodPressureTrainingSample", "java.util.List"), - new Tuple("location", "java.lang.String"), - new Tuple("deviceDetailsTrainingSample", "java.util.List"), - new Tuple("categoryDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode"), - new Tuple("startTimeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("participations", "java.util.List"), - new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit") - ); - - - writeFiles(generate); - - - } - - private void writeFiles(ClassGeneratorResult generate) throws IOException { - if (WRITE_FILES) { - Path path = Paths.get("..", "client/src/test/java/"); - generate.getClasses().keySet().stream().filter(s -> !s.contains("definition")).findFirst().ifPresent( - s -> - { - try { - FileUtils.cleanDirectory(Paths.get(String.valueOf(path), s.replace(".", "/")).toFile()); - } catch (Exception e) { - //NOP - } - } - ); - List generateFiles = generate.writeFiles(path); - - FieldGenerator fieldGenerator = new FieldGenerator(); - fieldGenerator.generate(generateFiles).writeFiles(path); - } - } - - - @Test - public void testGenerateAltEvents() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.ALT_EVENTS.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - - - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); - - - assertThat(fieldSpecs) - .extracting(f -> f.name, f -> f.type.toString()) - .containsExactlyInAnyOrder( - new Tuple("value", "java.lang.String"), - new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("gewichtMagnitude", "java.lang.Double"), - new Tuple("gewichtUnits", "java.lang.String"), - new Tuple("confoundingFactorsEn", "java.util.List"), - new Tuple("commentEnValue", "java.lang.String"), - new Tuple("stateOfDressEnDefiningcode", "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.StateOfDressEnDefiningCode"), - new Tuple("value", "java.lang.String"), - new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("gewichtMagnitude", "java.lang.Double"), - new Tuple("gewichtUnits", "java.lang.String"), - new Tuple("confoundingFactorsEn", "java.util.List"), - new Tuple("commentEnValue", "java.lang.String"), - new Tuple("stateOfDressEnDefiningcode", "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.StateOfDressEnDefiningCode"), - new Tuple("value", "java.lang.String"), - new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("gewichtMagnitude", "java.lang.Double"), - new Tuple("gewichtUnits", "java.lang.String"), - new Tuple("confoundingFactorsEn", "java.util.List"), - new Tuple("widthValue", "java.time.temporal.TemporalAmount"), - new Tuple("commentEnValue", "java.lang.String"), - new Tuple("stateOfDressEnDefiningcode", "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.StateOfDressEnDefiningCode"), - new Tuple("mathFunctionDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.MathFunction"), - new Tuple("birthEn", "org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.KorpergewichtBirthEnEvent"), - new Tuple("anyEventEn", "java.util.List"), - new Tuple("extensionEn", "java.util.List"), - new Tuple("language", "org.ehrbase.client.classgenerator.examples.shareddefinition.Language"), - new Tuple("originValue", "java.time.temporal.TemporalAccessor"), - new Tuple("gerat", "com.nedap.archie.rm.datastructures.Cluster"), - new Tuple("subject", "com.nedap.archie.rm.generic.PartyProxy"), - new Tuple("versionUid", "org.ehrbase.client.openehrclient.VersionUid"), - new Tuple("endTimeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("language", "org.ehrbase.client.classgenerator.examples.shareddefinition.Language"), - new Tuple("healthCareFacility", "com.nedap.archie.rm.generic.PartyIdentified"), - new Tuple("statusValue", "java.lang.String"), - new Tuple("berichtIdValue", "java.lang.String"), - new Tuple("territory", "org.ehrbase.client.classgenerator.examples.shareddefinition.Territory"), - new Tuple("startTimeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("composer", "com.nedap.archie.rm.generic.PartyProxy"), - new Tuple("settingDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.Setting"), - new Tuple("korpergewicht", "java.util.List"), - new Tuple("erweiterung", "java.util.List"), - new Tuple("location", "java.lang.String"), - new Tuple("categoryDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.Category"), - new Tuple("participations", "java.util.List"), - new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit") - ); - - writeFiles(generate); - - - } - - @Test - public void testGenerateDiagnose() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.DIAGNOSE.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - - Set derDiagnoseDefiningcode = generate.getClasses() - .get("org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition") - .stream() - .filter(t -> t.name.equals("NameDesProblemsDerDiagnoseDefiningcode")) - .findAny() - .get() - .enumConstants - .keySet(); - - assertThat(derDiagnoseDefiningcode).containsExactlyInAnyOrder( - "KORONAVIREN_ALS_URSACHE_VON_KRANKHEITEN_DIE_IN_ANDEREN_KAPITELN_KLASSIFIZIERT_SIND", - "COVID19_VIRUS_NICHT_NACHGEWIESEN", - "COVID19_VIRUS_NACHGEWIESEN", - "INFEKTION_DURCH_KORONAVIREN_NICHT_NAHER_BEZEICHNETER_LOKALISATION" - ); - writeFiles(generate); - } - - - @Test - public void testGenerateEpisode() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.EPISODE_OF_CARE.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).map(f -> f.name).collect(Collectors.toList()); - - assertThat(fieldSpecs).containsExactlyInAnyOrder( - "value", - "value", - "rankMagnitude", - "roleValue", - "diagnosisEntry", - "identifier", - "team", - "statusDefiningcode", - "language", - "diagnosis", - "subject", - "managingOrganizationValue", - "typeValue", - "period", - "careManagerValue", - "versionUid", - "episodeofcare", - "endTimeValue", - "participations", - "language", - "healthcarefacility", - "composer", - "settingDefiningcode", - "territory", - "feederAudit", - "location", - "categoryDefiningcode", - "startTimeValue" - ); - - writeFiles(generate); - - - } - - @Test - public void testGenerateSmICS() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.SM_I_C_S_BEFUND.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).map(f -> f.name).collect(Collectors.toList()); - - assertThat(fieldSpecs).containsExactlyInAnyOrder( - "value", - "valueValue", - "value", - "idDerPerson", - "artDerPersonValue", - "kommentarValue", - "fallKategorieValue", - "fallidentifikationValue", - "fallArtValue", - "beteiligtePersonen", - "zimmerValue", - "stationValue", - "details", - "standorttypValue", - "standortbeschreibungValue", - "standortschlusselValue", - "antibiotikumDefiningcode", - "resistenzValue", - "kommentarValue", - "minimaleHemmkonzentrationMagnitude", - "minimaleHemmkonzentrationUnits", - "analyseergebnisDetails", - "laboranalytResultat", - "resistenzmechanismusBezeichnungValue", - "value", - "antibiogramm", - "haufigkeit", - "kommentarValue", - "resistenzmechanismus", - "keimzahlMagnitude", - "keimzahlUnits", - "weitereErganzungen", - "keimSubtyp", - "keimzahlDefiningcode", - "virulenzfaktorValue", - "mreKlasseDefiningcode", - "magnitude", - "definingcode", - "value", - "bewertungValue", - "kommentarValue", - "artDerTypisierung", - "ergebnis", - "erregernameDefiningcode", - "language", - "standort", - "zeitpunktDesErstenErregernachweisesValue", - "zeitpunktDesLetztenErregernachweisesValue", - "transmissionswegValue", - "ubertragungswegValue", - "erregerdetails", - "smicsErgebniskategorieDefiningcode", - "multispeziesValue", - "anzahlDerErregernachweise", - "timeValue", - "beginnValue", - "beginnDerUntersuchungValue", - "endeValue", - "dauerValue", - "subject", - "originValue", - "erregertypisierung", - "kommentarValue", - "kommentarValueArtDerUbertragung", - "versionUid", - "endTimeValue", - "participations", - "language", - "healthCareFacility", - "statusValue", - "berichtIdValue", - "territory", - "eventsummary", - "startTimeValue", - "smicsErgebnis", - "composer", - "settingDefiningcode", - "feederAudit", - "location", - "categoryDefiningcode" - ); - - writeFiles(generate); - - - } - - @Test - public void testGenerateD4LQuestionnaire() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.D4L_QUESTIONNAIRE.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); - - assertThat(fieldSpecs).size().isEqualTo(348); - - } - - @Test - public void testGenerateBefundDerBlutgasanalyse() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.BEFUND_DER_BLUTGASANALYSE.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).map(f -> f.name).collect(Collectors.toList()); - - assertThat(fieldSpecs).containsExactlyInAnyOrder( - "versionUid", - "endTimeValue", - "participations", - "language", - "healthCareFacility", - "statusDefiningcode", - "kategorieValue", - "territory", - "startTimeValue", - "composer", - "settingDefiningcode", - "feederAudit", - "location", - "categoryDefiningcode", - "erweiterung", - "laborergebnis", - "ergebnisStatusValue", - "untersuchterAnalytDefiningcode", - "analytResultatMagnitude", - "analytResultatUnits", - "analyseergebnisDetails", - "ergebnisStatusValue", - "untersuchterAnalytDefiningcode", - "analytResultatMagnitude", - "analytResultatUnits", - "analyseergebnisDetails", - "ergebnisStatusValue", - "untersuchterAnalytDefiningcode", - "analytResultatMagnitude", - "analytResultatUnits", - "analyseergebnisDetails", - "ergebnisStatusValue", - "untersuchterAnalytDefiningcode", - "analytResultatMagnitude", - "analytResultatUnits", - "analyseergebnisDetails", - "testDetails", - "phWert", - "language", - "sauerstoffpartialdruck", - "multimediaDarstellung", - "labortestBezeichnungDefiningcode", - "strukturierteErfassungDerStorfaktoren", - "strukturierteTestdiagnostik", - "kohlendioxidpartialdruck", - "sauerstoffsattigung", - "erweiterung", - "timeValue", - "probendetail", - "subject", - "originValue", - "laborWelchesDenUntersuchungsauftragAnnimmt" - ); - - writeFiles(generate); - - - } - - @Test - public void testGenerateMultiOccurrence() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.MULTI_OCCURRENCE.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - - - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); - - - assertThat(fieldSpecs) - .extracting(f -> f.name, f -> f.type.toString()) - .containsExactlyInAnyOrder( - new Tuple("versionUid", "org.ehrbase.client.openehrclient.VersionUid"), - new Tuple("extension", "java.util.List"), - new Tuple("language", "org.ehrbase.client.classgenerator.examples.shareddefinition.Language"), - new Tuple("settingDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.SettingDefiningcode"), - new Tuple("structuredMeasurementLocation", "java.util.List"), - new Tuple("originValue", "java.time.temporal.TemporalAccessor"), - new Tuple("device", "com.nedap.archie.rm.datastructures.Cluster"), - new Tuple("subject", "com.nedap.archie.rm.generic.PartyProxy"), - new Tuple("locationOfMeasurementDefiningcode", "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.LocationOfMeasurementDefiningcode"), - new Tuple("locationOfMeasurementValue", "java.lang.String"), - new Tuple("bodyExposureDefiningcode", "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyExposureDefiningcode"), - new Tuple("bodyExposureValue", "java.lang.String"), - new Tuple("temperatureMagnitude", "java.lang.Double"), - new Tuple("temperatureUnits", "java.lang.String"), - new Tuple("descriptionOfThermalStressValue", "java.lang.String"), - new Tuple("exertion", "com.nedap.archie.rm.datastructures.Cluster"), - new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("endTimeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("language", "org.ehrbase.client.classgenerator.examples.shareddefinition.Language"), - new Tuple("healthCareFacility", "com.nedap.archie.rm.generic.PartyIdentified"), - new Tuple("composer", "com.nedap.archie.rm.generic.PartyProxy"), - new Tuple("territory", "org.ehrbase.client.classgenerator.examples.shareddefinition.Territory"), - new Tuple("bodyTemperature", "java.util.List"), - new Tuple("location", "java.lang.String"), - new Tuple("startTimeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("currentDayOfMenstrualCycleMagnitude", "java.lang.Long"), - new Tuple("environmentalConditions", "java.util.List"), - new Tuple("bodyExposure", "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureBodyExposureChoice"), - new Tuple("locationOfMeasurement", "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureLocationOfMeasurementChoice"), - new Tuple("categoryDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.CategoryDefiningcode"), - new Tuple("extension", "java.util.List"), - new Tuple("bodyExposureDefiningcode", "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyExposureDefiningcode"), - new Tuple("bodyExposureValue", "java.lang.String"), - new Tuple("timeValue", "java.time.temporal.TemporalAccessor"), - new Tuple("temperatureMagnitude", "java.lang.Double"), - new Tuple("temperatureUnits", "java.lang.String"), - new Tuple("descriptionOfThermalStressValue", "java.lang.String"), - new Tuple("exertion", "com.nedap.archie.rm.datastructures.Cluster"), - new Tuple("currentDayOfMenstrualCycleMagnitude", "java.lang.Long"), - new Tuple("environmentalConditions", "java.util.List"), - new Tuple("widthValue", "java.time.temporal.TemporalAmount"), - new Tuple("bodyExposure", "org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureBodyExposureChoice2"), - new Tuple("mathFunctionDefiningcode", "org.ehrbase.client.classgenerator.examples.shareddefinition.MathFunctionDefiningcode"), - new Tuple("anyEvent", "java.util.List"), - new Tuple("participations", "java.util.List"), - new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit") - ); - - - writeFiles(generate); - - } - - @Test - public void testGenerateAllTypes() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.ALL_TYPES.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - - - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); - - assertThat(fieldSpecs).size().isEqualTo(75L); - - writeFiles(generate); - - } - - @Test - public void testGenerateVirologyFinding() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.VIROLOGY_FINDING.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - - - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).map(f -> f.name).collect(Collectors.toList()); - - assertThat(fieldSpecs).containsExactlyInAnyOrder( - "alternativeStruktur", - "nameDerKorperstelleValue", - "multimedialeDarstellung", - "kommentarDesProbennehmersValue", - "angabenZumProbennehmer", - "angabenZumTransport", - "externerIdentifikator", - "probenentnahmestelleValue", - "zusatzlicheAngabenZurProbennahme", - "behalterDetails", - "digitaleDarstellung", - "identifikatorDerUbergeordnetenProbe", - "zeitpunktDesProbeneingangsValue", - "kommentarValue", - "probenartValue", - "anatomischeLokalisation", - "laborprobenidentifikator", - "angabenZurVerarbeitung", - "identifikatorDesProbennehmers", - "physischeEigenschaften", - "zeitpunktDerProbenentnahmeValue", - "details", - "standorttypValue", - "standortbeschreibungValue", - "standortschlusselValue", - "nachweisValue", - "viruslastCtWertMagnitude", - "viruslastCtWertUnits", - "virusValue", - "kommentarValue", - "nachweis", - "zugehorigeLaborprobe", - "analyseergebnisReihenfolgeMagnitude", - "analyseergebnisDetails", - "proVirus", - "details", - "standorttypValue", - "standortbeschreibungValue", - "standortschlusselValue", - "value", - "testDetails", - "probe", - "language", - "einsenderstandort", - "kultur", - "multimediaDarstellung", - "auftragsIdDesAnforderndenEinsendendenSystems", - "auftragsIdEmpfanger", - "labortestBezeichnungValue", - "strukturierteErfassungDerStorfaktoren", - "strukturierteTestdiagnostik", - "empfangerstandort", - "erweiterung", - "timeValue", - "anforderung", - "subject", - "originValue", - "verteilerliste", - "fallKennungValue", - "versionUid", - "endTimeValue", - "befund", - "participations", - "language", - "healthCareFacility", - "statusValue", - "berichtIdValue", - "territory", - "startTimeValue", - "fallidentifikation", - "composer", - "settingDefiningcode", - "feederAudit", - "location", - "categoryDefiningcode"); - - writeFiles(generate); - - } - - @Test - public void testGenerateCorona() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.CORONA_ANAMNESE.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - - - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); - - assertThat(fieldSpecs).size().isEqualTo(305); - - writeFiles(generate); - - } - - @Test - public void testGenerateSchwangerschaftsstatus() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.SCHWANGERSCHAFTSSTATUS.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - - - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).map(f -> f.name).collect(Collectors.toList()); - - assertThat(fieldSpecs).containsExactlyInAnyOrder( - "versionUid", - "endTimeValue", - "participations", - "language", - "healthCareFacility", - "statusDefiningcode", - "kategorieValue", - "territory", - "startTimeValue", - "composer", - "settingDefiningcode", - "schwangerschaftsstatus", - "feederAudit", - "location", - "categoryDefiningcode", - "erweiterung", - "timeValue", - "subject", - "originValue", - "language", - "erweiterungen", - "statusDefiningcode" - - ); - - - Optional status1 = generate.getClasses().values().stream() - .flatMap(Collection::stream).filter(s -> s.name.equals("StatusDefiningcode")).findAny(); - assertThat(status1).isPresent(); - assertThat(status1.get().enumConstants.keySet()).containsExactlyInAnyOrder( - "VORLAUFIG", - "FINAL", - "REGISTRIERT", - "GEANDERT" - ); - - Optional status2 = generate.getClasses().values().stream() - .flatMap(Collection::stream).filter(s -> s.name.equals("StatusDefiningcode2")).findAny(); - assertThat(status2).isPresent(); - assertThat(status2.get().enumConstants.keySet()).containsExactlyInAnyOrder( - "SCHWANGER", - "NICHT_SCHWANGER", - "UNBEKANNT" - ); - - writeFiles(generate); - - } - - @Test - public void testCreateName() { - ClassGenerator cut = new ClassGenerator(); - String className = cut.buildClassName("/_state structure/*_confounding factors(en)_ELEMENT", true); - - assertThat(className).isEqualTo("ConfoundingFactorsEnElement"); - } - - @Test - public void testGenerateReactCare() throws IOException, XmlException { - OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.OPEN_E_REACT_CARE.getStream()).getTemplate(); - ClassGenerator cut = new ClassGenerator(); - ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, template); - - List fieldSpecs = generate.getClasses().values().stream() - .flatMap(Collection::stream) - .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) - .map(t -> t.fieldSpecs).flatMap(List::stream).collect(Collectors.toList()); - - assertThat(fieldSpecs).size().isEqualTo(352); - - writeFiles(generate); - } - -} \ No newline at end of file From 3fad0b57d879f682f04d5fd8868d7d19a39904f0 Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Wed, 2 Dec 2020 09:45:47 +0100 Subject: [PATCH 19/54] fix filenames see https://github.com/ehrbase/project_management/issues/424 --- ...e.java => StateOfDressEnDefiningCode.java} | 0 ... => LabortestBezeichnungDefiningCode.java} | 0 ...e.java => DiagnosestatusDefiningCode.java} | 0 ... DiagnostischeSicherheitDefiningCode.java} | 0 ...dyTemperatureBodyExposureDvCodedText.java} | 0 ...=> BodyTemperatureBodyExposureDvText.java} | 0 ...tureLocationOfMeasurementDvCodedText.java} | 0 ...mperatureLocationOfMeasurementDvText.java} | 0 ...iningcode.java => StatusDefiningCode.java} | 0 ...id19TestOverallTestStatusDvCodedText.java} | 0 ...stCovid19TestOverallTestStatusDvText.java} | 0 .../CategoryDefiningcode.java | 42 -- .../shareddefinition/Definingcode.java | 42 -- .../examples/shareddefinition/Language.java | 296 ---------- .../MathFunctionDefiningcode.java | 58 -- .../ServiceNameDefiningcode.java | 40 -- .../ServicePlannedDefiningcode.java | 38 -- .../shareddefinition/SettingDefiningcode.java | 62 -- .../SymptomSignNameDefiningcode.java | 38 -- .../examples/shareddefinition/Territory.java | 528 ------------------ .../TransitionDefiningcode.java | 76 --- ...nt.java => TestAllTypesChoiceDvCount.java} | 0 ...java => TestAllTypesChoiceDvQuantity.java} | 0 ...sGeneratorNew.java => ClassGenerator.java} | 4 +- .../classgenerator/ClassGeneratorRunner.java | 2 +- .../classgenerator/DefaultNamingStrategy.java | 12 +- ...orNewTest.java => ClassGeneratorTest.java} | 32 +- 27 files changed, 25 insertions(+), 1245 deletions(-) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/{StateOfDressEnDefiningcode.java => StateOfDressEnDefiningCode.java} (100%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/{LabortestBezeichnungDefiningcode.java => LabortestBezeichnungDefiningCode.java} (100%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/{DiagnosestatusDefiningcode.java => DiagnosestatusDefiningCode.java} (100%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/{DiagnostischeSicherheitDefiningcode.java => DiagnostischeSicherheitDefiningCode.java} (100%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/{BodyTemperatureBodyExposureDvcodedtext.java => BodyTemperatureBodyExposureDvCodedText.java} (100%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/{BodyTemperatureBodyExposureDvtext.java => BodyTemperatureBodyExposureDvText.java} (100%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/{BodyTemperatureLocationOfMeasurementDvcodedtext.java => BodyTemperatureLocationOfMeasurementDvCodedText.java} (100%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/{BodyTemperatureLocationOfMeasurementDvtext.java => BodyTemperatureLocationOfMeasurementDvText.java} (100%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/{StatusDefiningcode.java => StatusDefiningCode.java} (100%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/{LatestCovid19TestOverallTestStatusDvcodedtext.java => LatestCovid19TestOverallTestStatusDvCodedText.java} (100%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/{LatestCovid19TestOverallTestStatusDvtext.java => LatestCovid19TestOverallTestStatusDvText.java} (100%) delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/CategoryDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/Definingcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/Language.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/MathFunctionDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/ServiceNameDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/ServicePlannedDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/SettingDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/SymptomSignNameDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/Territory.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/TransitionDefiningcode.java rename client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/{TestAllTypesChoiceDvcount.java => TestAllTypesChoiceDvCount.java} (100%) rename client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/{TestAllTypesChoiceDvquantity.java => TestAllTypesChoiceDvQuantity.java} (100%) rename generator/src/main/java/org/ehrbase/client/classgenerator/{ClassGeneratorNew.java => ClassGenerator.java} (99%) rename generator/src/test/java/org/ehrbase/client/classgenerator/{ClassGeneratorNewTest.java => ClassGeneratorTest.java} (96%) diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/StateOfDressEnDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/StateOfDressEnDefiningCode.java similarity index 100% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/StateOfDressEnDefiningcode.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/StateOfDressEnDefiningCode.java diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LabortestBezeichnungDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LabortestBezeichnungDefiningCode.java similarity index 100% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LabortestBezeichnungDefiningcode.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LabortestBezeichnungDefiningCode.java diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnosestatusDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnosestatusDefiningCode.java similarity index 100% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnosestatusDefiningcode.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnosestatusDefiningCode.java diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningCode.java similarity index 100% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningcode.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningCode.java diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvcodedtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvCodedText.java similarity index 100% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvcodedtext.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvCodedText.java diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java similarity index 100% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvtext.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvcodedtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvCodedText.java similarity index 100% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvcodedtext.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvCodedText.java diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java similarity index 100% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvtext.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/StatusDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/StatusDefiningCode.java similarity index 100% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/StatusDefiningcode.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/StatusDefiningCode.java diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvcodedtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvCodedText.java similarity index 100% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvcodedtext.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvCodedText.java diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvtext.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java similarity index 100% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvtext.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/CategoryDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/CategoryDefiningcode.java deleted file mode 100644 index ece3ba0e4..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/CategoryDefiningcode.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.shareddefinition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum CategoryDefiningcode implements EnumValueSet { - EVENT("event", "event", "openehr", "433"), - - EPISODIC("episodic", "episodic", "openehr", "435"), - - PERSISTENT("persistent", "persistent", "openehr", "431"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - CategoryDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/Definingcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/Definingcode.java deleted file mode 100644 index f93ee1510..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/Definingcode.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.shareddefinition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum Definingcode implements EnumValueSet { - N840544004("840544004", "840544004", "SNOMED-CT", "840544004"), - - N840539006("840539006", "840539006", "SNOMED-CT", "840539006"), - - N840546002("840546002", "840546002", "SNOMED-CT", "840546002"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - Definingcode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/Language.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/Language.java deleted file mode 100644 index 6cbb8ae36..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/Language.java +++ /dev/null @@ -1,296 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.shareddefinition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum Language implements EnumValueSet { - ZU("zu", "zu", "ISO_639-1", "zu"), - - ES_MX("es-mx", "es-mx", "ISO_639-1", "es-mx"), - - ES_HN("es-hn", "es-hn", "ISO_639-1", "es-hn"), - - ES_CL("es-cl", "es-cl", "ISO_639-1", "es-cl"), - - AR_LY("ar-ly", "ar-ly", "ISO_639-1", "ar-ly"), - - MK("mk", "mk", "ISO_639-1", "mk"), - - DA("da", "da", "ISO_639-1", "da"), - - UK("uk", "uk", "ISO_639-1", "uk"), - - RM("rm", "rm", "ISO_639-1", "rm"), - - AR_DZ("ar-dz", "ar-dz", "ISO_639-1", "ar-dz"), - - ES_GT("es-gt", "es-gt", "ISO_639-1", "es-gt"), - - NL_BE("nl-be", "nl-be", "ISO_639-1", "nl-be"), - - EN_JM("en-jm", "en-jm", "ISO_639-1", "en-jm"), - - ES_NI("es-ni", "es-ni", "ISO_639-1", "es-ni"), - - MT("mt", "mt", "ISO_639-1", "mt"), - - VE("ve", "ve", "ISO_639-1", "ve"), - - EL("el", "el", "ISO_639-1", "el"), - - IT("it", "it", "ISO_639-1", "it"), - - ES_PE("es-pe", "es-pe", "ISO_639-1", "es-pe"), - - EN_US("en-us", "en-us", "ISO_639-1", "en-us"), - - HR("hr", "hr", "ISO_639-1", "hr"), - - SX("sx", "sx", "ISO_639-1", "sx"), - - ET("et", "et", "ISO_639-1", "et"), - - TR("tr", "tr", "ISO_639-1", "tr"), - - CY("cy", "cy", "ISO_639-1", "cy"), - - ID("id", "id", "ISO_639-1", "id"), - - NN("nn", "nn", "ISO_639-1", "nn"), - - RU_MO("ru-mo", "ru-mo", "ISO_639-1", "ru-mo"), - - BG("bg", "bg", "ISO_639-1", "bg"), - - ZH_CN("zh-cn", "zh-cn", "ISO_639-1", "zh-cn"), - - CY_GB("cy-gb", "cy-gb", "ISO_639-1", "cy-gb"), - - AR_KW("ar-kw", "ar-kw", "ISO_639-1", "ar-kw"), - - FO("fo", "fo", "ISO_639-1", "fo"), - - EU("eu", "eu", "ISO_639-1", "eu"), - - AR_SY("ar-sy", "ar-sy", "ISO_639-1", "ar-sy"), - - EN_AU("en-au", "en-au", "ISO_639-1", "en-au"), - - AR_AE("ar-ae", "ar-ae", "ISO_639-1", "ar-ae"), - - ES_SV("es-sv", "es-sv", "ISO_639-1", "es-sv"), - - ES_AR("es-ar", "es-ar", "ISO_639-1", "es-ar"), - - AA("aa", "aa", "ISO_639-1", "aa"), - - AR_LB("ar-lb", "ar-lb", "ISO_639-1", "ar-lb"), - - EN_CA("en-ca", "en-ca", "ISO_639-1", "en-ca"), - - AZ("az", "az", "ISO_639-1", "az"), - - FR_CA("fr-ca", "fr-ca", "ISO_639-1", "fr-ca"), - - SV("sv", "sv", "ISO_639-1", "sv"), - - AR_BH("ar-bh", "ar-bh", "ISO_639-1", "ar-bh"), - - AR_YE("ar-ye", "ar-ye", "ISO_639-1", "ar-ye"), - - UR("ur", "ur", "ISO_639-1", "ur"), - - ZH_TW("zh-tw", "zh-tw", "ISO_639-1", "zh-tw"), - - FR_LU("fr-lu", "fr-lu", "ISO_639-1", "fr-lu"), - - DE_LI("de-li", "de-li", "ISO_639-1", "de-li"), - - NL("nl", "nl", "ISO_639-1", "nl"), - - IT_CH("it-ch", "it-ch", "ISO_639-1", "it-ch"), - - EN_IE("en-ie", "en-ie", "ISO_639-1", "en-ie"), - - AR_SA("ar-sa", "ar-sa", "ISO_639-1", "ar-sa"), - - TH("th", "th", "ISO_639-1", "th"), - - ES_DO("es-do", "es-do", "ISO_639-1", "es-do"), - - ES_UY("es-uy", "es-uy", "ISO_639-1", "es-uy"), - - BE("be", "be", "ISO_639-1", "be"), - - HI("hi", "hi", "ISO_639-1", "hi"), - - RU("ru", "ru", "ISO_639-1", "ru"), - - XH("xh", "xh", "ISO_639-1", "xh"), - - KO("ko", "ko", "ISO_639-1", "ko"), - - EN_TT("en-tt", "en-tt", "ISO_639-1", "en-tt"), - - IS("is", "is", "ISO_639-1", "is"), - - ES("es", "es", "ISO_639-1", "es"), - - PT_PT("pt-pt", "pt-pt", "ISO_639-1", "pt-pt"), - - AR_JO("ar-jo", "ar-jo", "ISO_639-1", "ar-jo"), - - AR_EG("ar-eg", "ar-eg", "ISO_639-1", "ar-eg"), - - ES_VE("es-ve", "es-ve", "ISO_639-1", "es-ve"), - - RO_MO("ro-mo", "ro-mo", "ISO_639-1", "ro-mo"), - - JA("ja", "ja", "ISO_639-1", "ja"), - - ES_PA("es-pa", "es-pa", "ISO_639-1", "es-pa"), - - EN_GB("en-gb", "en-gb", "ISO_639-1", "en-gb"), - - ES_PR("es-pr", "es-pr", "ISO_639-1", "es-pr"), - - KK("kk", "kk", "ISO_639-1", "kk"), - - FA("fa", "fa", "ISO_639-1", "fa"), - - VI("vi", "vi", "ISO_639-1", "vi"), - - FR_CH("fr-ch", "fr-ch", "ISO_639-1", "fr-ch"), - - JI("ji", "ji", "ISO_639-1", "ji"), - - HE("he", "he", "ISO_639-1", "he"), - - SK("sk", "sk", "ISO_639-1", "sk"), - - DE_AT("de-at", "de-at", "ISO_639-1", "de-at"), - - ZH_SG("zh-sg", "zh-sg", "ISO_639-1", "zh-sg"), - - ES_EC("es-ec", "es-ec", "ISO_639-1", "es-ec"), - - FR("fr", "fr", "ISO_639-1", "fr"), - - DE_CH("de-ch", "de-ch", "ISO_639-1", "de-ch"), - - LV("lv", "lv", "ISO_639-1", "lv"), - - SL("sl", "sl", "ISO_639-1", "sl"), - - TN("tn", "tn", "ISO_639-1", "tn"), - - NB("nb", "nb", "ISO_639-1", "nb"), - - EN_BZ("en-bz", "en-bz", "ISO_639-1", "en-bz"), - - ES_PY("es-py", "es-py", "ISO_639-1", "es-py"), - - ES_CO("es-co", "es-co", "ISO_639-1", "es-co"), - - GD("gd", "gd", "ISO_639-1", "gd"), - - PT_BR("pt-br", "pt-br", "ISO_639-1", "pt-br"), - - KM("km", "km", "ISO_639-1", "km"), - - EN_ZA("en-za", "en-za", "ISO_639-1", "en-za"), - - EN_NZ("en-nz", "en-nz", "ISO_639-1", "en-nz"), - - CY_AR("cy-ar", "cy-ar", "ISO_639-1", "cy-ar"), - - SQ("sq", "sq", "ISO_639-1", "sq"), - - TS("ts", "ts", "ISO_639-1", "ts"), - - ES_CR("es-cr", "es-cr", "ISO_639-1", "es-cr"), - - RO("ro", "ro", "ISO_639-1", "ro"), - - AF("af", "af", "ISO_639-1", "af"), - - GD_IE("gd-ie", "gd-ie", "ISO_639-1", "gd-ie"), - - CA("ca", "ca", "ISO_639-1", "ca"), - - SI("si", "si", "ISO_639-1", "si"), - - AR_TN("ar-tn", "ar-tn", "ISO_639-1", "ar-tn"), - - LT("lt", "lt", "ISO_639-1", "lt"), - - PT("pt", "pt", "ISO_639-1", "pt"), - - EN("en", "en", "ISO_639-1", "en"), - - SZ("sz", "sz", "ISO_639-1", "sz"), - - ZH_HK("zh-hk", "zh-hk", "ISO_639-1", "zh-hk"), - - SR("sr", "sr", "ISO_639-1", "sr"), - - ES_BO("es-bo", "es-bo", "ISO_639-1", "es-bo"), - - AR_QA("ar-qa", "ar-qa", "ISO_639-1", "ar-qa"), - - FR_BE("fr-be", "fr-be", "ISO_639-1", "fr-be"), - - PL("pl", "pl", "ISO_639-1", "pl"), - - AR_MA("ar-ma", "ar-ma", "ISO_639-1", "ar-ma"), - - DE("de", "de", "ISO_639-1", "de"), - - FI("fi", "fi", "ISO_639-1", "fi"), - - ZH("zh", "zh", "ISO_639-1", "zh"), - - AR_OM("ar-om", "ar-om", "ISO_639-1", "ar-om"), - - SB("sb", "sb", "ISO_639-1", "sb"), - - DE_LU("de-lu", "de-lu", "ISO_639-1", "de-lu"), - - SV_FI("sv-fi", "sv-fi", "ISO_639-1", "sv-fi"), - - AR_IQ("ar-iq", "ar-iq", "ISO_639-1", "ar-iq"), - - CS("cs", "cs", "ISO_639-1", "cs"), - - HU("hu", "hu", "ISO_639-1", "hu"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - Language(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/MathFunctionDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/MathFunctionDefiningcode.java deleted file mode 100644 index 40660a65d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/MathFunctionDefiningcode.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.shareddefinition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum MathFunctionDefiningcode implements EnumValueSet { - DECREASE("decrease", "decrease", "openehr", "521"), - - TOTAL("total", "total", "openehr", "148"), - - MAXIMUM("maximum", "maximum", "openehr", "144"), - - MODE("mode", "mode", "openehr", "267"), - - INCREASE("increase", "increase", "openehr", "522"), - - ACTUAL("actual", "actual", "openehr", "640"), - - VARIATION("variation", "variation", "openehr", "149"), - - MINIMUM("minimum", "minimum", "openehr", "145"), - - CHANGE("change", "change", "openehr", "147"), - - MEAN("mean", "mean", "openehr", "146"), - - MEDIAN("median", "median", "openehr", "268"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - MathFunctionDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/ServiceNameDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/ServiceNameDefiningcode.java deleted file mode 100644 index d7c6ad8db..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/ServiceNameDefiningcode.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.shareddefinition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum ServiceNameDefiningcode implements EnumValueSet { - N170499009("170499009", "170499009", "SNOMED-CT", "170499009"), - - N225368008("225368008", "225368008", "SNOMED-CT", "225368008"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - ServiceNameDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/ServicePlannedDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/ServicePlannedDefiningcode.java deleted file mode 100644 index 724b10a2d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/ServicePlannedDefiningcode.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.shareddefinition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum ServicePlannedDefiningcode implements EnumValueSet { - PLANNED("planned", "planned", "openehr", "526"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - ServicePlannedDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/SettingDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/SettingDefiningcode.java deleted file mode 100644 index 10c8e969d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/SettingDefiningcode.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.shareddefinition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum SettingDefiningcode implements EnumValueSet { - COMPLEMENTARY_HEALTH_CARE("complementary health care", "complementary health care", "openehr", "235"), - - HOME("home", "home", "openehr", "225"), - - SECONDARY_NURSING_CARE("secondary nursing care", "secondary nursing care", "openehr", "233"), - - DENTAL_CARE("dental care", "dental care", "openehr", "236"), - - OTHER_CARE("other care", "other care", "openehr", "238"), - - NURSING_HOME_CARE("nursing home care", "nursing home care", "openehr", "237"), - - SECONDARY_ALLIED_HEALTH_CARE("secondary allied health care", "secondary allied health care", "openehr", "234"), - - EMERGENCY_CARE("emergency care", "emergency care", "openehr", "227"), - - PRIMARY_NURSING_CARE("primary nursing care", "primary nursing care", "openehr", "229"), - - PRIMARY_MEDICAL_CARE("primary medical care", "primary medical care", "openehr", "228"), - - PRIMARY_ALLIED_HEALTH_CARE("primary allied health care", "primary allied health care", "openehr", "230"), - - SECONDARY_MEDICAL_CARE("secondary medical care", "secondary medical care", "openehr", "232"), - - MIDWIFERY_CARE("midwifery care", "midwifery care", "openehr", "231"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - SettingDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/SymptomSignNameDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/SymptomSignNameDefiningcode.java deleted file mode 100644 index 01c698e2f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/SymptomSignNameDefiningcode.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.shareddefinition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum SymptomSignNameDefiningcode implements EnumValueSet { - N315642008("315642008", "315642008", "SNOMED-CT", "315642008"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - SymptomSignNameDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/Territory.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/Territory.java deleted file mode 100644 index 8b65543eb..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/Territory.java +++ /dev/null @@ -1,528 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.shareddefinition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum Territory implements EnumValueSet { - AD("AD", "AD", "ISO_3166-1", "AD"), - - BF("BF", "BF", "ISO_3166-1", "BF"), - - DJ("DJ", "DJ", "ISO_3166-1", "DJ"), - - CH("CH", "CH", "ISO_3166-1", "CH"), - - PR("PR", "PR", "ISO_3166-1", "PR"), - - HR("HR", "HR", "ISO_3166-1", "HR"), - - GP("GP", "GP", "ISO_3166-1", "GP"), - - TZ("TZ", "TZ", "ISO_3166-1", "TZ"), - - IT("IT", "IT", "ISO_3166-1", "IT"), - - AT("AT", "AT", "ISO_3166-1", "AT"), - - BV("BV", "BV", "ISO_3166-1", "BV"), - - DZ("DZ", "DZ", "ISO_3166-1", "DZ"), - - CX("CX", "CX", "ISO_3166-1", "CX"), - - PA("PA", "PA", "ISO_3166-1", "PA"), - - MK("MK", "MK", "ISO_3166-1", "MK"), - - LI("LI", "LI", "ISO_3166-1", "LI"), - - RE("RE", "RE", "ISO_3166-1", "RE"), - - SG("SG", "SG", "ISO_3166-1", "SG"), - - JE("JE", "JE", "ISO_3166-1", "JE"), - - KG("KG", "KG", "ISO_3166-1", "KG"), - - AE("AE", "AE", "ISO_3166-1", "AE"), - - BG("BG", "BG", "ISO_3166-1", "BG"), - - CI("CI", "CI", "ISO_3166-1", "CI"), - - PS("PS", "PS", "ISO_3166-1", "PS"), - - NO("NO", "NO", "ISO_3166-1", "NO"), - - DK("DK", "DK", "ISO_3166-1", "DK"), - - KY("KY", "KY", "ISO_3166-1", "KY"), - - GQ("GQ", "GQ", "ISO_3166-1", "GQ"), - - FO("FO", "FO", "ISO_3166-1", "FO"), - - RW("RW", "RW", "ISO_3166-1", "RW"), - - SY("SY", "SY", "ISO_3166-1", "SY"), - - YT("YT", "YT", "ISO_3166-1", "YT"), - - AU("AU", "AU", "ISO_3166-1", "AU"), - - BW("BW", "BW", "ISO_3166-1", "BW"), - - CY("CY", "CY", "ISO_3166-1", "CY"), - - KH("KH", "KH", "ISO_3166-1", "KH"), - - ID("ID", "ID", "ISO_3166-1", "ID"), - - ML("ML", "ML", "ISO_3166-1", "ML"), - - SH("SH", "SH", "ISO_3166-1", "SH"), - - TJ("TJ", "TJ", "ISO_3166-1", "TJ"), - - VN("VN", "VN", "ISO_3166-1", "VN"), - - BD("BD", "BD", "ISO_3166-1", "BD"), - - CF("CF", "CF", "ISO_3166-1", "CF"), - - GN("GN", "GN", "ISO_3166-1", "GN"), - - QA("QA", "QA", "ISO_3166-1", "QA"), - - MZ("MZ", "MZ", "ISO_3166-1", "MZ"), - - SV("SV", "SV", "ISO_3166-1", "SV"), - - IR("IR", "IR", "ISO_3166-1", "IR"), - - UZ("UZ", "UZ", "ISO_3166-1", "UZ"), - - AR("AR", "AR", "ISO_3166-1", "AR"), - - BT("BT", "BT", "ISO_3166-1", "BT"), - - CV("CV", "CV", "ISO_3166-1", "CV"), - - SE("SE", "SE", "ISO_3166-1", "SE"), - - TG("TG", "TG", "ISO_3166-1", "TG"), - - OM("OM", "OM", "ISO_3166-1", "OM"), - - KE("KE", "KE", "ISO_3166-1", "KE"), - - BE("BE", "BE", "ISO_3166-1", "BE"), - - CG("CG", "CG", "ISO_3166-1", "CG"), - - FM("FM", "FM", "ISO_3166-1", "FM"), - - LY("LY", "LY", "ISO_3166-1", "LY"), - - RU("RU", "RU", "ISO_3166-1", "RU"), - - IS("IS", "IS", "ISO_3166-1", "IS"), - - KW("KW", "KW", "ISO_3166-1", "KW"), - - AS("AS", "AS", "ISO_3166-1", "AS"), - - TH("TH", "TH", "ISO_3166-1", "TH"), - - NL("NL", "NL", "ISO_3166-1", "NL"), - - CD("CD", "CD", "ISO_3166-1", "CD"), - - FJ("FJ", "FJ", "ISO_3166-1", "FJ"), - - EH("EH", "EH", "ISO_3166-1", "EH"), - - GL("GL", "GL", "ISO_3166-1", "GL"), - - HN("HN", "HN", "ISO_3166-1", "HN"), - - SC("SC", "SC", "ISO_3166-1", "SC"), - - ST("ST", "ST", "ISO_3166-1", "ST"), - - TV("TV", "TV", "ISO_3166-1", "TV"), - - LV("LV", "LV", "ISO_3166-1", "LV"), - - ZA("ZA", "ZA", "ISO_3166-1", "ZA"), - - NZ("NZ", "NZ", "ISO_3166-1", "NZ"), - - MX("MX", "MX", "ISO_3166-1", "MX"), - - BR("BR", "BR", "ISO_3166-1", "BR"), - - UG("UG", "UG", "ISO_3166-1", "UG"), - - PM("PM", "PM", "ISO_3166-1", "PM"), - - VI("VI", "VI", "ISO_3166-1", "VI"), - - MG("MG", "MG", "ISO_3166-1", "MG"), - - NI("NI", "NI", "ISO_3166-1", "NI"), - - BA("BA", "BA", "ISO_3166-1", "BA"), - - CC("CC", "CC", "ISO_3166-1", "CC"), - - IQ("IQ", "IQ", "ISO_3166-1", "IQ"), - - FK("FK", "FK", "ISO_3166-1", "FK"), - - GM("GM", "GM", "ISO_3166-1", "GM"), - - RS("RS", "RS", "ISO_3166-1", "RS"), - - UY("UY", "UY", "ISO_3166-1", "UY"), - - TW("TW", "TW", "ISO_3166-1", "TW"), - - MY("MY", "MY", "ISO_3166-1", "MY"), - - AQ("AQ", "AQ", "ISO_3166-1", "AQ"), - - BS("BS", "BS", "ISO_3166-1", "BS"), - - CU("CU", "CU", "ISO_3166-1", "CU"), - - SD("SD", "SD", "ISO_3166-1", "SD"), - - TF("TF", "TF", "ISO_3166-1", "TF"), - - PN("PN", "PN", "ISO_3166-1", "PN"), - - MH("MH", "MH", "ISO_3166-1", "MH"), - - BB("BB", "BB", "ISO_3166-1", "BB"), - - JP("JP", "JP", "ISO_3166-1", "JP"), - - KR("KR", "KR", "ISO_3166-1", "KR"), - - LT("LT", "LT", "ISO_3166-1", "LT"), - - SA("SA", "SA", "ISO_3166-1", "SA"), - - TC("TC", "TC", "ISO_3166-1", "TC"), - - IN("IN", "IN", "ISO_3166-1", "IN"), - - AN("AN", "AN", "ISO_3166-1", "AN"), - - MV("MV", "MV", "ISO_3166-1", "MV"), - - CR("CR", "CR", "ISO_3166-1", "CR"), - - ME("ME", "ME", "ISO_3166-1", "ME"), - - LC("LC", "LC", "ISO_3166-1", "LC"), - - RO("RO", "RO", "ISO_3166-1", "RO"), - - VG("VG", "VG", "ISO_3166-1", "VG"), - - PK("PK", "PK", "ISO_3166-1", "PK"), - - CA("CA", "CA", "ISO_3166-1", "CA"), - - NG("NG", "NG", "ISO_3166-1", "NG"), - - EE("EE", "EE", "ISO_3166-1", "EE"), - - EG("EG", "EG", "ISO_3166-1", "EG"), - - FI("FI", "FI", "ISO_3166-1", "FI"), - - DE("DE", "DE", "ISO_3166-1", "DE"), - - IO("IO", "IO", "ISO_3166-1", "IO"), - - SB("SB", "SB", "ISO_3166-1", "SB"), - - HM("HM", "HM", "ISO_3166-1", "HM"), - - TD("TD", "TD", "ISO_3166-1", "TD"), - - MW("MW", "MW", "ISO_3166-1", "MW"), - - LU("LU", "LU", "ISO_3166-1", "LU"), - - AO("AO", "AO", "ISO_3166-1", "AO"), - - SR("SR", "SR", "ISO_3166-1", "SR"), - - TT("TT", "TT", "ISO_3166-1", "TT"), - - PL("PL", "PL", "ISO_3166-1", "PL"), - - MF("MF", "MF", "ISO_3166-1", "MF"), - - KP("KP", "KP", "ISO_3166-1", "KP"), - - LR("LR", "LR", "ISO_3166-1", "LR"), - - IL("IL", "IL", "ISO_3166-1", "IL"), - - GH("GH", "GH", "ISO_3166-1", "GH"), - - MT("MT", "MT", "ISO_3166-1", "MT"), - - VE("VE", "VE", "ISO_3166-1", "VE"), - - AL("AL", "AL", "ISO_3166-1", "AL"), - - BN("BN", "BN", "ISO_3166-1", "BN"), - - ET("ET", "ET", "ISO_3166-1", "ET"), - - NE("NE", "NE", "ISO_3166-1", "NE"), - - MC("MC", "MC", "ISO_3166-1", "MC"), - - LA("LA", "LA", "ISO_3166-1", "LA"), - - SO("SO", "SO", "ISO_3166-1", "SO"), - - US("US", "US", "ISO_3166-1", "US"), - - VU("VU", "VU", "ISO_3166-1", "VU"), - - ZM("ZM", "ZM", "ISO_3166-1", "ZM"), - - EC("EC", "EC", "ISO_3166-1", "EC"), - - GG("GG", "GG", "ISO_3166-1", "GG"), - - IM("IM", "IM", "ISO_3166-1", "IM"), - - JO("JO", "JO", "ISO_3166-1", "JO"), - - HK("HK", "HK", "ISO_3166-1", "HK"), - - MU("MU", "MU", "ISO_3166-1", "MU"), - - GI("GI", "GI", "ISO_3166-1", "GI"), - - LS("LS", "LS", "ISO_3166-1", "LS"), - - AM("AM", "AM", "ISO_3166-1", "AM"), - - BO("BO", "BO", "ISO_3166-1", "BO"), - - LB("LB", "LB", "ISO_3166-1", "LB"), - - NF("NF", "NF", "ISO_3166-1", "NF"), - - GY("GY", "GY", "ISO_3166-1", "GY"), - - MD("MD", "MD", "ISO_3166-1", "MD"), - - TR("TR", "TR", "ISO_3166-1", "TR"), - - MR("MR", "MR", "ISO_3166-1", "MR"), - - UA("UA", "UA", "ISO_3166-1", "UA"), - - VC("VC", "VC", "ISO_3166-1", "VC"), - - KN("KN", "KN", "ISO_3166-1", "KN"), - - BL("BL", "BL", "ISO_3166-1", "BL"), - - CN("CN", "CN", "ISO_3166-1", "CN"), - - ER("ER", "ER", "ISO_3166-1", "ER"), - - PG("PG", "PG", "ISO_3166-1", "PG"), - - SM("SM", "SM", "ISO_3166-1", "SM"), - - NC("NC", "NC", "ISO_3166-1", "NC"), - - TO("TO", "TO", "ISO_3166-1", "TO"), - - MA("MA", "MA", "ISO_3166-1", "MA"), - - AZ("AZ", "AZ", "ISO_3166-1", "AZ"), - - GE("GE", "GE", "ISO_3166-1", "GE"), - - MS("MS", "MS", "ISO_3166-1", "MS"), - - NU("NU", "NU", "ISO_3166-1", "NU"), - - WF("WF", "WF", "ISO_3166-1", "WF"), - - JM("JM", "JM", "ISO_3166-1", "JM"), - - BM("BM", "BM", "ISO_3166-1", "BM"), - - CO("CO", "CO", "ISO_3166-1", "CO"), - - GW("GW", "GW", "ISO_3166-1", "GW"), - - PY("PY", "PY", "ISO_3166-1", "PY"), - - ES("ES", "ES", "ISO_3166-1", "ES"), - - PH("PH", "PH", "ISO_3166-1", "PH"), - - SN("SN", "SN", "ISO_3166-1", "SN"), - - GF("GF", "GF", "ISO_3166-1", "GF"), - - VA("VA", "VA", "ISO_3166-1", "VA"), - - NR("NR", "NR", "ISO_3166-1", "NR"), - - MP("MP", "MP", "ISO_3166-1", "MP"), - - BJ("BJ", "BJ", "ISO_3166-1", "BJ"), - - FR("FR", "FR", "ISO_3166-1", "FR"), - - CL("CL", "CL", "ISO_3166-1", "CL"), - - GT("GT", "GT", "ISO_3166-1", "GT"), - - WS("WS", "WS", "ISO_3166-1", "WS"), - - TM("TM", "TM", "ISO_3166-1", "TM"), - - PE("PE", "PE", "ISO_3166-1", "PE"), - - NA("NA", "NA", "ISO_3166-1", "NA"), - - AX("AX", "AX", "ISO_3166-1", "AX"), - - BZ("BZ", "BZ", "ISO_3166-1", "BZ"), - - SK("SK", "SK", "ISO_3166-1", "SK"), - - PW("PW", "PW", "ISO_3166-1", "PW"), - - KM("KM", "KM", "ISO_3166-1", "KM"), - - MQ("MQ", "MQ", "ISO_3166-1", "MQ"), - - AI("AI", "AI", "ISO_3166-1", "AI"), - - CM("CM", "CM", "ISO_3166-1", "CM"), - - DO("DO", "DO", "ISO_3166-1", "DO"), - - GU("GU", "GU", "ISO_3166-1", "GU"), - - SL("SL", "SL", "ISO_3166-1", "SL"), - - TN("TN", "TN", "ISO_3166-1", "TN"), - - PF("PF", "PF", "ISO_3166-1", "PF"), - - GD("GD", "GD", "ISO_3166-1", "GD"), - - YE("YE", "YE", "ISO_3166-1", "YE"), - - AF("AF", "AF", "ISO_3166-1", "AF"), - - PT("PT", "PT", "ISO_3166-1", "PT"), - - MN("MN", "MN", "ISO_3166-1", "MN"), - - BH("BH", "BH", "ISO_3166-1", "BH"), - - NP("NP", "NP", "ISO_3166-1", "NP"), - - HT("HT", "HT", "ISO_3166-1", "HT"), - - GR("GR", "GR", "ISO_3166-1", "GR"), - - KZ("KZ", "KZ", "ISO_3166-1", "KZ"), - - SZ("SZ", "SZ", "ISO_3166-1", "SZ"), - - ZW("ZW", "ZW", "ISO_3166-1", "ZW"), - - CZ("CZ", "CZ", "ISO_3166-1", "CZ"), - - IE("IE", "IE", "ISO_3166-1", "IE"), - - KI("KI", "KI", "ISO_3166-1", "KI"), - - MM("MM", "MM", "ISO_3166-1", "MM"), - - GA("GA", "GA", "ISO_3166-1", "GA"), - - LK("LK", "LK", "ISO_3166-1", "LK"), - - SI("SI", "SI", "ISO_3166-1", "SI"), - - UM("UM", "UM", "ISO_3166-1", "UM"), - - TK("TK", "TK", "ISO_3166-1", "TK"), - - MO("MO", "MO", "ISO_3166-1", "MO"), - - AG("AG", "AG", "ISO_3166-1", "AG"), - - BI("BI", "BI", "ISO_3166-1", "BI"), - - CK("CK", "CK", "ISO_3166-1", "CK"), - - GS("GS", "GS", "ISO_3166-1", "GS"), - - DM("DM", "DM", "ISO_3166-1", "DM"), - - HU("HU", "HU", "ISO_3166-1", "HU"), - - AW("AW", "AW", "ISO_3166-1", "AW"), - - BY("BY", "BY", "ISO_3166-1", "BY"), - - GB("GB", "GB", "ISO_3166-1", "GB"), - - SJ("SJ", "SJ", "ISO_3166-1", "SJ"), - - TL("TL", "TL", "ISO_3166-1", "TL"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - Territory(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/TransitionDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/TransitionDefiningcode.java deleted file mode 100644 index 4bf29dee1..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/TransitionDefiningcode.java +++ /dev/null @@ -1,76 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.shareddefinition; - -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum TransitionDefiningcode implements EnumValueSet { - CANCEL("cancel", "cancel", "openehr", "166"), - - INITIATE("initiate", "initiate", "openehr", "535"), - - SUSPEND("suspend", "suspend", "openehr", "544"), - - SCHEDULED_STEP("scheduled step", "scheduled step", "openehr", "534"), - - RESTORE("restore", "restore", "openehr", "538"), - - POSTPONE("postpone", "postpone", "openehr", "537"), - - RESUME("resume", "resume", "openehr", "546"), - - SUSPENDED_STEP("suspended step", "suspended step", "openehr", "545"), - - NOTIFY_ABORTED("notify aborted", "notify aborted", "openehr", "550"), - - START("start", "start", "openehr", "540"), - - FINISH("finish", "finish", "openehr", "548"), - - SCHEDULE("schedule", "schedule", "openehr", "539"), - - NOTIFY_COMPLETED("notify completed", "notify completed", "openehr", "551"), - - ACTIVE_STEP("active step", "active step", "openehr", "543"), - - DO("do", "do", "openehr", "541"), - - PLAN_STEP("plan step", "plan step", "openehr", "536"), - - TIME_OUT("time out", "time out", "openehr", "549"), - - NOTIFY_CANCELLED("notify cancelled", "notify cancelled", "openehr", "552"), - - POSTPONED_STEP("postponed step", "postponed step", "openehr", "542"), - - ABORT("abort", "abort", "openehr", "547"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - TransitionDefiningcode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvcount.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java similarity index 100% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvcount.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvquantity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java similarity index 100% rename from client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvquantity.java rename to client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java similarity index 99% rename from generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java rename to generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java index 462aa79fb..cf5335fad 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorNew.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java @@ -74,7 +74,7 @@ import java.util.Set; import java.util.stream.Collectors; -public class ClassGeneratorNew { +public class ClassGenerator { private static final ArchieRMInfoLookup RM_INFO_LOOKUP = ArchieRMInfoLookup.getInstance(); public static final String ABBREV_MARKER = "_"; @@ -101,7 +101,7 @@ static class Context { private final WebTemplateFilter filter; - public ClassGeneratorNew(ClassGeneratorConfig config) { + public ClassGenerator(ClassGeneratorConfig config) { filter = new FlattFilter(); } diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorRunner.java b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorRunner.java index 845ae3714..dfebaf5c4 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorRunner.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorRunner.java @@ -63,7 +63,7 @@ public static void main(String[] args) throws IOException, XmlException { } OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(Paths.get(cmd.getOptionValue("opt")).toFile()).getTemplate(); - ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGenerator cut = new ClassGenerator(new ClassGeneratorConfig()); ClassGeneratorResult generate = cut.generate(cmd.getOptionValue("package"), new OPTParser(template).parse()); diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java b/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java index 855f25635..7d6a1ccf8 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java @@ -39,7 +39,7 @@ public class DefaultNamingStrategy { public DefaultNamingStrategy() {} String buildClassName( - ClassGeneratorNew.Context context, WebTemplateNode node, boolean isChoice, boolean isEnum) { + ClassGenerator.Context context, WebTemplateNode node, boolean isChoice, boolean isEnum) { String name = replaceElementName(context, node); if (context.nodeDeque.isEmpty()) { @@ -61,8 +61,8 @@ String buildClassName( String fieldName = StringUtils.abbreviate( normalise(name, true), - ClassGeneratorNew.ABBREV_MARKER, - ClassGeneratorNew.CLASS_NAME_MAX_WIDTH); + ClassGenerator.ABBREV_MARKER, + ClassGenerator.CLASS_NAME_MAX_WIDTH); if (context.currentClassNameMap.containsKey(fieldName)) { context.currentClassNameMap.put(fieldName, context.currentClassNameMap.get(fieldName) + 1); @@ -74,7 +74,7 @@ String buildClassName( return fieldName; } - private String makeNameUnique(ClassGeneratorNew.Context context, WebTemplateNode node) { + private String makeNameUnique(ClassGenerator.Context context, WebTemplateNode node) { WebTemplateNode parent = context.nodeDeque.peek(); String name = replaceElementName(context, node); @@ -98,7 +98,7 @@ private String makeNameUnique(ClassGeneratorNew.Context context, WebTemplateNode return name; } - private String replaceElementName(ClassGeneratorNew.Context context, WebTemplateNode node) { + private String replaceElementName(ClassGenerator.Context context, WebTemplateNode node) { String name = node.getName(); WebTemplateNode trueParent = Optional.ofNullable(context.webTemplate.findFiltersNodes(node)) @@ -149,7 +149,7 @@ String toEnumName(String fieldName) { return new SnakeCase(normalise(fieldName, false)).camelToUpperSnake(); } - String buildFieldName(ClassGeneratorNew.Context context, String path, WebTemplateNode node) { + String buildFieldName(ClassGenerator.Context context, String path, WebTemplateNode node) { String name = node.getName(); String attributeName = new FlatPath(path).getLast().getAttributeName(); diff --git a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java similarity index 96% rename from generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java rename to generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java index be331d33b..3f9ddcc63 100644 --- a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorNewTest.java +++ b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java @@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat; -public class ClassGeneratorNewTest { +public class ClassGeneratorTest { public static final String PACKAGE_NAME = "org.ehrbase.client.classgenerator.examples"; @@ -56,7 +56,7 @@ public void testGenerate() throws IOException, XmlException { OperationalTemplateTestData.BLOOD_PRESSURE_SIMPLE.getStream()) .getTemplate(); WebTemplate webTemplate = new OPTParser(template).parse(); - ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGenerator cut = new ClassGenerator(new ClassGeneratorConfig()); ClassGeneratorResult generate = null; generate = cut.generate(PACKAGE_NAME, webTemplate); @@ -167,7 +167,7 @@ public void testGenerateAltEvents() throws IOException, XmlException { TemplateDocument.Factory.parse(OperationalTemplateTestData.ALT_EVENTS.getStream()) .getTemplate(); WebTemplate webTemplate = new OPTParser(template).parse(); - ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGenerator cut = new ClassGenerator(new ClassGeneratorConfig()); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, webTemplate); @@ -262,7 +262,7 @@ public void testGenerateDiagnose() throws IOException, XmlException { OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.DIAGNOSE.getStream()) .getTemplate(); - ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGenerator cut = new ClassGenerator(new ClassGeneratorConfig()); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); Set derDiagnoseDefiningCode = @@ -291,7 +291,7 @@ public void testGenerateEpisode() throws IOException, XmlException { OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.EPISODE_OF_CARE.getStream()) .getTemplate(); - ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGenerator cut = new ClassGenerator(new ClassGeneratorConfig()); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); List fieldSpecs = generate.getClasses().values().stream() @@ -344,7 +344,7 @@ public void testGenerateSmICS() throws IOException, XmlException { OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.SM_I_C_S_BEFUND.getStream()) .getTemplate(); - ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGenerator cut = new ClassGenerator(new ClassGeneratorConfig()); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); List fieldSpecs = generate.getClasses().values().stream() @@ -445,7 +445,7 @@ public void testGenerateD4LQuestionnaire() throws IOException, XmlException { OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.D4L_QUESTIONNAIRE.getStream()) .getTemplate(); - ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGenerator cut = new ClassGenerator(new ClassGeneratorConfig()); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); List fieldSpecs = @@ -464,7 +464,7 @@ public void testGeneratePatientenaufenthalt() throws IOException, XmlException { OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.PATIENTEN_AUFENTHALT.getStream()) .getTemplate(); - ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGenerator cut = new ClassGenerator(new ClassGeneratorConfig()); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); List fieldSpecs = @@ -484,7 +484,7 @@ public void testGenerateStationaererVersorgungsfall() throws IOException, XmlExc OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.EPISODE_SUMMARY.getStream()) .getTemplate(); - ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGenerator cut = new ClassGenerator(new ClassGeneratorConfig()); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); List fieldSpecs = @@ -505,7 +505,7 @@ public void testGenerateBefundDerBlutgasanalyse() throws IOException, XmlExcepti TemplateDocument.Factory.parse( OperationalTemplateTestData.BEFUND_DER_BLUTGASANALYSE.getStream()) .getTemplate(); - ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGenerator cut = new ClassGenerator(new ClassGeneratorConfig()); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); List fieldSpecs = generate.getClasses().values().stream() @@ -579,7 +579,7 @@ public void testGenerateMultiOccurrence() throws IOException, XmlException { OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.MULTI_OCCURRENCE.getStream()) .getTemplate(); - ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGenerator cut = new ClassGenerator(new ClassGeneratorConfig()); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); List fieldSpecs = @@ -673,7 +673,7 @@ public void testGenerateAllTypes() throws IOException, XmlException { OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.ALL_TYPES.getStream()) .getTemplate(); - ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGenerator cut = new ClassGenerator(new ClassGeneratorConfig()); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); List fieldSpecs = @@ -694,7 +694,7 @@ public void testGenerateVirologyFinding() throws IOException, XmlException { OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.VIROLOGY_FINDING.getStream()) .getTemplate(); - ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGenerator cut = new ClassGenerator(new ClassGeneratorConfig()); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); List fieldSpecs = @@ -791,7 +791,7 @@ public void testGenerateCorona() throws IOException, XmlException { OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.CORONA_ANAMNESE.getStream()) .getTemplate(); - ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGenerator cut = new ClassGenerator(new ClassGeneratorConfig()); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); List fieldSpecs = @@ -813,7 +813,7 @@ public void testGenerateSchwangerschaftsstatus() throws IOException, XmlExceptio TemplateDocument.Factory.parse( OperationalTemplateTestData.SCHWANGERSCHAFTSSTATUS.getStream()) .getTemplate(); - ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGenerator cut = new ClassGenerator(new ClassGeneratorConfig()); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); List fieldSpecs = @@ -876,7 +876,7 @@ public void testGenerateReactCare() throws IOException, XmlException { OPERATIONALTEMPLATE template = TemplateDocument.Factory.parse(OperationalTemplateTestData.OPEN_E_REACT_CARE.getStream()) .getTemplate(); - ClassGeneratorNew cut = new ClassGeneratorNew(new ClassGeneratorConfig()); + ClassGenerator cut = new ClassGenerator(new ClassGeneratorConfig()); ClassGeneratorResult generate = cut.generate(PACKAGE_NAME, new OPTParser(template).parse()); List fieldSpecs = From 63e24188c14e991e4d42000b9e3eb3f893a622b8 Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Wed, 2 Dec 2020 10:05:18 +0100 Subject: [PATCH 20/54] fix filenames see https://github.com/ehrbase/project_management/issues/424 --- .../AlternativeEventsComposition.java | 6 +++--- .../AlternativeEventsCompositionContainment.java | 4 ++-- .../KorpergewichtAnyEventEnIntervalEvent.java | 9 +++++---- .../definition/KorpergewichtAnyEventEnPointEvent.java | 7 ++++--- .../definition/KorpergewichtBirthEnPointEvent.java | 7 ++++--- .../KorpergewichtConfoundingFactorsEnElement.java | 1 + .../definition/KorpergewichtObservation.java | 5 ++--- .../KorpergewichtObservationContainment.java | 3 +-- .../definition/StateOfDressEnDefiningCode.java | 1 + .../BefundDerBlutgasanalyseComposition.java | 6 +++--- ...BefundDerBlutgasanalyseCompositionContainment.java | 4 ++-- .../definition/KohlendioxidpartialdruckCluster.java | 5 +++-- .../KohlendioxidpartialdruckClusterContainment.java | 2 ++ .../definition/LaborergebnisObservation.java | 5 ++--- .../LaborergebnisObservationContainment.java | 3 +-- .../definition/LabortestBezeichnungDefiningCode.java | 1 + .../definition/PhWertCluster.java | 5 +++-- .../definition/PhWertClusterContainment.java | 2 ++ .../definition/SauerstoffpartialdruckCluster.java | 5 +++-- .../SauerstoffpartialdruckClusterContainment.java | 2 ++ .../definition/SauerstoffsattigungCluster.java | 5 +++-- .../SauerstoffsattigungClusterContainment.java | 2 ++ .../definition/StatusDefiningcode.java | 1 + .../definition/UntersuchterAnalytDefiningcode.java | 1 + .../definition/UntersuchterAnalytDefiningcode2.java | 1 + .../definition/UntersuchterAnalytDefiningcode3.java | 1 + .../definition/UntersuchterAnalytDefiningcode4.java | 1 + .../CoronaAnamneseComposition.java | 6 +++--- .../CoronaAnamneseCompositionContainment.java | 4 ++-- .../definition/AdresseCluster.java | 1 + .../definition/AdresseClusterContainment.java | 1 + .../definition/AllgemeineAngabenSection.java | 3 +-- .../AndereAktuelleErkrankungenObservation.java | 6 +++--- ...ereAktuelleErkrankungenObservationContainment.java | 4 ++-- ...DerRisikogebieteFurCoronainfektionOderKontak_.java | 1 + ...AufenthaltInGesundheitseinrichtungObservation.java | 6 +++--- ...nGesundheitseinrichtungObservationContainment.java | 4 ++-- .../definition/BeschaftigungCluster.java | 4 ++-- .../definition/BeschaftigungClusterContainment.java | 1 + .../BewertungDesGesundheitsrisikosEvaluation.java | 6 +++--- ...ungDesGesundheitsrisikosEvaluationContainment.java | 4 ++-- .../definition/ChronischeErkrankungenObservation.java | 6 +++--- .../ChronischeErkrankungenObservationContainment.java | 4 ++-- .../definition/DiagnosestatusDefiningCode.java | 1 + .../DiagnostischeSicherheitDefiningCode.java | 1 + .../DienstleistungAktuelleAktivitatActivity.java | 4 ++-- .../DienstleistungGrundFurDieAnforderungElement.java | 1 + .../definition/DienstleistungInstruction.java | 6 +++--- .../DienstleistungInstructionContainment.java | 4 ++-- .../definition/DurchfallObservation.java | 6 +++--- .../definition/DurchfallObservationContainment.java | 4 ++-- .../FieberOderErhohteKorpertemperaturObservation.java | 6 +++--- ...ErhohteKorpertemperaturObservationContainment.java | 4 ++-- .../FragebogenZumMedikationsScreeningObservation.java | 6 +++--- ...ZumMedikationsScreeningObservationContainment.java | 4 ++-- ...kationsScreeningSpezifischeMedikamenteCluster.java | 1 + ...hichteHistorieBeliebigesEreignisIntervalEvent.java | 7 +++---- ...eschichteHistorieBeliebigesEreignisPointEvent.java | 5 ++--- .../GeschichteHistorieGeschichteElement.java | 1 + .../definition/GeschichteHistorieObservation.java | 5 ++--- .../GeschichteHistorieObservationContainment.java | 3 +-- .../definition/GestorterGeruchssinnObservation.java | 6 +++--- .../GestorterGeruchssinnObservationContainment.java | 4 ++-- .../GestorterGeschmackssinnObservation.java | 6 +++--- ...GestorterGeschmackssinnObservationContainment.java | 4 ++-- .../GesundheitsbezogenerBerufEvaluation.java | 4 ++-- ...esundheitsbezogenerBerufEvaluationContainment.java | 1 + .../definition/HeiserkeitObservation.java | 6 +++--- .../definition/HeiserkeitObservationContainment.java | 4 ++-- .../definition/HistorieDerReiseObservation.java | 5 ++--- .../HistorieDerReiseObservationContainment.java | 3 +-- .../definition/HustenObservation.java | 6 +++--- .../definition/HustenObservationContainment.java | 4 ++-- .../definition/InlandAuslandDefiningcode.java | 1 + .../definition/KorpertemperaturObservation.java | 7 ++++--- .../KorpertemperaturObservationContainment.java | 5 +++-- .../KorpertemperaturStorfaktorenElement.java | 1 + .../definition/LetzteReiseDefiningcode.java | 1 + .../MedikamentInVerwendungDefiningcode.java | 1 + .../MedikamentenklasseInVerwendungDefiningcode.java | 1 + .../definition/OrganisationCluster.java | 4 ++-- .../definition/OrganisationClusterContainment.java | 1 + .../definition/PersonenkontaktObservation.java | 6 +++--- .../PersonenkontaktObservationContainment.java | 4 ++-- .../PresenceOfAnyExposureEnDefiningcode.java | 1 + .../definition/ProblemDiagnoseEvaluation.java | 4 ++-- .../ProblemDiagnoseEvaluationContainment.java | 1 + ...anoseCoronovirusDiagnostischeSicherheitDvText.java | 1 + .../ProblemDiganoseCoronovirusEvaluation.java | 6 +++--- ...oblemDiganoseCoronovirusEvaluationContainment.java | 4 ++-- ...efallBeliebigesIntervallereignisIntervalEvent.java | 7 +++---- .../definition/ReisefallBestimmteReiseCluster.java | 5 ++--- .../ReisefallBestimmtesReisezielCluster.java | 4 ++-- .../definition/ReisefallObservation.java | 5 ++--- .../definition/ReisefallObservationContainment.java | 3 +-- .../definition/RisikogebietSection.java | 3 +-- .../definition/SchnupfenObservation.java | 6 +++--- .../definition/SchnupfenObservationContainment.java | 4 ++-- .../definition/StandortCluster.java | 4 ++-- .../definition/StandortClusterContainment.java | 1 + .../definition/VorhandenDefiningcode.java | 1 + .../definition/VorhandenDefiningcode2.java | 1 + .../definition/VorhandenseinDefiningCode2.java | 1 + .../definition/VorhandenseinDefiningcode.java | 1 + ...eitereSymptomeBeliebigesEreignisIntervalEvent.java | 7 +++---- .../WeitereSymptomeBeliebigesEreignisPointEvent.java | 5 ++--- .../definition/WeitereSymptomeObservation.java | 5 ++--- .../WeitereSymptomeObservationContainment.java | 3 +-- ...reSymptomeSpezifischesSymptomAnzeichenCluster.java | 4 ++-- .../definition/WohnsituationEvaluation.java | 5 +++-- .../WohnsituationEvaluationContainment.java | 2 ++ .../definition/WohnstatteCluster.java | 4 ++-- .../definition/WohnstatteClusterContainment.java | 1 + .../diagnosecomposition/DiagnoseComposition.java | 6 +++--- .../DiagnoseCompositionContainment.java | 4 ++-- .../definition/AnatomischeLokalisationCluster.java | 4 ++-- .../AnatomischeLokalisationClusterContainment.java | 1 + ...iopathogeneseBeschreibungDesEntstehensElement.java | 1 + .../definition/AtiopathogeneseCluster.java | 3 +-- .../definition/AtiopathogeneseValueDvText.java | 1 + .../definition/DiagnosedetailsCluster.java | 2 ++ .../definition/DiagnosedetailsClusterContainment.java | 2 ++ .../DiagnostischeSicherheitDefiningcode.java | 1 + .../definition/FallidentifikationCluster.java | 1 + .../FallidentifikationClusterContainment.java | 1 + .../definition/LateralitatDefiningcode.java | 1 + .../NameDesProblemsDerDiagnoseDefiningcode.java | 1 + .../ProblemDiagnoseDiagnostischeSicherheitDvText.java | 1 + .../definition/ProblemDiagnoseEvaluation.java | 6 +++--- .../ProblemDiagnoseEvaluationContainment.java | 4 ++-- .../definition/ProblemDiagnoseSchweregradDvText.java | 1 + .../definition/SchweregradDefiningcode.java | 1 + .../definition/ValueDefiningcode.java | 1 + .../EhrbaseBloodPressureSimpleDeV0Composition.java | 6 +++--- ...BloodPressureSimpleDeV0CompositionContainment.java | 4 ++-- .../BloodPressureTrainingSampleObservation.java | 7 ++++--- ...dPressureTrainingSampleObservationContainment.java | 5 +++-- .../definition/CuffSizeDefiningcode.java | 1 + .../DeviceDetailsTrainingSampleCluster.java | 4 ++-- ...DeviceDetailsTrainingSampleClusterContainment.java | 4 ++-- .../definition/KorotkoffSoundsDefiningcode.java | 1 + .../definition/LocationOfMeasurementDefiningcode.java | 1 + .../definition/PositionDefiningcode.java | 1 + .../EhrbaseMultiOccurrenceDeV1Composition.java | 6 +++--- ...baseMultiOccurrenceDeV1CompositionContainment.java | 4 ++-- .../definition/BodyExposureDefiningcode.java | 1 + .../BodyTemperatureAnyEventIntervalEvent.java | 10 ++++++---- .../definition/BodyTemperatureAnyEventPointEvent.java | 8 +++++--- .../definition/BodyTemperatureBodyExposureDvText.java | 1 + .../BodyTemperatureLocationOfMeasurementDvText.java | 1 + .../definition/BodyTemperatureObservation.java | 5 ++--- .../BodyTemperatureObservationContainment.java | 3 +-- .../definition/LocationOfMeasurementDefiningcode.java | 1 + .../EpisodeOfCareComposition.java | 6 +++--- .../EpisodeOfCareCompositionContainment.java | 4 ++-- .../definition/EpisodeofcareAdminEntry.java | 9 +++++---- .../EpisodeofcareAdminEntryContainment.java | 7 ++++--- .../definition/EpisodeofcareDiagnosisCluster.java | 2 ++ .../definition/EpisodeofcareTeamElement.java | 3 +-- .../definition/StatusDefiningCode.java | 1 + .../OpenEREACTCareComposition.java | 6 +++--- .../OpenEREACTCareCompositionContainment.java | 4 ++-- .../definition/AbdomenSymptomCluster.java | 3 +-- .../definition/AcvpuDefiningcode.java | 1 + .../definition/AcvpuScaleObservation.java | 5 ++--- .../definition/AcvpuScaleObservationContainment.java | 3 +-- .../definition/AllergiesEvaluation.java | 4 ++-- .../definition/AllergiesEvaluationContainment.java | 1 + .../definition/AmberFlagAcuteDefiningCode.java | 1 + .../definition/BloodPressureObservation.java | 7 ++++--- .../BloodPressureObservationContainment.java | 5 +++-- .../definition/BreathingIndicatorDefiningCode.java | 1 + .../definition/CareflowStepDefiningCode.java | 1 + .../definition/ChestSymptomCluster.java | 3 +-- .../definition/CirculationIndicatorDefiningCode.java | 1 + .../definition/ClinicalRiskCategoryDefiningcode.java | 1 + .../definition/Covid19ExposureEvaluation.java | 3 +-- .../definition/CovidNotesEvaluation.java | 4 ++-- .../definition/CovidNotesEvaluationContainment.java | 1 + .../definition/CovidSymptomsObservation.java | 6 +++--- .../CovidSymptomsObservationContainment.java | 4 ++-- .../definition/CurrentStateDefiningCode.java | 1 + .../definition/DenwisObservation.java | 7 ++++--- .../definition/DenwisObservationContainment.java | 5 +++-- .../definition/DenwisValueDvText.java | 1 + .../definition/DenwisValueDvText2.java | 1 + .../definition/DenwisValueDvText3.java | 1 + .../definition/DenwisValueDvText4.java | 1 + .../definition/DenwisValueDvText5.java | 1 + .../definition/DenwisValueDvText6.java | 1 + .../definition/FirstSymptomsCluster.java | 8 ++++---- .../definition/FirstSymptomsClusterContainment.java | 6 +++--- .../definition/FrailtyObservation.java | 5 ++--- .../definition/FrailtyObservationContainment.java | 3 +-- .../definition/HealthRiskDefiningcode.java | 1 + .../definition/HeightObservation.java | 7 ++++--- .../definition/HeightObservationContainment.java | 5 +++-- .../definition/KeyCovidSymptomCluster.java | 3 +-- .../definition/LatestCovid19TestObservation.java | 6 +++--- .../LatestCovid19TestObservationContainment.java | 4 ++-- .../LatestCovid19TestOverallTestStatusDvText.java | 1 + .../LatestCovid19TestTestRequestDetailsCluster.java | 3 +-- .../definition/MedicationEvaluation.java | 4 ++-- .../definition/MedicationEvaluationContainment.java | 1 + .../definition/N999FlagDefiningCode.java | 1 + .../definition/NeuroSymptomCluster.java | 3 +-- .../definition/News2ScoreObservation.java | 6 +++--- .../definition/News2ScoreObservationContainment.java | 4 ++-- .../definition/OtherSymptomCluster.java | 4 ++-- .../definition/OtherSymptomClusterContainment.java | 1 + .../definition/OverallTestStatusDefiningcode.java | 1 + .../definition/PastHistoryEvaluation.java | 4 ++-- .../definition/PastHistoryEvaluationContainment.java | 1 + .../definition/PresenceDefiningCode2.java | 1 + .../definition/PresenceDefiningcode.java | 1 + .../definition/PulseObservation.java | 7 ++++--- .../definition/PulseObservationContainment.java | 5 +++-- .../definition/PulseOximetryObservation.java | 5 ++--- .../PulseOximetryObservationContainment.java | 3 +-- .../definition/RecommendationEvaluation.java | 3 +-- .../RecommendationRecommendationElement.java | 1 + .../definition/RedFlagAcuteDefiningCode.java | 1 + .../definition/RespirationsObservation.java | 7 ++++--- .../RespirationsObservationContainment.java | 5 +++-- .../definition/ResponseSection.java | 3 +-- .../definition/RiskAssessmentDefiningcode.java | 1 + .../definition/RiskFactorDefiningCode2.java | 1 + .../definition/RiskFactorDefiningCode3.java | 1 + .../definition/RiskFactorDefiningcode.java | 1 + .../definition/RiskFactorsForSepsisDefiningCode.java | 1 + .../definition/SepsisScreeningObservation.java | 5 ++--- .../SepsisScreeningObservationContainment.java | 3 +-- .../definition/SepsisScreeningValueDvText.java | 1 + .../definition/ServiceAction.java | 6 +++--- .../definition/ServiceActionContainment.java | 4 ++-- .../ServiceRequestCurrentActivityActivity.java | 6 +++--- .../definition/ServiceRequestInstruction.java | 6 +++--- .../ServiceRequestInstructionContainment.java | 4 ++-- .../definition/StoryHistoryObservation.java | 6 +++--- .../StoryHistoryObservationContainment.java | 4 ++-- .../definition/StoryHistorySoftSignsElement.java | 1 + .../definition/TemperatureObservation.java | 5 +++-- .../definition/TemperatureObservationContainment.java | 5 +++-- .../definition/TrendDefiningcode.java | 1 + .../definition/ValueDefiningcode.java | 1 + .../definition/ValueDefiningcode2.java | 1 + .../definition/ValueDefiningcode3.java | 1 + .../definition/ValueDefiningcode4.java | 1 + .../definition/ValueDefiningcode5.java | 1 + .../definition/ValueDefiningcode6.java | 1 + .../definition/ValueDefiningcode7.java | 1 + .../definition/WeightObservation.java | 7 ++++--- .../definition/WeightObservationContainment.java | 5 +++-- .../PatientenaufenthaltComposition.java | 6 +++--- .../PatientenaufenthaltCompositionContainment.java | 4 ++-- .../definition/AbteilungsfallCluster.java | 1 + .../definition/AbteilungsfallClusterContainment.java | 1 + .../definition/DetailsZumBettCluster.java | 4 ++-- .../definition/DetailsZumBettClusterContainment.java | 1 + .../definition/StandortCluster.java | 1 + .../definition/StandortClusterContainment.java | 1 + .../definition/StandortschlusselDefiningcode.java | 1 + .../definition/VersorgungsfallCluster.java | 1 + .../definition/VersorgungsfallClusterContainment.java | 1 + .../definition/VersorgungsortAdminEntry.java | 4 ++-- .../VersorgungsortAdminEntryContainment.java | 4 ++-- .../SchwangerschaftsstatusComposition.java | 6 +++--- .../SchwangerschaftsstatusCompositionContainment.java | 4 ++-- .../definition/SchwangerschaftsstatusObservation.java | 5 ++--- .../SchwangerschaftsstatusObservationContainment.java | 3 +-- .../definition/StatusDefiningcode.java | 1 + .../definition/StatusDefiningcode2.java | 1 + .../SmICSBefundComposition.java | 6 +++--- .../SmICSBefundCompositionContainment.java | 4 ++-- .../definition/AntibiogrammCluster.java | 3 +-- .../definition/AntibiotikumDefiningcode.java | 1 + .../definition/ArtDerTypisierungDefiningCode.java | 1 + .../definition/ErregerdetailsCluster.java | 5 +++-- .../definition/ErregerdetailsClusterContainment.java | 2 ++ .../definition/ErregerdetailsKeimSubtypElement.java | 1 + .../ErregerdetailsResistenzmechanismusCluster.java | 1 + .../definition/ErregernameDefiningcode.java | 1 + .../definition/ErregertypisierungCluster.java | 4 ++-- .../ErregertypisierungClusterContainment.java | 1 + .../EventsummaryBeteiligtePersonenCluster.java | 4 ++-- .../definition/EventsummaryCluster.java | 4 ++-- .../definition/EventsummaryClusterContainment.java | 1 + .../definition/EventsummaryValueDvUri.java | 3 +-- .../definition/LaboranalytResultatCluster.java | 5 +++-- .../LaboranalytResultatClusterContainment.java | 2 ++ .../definition/MreKlasseDefiningcode.java | 1 + ...SmicsErgebnisAnzahlDerErregernachweiseElement.java | 1 + .../definition/SmicsErgebnisObservation.java | 9 +++++---- .../SmicsErgebnisObservationContainment.java | 7 ++++--- .../SmicsErgebniskategorieDefiningcode.java | 1 + .../definition/StandortCluster.java | 4 ++-- .../definition/StandortClusterContainment.java | 1 + .../StationarerVersorgungsfallComposition.java | 6 +++--- ...tionarerVersorgungsfallCompositionContainment.java | 4 ++-- .../definition/AufnahmedatenAdminEntry.java | 6 +++--- .../AufnahmedatenAdminEntryContainment.java | 4 ++-- .../definition/EntlassungsdatenAdminEntry.java | 6 +++--- .../EntlassungsdatenAdminEntryContainment.java | 4 ++-- .../definition/FalltypDefiningcode.java | 1 + .../KlinischerZustandDesPatientenDefiningcode.java | 1 + .../TestAllTypesEnV1Composition.java | 6 +++--- .../TestAllTypesEnV1CompositionContainment.java | 4 ++-- .../definition/CareflowStepDefiningCode.java | 1 + .../definition/ContextCodedTextDefiningcode.java | 1 + .../definition/CurrentStateDefiningCode.java | 1 + .../definition/TestAllTypesAction.java | 5 ++--- .../definition/TestAllTypesActionContainment.java | 3 +-- .../definition/TestAllTypesAdminEntry.java | 1 + .../definition/TestAllTypesAdminEntryContainment.java | 1 + .../definition/TestAllTypesChoiceDvCount.java | 1 + .../definition/TestAllTypesChoiceDvQuantity.java | 2 ++ .../definition/TestAllTypesCluster.java | 1 + .../definition/TestAllTypesClusterContainment.java | 1 + .../definition/TestAllTypesEvaluation.java | 9 ++++++--- .../definition/TestAllTypesEvaluationContainment.java | 9 ++++++--- .../definition/TestAllTypesInstruction.java | 6 +++--- .../TestAllTypesInstructionContainment.java | 6 +++--- .../definition/TestAllTypesObservation.java | 11 +++++++---- .../TestAllTypesObservationContainment.java | 11 +++++++---- .../definition/TestAllTypesSection.java | 3 +-- .../VirologischerBefundComposition.java | 6 +++--- .../VirologischerBefundCompositionContainment.java | 4 ++-- .../definition/AnatomischeLokalisationCluster.java | 4 ++-- .../AnatomischeLokalisationClusterContainment.java | 1 + .../definition/BefundAnforderungElement.java | 1 + .../definition/BefundObservation.java | 6 +++--- .../definition/BefundObservationContainment.java | 4 ++-- .../definition/EinsenderstandortCluster.java | 4 ++-- .../EinsenderstandortClusterContainment.java | 1 + .../definition/EmpfangerstandortCluster.java | 4 ++-- .../EmpfangerstandortClusterContainment.java | 1 + .../definition/FallidentifikationCluster.java | 1 + .../FallidentifikationClusterContainment.java | 1 + .../definition/KulturCluster.java | 3 +-- .../definition/ProVirusCluster.java | 6 ++++-- .../definition/ProVirusClusterContainment.java | 3 +++ .../definition/ProbeCluster.java | 6 +++--- .../definition/ProbeClusterContainment.java | 4 ++-- .../client/classgenerator/ClassGeneratorTest.java | 2 ++ 344 files changed, 654 insertions(+), 493 deletions(-) diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java index cd7e24b08..6dc5ea259 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java @@ -5,6 +5,9 @@ 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 org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Id; @@ -17,9 +20,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-COMPOSITION.report.v1") @Template("AlternativeEvents") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsCompositionContainment.java index ac10ccf32..6b9196568 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsCompositionContainment.java @@ -5,6 +5,8 @@ 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 org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -16,8 +18,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Setting; import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import java.time.temporal.TemporalAccessor; - public class AlternativeEventsCompositionContainment extends Containment { public SelectAqlField ALTERNATIVE_EVENTS_COMPOSITION = new AqlFieldImp(AlternativeEventsComposition.class, "", "AlternativeEventsComposition", AlternativeEventsComposition.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java index c7d143161..252ae7f8f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java @@ -1,14 +1,15 @@ package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalAmount; -import java.util.List; - @Entity @OptionFor("INTERVAL_EVENT") public class KorpergewichtAnyEventEnIntervalEvent implements KorpergewichtAnyEventEnChoice { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java index 9ed9cf5c1..9150cef34 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java @@ -1,12 +1,13 @@ package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @OptionFor("POINT_EVENT") public class KorpergewichtAnyEventEnPointEvent implements KorpergewichtAnyEventEnChoice { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java index aedc57ed4..01fdb2dbc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java @@ -1,10 +1,11 @@ package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - +import java.lang.Double; +import java.lang.String; import java.time.temporal.TemporalAccessor; import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; @Entity public class KorpergewichtBirthEnPointEvent { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java index 2244262fe..91525cbf1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java index 6c3bb09cb..4f644459e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java @@ -2,15 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; 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.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.body_weight.v2") public class KorpergewichtObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java index b8f12c63b..ce524c13b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +10,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class KorpergewichtObservationContainment extends Containment { public SelectAqlField KORPERGEWICHT_OBSERVATION = new AqlFieldImp(KorpergewichtObservation.class, "", "KorpergewichtObservation", KorpergewichtObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/StateOfDressEnDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/StateOfDressEnDefiningCode.java index 7f1552aca..a2a979696 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/StateOfDressEnDefiningCode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/StateOfDressEnDefiningCode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum StateOfDressEnDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java index 80c109ad6..d431671b1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java @@ -5,6 +5,9 @@ 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 org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Id; @@ -18,9 +21,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-COMPOSITION.registereintrag.v1") @Template("Befund der Blutgasanalyse") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseCompositionContainment.java index d44d4fdc9..f8d6d7daa 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseCompositionContainment.java @@ -5,6 +5,8 @@ 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 org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -17,8 +19,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Setting; import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import java.time.temporal.TemporalAccessor; - public class BefundDerBlutgasanalyseCompositionContainment extends Containment { public SelectAqlField BEFUND_DER_BLUTGASANALYSE_COMPOSITION = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "", "BefundDerBlutgasanalyseComposition", BefundDerBlutgasanalyseComposition.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java index d003473f4..c7454a080 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java @@ -1,12 +1,13 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") public class KohlendioxidpartialdruckCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckClusterContainment.java index 759cc21b8..61bcc6d16 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckClusterContainment.java @@ -1,6 +1,8 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java index ab4b83845..c7aa42893 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java @@ -2,14 +2,13 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.laboratory_test_result.v1") public class LaborergebnisObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservationContainment.java index 8230cf4bd..75527aaf1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservationContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +10,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class LaborergebnisObservationContainment extends Containment { public SelectAqlField LABORERGEBNIS_OBSERVATION = new AqlFieldImp(LaborergebnisObservation.class, "", "LaborergebnisObservation", LaborergebnisObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LabortestBezeichnungDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LabortestBezeichnungDefiningCode.java index 4bbfd1310..1a165d92c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LabortestBezeichnungDefiningCode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LabortestBezeichnungDefiningCode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum LabortestBezeichnungDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java index af6491202..30121f0a5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java @@ -1,12 +1,13 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") public class PhWertCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertClusterContainment.java index 034a1b14f..0c1d88771 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertClusterContainment.java @@ -1,6 +1,8 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java index d141e0737..02c783230 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java @@ -1,12 +1,13 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") public class SauerstoffpartialdruckCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckClusterContainment.java index 36cbdc229..d3d3cd454 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckClusterContainment.java @@ -1,6 +1,8 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java index d7859d988..25eded4cd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java @@ -1,12 +1,13 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") public class SauerstoffsattigungCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungClusterContainment.java index 73454082e..f97680f20 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungClusterContainment.java @@ -1,6 +1,8 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/StatusDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/StatusDefiningcode.java index 977a85917..fe85e0cc1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/StatusDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/StatusDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum StatusDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode.java index d02bc3ae0..dc8789a12 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum UntersuchterAnalytDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode2.java index d23150804..76393c5ea 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode2.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode2.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum UntersuchterAnalytDefiningCode2 implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode3.java index ed111caf5..6b43c1f6a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode3.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode3.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum UntersuchterAnalytDefiningCode3 implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode4.java index c78f155f6..743b83b4f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode4.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode4.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum UntersuchterAnalytDefiningCode4 implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java index dcb38d2cc..e11fdfa4b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java @@ -5,6 +5,9 @@ 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 org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Id; @@ -21,9 +24,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-COMPOSITION.report.v1") @Template("Corona_Anamnese") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java index 034081a5d..7698e86e0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java @@ -5,6 +5,8 @@ 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 org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -20,8 +22,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Setting; import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import java.time.temporal.TemporalAccessor; - public class CoronaAnamneseCompositionContainment extends Containment { public SelectAqlField CORONA_ANAMNESE_COMPOSITION = new AqlFieldImp(CoronaAnamneseComposition.class, "", "CoronaAnamneseComposition", CoronaAnamneseComposition.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java index d173ceb8b..da3ee2756 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseClusterContainment.java index 2b22db35c..f8f98504b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java index 210d3eed1..541fc885d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java @@ -1,11 +1,10 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class AllgemeineAngabenSection { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java index b7b8e2299..489ca877a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java @@ -2,14 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class AndereAktuelleErkrankungenObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java index 04eba6abe..436b28080 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class AndereAktuelleErkrankungenObservationContainment extends Containment { public SelectAqlField ANDERE_AKTUELLE_ERKRANKUNGEN_OBSERVATION = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "", "AndereAktuelleErkrankungenObservation", AndereAktuelleErkrankungenObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java index bcd39f709..ac6e28558 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java index 3d41837bd..21647db2e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java @@ -2,14 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.exposure_assessment.v0") public class AufenthaltInGesundheitseinrichtungObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java index bdf09520a..15fe2e055 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class AufenthaltInGesundheitseinrichtungObservationContainment extends Containment { public SelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG_OBSERVATION = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "", "AufenthaltInGesundheitseinrichtungObservation", AufenthaltInGesundheitseinrichtungObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java index 65e324563..f012cc41c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java @@ -1,12 +1,12 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.occupation_record.v1") public class BeschaftigungCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java index 508b72d67..f11fdc160 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java index 841c4940b..32426fdf3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java @@ -2,14 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-EVALUATION.health_risk.v1") public class BewertungDesGesundheitsrisikosEvaluation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java index 185a8eb05..651c5cee5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class BewertungDesGesundheitsrisikosEvaluationContainment extends Containment { public SelectAqlField BEWERTUNG_DES_GESUNDHEITSRISIKOS_EVALUATION = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "", "BewertungDesGesundheitsrisikosEvaluation", BewertungDesGesundheitsrisikosEvaluation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java index 280be915e..c0c1c15cf 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java @@ -2,14 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class ChronischeErkrankungenObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java index 2ea4adc80..43b886c6d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class ChronischeErkrankungenObservationContainment extends Containment { public SelectAqlField CHRONISCHE_ERKRANKUNGEN_OBSERVATION = new AqlFieldImp(ChronischeErkrankungenObservation.class, "", "ChronischeErkrankungenObservation", ChronischeErkrankungenObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnosestatusDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnosestatusDefiningCode.java index e550ec3a1..7ec11067a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnosestatusDefiningCode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnosestatusDefiningCode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum DiagnosestatusDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningCode.java index a1bb980a8..73f2ae3ad 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningCode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningCode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum DiagnostischeSicherheitDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java index 834824db9..0b6dccd7f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java @@ -2,11 +2,11 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity public class DienstleistungAktuelleAktivitatActivity { @Path("/description[at0009]/items[at0121]/value|value") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java index 93c5158d7..ae73ac04b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java index 65cff3c8b..a8bea456d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java @@ -2,14 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-INSTRUCTION.service_request.v1") public class DienstleistungInstruction { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java index d060d6ca6..86f98dad8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class DienstleistungInstructionContainment extends Containment { public SelectAqlField DIENSTLEISTUNG_INSTRUCTION = new AqlFieldImp(DienstleistungInstruction.class, "", "DienstleistungInstruction", DienstleistungInstruction.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java index 0f9e74150..5f99f53a8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java @@ -2,14 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class DurchfallObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java index d268ce2e0..7bdb007a1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class DurchfallObservationContainment extends Containment { public SelectAqlField DURCHFALL_OBSERVATION = new AqlFieldImp(DurchfallObservation.class, "", "DurchfallObservation", DurchfallObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java index 4d53489c6..1d3b2ecd7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java @@ -2,14 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class FieberOderErhohteKorpertemperaturObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java index d33ce9209..833a9d289 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class FieberOderErhohteKorpertemperaturObservationContainment extends Containment { public SelectAqlField FIEBER_ODER_ERHOHTE_KORPERTEMPERATUR_OBSERVATION = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "", "FieberOderErhohteKorpertemperaturObservation", FieberOderErhohteKorpertemperaturObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java index d3fac31fd..cf6442814 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java @@ -3,14 +3,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datatypes.CodePhrase; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.medication_use.v0") public class FragebogenZumMedikationsScreeningObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java index fac157170..5a537f20f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java @@ -3,6 +3,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datatypes.CodePhrase; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -10,8 +12,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class FragebogenZumMedikationsScreeningObservationContainment extends Containment { public SelectAqlField FRAGEBOGEN_ZUM_MEDIKATIONS_SCREENING_OBSERVATION = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "", "FragebogenZumMedikationsScreeningObservation", FragebogenZumMedikationsScreeningObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java index f4b534edd..583b84a2d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java index 54f12c3a2..d36fb3102 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java @@ -1,15 +1,14 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalAmount; -import java.util.List; - @Entity @OptionFor("INTERVAL_EVENT") public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements GeschichteHistorieBeliebigesEreignisChoice { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java index 439e28213..5a425fc26 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java @@ -1,13 +1,12 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @OptionFor("POINT_EVENT") public class GeschichteHistorieBeliebigesEreignisPointEvent implements GeschichteHistorieBeliebigesEreignisChoice { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java index 1470f1785..68c3c7c45 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java index 1481c0c6b..caa66e1d6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java @@ -2,15 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; 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.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.story.v1") public class GeschichteHistorieObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java index 62a45e784..5cc4f0c20 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +10,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class GeschichteHistorieObservationContainment extends Containment { public SelectAqlField GESCHICHTE_HISTORIE_OBSERVATION = new AqlFieldImp(GeschichteHistorieObservation.class, "", "GeschichteHistorieObservation", GeschichteHistorieObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java index f02652146..190420e6d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java @@ -2,14 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class GestorterGeruchssinnObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java index c8dca02b0..eac3965fa 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class GestorterGeruchssinnObservationContainment extends Containment { public SelectAqlField GESTORTER_GERUCHSSINN_OBSERVATION = new AqlFieldImp(GestorterGeruchssinnObservation.class, "", "GestorterGeruchssinnObservation", GestorterGeruchssinnObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java index 21c5ae8ab..58fcd7d49 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java @@ -2,14 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class GestorterGeschmackssinnObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java index cad3dfb7a..b39fc7247 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class GestorterGeschmackssinnObservationContainment extends Containment { public SelectAqlField GESTORTER_GESCHMACKSSINN_OBSERVATION = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "", "GestorterGeschmackssinnObservation", GestorterGeschmackssinnObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java index 8011789ef..82d2577b4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java @@ -2,13 +2,13 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.util.List; - @Entity @Archetype("openEHR-EHR-EVALUATION.occupation_summary.v1") public class GesundheitsbezogenerBerufEvaluation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java index 274b70745..8383c0a16 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java index 1ddc04ed5..d217a6390 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java @@ -2,14 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class HeiserkeitObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java index 0a21e54f7..cbe61fa5f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class HeiserkeitObservationContainment extends Containment { public SelectAqlField HEISERKEIT_OBSERVATION = new AqlFieldImp(HeiserkeitObservation.class, "", "HeiserkeitObservation", HeiserkeitObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java index e028c30ec..d8c6ea951 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java @@ -2,14 +2,13 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.travel_history.v0") public class HistorieDerReiseObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java index 2e6b80108..50ae4316c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +10,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class HistorieDerReiseObservationContainment extends Containment { public SelectAqlField HISTORIE_DER_REISE_OBSERVATION = new AqlFieldImp(HistorieDerReiseObservation.class, "", "HistorieDerReiseObservation", HistorieDerReiseObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java index af3fa2a1e..e6c6e3b03 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java @@ -2,14 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class HustenObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservationContainment.java index 7978ccb67..a4e03a368 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservationContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class HustenObservationContainment extends Containment { public SelectAqlField HUSTEN_OBSERVATION = new AqlFieldImp(HustenObservation.class, "", "HustenObservation", HustenObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/InlandAuslandDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/InlandAuslandDefiningcode.java index 01e19c022..483633758 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/InlandAuslandDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/InlandAuslandDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum InlandAuslandDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java index 6affd2529..bcad74060 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java @@ -2,14 +2,15 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.body_temperature.v2") public class KorpertemperaturObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java index ee6356000..4ac95d65f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java @@ -2,6 +2,9 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +12,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class KorpertemperaturObservationContainment extends Containment { public SelectAqlField KORPERTEMPERATUR_OBSERVATION = new AqlFieldImp(KorpertemperaturObservation.class, "", "KorpertemperaturObservation", KorpertemperaturObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java index 2d5c3185f..b20737943 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/LetzteReiseDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/LetzteReiseDefiningcode.java index dd12b53e3..c8d35a6bb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/LetzteReiseDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/LetzteReiseDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum LetzteReiseDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningcode.java index cb7650b96..2d0686e62 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum MedikamentInVerwendungDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningcode.java index d31efb2ae..656a99a11 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum MedikamentenklasseInVerwendungDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java index c87a5b17c..8b3363d47 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java @@ -1,12 +1,12 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.organisation_cc.v0") public class OrganisationCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java index a35a9901a..995a412fa 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java index bd15a732f..b69ccd489 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java @@ -2,14 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.exposure_assessment.v0") public class PersonenkontaktObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java index 574160e57..0945a5d9a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class PersonenkontaktObservationContainment extends Containment { public SelectAqlField PERSONENKONTAKT_OBSERVATION = new AqlFieldImp(PersonenkontaktObservation.class, "", "PersonenkontaktObservation", PersonenkontaktObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningcode.java index 6784cce98..8b3743fb8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum PresenceOfAnyExposureEnDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java index f4ca9a9b6..395f5dc60 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java @@ -2,13 +2,13 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.util.List; - @Entity @Archetype("openEHR-EHR-EVALUATION.problem_diagnosis.v1") public class ProblemDiagnoseEvaluation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java index 4af01dd83..fc547d363 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java index fb3831c6e..036e0b57a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java index b43a6ffdf..73f92c3b9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java @@ -2,15 +2,15 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; 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.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1") public class ProblemDiganoseCoronovirusEvaluation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java index 0205c26e0..e34ec2001 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class ProblemDiganoseCoronovirusEvaluationContainment extends Containment { public SelectAqlField PROBLEM_DIGANOSE_CORONOVIRUS_EVALUATION = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "", "ProblemDiganoseCoronovirusEvaluation", ProblemDiganoseCoronovirusEvaluation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java index 4b2347524..6801442c8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java @@ -1,12 +1,11 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; - import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity public class ReisefallBeliebigesIntervallereignisIntervalEvent { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java index ad2ff1d61..ac6312008 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java @@ -1,11 +1,10 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - import java.time.temporal.TemporalAccessor; import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; @Entity public class ReisefallBestimmteReiseCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java index 0974a111e..28a423b7a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java @@ -1,11 +1,11 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity public class ReisefallBestimmtesReisezielCluster { @Path("/items[at0011]/value|value") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java index 7dc06b8ff..39d049e3f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java @@ -2,14 +2,13 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.travel_event.v0") public class ReisefallObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java index 5c4f3fc71..5964ada00 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +10,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class ReisefallObservationContainment extends Containment { public SelectAqlField REISEFALL_OBSERVATION = new AqlFieldImp(ReisefallObservation.class, "", "ReisefallObservation", ReisefallObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java index 4238d3a93..0498d6306 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java @@ -1,11 +1,10 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class RisikogebietSection { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java index 53a3b5780..ff4c107ca 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java @@ -2,14 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class SchnupfenObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java index ff1db2512..05af8ef1b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class SchnupfenObservationContainment extends Containment { public SelectAqlField SCHNUPFEN_OBSERVATION = new AqlFieldImp(SchnupfenObservation.class, "", "SchnupfenObservation", SchnupfenObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java index f6b00fc51..5a9148200 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java @@ -1,12 +1,12 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") public class StandortCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortClusterContainment.java index f96e1aadb..07b79556f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortClusterContainment.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode.java index e5367c4e8..548e8a567 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum VorhandenDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode2.java index 2e0a44bfa..e82a30d95 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode2.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode2.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum VorhandenDefiningCode2 implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java index aa2223b55..03cb0b364 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum VorhandenseinDefiningCode2 implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningcode.java index c624d7dbc..766dd1904 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum VorhandenseinDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java index dfcf5a4d8..4028f35a0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java @@ -1,14 +1,13 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalAmount; -import java.util.List; - @Entity @OptionFor("INTERVAL_EVENT") public class WeitereSymptomeBeliebigesEreignisIntervalEvent implements WeitereSymptomeBeliebigesEreignisChoice { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java index 413debf84..7ea76b09c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java @@ -1,12 +1,11 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @OptionFor("POINT_EVENT") public class WeitereSymptomeBeliebigesEreignisPointEvent implements WeitereSymptomeBeliebigesEreignisChoice { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java index d446cf4fe..4269af5d5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java @@ -2,15 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; 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.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class WeitereSymptomeObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java index 583059206..e6f84b771 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +10,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class WeitereSymptomeObservationContainment extends Containment { public SelectAqlField WEITERE_SYMPTOME_OBSERVATION = new AqlFieldImp(WeitereSymptomeObservation.class, "", "WeitereSymptomeObservation", WeitereSymptomeObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java index 65a3628dd..60bcd238b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java @@ -1,11 +1,11 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity public class WeitereSymptomeSpezifischesSymptomAnzeichenCluster { @Path("/items[at0004]/value|value") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java index 34a7796d1..cf669e5af 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java @@ -2,13 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Long; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.util.List; - @Entity @Archetype("openEHR-EHR-EVALUATION.living_arrangement.v0") public class WohnsituationEvaluation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java index 50519b151..cbc31e8f4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Long; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java index 9ea4c8951..fc9502ecc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java @@ -1,12 +1,12 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Long; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.dwelling.v0") public class WohnstatteCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java index 4e1b16493..cc1d048f6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Long; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java index b55b36dce..b336bb511 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java @@ -4,6 +4,9 @@ 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 org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Id; @@ -17,9 +20,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-COMPOSITION.report.v1") @Template("Diagnose") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseCompositionContainment.java index ba6612af2..38cdaa960 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseCompositionContainment.java @@ -4,6 +4,8 @@ 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 org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -16,8 +18,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Setting; import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import java.time.temporal.TemporalAccessor; - public class DiagnoseCompositionContainment extends Containment { public SelectAqlField DIAGNOSE_COMPOSITION = new AqlFieldImp(DiagnoseComposition.class, "", "DiagnoseComposition", DiagnoseComposition.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java index 5c16f43a9..0b1d9dc89 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java @@ -1,12 +1,12 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.anatomical_location.v1") public class AnatomischeLokalisationCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationClusterContainment.java index 27ee55e6d..2024cf025 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationClusterContainment.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java index 9c58f8a2f..f366a1d19 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java index fefa9c55b..3c6220c13 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java @@ -1,11 +1,10 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.etiology.v1") public class AtiopathogeneseCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java index 988793a86..a949ba251 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java index 0fae38c79..f2a27f682 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java @@ -1,5 +1,7 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import java.lang.Boolean; +import java.lang.String; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsClusterContainment.java index 849ef677e..711fc365e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsClusterContainment.java @@ -1,5 +1,7 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import java.lang.Boolean; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnostischeSicherheitDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnostischeSicherheitDefiningcode.java index a64b6cf4a..46bbc223c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnostischeSicherheitDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnostischeSicherheitDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum DiagnostischeSicherheitDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java index d14b53458..a4a8fe88f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationClusterContainment.java index 26a5e689c..de91985e6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/LateralitatDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/LateralitatDefiningcode.java index 051c318b4..7750c3f15 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/LateralitatDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/LateralitatDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum LateralitatDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/NameDesProblemsDerDiagnoseDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/NameDesProblemsDerDiagnoseDefiningcode.java index 6fef53e64..1c1938d9c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/NameDesProblemsDerDiagnoseDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/NameDesProblemsDerDiagnoseDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum NameDesProblemsDerDiagnoseDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java index 2e51141be..c5c0ef601 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java index 3d558a384..9c34f3cd1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java @@ -2,15 +2,15 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; 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.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-EVALUATION.problem_diagnosis.v1") public class ProblemDiagnoseEvaluation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluationContainment.java index 19bc3d6ef..0f6791fce 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluationContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class ProblemDiagnoseEvaluationContainment extends Containment { public SelectAqlField PROBLEM_DIAGNOSE_EVALUATION = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "", "ProblemDiagnoseEvaluation", ProblemDiagnoseEvaluation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java index 1c3c28390..40ca76c9f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/SchweregradDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/SchweregradDefiningcode.java index 9dea6e2ba..d2c8cd49a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/SchweregradDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/SchweregradDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum SchweregradDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ValueDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ValueDefiningcode.java index 4ad89a89b..4cccc7739 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ValueDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ValueDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum ValueDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java index f2f12fe94..b71f402dc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java @@ -4,6 +4,9 @@ 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 org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Id; @@ -17,9 +20,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-COMPOSITION.sample_encounter.v1") @Template("ehrbase_blood_pressure_simple.de.v0") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java index f667f8242..0685ac3c8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java @@ -4,6 +4,8 @@ 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 org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -16,8 +18,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Setting; import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import java.time.temporal.TemporalAccessor; - public class EhrbaseBloodPressureSimpleDeV0CompositionContainment extends Containment { public SelectAqlField EHRBASE_BLOOD_PRESSURE_SIMPLE_DE_V0_COMPOSITION = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "", "EhrbaseBloodPressureSimpleDeV0Composition", EhrbaseBloodPressureSimpleDeV0Composition.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java index a9d726aa5..84af6356c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java @@ -2,14 +2,15 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.sample_blood_pressure.v1") public class BloodPressureTrainingSampleObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java index 7dd9d179b..3b944c814 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java @@ -2,6 +2,9 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +12,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class BloodPressureTrainingSampleObservationContainment extends Containment { public SelectAqlField BLOOD_PRESSURE_TRAINING_SAMPLE_OBSERVATION = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "", "BloodPressureTrainingSampleObservation", BloodPressureTrainingSampleObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningcode.java index 763d367c4..90849c773 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum CuffSizeDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java index 8ed5c285b..75d4972c0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java @@ -1,12 +1,12 @@ package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.time.temporal.TemporalAccessor; - @Entity @Archetype("openEHR-EHR-CLUSTER.sample_device.v1") public class DeviceDetailsTrainingSampleCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java index e0e7a99d1..1f0d8e94f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java @@ -1,12 +1,12 @@ package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; -import java.time.temporal.TemporalAccessor; - public class DeviceDetailsTrainingSampleClusterContainment extends Containment { public SelectAqlField DEVICE_DETAILS_TRAINING_SAMPLE_CLUSTER = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "", "DeviceDetailsTrainingSampleCluster", DeviceDetailsTrainingSampleCluster.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningcode.java index 4f186f052..82ff05098 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum KorotkoffSoundsDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningcode.java index 9b5a1c7ea..4ee4484ad 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum LocationOfMeasurementDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningcode.java index d7ce02994..bf0068793 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum PositionDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java index 58aa09f75..b48942342 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java @@ -5,6 +5,9 @@ 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 org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Id; @@ -17,9 +20,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-COMPOSITION.encounter.v1") @Template("ehrbase_multi_occurrence.de.v1") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1CompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1CompositionContainment.java index 0894b00b2..60cdce008 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1CompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1CompositionContainment.java @@ -5,6 +5,8 @@ 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 org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -16,8 +18,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Setting; import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import java.time.temporal.TemporalAccessor; - public class EhrbaseMultiOccurrenceDeV1CompositionContainment extends Containment { public SelectAqlField EHRBASE_MULTI_OCCURRENCE_DE_V1_COMPOSITION = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "", "EhrbaseMultiOccurrenceDeV1Composition", EhrbaseMultiOccurrenceDeV1Composition.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyExposureDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyExposureDefiningcode.java index 550b59850..581f9d6d9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyExposureDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyExposureDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum BodyExposureDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java index a74c1aeae..a1b9c83a7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java @@ -1,16 +1,18 @@ package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.Long; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.util.List; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalAmount; -import java.util.List; - @Entity @OptionFor("INTERVAL_EVENT") public class BodyTemperatureAnyEventIntervalEvent implements BodyTemperatureAnyEventChoice { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java index ca5ccc5bf..505a566e2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java @@ -1,14 +1,16 @@ package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.Long; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @OptionFor("POINT_EVENT") public class BodyTemperatureAnyEventPointEvent implements BodyTemperatureAnyEventChoice { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java index 2a0957aa2..9a914dd21 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java index edbbd5ae7..2ec7ca97a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java index 613930d03..11a8519c4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java @@ -2,15 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; 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.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.body_temperature.v2") public class BodyTemperatureObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservationContainment.java index ed8d6b037..e44fbd1f6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservationContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +10,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class BodyTemperatureObservationContainment extends Containment { public SelectAqlField BODY_TEMPERATURE_OBSERVATION = new AqlFieldImp(BodyTemperatureObservation.class, "", "BodyTemperatureObservation", BodyTemperatureObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/LocationOfMeasurementDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/LocationOfMeasurementDefiningcode.java index c79f8f4dc..1d2a1e76c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/LocationOfMeasurementDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/LocationOfMeasurementDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum LocationOfMeasurementDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java index 021dd2995..abd114203 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java @@ -4,6 +4,9 @@ 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 org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Id; @@ -16,9 +19,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-COMPOSITION.versorgungsfall.v0") @Template("EpisodeOfCare") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareCompositionContainment.java index 8533df57f..eb6781267 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareCompositionContainment.java @@ -4,6 +4,8 @@ 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 org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -15,8 +17,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Setting; import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import java.time.temporal.TemporalAccessor; - public class EpisodeOfCareCompositionContainment extends Containment { public SelectAqlField EPISODE_OF_CARE_COMPOSITION = new AqlFieldImp(EpisodeOfCareComposition.class, "", "EpisodeOfCareComposition", EpisodeOfCareComposition.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java index 1ee8dd1a9..d8ec76761 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java @@ -1,15 +1,16 @@ package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Boolean; +import java.lang.String; +import java.net.URI; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.net.URI; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.episodeofcare.v0") public class EpisodeofcareAdminEntry { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntryContainment.java index 183291d5f..5eb5cabde 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntryContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntryContainment.java @@ -1,6 +1,10 @@ package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Boolean; +import java.lang.String; +import java.net.URI; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -8,9 +12,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.net.URI; -import java.time.temporal.TemporalAccessor; - public class EpisodeofcareAdminEntryContainment extends Containment { public SelectAqlField EPISODEOFCARE_ADMIN_ENTRY = new AqlFieldImp(EpisodeofcareAdminEntry.class, "", "EpisodeofcareAdminEntry", EpisodeofcareAdminEntry.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java index 94a658f84..169f6025b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java @@ -1,6 +1,8 @@ package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; import com.nedap.archie.rm.datavalues.DvEHRURI; +import java.lang.Long; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java index c4a7179f7..3fe2d4a99 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java @@ -1,10 +1,9 @@ package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; +import java.net.URI; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.net.URI; - @Entity public class EpisodeofcareTeamElement { @Path("/value|value") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/StatusDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/StatusDefiningCode.java index 9edea0607..f77dab15f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/StatusDefiningCode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/StatusDefiningCode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum StatusDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java index 9431212e5..53e115edc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java @@ -5,6 +5,9 @@ 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 org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Id; @@ -20,9 +23,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-COMPOSITION.encounter.v1") @Template("open_eREACT-Care") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareCompositionContainment.java index f5ee2c2d2..a8ccef628 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareCompositionContainment.java @@ -5,6 +5,8 @@ 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 org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -19,8 +21,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Setting; import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import java.time.temporal.TemporalAccessor; - public class OpenEREACTCareCompositionContainment extends Containment { public SelectAqlField OPEN_E_R_E_A_C_T_CARE_COMPOSITION = new AqlFieldImp(OpenEREACTCareComposition.class, "", "OpenEREACTCareComposition", OpenEREACTCareComposition.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java index 1b241caf7..fa8789045 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java @@ -2,12 +2,11 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datatypes.CodePhrase; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") public class AbdomenSymptomCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuDefiningcode.java index baac947bb..faffef258 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum AcvpuDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java index ac8d78fbf..53b2f3fd9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java @@ -3,14 +3,13 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.acvpu.v0") public class AcvpuScaleObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservationContainment.java index cf3aa81de..5a2da7e1f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservationContainment.java @@ -3,6 +3,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -10,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class AcvpuScaleObservationContainment extends Containment { public SelectAqlField ACVPU_SCALE_OBSERVATION = new AqlFieldImp(AcvpuScaleObservation.class, "", "AcvpuScaleObservation", AcvpuScaleObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java index 07d07f8e6..d5c906fa7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java @@ -2,13 +2,13 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.util.List; - @Entity @Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") public class AllergiesEvaluation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluationContainment.java index 701361e1b..eb96cf87f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluationContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AmberFlagAcuteDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AmberFlagAcuteDefiningCode.java index a3712d8c6..3cfbeab52 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AmberFlagAcuteDefiningCode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AmberFlagAcuteDefiningCode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum AmberFlagAcuteDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java index 57b8f1bd5..621f13f4e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java @@ -2,14 +2,15 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.blood_pressure.v2") public class BloodPressureObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservationContainment.java index b45856828..e983654f9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservationContainment.java @@ -2,6 +2,9 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +12,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class BloodPressureObservationContainment extends Containment { public SelectAqlField BLOOD_PRESSURE_OBSERVATION = new AqlFieldImp(BloodPressureObservation.class, "", "BloodPressureObservation", BloodPressureObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BreathingIndicatorDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BreathingIndicatorDefiningCode.java index 163f42900..8bd16182d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BreathingIndicatorDefiningCode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BreathingIndicatorDefiningCode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum BreathingIndicatorDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CareflowStepDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CareflowStepDefiningCode.java index 4ee4330ba..dc2e12890 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CareflowStepDefiningCode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CareflowStepDefiningCode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum CareflowStepDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java index 4a8d1188c..6a6405886 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java @@ -2,12 +2,11 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datatypes.CodePhrase; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") public class ChestSymptomCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CirculationIndicatorDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CirculationIndicatorDefiningCode.java index b7609bd08..b9755cab4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CirculationIndicatorDefiningCode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CirculationIndicatorDefiningCode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum CirculationIndicatorDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ClinicalRiskCategoryDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ClinicalRiskCategoryDefiningcode.java index 31c520746..c99c0e2ec 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ClinicalRiskCategoryDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ClinicalRiskCategoryDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum ClinicalRiskCategoryDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java index 970b8e825..074b2354a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java @@ -2,13 +2,12 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.util.List; - @Entity @Archetype("openEHR-EHR-EVALUATION.health_risk-covid.v0") public class Covid19ExposureEvaluation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java index 975e6605f..1f5f03c16 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java @@ -2,13 +2,13 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.util.List; - @Entity @Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") public class CovidNotesEvaluation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluationContainment.java index d906cba3d..c24e3bf4e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluationContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java index b8faf7853..33e9050d5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java @@ -2,14 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.story.v1") public class CovidSymptomsObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservationContainment.java index 2916d591c..38c324465 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservationContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class CovidSymptomsObservationContainment extends Containment { public SelectAqlField COVID_SYMPTOMS_OBSERVATION = new AqlFieldImp(CovidSymptomsObservation.class, "", "CovidSymptomsObservation", CovidSymptomsObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CurrentStateDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CurrentStateDefiningCode.java index be31724bf..00ea91ce9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CurrentStateDefiningCode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CurrentStateDefiningCode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum CurrentStateDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java index f92c1659a..c72f3b9f3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java @@ -4,14 +4,15 @@ import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Long; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.denwis.v0") public class DenwisObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservationContainment.java index be841c7e6..cc7287566 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservationContainment.java @@ -4,6 +4,9 @@ import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Long; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -11,8 +14,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class DenwisObservationContainment extends Containment { public SelectAqlField DENWIS_OBSERVATION = new AqlFieldImp(DenwisObservation.class, "", "DenwisObservation", DenwisObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java index 2a781362f..113be1a3c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java index c1ceabfd1..db19ab582 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java index 3c3fecff1..fb3622e75 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java index 5d51c7967..d1c2cf438 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java index 5268bc95f..ea8124987 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java index b4ca6f129..a3dd218c3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java index 9b5dd8af0..ac608eb0c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java @@ -2,13 +2,13 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datatypes.CodePhrase; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - +import java.lang.String; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java index 46abaa2e1..dd6d4bbdf 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java @@ -2,15 +2,15 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datatypes.CodePhrase; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalAmount; - public class FirstSymptomsClusterContainment extends Containment { public SelectAqlField FIRST_SYMPTOMS_CLUSTER = new AqlFieldImp(FirstSymptomsCluster.class, "", "FirstSymptomsCluster", FirstSymptomsCluster.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java index f648da0a1..f4af802a0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java @@ -3,14 +3,13 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.clinical_frailty_scale.v1") public class FrailtyObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservationContainment.java index 01355d700..5af020b9b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservationContainment.java @@ -3,6 +3,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -10,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class FrailtyObservationContainment extends Containment { public SelectAqlField FRAILTY_OBSERVATION = new AqlFieldImp(FrailtyObservation.class, "", "FrailtyObservation", FrailtyObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HealthRiskDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HealthRiskDefiningcode.java index cb2de7515..8717e7b68 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HealthRiskDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HealthRiskDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum HealthRiskDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java index 55bce1229..932ecf48c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java @@ -3,14 +3,15 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.height.v2") public class HeightObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservationContainment.java index 529b55dc6..6e7a8e2b5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservationContainment.java @@ -3,6 +3,9 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -10,8 +13,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class HeightObservationContainment extends Containment { public SelectAqlField HEIGHT_OBSERVATION = new AqlFieldImp(HeightObservation.class, "", "HeightObservation", HeightObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java index e2e86a0ba..42d83d5f2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java @@ -2,12 +2,11 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datatypes.CodePhrase; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") public class KeyCovidSymptomCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java index b6f4c13d3..017957406 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java @@ -2,15 +2,15 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; 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.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.laboratory_test_result.v1") public class LatestCovid19TestObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservationContainment.java index 03516fa76..7a8edbedf 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservationContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class LatestCovid19TestObservationContainment extends Containment { public SelectAqlField LATEST_COVID19_TEST_OBSERVATION = new AqlFieldImp(LatestCovid19TestObservation.class, "", "LatestCovid19TestObservation", LatestCovid19TestObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java index 556753e42..ffa8a2859 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java index 7b5e0476e..af4946d03 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java @@ -1,11 +1,10 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity public class LatestCovid19TestTestRequestDetailsCluster { @Path("/items[at0090]") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java index ad812b248..984525739 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java @@ -2,13 +2,13 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.util.List; - @Entity @Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") public class MedicationEvaluation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluationContainment.java index 141f96b86..a279c542c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluationContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/N999FlagDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/N999FlagDefiningCode.java index e184d53f8..689b3db4e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/N999FlagDefiningCode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/N999FlagDefiningCode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum N999FlagDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java index c2c8ec1f6..41fdd3ada 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java @@ -2,12 +2,11 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datatypes.CodePhrase; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") public class NeuroSymptomCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java index b9b29d100..01a94a542 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java @@ -3,14 +3,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Long; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.news2.v1") public class News2ScoreObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservationContainment.java index 20f1305bf..e4924dfb2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservationContainment.java @@ -3,6 +3,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Long; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -10,8 +12,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class News2ScoreObservationContainment extends Containment { public SelectAqlField NEWS2_SCORE_OBSERVATION = new AqlFieldImp(News2ScoreObservation.class, "", "News2ScoreObservation", News2ScoreObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java index 44c779406..74673cd18 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java @@ -1,12 +1,12 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") public class OtherSymptomCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomClusterContainment.java index 3d0ac81b4..2a2afe576 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomClusterContainment.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OverallTestStatusDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OverallTestStatusDefiningcode.java index b41c3a322..140db621a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OverallTestStatusDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OverallTestStatusDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum OverallTestStatusDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java index ca4607fd7..dafd48f9f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java @@ -2,13 +2,13 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.util.List; - @Entity @Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") public class PastHistoryEvaluation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluationContainment.java index b2ad285b3..1621376cf 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluationContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningCode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningCode2.java index 539e0fabb..b4c15cf91 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningCode2.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningCode2.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum PresenceDefiningCode2 implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningcode.java index 3a22dfb93..fd1a5563f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum PresenceDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java index d32370c5c..3da25bd7a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java @@ -2,14 +2,15 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.pulse.v1") public class PulseObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservationContainment.java index de9dc9f32..fb7f4eb2a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservationContainment.java @@ -2,6 +2,9 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +12,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class PulseObservationContainment extends Containment { public SelectAqlField PULSE_OBSERVATION = new AqlFieldImp(PulseObservation.class, "", "PulseObservation", PulseObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java index 0e2e86ead..dcd5e5a51 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java @@ -3,14 +3,13 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.quantity.DvProportion; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.pulse_oximetry.v1") public class PulseOximetryObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservationContainment.java index 686c151a2..6a5967d4d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservationContainment.java @@ -3,6 +3,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.quantity.DvProportion; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -10,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class PulseOximetryObservationContainment extends Containment { public SelectAqlField PULSE_OXIMETRY_OBSERVATION = new AqlFieldImp(PulseOximetryObservation.class, "", "PulseOximetryObservation", PulseOximetryObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java index bf92c61e9..e94af5370 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java @@ -2,13 +2,12 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.util.List; - @Entity @Archetype("openEHR-EHR-EVALUATION.recommendation.v1") public class RecommendationEvaluation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java index 47ef08c06..1dbefb506 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RedFlagAcuteDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RedFlagAcuteDefiningCode.java index 400896377..e5de6abc1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RedFlagAcuteDefiningCode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RedFlagAcuteDefiningCode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum RedFlagAcuteDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java index 2a2c71c6a..e368e07f0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java @@ -2,14 +2,15 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.respiration.v1") public class RespirationsObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservationContainment.java index 737f04eea..fa07ce9f9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservationContainment.java @@ -2,6 +2,9 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +12,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class RespirationsObservationContainment extends Containment { public SelectAqlField RESPIRATIONS_OBSERVATION = new AqlFieldImp(RespirationsObservation.class, "", "RespirationsObservation", RespirationsObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java index dc4155923..bddc3f7fc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java @@ -1,11 +1,10 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class ResponseSection { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskAssessmentDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskAssessmentDefiningcode.java index 7845a4175..50b6e5ec2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskAssessmentDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskAssessmentDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum RiskAssessmentDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode2.java index 03bf745b1..48f9a7c80 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode2.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode2.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum RiskFactorDefiningCode2 implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode3.java index dbe1d9c26..17fc633d6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode3.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode3.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum RiskFactorDefiningCode3 implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningcode.java index 4d7e400e3..36ca74158 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum RiskFactorDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorsForSepsisDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorsForSepsisDefiningCode.java index fd3e6e624..0ac5634b0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorsForSepsisDefiningCode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorsForSepsisDefiningCode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum RiskFactorsForSepsisDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java index 476325026..3287b4621 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java @@ -2,14 +2,13 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.sepsis_screening_tool.v0") public class SepsisScreeningObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservationContainment.java index 6e085634b..272af5b11 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservationContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +10,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class SepsisScreeningObservationContainment extends Containment { public SelectAqlField SEPSIS_SCREENING_OBSERVATION = new AqlFieldImp(SepsisScreeningObservation.class, "", "SepsisScreeningObservation", SepsisScreeningObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java index 31c152d10..63fe4b3e7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java index 8d1d55dfe..22433ab0d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java @@ -3,14 +3,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datatypes.CodePhrase; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-ACTION.service.v0") public class ServiceAction { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java index 3a67ed0c2..f5563384b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java @@ -3,6 +3,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datatypes.CodePhrase; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -10,8 +12,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class ServiceActionContainment extends Containment { public SelectAqlField SERVICE_ACTION = new AqlFieldImp(ServiceAction.class, "", "ServiceAction", ServiceAction.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java index a2e6e45dc..ac2143f0a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java @@ -3,11 +3,11 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datatypes.CodePhrase; import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - +import java.lang.String; import java.time.temporal.TemporalAccessor; import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; @Entity public class ServiceRequestCurrentActivityActivity { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java index 56a00b240..e8b2f0d05 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java @@ -2,14 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-INSTRUCTION.service_request.v1") public class ServiceRequestInstruction { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstructionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstructionContainment.java index ccbd766e3..4efc80642 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstructionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstructionContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class ServiceRequestInstructionContainment extends Containment { public SelectAqlField SERVICE_REQUEST_INSTRUCTION = new AqlFieldImp(ServiceRequestInstruction.class, "", "ServiceRequestInstruction", ServiceRequestInstruction.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java index 4d8c76193..23bcdf0d0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java @@ -2,14 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.story.v1") public class StoryHistoryObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservationContainment.java index e391a7436..0f1758a3b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservationContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class StoryHistoryObservationContainment extends Containment { public SelectAqlField STORY_HISTORY_OBSERVATION = new AqlFieldImp(StoryHistoryObservation.class, "", "StoryHistoryObservation", StoryHistoryObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java index 1493e9f6b..15eb48c4a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java index 976fd55f6..e07b98ba6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java @@ -3,13 +3,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datastructures.Element; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - @Entity @Archetype("openEHR-EHR-OBSERVATION.body_temperature.v1") public class TemperatureObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservationContainment.java index 537f830b6..36c4cf756 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservationContainment.java @@ -3,13 +3,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datastructures.Element; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class TemperatureObservationContainment extends Containment { public SelectAqlField TEMPERATURE_OBSERVATION = new AqlFieldImp(TemperatureObservation.class, "", "TemperatureObservation", TemperatureObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TrendDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TrendDefiningcode.java index 75a1df563..4620eeba4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TrendDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TrendDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum TrendDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode.java index 576f7a53b..116bfe4ba 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum ValueDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode2.java index e3e7bad1f..9d68bd02b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode2.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode2.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum ValueDefiningCode2 implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode3.java index 65bb52daf..8193255d6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode3.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode3.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum ValueDefiningCode3 implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode4.java index d6d62612b..49fbd0fbf 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode4.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode4.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum ValueDefiningCode4 implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode5.java index 14c40436b..c232fb457 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode5.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode5.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum ValueDefiningCode5 implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode6.java index 556d7a1ef..888136b15 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode6.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode6.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum ValueDefiningCode6 implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode7.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode7.java index e857555d2..339136461 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode7.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode7.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum ValueDefiningCode7 implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java index 22d33048f..d0cdf2597 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java @@ -3,14 +3,15 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.body_weight.v2") public class WeightObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservationContainment.java index aa5188f3c..cc1af55b6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservationContainment.java @@ -3,6 +3,9 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -10,8 +13,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class WeightObservationContainment extends Containment { public SelectAqlField WEIGHT_OBSERVATION = new AqlFieldImp(WeightObservation.class, "", "WeightObservation", WeightObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java index 047ca5c73..2bd930c05 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java @@ -4,6 +4,9 @@ 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 org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Id; @@ -18,9 +21,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-COMPOSITION.event_summary.v0") @Template("Patientenaufenthalt") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltCompositionContainment.java index 13b5eb1b3..c5a5f02a1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltCompositionContainment.java @@ -4,6 +4,8 @@ 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 org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -17,8 +19,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Setting; import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import java.time.temporal.TemporalAccessor; - public class PatientenaufenthaltCompositionContainment extends Containment { public SelectAqlField PATIENTENAUFENTHALT_COMPOSITION = new AqlFieldImp(PatientenaufenthaltComposition.class, "", "PatientenaufenthaltComposition", PatientenaufenthaltComposition.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java index f89f4fbdb..e062578bf 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallClusterContainment.java index d7b0258cb..64a9ce533 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java index 795eb8c7c..16b35ec32 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java @@ -2,12 +2,12 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.DvIdentifier; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.device.v1") public class DetailsZumBettCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettClusterContainment.java index e88392c9d..b92011443 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettClusterContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.DvIdentifier; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java index 9252c7692..296a0609b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortClusterContainment.java index dae0fa859..631cb838d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortschlusselDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortschlusselDefiningcode.java index 1e04607e7..33a6aa353 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortschlusselDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortschlusselDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum StandortschlusselDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java index b1292db96..b1d7b54e5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallClusterContainment.java index 5cba715b0..d1f5b4a3a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java index b5151c8a7..ae32fd27b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java @@ -1,13 +1,13 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.hospitalization.v0") public class VersorgungsortAdminEntry { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntryContainment.java index d150adc63..2b82cce8d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntryContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntryContainment.java @@ -1,13 +1,13 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class VersorgungsortAdminEntryContainment extends Containment { public SelectAqlField VERSORGUNGSORT_ADMIN_ENTRY = new AqlFieldImp(VersorgungsortAdminEntry.class, "", "VersorgungsortAdminEntry", VersorgungsortAdminEntry.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java index 6babdf0b5..047b47d88 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java @@ -5,6 +5,9 @@ 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 org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Id; @@ -18,9 +21,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-COMPOSITION.registereintrag.v1") @Template("Schwangerschaftsstatus") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusCompositionContainment.java index e940055e3..5f853a4ff 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusCompositionContainment.java @@ -5,6 +5,8 @@ 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 org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -17,8 +19,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Setting; import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import java.time.temporal.TemporalAccessor; - public class SchwangerschaftsstatusCompositionContainment extends Containment { public SelectAqlField SCHWANGERSCHAFTSSTATUS_COMPOSITION = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "", "SchwangerschaftsstatusComposition", SchwangerschaftsstatusComposition.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java index 579bd2734..1e84831b4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java @@ -2,14 +2,13 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.pregnancy_status.v0") public class SchwangerschaftsstatusObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservationContainment.java index 809ce26f1..24d7573d7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservationContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +10,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class SchwangerschaftsstatusObservationContainment extends Containment { public SelectAqlField SCHWANGERSCHAFTSSTATUS_OBSERVATION = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "", "SchwangerschaftsstatusObservation", SchwangerschaftsstatusObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode.java index ad62a720e..12136f133 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum StatusDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode2.java index 78db99cc4..59f762ecf 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode2.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode2.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum StatusDefiningCode2 implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java index a38309340..881c2ecc4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java @@ -4,6 +4,9 @@ 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 org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Id; @@ -17,9 +20,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-COMPOSITION.report.v1") @Template("SmICS-Befund") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundCompositionContainment.java index 411cf9d5c..50d07f8ec 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundCompositionContainment.java @@ -4,6 +4,8 @@ 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 org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -16,8 +18,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Setting; import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import java.time.temporal.TemporalAccessor; - public class SmICSBefundCompositionContainment extends Containment { public SelectAqlField SM_I_C_S_BEFUND_COMPOSITION = new AqlFieldImp(SmICSBefundComposition.class, "", "SmICSBefundComposition", SmICSBefundComposition.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java index 65c7afa27..97e79b29a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java @@ -1,11 +1,10 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_panel.v0") public class AntibiogrammCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiotikumDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiotikumDefiningcode.java index 240c8c2bc..5249e6c97 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiotikumDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiotikumDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum AntibiotikumDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ArtDerTypisierungDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ArtDerTypisierungDefiningCode.java index 96ccc6894..e78016790 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ArtDerTypisierungDefiningCode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ArtDerTypisierungDefiningCode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum ArtDerTypisierungDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java index d4cbbb242..99e030a1c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java @@ -2,12 +2,13 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; +import java.lang.Double; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.erregerdetails.v1") public class ErregerdetailsCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsClusterContainment.java index 7e6a43103..08183a74a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsClusterContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; +import java.lang.Double; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java index 6836724c1..a8d8b678d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java index 14a42a06c..4ebee1e08 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregernameDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregernameDefiningcode.java index 4ab6c16ce..776680619 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregernameDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregernameDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum ErregernameDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java index ac4cce423..c78413728 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java @@ -1,11 +1,11 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.molekulare_typisierung.v0") public class ErregertypisierungCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungClusterContainment.java index 634100d06..8b62923a3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java index 13cd3b58f..5445e4645 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java @@ -1,10 +1,10 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity public class EventsummaryBeteiligtePersonenCluster { @Path("/items[at0011]/value|value") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java index 0f0296f64..ca4c70342 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java @@ -1,11 +1,11 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.eventsummary.v0") public class EventsummaryCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryClusterContainment.java index 30afbff77..952e87af9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java index 907ee5d9c..ae6e20aa2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java @@ -1,11 +1,10 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import java.net.URI; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; -import java.net.URI; - @Entity @OptionFor("DV_URI") public class EventsummaryValueDvUri implements EventsummaryValueChoice { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java index e3125e1b9..e60df6216 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java @@ -1,12 +1,13 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") public class LaboranalytResultatCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatClusterContainment.java index b0d1702cd..9321467ee 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatClusterContainment.java @@ -1,6 +1,8 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/MreKlasseDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/MreKlasseDefiningcode.java index cf5a13356..a4ba03366 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/MreKlasseDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/MreKlasseDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum MreKlasseDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java index 3196adc7e..a3a5bb9b4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import java.lang.Long; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java index 299d5401a..1f27a1768 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java @@ -1,15 +1,16 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Boolean; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalAmount; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.smics_befund.v1") public class SmicsErgebnisObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservationContainment.java index 250aa2bd5..e563259ff 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservationContainment.java @@ -1,6 +1,10 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Boolean; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -8,9 +12,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalAmount; - public class SmicsErgebnisObservationContainment extends Containment { public SelectAqlField SMICS_ERGEBNIS_OBSERVATION = new AqlFieldImp(SmicsErgebnisObservation.class, "", "SmicsErgebnisObservation", SmicsErgebnisObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebniskategorieDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebniskategorieDefiningcode.java index 9efb34492..d6754c74c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebniskategorieDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebniskategorieDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum SmicsErgebniskategorieDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java index adaa043c4..5aaa3e5bb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java @@ -1,12 +1,12 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") public class StandortCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortClusterContainment.java index c418b4e35..8e8f17e87 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortClusterContainment.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java index fa40a4d12..7a478e58e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java @@ -5,6 +5,9 @@ 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 org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Id; @@ -19,9 +22,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-COMPOSITION.fall.v0") @Template("Stationärer Versorgungsfall") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallCompositionContainment.java index 1a02d96ae..91a004845 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallCompositionContainment.java @@ -5,6 +5,8 @@ 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 org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -18,8 +20,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Setting; import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import java.time.temporal.TemporalAccessor; - public class StationarerVersorgungsfallCompositionContainment extends Containment { public SelectAqlField STATIONARER_VERSORGUNGSFALL_COMPOSITION = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "", "StationarerVersorgungsfallComposition", StationarerVersorgungsfallComposition.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java index b76edd5a6..7b2e44001 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java @@ -2,14 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.admission.v0") public class AufnahmedatenAdminEntry { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntryContainment.java index e1a4972a7..9f9ade2a5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntryContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntryContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class AufnahmedatenAdminEntryContainment extends Containment { public SelectAqlField AUFNAHMEDATEN_ADMIN_ENTRY = new AqlFieldImp(AufnahmedatenAdminEntry.class, "", "AufnahmedatenAdminEntry", AufnahmedatenAdminEntry.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java index 3236c4394..7e975ea23 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java @@ -2,14 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.discharge_summary.v0") public class EntlassungsdatenAdminEntry { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntryContainment.java index f2bad3c8c..dadff48ee 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntryContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntryContainment.java @@ -2,6 +2,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +11,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class EntlassungsdatenAdminEntryContainment extends Containment { public SelectAqlField ENTLASSUNGSDATEN_ADMIN_ENTRY = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "", "EntlassungsdatenAdminEntry", EntlassungsdatenAdminEntry.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/FalltypDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/FalltypDefiningcode.java index e61b550b1..33e928d74 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/FalltypDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/FalltypDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum FalltypDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/KlinischerZustandDesPatientenDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/KlinischerZustandDesPatientenDefiningcode.java index 7912afa2f..0f4036c1d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/KlinischerZustandDesPatientenDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/KlinischerZustandDesPatientenDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum KlinischerZustandDesPatientenDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java index 8aa1c63a4..be6c11123 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java @@ -4,6 +4,9 @@ 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 org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Id; @@ -19,9 +22,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-COMPOSITION.test_all_types.v1") @Template("test_all_types.en.v1") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java index 6fb006f81..ddef03d1a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java @@ -4,6 +4,8 @@ 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 org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -18,8 +20,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Setting; import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import java.time.temporal.TemporalAccessor; - public class TestAllTypesEnV1CompositionContainment extends Containment { public SelectAqlField TEST_ALL_TYPES_EN_V1_COMPOSITION = new AqlFieldImp(TestAllTypesEnV1Composition.class, "", "TestAllTypesEnV1Composition", TestAllTypesEnV1Composition.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CareflowStepDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CareflowStepDefiningCode.java index d30bacca9..9b86c5b65 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CareflowStepDefiningCode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CareflowStepDefiningCode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum CareflowStepDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ContextCodedTextDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ContextCodedTextDefiningcode.java index 1c7c49f69..82f69efd0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ContextCodedTextDefiningcode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ContextCodedTextDefiningcode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum ContextCodedTextDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CurrentStateDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CurrentStateDefiningCode.java index c4ba1fc45..2615d9361 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CurrentStateDefiningCode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CurrentStateDefiningCode.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import java.lang.String; import org.ehrbase.client.classgenerator.EnumValueSet; public enum CurrentStateDefiningCode implements EnumValueSet { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java index ea3fda68b..4c4853e97 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java @@ -2,14 +2,13 @@ import com.nedap.archie.rm.datatypes.CodePhrase; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-ACTION.test_all_types.v1") public class TestAllTypesAction { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java index 7d368cdc7..eddcd95e9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.datatypes.CodePhrase; import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -9,8 +10,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class TestAllTypesActionContainment extends Containment { public SelectAqlField TEST_ALL_TYPES_ACTION = new AqlFieldImp(TestAllTypesAction.class, "", "TestAllTypesAction", TestAllTypesAction.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java index 00d3559b9..79bfc0b9a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Long; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java index cf5fe733a..d024d2456 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Long; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java index f3eb69f6c..b2e1a971b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import java.lang.Long; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java index 9892cb1a3..65c47bd21 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java @@ -1,5 +1,7 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import java.lang.Double; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java index 9eab3f38f..760d6fca3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import java.lang.Boolean; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java index 810b3e6ca..a2012313d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import java.lang.Boolean; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java index 3503bddd3..0bd143a90 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java @@ -1,15 +1,18 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Boolean; +import java.lang.Double; +import java.lang.Long; +import java.lang.String; +import java.net.URI; +import java.time.temporal.TemporalAccessor; 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.shareddefinition.Language; -import java.net.URI; -import java.time.temporal.TemporalAccessor; - @Entity @Archetype("openEHR-EHR-EVALUATION.test_all_types.v1") public class TestAllTypesEvaluation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java index 6a2a8bc3e..2bd2f2deb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java @@ -1,14 +1,17 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Boolean; +import java.lang.Double; +import java.lang.Long; +import java.lang.String; +import java.net.URI; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.net.URI; -import java.time.temporal.TemporalAccessor; - public class TestAllTypesEvaluationContainment extends Containment { public SelectAqlField TEST_ALL_TYPES_EVALUATION = new AqlFieldImp(TestAllTypesEvaluation.class, "", "TestAllTypesEvaluation", TestAllTypesEvaluation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java index 42cc9ef6d..493a5fe03 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java @@ -2,14 +2,14 @@ import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.Temporal; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.Temporal; -import java.time.temporal.TemporalAccessor; - @Entity @Archetype("openEHR-EHR-INSTRUCTION.test_all_types.v1") public class TestAllTypesInstruction { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java index f93134202..055f8f3b2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java @@ -2,14 +2,14 @@ import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.Temporal; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.Temporal; -import java.time.temporal.TemporalAccessor; - public class TestAllTypesInstructionContainment extends Containment { public SelectAqlField TEST_ALL_TYPES_INSTRUCTION = new AqlFieldImp(TestAllTypesInstruction.class, "", "TestAllTypesInstruction", TestAllTypesInstruction.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java index 5b46eaba2..e4751888a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java @@ -7,15 +7,18 @@ import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; import com.nedap.archie.rm.datavalues.quantity.DvProportion; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Boolean; +import java.lang.Double; +import java.lang.Long; +import java.lang.String; +import java.time.temporal.Temporal; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.Temporal; -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalAmount; - @Entity @Archetype("openEHR-EHR-OBSERVATION.test_all_types.v1") public class TestAllTypesObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java index 59ac9fa85..96cf0c114 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java @@ -7,15 +7,18 @@ import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; import com.nedap.archie.rm.datavalues.quantity.DvProportion; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Boolean; +import java.lang.Double; +import java.lang.Long; +import java.lang.String; +import java.time.temporal.Temporal; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.Temporal; -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalAmount; - public class TestAllTypesObservationContainment extends Containment { public SelectAqlField TEST_ALL_TYPES_OBSERVATION = new AqlFieldImp(TestAllTypesObservation.class, "", "TestAllTypesObservation", TestAllTypesObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java index 8fe03586f..abea012f5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java @@ -1,11 +1,10 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-SECTION.test_all_types.v1") public class TestAllTypesSection { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java index c55be9d86..273136c2f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java @@ -4,6 +4,9 @@ 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 org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Id; @@ -17,9 +20,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-COMPOSITION.report-result.v1") @Template("Virologischer Befund") diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundCompositionContainment.java index 8b7a26cc8..a49ff5a30 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundCompositionContainment.java @@ -4,6 +4,8 @@ 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 org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -16,8 +18,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Setting; import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import java.time.temporal.TemporalAccessor; - public class VirologischerBefundCompositionContainment extends Containment { public SelectAqlField VIROLOGISCHER_BEFUND_COMPOSITION = new AqlFieldImp(VirologischerBefundComposition.class, "", "VirologischerBefundComposition", VirologischerBefundComposition.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java index 9099f3b0c..de73ea967 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java @@ -1,12 +1,12 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.anatomical_location.v1") public class AnatomischeLokalisationCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationClusterContainment.java index bcbf15dde..346c112b8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationClusterContainment.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java index 62246249d..b37f2e586 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java index 7bce3303d..4e0044e03 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java @@ -3,14 +3,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.DvIdentifier; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-OBSERVATION.laboratory_test_result.v1") public class BefundObservation { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservationContainment.java index 16f93ec91..5aa5a3f8f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservationContainment.java @@ -3,6 +3,8 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.DvIdentifier; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -10,8 +12,6 @@ import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import java.time.temporal.TemporalAccessor; - public class BefundObservationContainment extends Containment { public SelectAqlField BEFUND_OBSERVATION = new AqlFieldImp(BefundObservation.class, "", "BefundObservation", BefundObservation.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java index 4213ba5c0..43e628658 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java @@ -1,12 +1,12 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") public class EinsenderstandortCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortClusterContainment.java index 9b23adb08..febd0e937 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortClusterContainment.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java index fa3f90fe9..72ebb9d5c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java @@ -1,12 +1,12 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") public class EmpfangerstandortCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortClusterContainment.java index e80ff8d5e..112508ffd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortClusterContainment.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java index 18c429907..6fefa5270 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; +import java.lang.String; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationClusterContainment.java index f9e94d225..a34b7a70c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java index 380317944..d0d355f8f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java @@ -1,11 +1,10 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_panel.v0") public class KulturCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java index eddfec517..1f0903984 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java @@ -2,12 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.DvIdentifier; +import java.lang.Double; +import java.lang.Long; +import java.lang.String; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") public class ProVirusCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusClusterContainment.java index 1dd79eedb..d9c4b1f9b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusClusterContainment.java @@ -2,6 +2,9 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.DvIdentifier; +import java.lang.Double; +import java.lang.Long; +import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java index a83d704fe..053662c81 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java @@ -2,13 +2,13 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.DvIdentifier; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-CLUSTER.specimen.v1") public class ProbeCluster { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeClusterContainment.java index fbb3e0fe9..c8c87764e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeClusterContainment.java @@ -2,14 +2,14 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.DvIdentifier; +import java.lang.String; +import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; -import java.time.temporal.TemporalAccessor; - public class ProbeClusterContainment extends Containment { public SelectAqlField PROBE_CLUSTER = new AqlFieldImp(ProbeCluster.class, "", "ProbeCluster", ProbeCluster.class, this); diff --git a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java index 3f9ddcc63..2d86f4a8b 100644 --- a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java +++ b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java @@ -28,6 +28,7 @@ import org.ehrbase.test_data.operationaltemplate.OperationalTemplateTestData; import org.ehrbase.webtemplate.model.WebTemplate; import org.ehrbase.webtemplate.parser.OPTParser; +import org.junit.Ignore; import org.junit.Test; import org.openehr.schemas.v1.OPERATIONALTEMPLATE; import org.openehr.schemas.v1.TemplateDocument; @@ -43,6 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@Ignore public class ClassGeneratorTest { public static final String PACKAGE_NAME = "org.ehrbase.client.classgenerator.examples"; From e23985fa5c3f2daf33198927408747c9216dd41f Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Wed, 2 Dec 2020 10:09:03 +0100 Subject: [PATCH 21/54] fix filenames see https://github.com/ehrbase/project_management/issues/424 --- .../AlternativeEventsComposition.java | 202 --- ...ternativeEventsCompositionContainment.java | 61 - .../KorpergewichtAnyEventEnChoice.java | 4 - .../KorpergewichtAnyEventEnIntervalEvent.java | 104 -- .../KorpergewichtAnyEventEnPointEvent.java | 80 - .../KorpergewichtBirthEnPointEvent.java | 78 - ...pergewichtConfoundingFactorsEnElement.java | 19 - .../definition/KorpergewichtObservation.java | 93 -- .../KorpergewichtObservationContainment.java | 37 - .../StateOfDressEnDefiningCode.java | 47 - .../BefundDerBlutgasanalyseComposition.java | 203 --- ...rBlutgasanalyseCompositionContainment.java | 62 - .../KohlendioxidpartialdruckCluster.java | 69 - ...ndioxidpartialdruckClusterContainment.java | 32 - .../definition/LaborergebnisObservation.java | 194 --- .../LaborergebnisObservationContainment.java | 55 - .../LabortestBezeichnungDefiningCode.java | 44 - .../definition/PhWertCluster.java | 69 - .../definition/PhWertClusterContainment.java | 32 - .../SauerstoffpartialdruckCluster.java | 69 - ...erstoffpartialdruckClusterContainment.java | 32 - .../SauerstoffsattigungCluster.java | 69 - ...SauerstoffsattigungClusterContainment.java | 32 - .../definition/StatusDefiningcode.java | 45 - .../UntersuchterAnalytDefiningcode.java | 44 - .../UntersuchterAnalytDefiningcode2.java | 44 - .../UntersuchterAnalytDefiningcode3.java | 50 - .../UntersuchterAnalytDefiningcode4.java | 42 - .../CoronaAnamneseComposition.java | 250 ---- .../CoronaAnamneseCompositionContainment.java | 73 - .../definition/AdresseCluster.java | 32 - .../definition/AdresseClusterContainment.java | 22 - .../definition/AllgemeineAngabenSection.java | 114 -- .../AllgemeineAngabenSectionContainment.java | 37 - ...AndereAktuelleErkrankungenObservation.java | 105 -- ...lleErkrankungenObservationContainment.java | 40 - ...ogebieteFurCoronainfektionOderKontak_.java | 42 - ...ltInGesundheitseinrichtungObservation.java | 126 -- ...eitseinrichtungObservationContainment.java | 44 - .../definition/BeschaftigungCluster.java | 45 - .../BeschaftigungClusterContainment.java | 27 - ...ertungDesGesundheitsrisikosEvaluation.java | 160 -- ...sundheitsrisikosEvaluationContainment.java | 50 - .../ChronischeErkrankungenObservation.java | 105 -- ...cheErkrankungenObservationContainment.java | 40 - .../DiagnosestatusDefiningCode.java | 39 - .../DiagnostischeSicherheitDefiningCode.java | 44 - ...enstleistungAktuelleAktivitatActivity.java | 89 -- ...leistungGrundFurDieAnforderungElement.java | 19 - .../definition/DienstleistungInstruction.java | 115 -- .../DienstleistungInstructionContainment.java | 42 - .../definition/DurchfallObservation.java | 105 -- .../DurchfallObservationContainment.java | 40 - ...derErhohteKorpertemperaturObservation.java | 105 -- ...orpertemperaturObservationContainment.java | 40 - ...genZumMedikationsScreeningObservation.java | 120 -- ...ationsScreeningObservationContainment.java | 43 - ...creeningSpezifischeMedikamenteCluster.java | 31 - ...ichteHistorieBeliebigesEreignisChoice.java | 4 - ...storieBeliebigesEreignisIntervalEvent.java | 69 - ...eHistorieBeliebigesEreignisPointEvent.java | 45 - .../GeschichteHistorieGeschichteElement.java | 19 - .../GeschichteHistorieObservation.java | 72 - ...chichteHistorieObservationContainment.java | 33 - .../GestorterGeruchssinnObservation.java | 105 -- ...rterGeruchssinnObservationContainment.java | 40 - .../GestorterGeschmackssinnObservation.java | 105 -- ...rGeschmackssinnObservationContainment.java | 40 - .../GesundheitsbezogenerBerufEvaluation.java | 80 - ...tsbezogenerBerufEvaluationContainment.java | 35 - .../definition/HeiserkeitObservation.java | 105 -- .../HeiserkeitObservationContainment.java | 40 - .../HistorieDerReiseObservation.java | 104 -- ...istorieDerReiseObservationContainment.java | 39 - .../definition/HustenObservation.java | 105 -- .../HustenObservationContainment.java | 40 - .../definition/InlandAuslandDefiningcode.java | 43 - .../definition/KontaktSection.java | 32 - .../definition/KontaktSectionContainment.java | 21 - .../KorpertemperaturObservation.java | 149 -- ...orpertemperaturObservationContainment.java | 49 - .../KorpertemperaturStorfaktorenElement.java | 19 - .../definition/LetzteReiseDefiningcode.java | 43 - .../MedikamentInVerwendungDefiningcode.java | 44 - ...amentenklasseInVerwendungDefiningcode.java | 44 - .../definition/OrganisationCluster.java | 78 - .../OrganisationClusterContainment.java | 33 - .../PersonenkontaktObservation.java | 126 -- ...PersonenkontaktObservationContainment.java | 44 - .../PresenceOfAnyExposureEnDefiningcode.java | 44 - .../definition/ProblemDiagnoseEvaluation.java | 91 -- .../ProblemDiagnoseEvaluationContainment.java | 37 - ...onovirusDiagnostischeSicherheitChoice.java | 4 - ...rusDiagnostischeSicherheitDvCodedText.java | 21 - ...onovirusDiagnostischeSicherheitDvText.java | 21 - .../ProblemDiganoseCoronovirusEvaluation.java | 128 -- ...anoseCoronovirusEvaluationContainment.java | 44 - ...iebigesIntervallereignisIntervalEvent.java | 77 - .../ReisefallBestimmteReiseCluster.java | 44 - .../ReisefallBestimmtesReisezielCluster.java | 65 - .../definition/ReisefallObservation.java | 70 - .../ReisefallObservationContainment.java | 33 - .../definition/RisikogebietSection.java | 32 - .../RisikogebietSectionContainment.java | 23 - .../definition/SchnupfenObservation.java | 105 -- .../SchnupfenObservationContainment.java | 40 - .../definition/StandortCluster.java | 34 - .../StandortClusterContainment.java | 25 - .../definition/StatusCluster.java | 20 - .../definition/StatusClusterContainment.java | 19 - .../definition/SymptomeSection.java | 110 -- .../SymptomeSectionContainment.java | 35 - .../definition/VorhandenDefiningcode.java | 41 - .../definition/VorhandenDefiningcode2.java | 43 - .../VorhandenseinDefiningCode2.java | 43 - .../definition/VorhandenseinDefiningcode.java | 41 - ...itereSymptomeBeliebigesEreignisChoice.java | 4 - ...mptomeBeliebigesEreignisIntervalEvent.java | 59 - ...eSymptomeBeliebigesEreignisPointEvent.java | 35 - .../WeitereSymptomeObservation.java | 72 - ...WeitereSymptomeObservationContainment.java | 33 - ...meSpezifischesSymptomAnzeichenCluster.java | 56 - .../definition/WohnsituationEvaluation.java | 81 -- .../WohnsituationEvaluationContainment.java | 36 - .../definition/WohnstatteCluster.java | 34 - .../WohnstatteClusterContainment.java | 25 - .../DiagnoseComposition.java | 191 --- .../DiagnoseCompositionContainment.java | 59 - .../AnatomischeLokalisationCluster.java | 56 - ...omischeLokalisationClusterContainment.java | 29 - ...thogeneseAtiologieDerKrankheitElement.java | 20 - ...eneseBeschreibungDesEntstehensElement.java | 19 - .../definition/AtiopathogeneseCluster.java | 34 - .../AtiopathogeneseClusterContainment.java | 23 - .../AtiopathogeneseValueChoice.java | 4 - .../AtiopathogeneseValueDvCodedText.java | 20 - .../AtiopathogeneseValueDvText.java | 21 - .../definition/DiagnosedetailsCluster.java | 55 - .../DiagnosedetailsClusterContainment.java | 27 - .../DiagnostischeSicherheitDefiningcode.java | 44 - .../definition/FallidentifikationCluster.java | 21 - .../FallidentifikationClusterContainment.java | 20 - .../definition/LateralitatDefiningcode.java | 43 - ...ameDesProblemsDerDiagnoseDefiningcode.java | 46 - ...DiagnoseDiagnostischeSicherheitChoice.java | 4 - ...oseDiagnostischeSicherheitDvCodedText.java | 21 - ...DiagnoseDiagnostischeSicherheitDvText.java | 21 - .../definition/ProblemDiagnoseEvaluation.java | 209 --- .../ProblemDiagnoseEvaluationContainment.java | 58 - .../ProblemDiagnoseSchweregradChoice.java | 4 - ...ProblemDiagnoseSchweregradDvCodedText.java | 20 - .../ProblemDiagnoseSchweregradDvText.java | 21 - .../definition/SchweregradDefiningcode.java | 43 - .../definition/ValueDefiningcode.java | 63 - ...aseBloodPressureSimpleDeV0Composition.java | 182 --- ...ssureSimpleDeV0CompositionContainment.java | 57 - ...loodPressureTrainingSampleObservation.java | 249 ---- ...eTrainingSampleObservationContainment.java | 67 - .../definition/CuffSizeDefiningcode.java | 53 - .../DeviceDetailsTrainingSampleCluster.java | 111 -- ...tailsTrainingSampleClusterContainment.java | 38 - .../KorotkoffSoundsDefiningcode.java | 44 - .../LocationOfMeasurementDefiningcode.java | 58 - .../definition/PositionDefiningcode.java | 53 - ...EhrbaseMultiOccurrenceDeV1Composition.java | 180 --- ...iOccurrenceDeV1CompositionContainment.java | 57 - .../definition/BodyExposureDefiningcode.java | 51 - .../BodyTemperatureAnyEventChoice.java | 4 - .../BodyTemperatureAnyEventIntervalEvent.java | 129 -- .../BodyTemperatureAnyEventPointEvent.java | 105 -- .../BodyTemperatureBodyExposureChoice.java | 4 - ...odyTemperatureBodyExposureDvCodedText.java | 20 - .../BodyTemperatureBodyExposureDvText.java | 21 - ...emperatureLocationOfMeasurementChoice.java | 4 - ...atureLocationOfMeasurementDvCodedText.java | 21 - ...emperatureLocationOfMeasurementDvText.java | 21 - .../BodyTemperatureObservation.java | 106 -- ...BodyTemperatureObservationContainment.java | 39 - .../LocationOfMeasurementDefiningcode.java | 70 - .../EpisodeOfCareComposition.java | 168 --- .../EpisodeOfCareCompositionContainment.java | 54 - .../definition/EpisodeofcareAdminEntry.java | 159 -- .../EpisodeofcareAdminEntryContainment.java | 51 - .../EpisodeofcareDiagnosisCluster.java | 43 - .../EpisodeofcareIdentifierElement.java | 19 - .../definition/EpisodeofcareTeamElement.java | 19 - .../definition/StatusDefiningCode.java | 51 - .../OpenEREACTCareComposition.java | 216 --- .../OpenEREACTCareCompositionContainment.java | 66 - .../definition/AbdomenSymptomCluster.java | 78 - .../AbdomenSymptomClusterContainment.java | 33 - .../definition/AcvpuDefiningcode.java | 47 - .../definition/AcvpuScaleObservation.java | 92 -- .../AcvpuScaleObservationContainment.java | 38 - .../definition/AllergiesEvaluation.java | 58 - .../AllergiesEvaluationContainment.java | 31 - .../AmberFlagAcuteDefiningCode.java | 53 - .../definition/AssessmentSection.java | 53 - .../AssessmentSectionContainment.java | 25 - .../definition/BackgroundSection.java | 75 - .../BackgroundSectionContainment.java | 29 - .../definition/BloodPressureObservation.java | 148 -- .../BloodPressureObservationContainment.java | 49 - .../BreathingIndicatorDefiningCode.java | 46 - .../definition/CareflowStepDefiningCode.java | 39 - .../definition/ChestSymptomCluster.java | 78 - .../ChestSymptomClusterContainment.java | 33 - .../CirculationIndicatorDefiningCode.java | 46 - .../ClinicalRiskCategoryDefiningcode.java | 46 - .../definition/Covid19ExposureEvaluation.java | 169 --- .../Covid19ExposureEvaluationContainment.java | 50 - .../definition/CovidNotesEvaluation.java | 58 - .../CovidNotesEvaluationContainment.java | 31 - .../definition/CovidSection.java | 53 - .../definition/CovidSectionContainment.java | 25 - .../definition/CovidSymptomsObservation.java | 147 -- .../CovidSymptomsObservationContainment.java | 48 - .../definition/CurrentStateDefiningCode.java | 39 - .../DenwisAgitationIndicatorElement.java | 20 - .../DenwisBreathingIndicatorElement.java | 18 - .../DenwisCirculationIndicatorElement.java | 18 - .../DenwisMentationIndicatorElement.java | 20 - ...DenwisNurseSubjectiveIndicatorElement.java | 20 - .../definition/DenwisObservation.java | 307 ---- .../DenwisObservationContainment.java | 79 - .../DenwisPainIndicatorElement.java | 20 - .../DenwisPatientIndicatorElement.java | 20 - .../DenwisTemperatureIndicatorElement.java | 20 - .../DenwisTrajectoryIndicatorElement.java | 20 - .../definition/DenwisValueChoice.java | 4 - .../definition/DenwisValueChoice2.java | 4 - .../definition/DenwisValueChoice3.java | 4 - .../definition/DenwisValueChoice4.java | 4 - .../definition/DenwisValueChoice5.java | 4 - .../definition/DenwisValueChoice6.java | 4 - .../definition/DenwisValueDvCodedText.java | 20 - .../definition/DenwisValueDvCodedText2.java | 20 - .../definition/DenwisValueDvCodedText3.java | 20 - .../definition/DenwisValueDvCodedText4.java | 20 - .../definition/DenwisValueDvCodedText5.java | 20 - .../definition/DenwisValueDvCodedText6.java | 20 - .../definition/DenwisValueDvText.java | 21 - .../definition/DenwisValueDvText2.java | 21 - .../definition/DenwisValueDvText3.java | 21 - .../definition/DenwisValueDvText4.java | 21 - .../definition/DenwisValueDvText5.java | 21 - .../definition/DenwisValueDvText6.java | 21 - .../definition/FirstSymptomsCluster.java | 125 -- .../FirstSymptomsClusterContainment.java | 44 - .../definition/FrailtyObservation.java | 81 -- .../FrailtyObservationContainment.java | 36 - .../definition/HealthRiskDefiningcode.java | 39 - .../definition/HeightObservation.java | 116 -- .../HeightObservationContainment.java | 44 - .../definition/KeyCovidSymptomCluster.java | 78 - .../KeyCovidSymptomClusterContainment.java | 33 - .../LatestCovid19TestObservation.java | 194 --- ...testCovid19TestObservationContainment.java | 56 - ...estCovid19TestOverallTestStatusChoice.java | 4 - ...vid19TestOverallTestStatusDvCodedText.java | 21 - ...estCovid19TestOverallTestStatusDvText.java | 21 - ...tCovid19TestTestRequestDetailsCluster.java | 31 - .../definition/MedicationEvaluation.java | 58 - .../MedicationEvaluationContainment.java | 31 - .../definition/N999FlagDefiningCode.java | 49 - .../definition/NeuroSymptomCluster.java | 78 - .../NeuroSymptomClusterContainment.java | 33 - .../definition/News2ScoreObservation.java | 182 --- .../News2ScoreObservationContainment.java | 55 - .../definition/News2Section.java | 86 -- .../definition/News2SectionContainment.java | 31 - .../definition/OtherSymptomCluster.java | 78 - .../OtherSymptomClusterContainment.java | 33 - .../OverallTestStatusDefiningcode.java | 54 - .../definition/PastHistoryEvaluation.java | 58 - .../PastHistoryEvaluationContainment.java | 31 - .../definition/PresenceDefiningCode2.java | 43 - .../definition/PresenceDefiningcode.java | 43 - .../definition/PulseObservation.java | 115 -- .../PulseObservationContainment.java | 43 - .../definition/PulseOximetryObservation.java | 136 -- .../PulseOximetryObservationContainment.java | 46 - .../definition/RecommendationEvaluation.java | 57 - .../RecommendationEvaluationContainment.java | 30 - .../RecommendationRecommendationElement.java | 19 - .../definition/RedFlagAcuteDefiningCode.java | 55 - .../definition/RespirationsObservation.java | 115 -- .../RespirationsObservationContainment.java | 43 - .../definition/ResponseSection.java | 43 - .../ResponseSectionContainment.java | 25 - .../RiskAssessmentDefiningcode.java | 41 - .../definition/RiskFactorDefiningCode2.java | 39 - .../definition/RiskFactorDefiningCode3.java | 39 - .../definition/RiskFactorDefiningcode.java | 39 - .../RiskFactorsForSepsisDefiningCode.java | 46 - .../SepsisScreening999FlagElement.java | 18 - .../SepsisScreeningAmberFlagAcuteElement.java | 18 - ...reeningLikelySourceOfInfectionElement.java | 20 - .../SepsisScreeningObservation.java | 126 -- ...SepsisScreeningObservationContainment.java | 43 - .../SepsisScreeningRedFlagAcuteElement.java | 18 - ...sScreeningRiskFactorsForSepsisElement.java | 18 - .../SepsisScreeningValueChoice.java | 4 - .../SepsisScreeningValueDvCodedText.java | 20 - .../SepsisScreeningValueDvText.java | 21 - .../definition/SepsisSection.java | 20 - .../definition/SepsisSectionContainment.java | 19 - .../definition/ServiceAction.java | 148 -- .../definition/ServiceActionContainment.java | 49 - ...ServiceRequestCurrentActivityActivity.java | 123 -- .../definition/ServiceRequestInstruction.java | 114 -- .../ServiceRequestInstructionContainment.java | 42 - ...ServiceRequestReasonForRequestElement.java | 19 - .../definition/SituationSection.java | 20 - .../SituationSectionContainment.java | 19 - .../definition/StoryHistoryObservation.java | 103 -- .../StoryHistoryObservationContainment.java | 40 - .../StoryHistorySoftSignsElement.java | 19 - .../definition/TemperatureObservation.java | 126 -- .../TemperatureObservationContainment.java | 44 - .../definition/TrendDefiningcode.java | 43 - .../definition/ValueDefiningcode.java | 39 - .../definition/ValueDefiningcode2.java | 41 - .../definition/ValueDefiningcode3.java | 41 - .../definition/ValueDefiningcode4.java | 41 - .../definition/ValueDefiningcode5.java | 41 - .../definition/ValueDefiningcode6.java | 41 - .../definition/ValueDefiningcode7.java | 49 - .../definition/WeightObservation.java | 116 -- .../WeightObservationContainment.java | 44 - .../PatientenaufenthaltComposition.java | 192 --- ...entenaufenthaltCompositionContainment.java | 60 - .../definition/AbteilungsfallCluster.java | 21 - .../AbteilungsfallClusterContainment.java | 20 - .../definition/DetailsZumBettCluster.java | 101 -- .../DetailsZumBettClusterContainment.java | 38 - .../definition/StandortCluster.java | 121 -- .../StandortClusterContainment.java | 38 - .../StandortschlusselDefiningcode.java | 332 ----- .../definition/VersorgungsfallCluster.java | 22 - .../VersorgungsfallClusterContainment.java | 20 - .../definition/VersorgungsortAdminEntry.java | 90 -- .../VersorgungsortAdminEntryContainment.java | 35 - .../SchwangerschaftsstatusComposition.java | 203 --- ...erschaftsstatusCompositionContainment.java | 62 - .../SchwangerschaftsstatusObservation.java | 80 - ...erschaftsstatusObservationContainment.java | 35 - .../definition/StatusDefiningcode.java | 45 - .../definition/StatusDefiningcode2.java | 43 - .../SmICSBefundComposition.java | 202 --- .../SmICSBefundCompositionContainment.java | 61 - .../definition/AntibiogrammCluster.java | 21 - .../AntibiogrammClusterContainment.java | 21 - .../definition/AntibiotikumDefiningcode.java | 397 ----- .../ArtDerTypisierungDefiningCode.java | 48 - .../definition/ErregerdetailsCluster.java | 125 -- .../ErregerdetailsClusterContainment.java | 43 - .../ErregerdetailsKeimSubtypElement.java | 19 - ...gerdetailsResistenzmechanismusCluster.java | 19 - .../definition/ErregernameDefiningcode.java | 1289 ----------------- ...ertypisierungArtDerTypisierungElement.java | 18 - .../definition/ErregertypisierungCluster.java | 56 - .../ErregertypisierungClusterContainment.java | 28 - .../ErregertypisierungErgebnisElement.java | 19 - ...EventsummaryBeteiligtePersonenCluster.java | 31 - .../definition/EventsummaryCluster.java | 67 - .../EventsummaryClusterContainment.java | 30 - .../EventsummaryIdDerPersonElement.java | 20 - .../definition/EventsummaryValueChoice.java | 4 - .../EventsummaryValueDvIdentifier.java | 21 - .../definition/EventsummaryValueDvUri.java | 21 - .../LaboranalytResultatCluster.java | 79 - ...LaboranalytResultatClusterContainment.java | 34 - .../definition/MreKlasseDefiningcode.java | 51 - ...ebnisAnzahlDerErregernachweiseElement.java | 19 - .../definition/SmicsErgebnisObservation.java | 251 ---- .../SmicsErgebnisObservationContainment.java | 67 - .../SmicsErgebniskategorieDefiningcode.java | 44 - .../definition/StandortCluster.java | 78 - .../StandortClusterContainment.java | 33 - ...StationarerVersorgungsfallComposition.java | 226 --- ...VersorgungsfallCompositionContainment.java | 67 - .../definition/AufnahmedatenAdminEntry.java | 92 -- .../AufnahmedatenAdminEntryContainment.java | 38 - .../EntlassungsdatenAdminEntry.java | 104 -- ...EntlassungsdatenAdminEntryContainment.java | 40 - .../definition/FalltypDefiningcode.java | 39 - ...ischerZustandDesPatientenDefiningcode.java | 52 - .../TestAllTypesEnV1Composition.java | 205 --- ...estAllTypesEnV1CompositionContainment.java | 63 - .../definition/CareflowStepDefiningCode.java | 43 - .../ContextCodedTextDefiningcode.java | 44 - .../definition/CurrentStateDefiningCode.java | 43 - .../definition/TestAllTypesAction.java | 91 -- .../TestAllTypesActionContainment.java | 37 - .../definition/TestAllTypesAdminEntry.java | 45 - .../TestAllTypesAdminEntryContainment.java | 26 - .../definition/TestAllTypesChoiceChoice.java | 4 - .../definition/TestAllTypesChoiceDvCount.java | 21 - .../TestAllTypesChoiceDvQuantity.java | 33 - .../definition/TestAllTypesCluster.java | 21 - .../TestAllTypesClusterContainment.java | 20 - .../definition/TestAllTypesEvaluation.java | 228 --- .../TestAllTypesEvaluationContainment.java | 63 - .../definition/TestAllTypesInstruction.java | 92 -- .../TestAllTypesInstructionContainment.java | 37 - .../definition/TestAllTypesObservation.java | 255 ---- .../TestAllTypesObservationContainment.java | 74 - .../definition/TestAllTypesSection.java | 43 - .../TestAllTypesSectionContainment.java | 25 - .../VirologischerBefundComposition.java | 202 --- ...logischerBefundCompositionContainment.java | 61 - .../AnatomischeLokalisationCluster.java | 45 - ...omischeLokalisationClusterContainment.java | 27 - .../definition/BefundAnforderungElement.java | 19 - .../definition/BefundObservation.java | 216 --- .../BefundObservationContainment.java | 61 - .../definition/EinsenderstandortCluster.java | 56 - .../EinsenderstandortClusterContainment.java | 29 - .../definition/EmpfangerstandortCluster.java | 56 - .../EmpfangerstandortClusterContainment.java | 29 - .../definition/FallidentifikationCluster.java | 21 - .../FallidentifikationClusterContainment.java | 20 - .../definition/KulturCluster.java | 21 - .../definition/KulturClusterContainment.java | 21 - .../definition/ProVirusCluster.java | 103 -- .../ProVirusClusterContainment.java | 40 - .../definition/ProbeCluster.java | 213 --- .../definition/ProbeClusterContainment.java | 59 - 429 files changed, 26669 deletions(-) delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsCompositionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/StateOfDressEnDefiningCode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseCompositionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LabortestBezeichnungDefiningCode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/StatusDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode2.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode3.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode4.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSectionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnosestatusDefiningCode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningCode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/InlandAuslandDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSectionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/LetzteReiseDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSectionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSectionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode2.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseCompositionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnostischeSicherheitDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/LateralitatDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/NameDesProblemsDerDiagnoseDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/SchweregradDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ValueDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1CompositionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyExposureDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvCodedText.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvCodedText.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/LocationOfMeasurementDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareCompositionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntryContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/StatusDefiningCode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareCompositionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AmberFlagAcuteDefiningCode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSectionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSectionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BreathingIndicatorDefiningCode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CareflowStepDefiningCode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CirculationIndicatorDefiningCode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ClinicalRiskCategoryDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSectionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CurrentStateDefiningCode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice2.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice3.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice4.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice5.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice6.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HealthRiskDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvCodedText.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/N999FlagDefiningCode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2SectionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OverallTestStatusDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningCode2.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RedFlagAcuteDefiningCode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSectionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskAssessmentDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode2.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode3.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorsForSepsisDefiningCode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSectionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstructionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSectionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TrendDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode2.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode3.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode4.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode5.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode6.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode7.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltCompositionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortschlusselDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntryContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusCompositionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode2.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundCompositionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiotikumDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ArtDerTypisierungDefiningCode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregernameDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/MreKlasseDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebniskategorieDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallCompositionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntryContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntryContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/FalltypDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/KlinischerZustandDesPatientenDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CareflowStepDefiningCode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ContextCodedTextDefiningcode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CurrentStateDefiningCode.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceChoice.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSectionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundCompositionContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservationContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusClusterContainment.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java delete mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeClusterContainment.java diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java deleted file mode 100644 index 6dc5ea259..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java +++ /dev/null @@ -1,202 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -import com.nedap.archie.rm.datastructures.Cluster; -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 org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Id; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.KorpergewichtObservation; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import org.ehrbase.client.openehrclient.VersionUid; - -@Entity -@Archetype("openEHR-EHR-COMPOSITION.report.v1") -@Template("AlternativeEvents") -public class AlternativeEventsComposition { - @Path("/context/other_context[at0001]/items[at0002]/value|value") - private String berichtIdValue; - - @Path("/context/other_context[at0001]/items[at0005]/value|value") - private String statusValue; - - @Path("/context/other_context[at0001]/items[at0006]") - private List erweiterung; - - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; - - @Path("/context/participations") - private List participations; - - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; - - @Path("/context/location") - private String location; - - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; - - @Path("/context/setting|defining_code") - private Setting settingDefiningCode; - - @Path("/content[openEHR-EHR-OBSERVATION.body_weight.v2]") - private List korpergewicht; - - @Path("/composer") - private PartyProxy composer; - - @Path("/language") - private Language language; - - @Path("/feeder_audit") - private FeederAudit feederAudit; - - @Path("/category|defining_code") - private Category categoryDefiningCode; - - @Path("/territory") - private Territory territory; - - @Id - private VersionUid versionUid; - - public void setBerichtIdValue(String berichtIdValue) { - this.berichtIdValue = berichtIdValue; - } - - public String getBerichtIdValue() { - return this.berichtIdValue ; - } - - public void setStatusValue(String statusValue) { - this.statusValue = statusValue; - } - - public String getStatusValue() { - return this.statusValue ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - 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 setKorpergewicht(List korpergewicht) { - this.korpergewicht = korpergewicht; - } - - public List getKorpergewicht() { - return this.korpergewicht ; - } - - 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 setCategoryDefiningCode(Category categoryDefiningCode) { - this.categoryDefiningCode = categoryDefiningCode; - } - - public Category getCategoryDefiningCode() { - return this.categoryDefiningCode ; - } - - 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsCompositionContainment.java deleted file mode 100644 index 6b9196568..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsCompositionContainment.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -import com.nedap.archie.rm.datastructures.Cluster; -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 org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.KorpergewichtObservation; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; - -public class AlternativeEventsCompositionContainment extends Containment { - public SelectAqlField ALTERNATIVE_EVENTS_COMPOSITION = new AqlFieldImp(AlternativeEventsComposition.class, "", "AlternativeEventsComposition", AlternativeEventsComposition.class, this); - - public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); - - public SelectAqlField STATUS_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "statusValue", String.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(AlternativeEventsComposition.class, "/context/other_context[at0001]/items[at0006]", "erweiterung", Cluster.class, this); - - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(AlternativeEventsComposition.class, "/context/participations", "participations", Participation.class, this); - - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - - public SelectAqlField LOCATION = new AqlFieldImp(AlternativeEventsComposition.class, "/context/location", "location", String.class, this); - - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(AlternativeEventsComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - - public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - - public ListSelectAqlField KORPERGEWICHT = new ListAqlFieldImp(AlternativeEventsComposition.class, "/content[openEHR-EHR-OBSERVATION.body_weight.v2]", "korpergewicht", KorpergewichtObservation.class, this); - - public SelectAqlField COMPOSER = new AqlFieldImp(AlternativeEventsComposition.class, "/composer", "composer", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(AlternativeEventsComposition.class, "/language", "language", Language.class, this); - - public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AlternativeEventsComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - - public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(AlternativeEventsComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - - public SelectAqlField TERRITORY = new AqlFieldImp(AlternativeEventsComposition.class, "/territory", "territory", Territory.class, this); - - private AlternativeEventsCompositionContainment() { - super("openEHR-EHR-COMPOSITION.report.v1"); - } - - public static AlternativeEventsCompositionContainment getInstance() { - return new AlternativeEventsCompositionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java deleted file mode 100644 index 23aa3b305..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; - -public interface KorpergewichtAnyEventEnChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java deleted file mode 100644 index 252ae7f8f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; - -import java.lang.Double; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalAmount; -import java.util.List; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; - -@Entity -@OptionFor("INTERVAL_EVENT") -public class KorpergewichtAnyEventEnIntervalEvent implements KorpergewichtAnyEventEnChoice { - @Path("/data[at0001]/items[at0004]/value|magnitude") - private Double gewichtMagnitude; - - @Path("/data[at0001]/items[at0004]/value|units") - private String gewichtUnits; - - @Path("/data[at0001]/items[at0024]/value|value") - private String commentEnValue; - - @Path("/state[at0008]/items[at0009]/value|defining_code") - private StateOfDressEnDefiningCode stateOfDressEnDefiningCode; - - @Path("/state[at0008]/items[at0025]") - private List confoundingFactorsEn; - - @Path("/time|value") - private TemporalAccessor timeValue; - - @Path("/width|value") - private TemporalAmount widthValue; - - @Path("/math_function|defining_code") - private MathFunction mathFunctionDefiningCode; - - public void setGewichtMagnitude(Double gewichtMagnitude) { - this.gewichtMagnitude = gewichtMagnitude; - } - - public Double getGewichtMagnitude() { - return this.gewichtMagnitude ; - } - - public void setGewichtUnits(String gewichtUnits) { - this.gewichtUnits = gewichtUnits; - } - - public String getGewichtUnits() { - return this.gewichtUnits ; - } - - public void setCommentEnValue(String commentEnValue) { - this.commentEnValue = commentEnValue; - } - - public String getCommentEnValue() { - return this.commentEnValue ; - } - - public void setStateOfDressEnDefiningCode(StateOfDressEnDefiningCode stateOfDressEnDefiningCode) { - this.stateOfDressEnDefiningCode = stateOfDressEnDefiningCode; - } - - public StateOfDressEnDefiningCode getStateOfDressEnDefiningCode() { - return this.stateOfDressEnDefiningCode ; - } - - public void setConfoundingFactorsEn( - List confoundingFactorsEn) { - this.confoundingFactorsEn = confoundingFactorsEn; - } - - public List getConfoundingFactorsEn() { - return this.confoundingFactorsEn ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setWidthValue(TemporalAmount widthValue) { - this.widthValue = widthValue; - } - - public TemporalAmount getWidthValue() { - return this.widthValue ; - } - - public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { - this.mathFunctionDefiningCode = mathFunctionDefiningCode; - } - - public MathFunction getMathFunctionDefiningCode() { - return this.mathFunctionDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java deleted file mode 100644 index 9150cef34..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java +++ /dev/null @@ -1,80 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; - -import java.lang.Double; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("POINT_EVENT") -public class KorpergewichtAnyEventEnPointEvent implements KorpergewichtAnyEventEnChoice { - @Path("/data[at0001]/items[at0004]/value|magnitude") - private Double gewichtMagnitude; - - @Path("/data[at0001]/items[at0004]/value|units") - private String gewichtUnits; - - @Path("/data[at0001]/items[at0024]/value|value") - private String commentEnValue; - - @Path("/state[at0008]/items[at0009]/value|defining_code") - private StateOfDressEnDefiningCode stateOfDressEnDefiningCode; - - @Path("/state[at0008]/items[at0025]") - private List confoundingFactorsEn; - - @Path("/time|value") - private TemporalAccessor timeValue; - - public void setGewichtMagnitude(Double gewichtMagnitude) { - this.gewichtMagnitude = gewichtMagnitude; - } - - public Double getGewichtMagnitude() { - return this.gewichtMagnitude ; - } - - public void setGewichtUnits(String gewichtUnits) { - this.gewichtUnits = gewichtUnits; - } - - public String getGewichtUnits() { - return this.gewichtUnits ; - } - - public void setCommentEnValue(String commentEnValue) { - this.commentEnValue = commentEnValue; - } - - public String getCommentEnValue() { - return this.commentEnValue ; - } - - public void setStateOfDressEnDefiningCode(StateOfDressEnDefiningCode stateOfDressEnDefiningCode) { - this.stateOfDressEnDefiningCode = stateOfDressEnDefiningCode; - } - - public StateOfDressEnDefiningCode getStateOfDressEnDefiningCode() { - return this.stateOfDressEnDefiningCode ; - } - - public void setConfoundingFactorsEn( - List confoundingFactorsEn) { - this.confoundingFactorsEn = confoundingFactorsEn; - } - - public List getConfoundingFactorsEn() { - return this.confoundingFactorsEn ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java deleted file mode 100644 index 01fdb2dbc..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; - -import java.lang.Double; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class KorpergewichtBirthEnPointEvent { - @Path("/data[at0001]/items[at0004]/value|magnitude") - private Double gewichtMagnitude; - - @Path("/data[at0001]/items[at0004]/value|units") - private String gewichtUnits; - - @Path("/data[at0001]/items[at0024]/value|value") - private String commentEnValue; - - @Path("/state[at0008]/items[at0009]/value|defining_code") - private StateOfDressEnDefiningCode stateOfDressEnDefiningCode; - - @Path("/state[at0008]/items[at0025]") - private List confoundingFactorsEn; - - @Path("/time|value") - private TemporalAccessor timeValue; - - public void setGewichtMagnitude(Double gewichtMagnitude) { - this.gewichtMagnitude = gewichtMagnitude; - } - - public Double getGewichtMagnitude() { - return this.gewichtMagnitude ; - } - - public void setGewichtUnits(String gewichtUnits) { - this.gewichtUnits = gewichtUnits; - } - - public String getGewichtUnits() { - return this.gewichtUnits ; - } - - public void setCommentEnValue(String commentEnValue) { - this.commentEnValue = commentEnValue; - } - - public String getCommentEnValue() { - return this.commentEnValue ; - } - - public void setStateOfDressEnDefiningCode(StateOfDressEnDefiningCode stateOfDressEnDefiningCode) { - this.stateOfDressEnDefiningCode = stateOfDressEnDefiningCode; - } - - public StateOfDressEnDefiningCode getStateOfDressEnDefiningCode() { - return this.stateOfDressEnDefiningCode ; - } - - public void setConfoundingFactorsEn( - List confoundingFactorsEn) { - this.confoundingFactorsEn = confoundingFactorsEn; - } - - public List getConfoundingFactorsEn() { - return this.confoundingFactorsEn ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java deleted file mode 100644 index 91525cbf1..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class KorpergewichtConfoundingFactorsEnElement { - @Path("/value|value") - private String value; - - public void setValue(String value) { - this.value = value; - } - - public String getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java deleted file mode 100644 index 4f644459e..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java +++ /dev/null @@ -1,93 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import java.util.List; -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.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.body_weight.v2") -public class KorpergewichtObservation { - @Path("/data[at0002]/events[at0026]") - private KorpergewichtBirthEnPointEvent birthEn; - - @Path("/data[at0002]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0015]/items[at0020]") - private Cluster gerat; - - @Path("/protocol[at0015]/items[at0027]") - private List extensionEn; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - @Path("/data[at0002]/events[at0003]") - @Choice - private List anyEventEn; - - public void setBirthEn(KorpergewichtBirthEnPointEvent birthEn) { - this.birthEn = birthEn; - } - - public KorpergewichtBirthEnPointEvent getBirthEn() { - return this.birthEn ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setGerat(Cluster gerat) { - this.gerat = gerat; - } - - public Cluster getGerat() { - return this.gerat ; - } - - public void setExtensionEn(List extensionEn) { - this.extensionEn = extensionEn; - } - - public List getExtensionEn() { - return this.extensionEn ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } - - public void setAnyEventEn(List anyEventEn) { - this.anyEventEn = anyEventEn; - } - - public List getAnyEventEn() { - return this.anyEventEn ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java deleted file mode 100644 index ce524c13b..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class KorpergewichtObservationContainment extends Containment { - public SelectAqlField KORPERGEWICHT_OBSERVATION = new AqlFieldImp(KorpergewichtObservation.class, "", "KorpergewichtObservation", KorpergewichtObservation.class, this); - - public SelectAqlField BIRTH_EN = new AqlFieldImp(KorpergewichtObservation.class, "/data[at0002]/events[at0026]", "birthEn", KorpergewichtBirthEnPointEvent.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(KorpergewichtObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); - - public SelectAqlField GERAT = new AqlFieldImp(KorpergewichtObservation.class, "/protocol[at0015]/items[at0020]", "gerat", Cluster.class, this); - - public ListSelectAqlField EXTENSION_EN = new ListAqlFieldImp(KorpergewichtObservation.class, "/protocol[at0015]/items[at0027]", "extensionEn", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(KorpergewichtObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(KorpergewichtObservation.class, "/language", "language", Language.class, this); - - public ListSelectAqlField ANY_EVENT_EN = new ListAqlFieldImp(KorpergewichtObservation.class, "/data[at0002]/events[at0003]", "anyEventEn", KorpergewichtAnyEventEnChoice.class, this); - - private KorpergewichtObservationContainment() { - super("openEHR-EHR-OBSERVATION.body_weight.v2"); - } - - public static KorpergewichtObservationContainment getInstance() { - return new KorpergewichtObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/StateOfDressEnDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/StateOfDressEnDefiningCode.java deleted file mode 100644 index a2a979696..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/StateOfDressEnDefiningCode.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum StateOfDressEnDefiningCode implements EnumValueSet { - LEICHT_BEKLEIDET_UNTERWASCHE("Leicht bekleidet / Unterwäsche", "Bekleidung, die nicht signifikant zum Gewicht beiträgt.", "local", "at0011"), - - UNBEKLEIDET("Unbekleidet", "Ohne Kleidung.", "local", "at0013"), - - N_FULLY_CLOTHED_WITHOUT_SHOES_EN("*Fully clothed, without shoes (en)", "*Clothing which may add significantly to weight. (en)", "local", "at0028"), - - WINDEL("Windel", "Trägt Windel; kann signifikant zum Gewicht beitragen.", "local", "at0017"), - - VOLL_BEKLEIDET_MIT_SCHUHEN("Voll bekleidet, mit Schuhen", "Bekleidung, die signifikant zum Gewicht beiträgt, mit Schuhen.", "local", "at0010"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - StateOfDressEnDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java deleted file mode 100644 index d431671b1..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java +++ /dev/null @@ -1,203 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -import com.nedap.archie.rm.datastructures.Cluster; -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 org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Id; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition.LaborergebnisObservation; -import org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition.StatusDefiningCode; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import org.ehrbase.client.openehrclient.VersionUid; - -@Entity -@Archetype("openEHR-EHR-COMPOSITION.registereintrag.v1") -@Template("Befund der Blutgasanalyse") -public class BefundDerBlutgasanalyseComposition { - @Path("/context/other_context[at0001]/items[at0002]") - private List erweiterung; - - @Path("/context/other_context[at0001]/items[at0004]/value|defining_code") - private StatusDefiningCode statusDefiningCode; - - @Path("/context/other_context[at0001]/items[at0005]/value|value") - private String kategorieValue; - - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; - - @Path("/context/participations") - private List participations; - - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; - - @Path("/context/location") - private String location; - - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; - - @Path("/context/setting|defining_code") - private Setting settingDefiningCode; - - @Path("/content[openEHR-EHR-OBSERVATION.laboratory_test_result.v1]") - private LaborergebnisObservation laborergebnis; - - @Path("/composer") - private PartyProxy composer; - - @Path("/language") - private Language language; - - @Path("/feeder_audit") - private FeederAudit feederAudit; - - @Path("/category|defining_code") - private Category categoryDefiningCode; - - @Path("/territory") - private Territory territory; - - @Id - private VersionUid versionUid; - - 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 setKategorieValue(String kategorieValue) { - this.kategorieValue = kategorieValue; - } - - public String getKategorieValue() { - return this.kategorieValue ; - } - - 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 setLaborergebnis(LaborergebnisObservation laborergebnis) { - this.laborergebnis = laborergebnis; - } - - public LaborergebnisObservation getLaborergebnis() { - return this.laborergebnis ; - } - - 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 setCategoryDefiningCode(Category categoryDefiningCode) { - this.categoryDefiningCode = categoryDefiningCode; - } - - public Category getCategoryDefiningCode() { - return this.categoryDefiningCode ; - } - - 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseCompositionContainment.java deleted file mode 100644 index f8d6d7daa..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseCompositionContainment.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -import com.nedap.archie.rm.datastructures.Cluster; -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 org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition.LaborergebnisObservation; -import org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition.StatusDefiningCode; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; - -public class BefundDerBlutgasanalyseCompositionContainment extends Containment { - public SelectAqlField BEFUND_DER_BLUTGASANALYSE_COMPOSITION = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "", "BefundDerBlutgasanalyseComposition", BefundDerBlutgasanalyseComposition.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/other_context[at0001]/items[at0002]", "erweiterung", Cluster.class, this); - - public SelectAqlField STATUS_DEFINING_CODE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/other_context[at0001]/items[at0004]/value|defining_code", "statusDefiningCode", StatusDefiningCode.class, this); - - public SelectAqlField KATEGORIE_VALUE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "kategorieValue", String.class, this); - - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/participations", "participations", Participation.class, this); - - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - - public SelectAqlField LOCATION = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/location", "location", String.class, this); - - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - - public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - - public SelectAqlField LABORERGEBNIS = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/content[openEHR-EHR-OBSERVATION.laboratory_test_result.v1]", "laborergebnis", LaborergebnisObservation.class, this); - - public SelectAqlField COMPOSER = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/composer", "composer", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/language", "language", Language.class, this); - - public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - - public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - - public SelectAqlField TERRITORY = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/territory", "territory", Territory.class, this); - - private BefundDerBlutgasanalyseCompositionContainment() { - super("openEHR-EHR-COMPOSITION.registereintrag.v1"); - } - - public static BefundDerBlutgasanalyseCompositionContainment getInstance() { - return new BefundDerBlutgasanalyseCompositionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java deleted file mode 100644 index c7454a080..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.Double; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") -public class KohlendioxidpartialdruckCluster { - @Path("/items[at0024]/value|defining_code") - private UntersuchterAnalytDefiningCode untersuchterAnalytDefiningCode; - - @Path("/items[at0001]/value|magnitude") - private Double analytResultatMagnitude; - - @Path("/items[at0001]/value|units") - private String analytResultatUnits; - - @Path("/items[at0014]") - private List analyseergebnisDetails; - - @Path("/items[at0005]/value|value") - private String ergebnisStatusValue; - - public void setUntersuchterAnalytDefiningCode( - UntersuchterAnalytDefiningCode untersuchterAnalytDefiningCode) { - this.untersuchterAnalytDefiningCode = untersuchterAnalytDefiningCode; - } - - public UntersuchterAnalytDefiningCode getUntersuchterAnalytDefiningCode() { - return this.untersuchterAnalytDefiningCode ; - } - - public void setAnalytResultatMagnitude(Double analytResultatMagnitude) { - this.analytResultatMagnitude = analytResultatMagnitude; - } - - public Double getAnalytResultatMagnitude() { - return this.analytResultatMagnitude ; - } - - public void setAnalytResultatUnits(String analytResultatUnits) { - this.analytResultatUnits = analytResultatUnits; - } - - public String getAnalytResultatUnits() { - return this.analytResultatUnits ; - } - - public void setAnalyseergebnisDetails(List analyseergebnisDetails) { - this.analyseergebnisDetails = analyseergebnisDetails; - } - - public List getAnalyseergebnisDetails() { - return this.analyseergebnisDetails ; - } - - public void setErgebnisStatusValue(String ergebnisStatusValue) { - this.ergebnisStatusValue = ergebnisStatusValue; - } - - public String getErgebnisStatusValue() { - return this.ergebnisStatusValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckClusterContainment.java deleted file mode 100644 index 61bcc6d16..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckClusterContainment.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.Double; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class KohlendioxidpartialdruckClusterContainment extends Containment { - public SelectAqlField KOHLENDIOXIDPARTIALDRUCK_CLUSTER = new AqlFieldImp(KohlendioxidpartialdruckCluster.class, "", "KohlendioxidpartialdruckCluster", KohlendioxidpartialdruckCluster.class, this); - - public SelectAqlField UNTERSUCHTER_ANALYT_DEFINING_CODE = new AqlFieldImp(KohlendioxidpartialdruckCluster.class, "/items[at0024]/value|defining_code", "untersuchterAnalytDefiningCode", UntersuchterAnalytDefiningCode.class, this); - - public SelectAqlField ANALYT_RESULTAT_MAGNITUDE = new AqlFieldImp(KohlendioxidpartialdruckCluster.class, "/items[at0001]/value|magnitude", "analytResultatMagnitude", Double.class, this); - - public SelectAqlField ANALYT_RESULTAT_UNITS = new AqlFieldImp(KohlendioxidpartialdruckCluster.class, "/items[at0001]/value|units", "analytResultatUnits", String.class, this); - - public ListSelectAqlField ANALYSEERGEBNIS_DETAILS = new ListAqlFieldImp(KohlendioxidpartialdruckCluster.class, "/items[at0014]", "analyseergebnisDetails", Cluster.class, this); - - public SelectAqlField ERGEBNIS_STATUS_VALUE = new AqlFieldImp(KohlendioxidpartialdruckCluster.class, "/items[at0005]/value|value", "ergebnisStatusValue", String.class, this); - - private KohlendioxidpartialdruckClusterContainment() { - super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); - } - - public static KohlendioxidpartialdruckClusterContainment getInstance() { - return new KohlendioxidpartialdruckClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java deleted file mode 100644 index c7aa42893..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java +++ /dev/null @@ -1,194 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.laboratory_test_result.v1") -public class LaborergebnisObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|defining_code") - private LabortestBezeichnungDefiningCode labortestBezeichnungDefiningCode; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0065]") - private List probendetail; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Kohlendioxidpartialdruck']") - private KohlendioxidpartialdruckCluster kohlendioxidpartialdruck; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Sauerstoffpartialdruck']") - private SauerstoffpartialdruckCluster sauerstoffpartialdruck; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='pH-Wert']") - private PhWertCluster phWert; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Sauerstoffsättigung']") - private SauerstoffsattigungCluster sauerstoffsattigung; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0122]") - private List strukturierteTestdiagnostik; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0118]") - private List multimediaDarstellung; - - @Path("/data[at0001]/events[at0002]/state[at0112]/items[at0114]") - private List strukturierteErfassungDerStorfaktoren; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0004]/items[at0017]") - private Cluster laborWelchesDenUntersuchungsauftragAnnimmt; - - @Path("/protocol[at0004]/items[at0110]") - private List testDetails; - - @Path("/protocol[at0004]/items[at0117]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setLabortestBezeichnungDefiningCode( - LabortestBezeichnungDefiningCode labortestBezeichnungDefiningCode) { - this.labortestBezeichnungDefiningCode = labortestBezeichnungDefiningCode; - } - - public LabortestBezeichnungDefiningCode getLabortestBezeichnungDefiningCode() { - return this.labortestBezeichnungDefiningCode ; - } - - public void setProbendetail(List probendetail) { - this.probendetail = probendetail; - } - - public List getProbendetail() { - return this.probendetail ; - } - - public void setKohlendioxidpartialdruck( - KohlendioxidpartialdruckCluster kohlendioxidpartialdruck) { - this.kohlendioxidpartialdruck = kohlendioxidpartialdruck; - } - - public KohlendioxidpartialdruckCluster getKohlendioxidpartialdruck() { - return this.kohlendioxidpartialdruck ; - } - - public void setSauerstoffpartialdruck(SauerstoffpartialdruckCluster sauerstoffpartialdruck) { - this.sauerstoffpartialdruck = sauerstoffpartialdruck; - } - - public SauerstoffpartialdruckCluster getSauerstoffpartialdruck() { - return this.sauerstoffpartialdruck ; - } - - public void setPhWert(PhWertCluster phWert) { - this.phWert = phWert; - } - - public PhWertCluster getPhWert() { - return this.phWert ; - } - - public void setSauerstoffsattigung(SauerstoffsattigungCluster sauerstoffsattigung) { - this.sauerstoffsattigung = sauerstoffsattigung; - } - - public SauerstoffsattigungCluster getSauerstoffsattigung() { - return this.sauerstoffsattigung ; - } - - public void setStrukturierteTestdiagnostik(List strukturierteTestdiagnostik) { - this.strukturierteTestdiagnostik = strukturierteTestdiagnostik; - } - - public List getStrukturierteTestdiagnostik() { - return this.strukturierteTestdiagnostik ; - } - - public void setMultimediaDarstellung(List multimediaDarstellung) { - this.multimediaDarstellung = multimediaDarstellung; - } - - public List getMultimediaDarstellung() { - return this.multimediaDarstellung ; - } - - public void setStrukturierteErfassungDerStorfaktoren( - List strukturierteErfassungDerStorfaktoren) { - this.strukturierteErfassungDerStorfaktoren = strukturierteErfassungDerStorfaktoren; - } - - public List getStrukturierteErfassungDerStorfaktoren() { - return this.strukturierteErfassungDerStorfaktoren ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setLaborWelchesDenUntersuchungsauftragAnnimmt( - Cluster laborWelchesDenUntersuchungsauftragAnnimmt) { - this.laborWelchesDenUntersuchungsauftragAnnimmt = laborWelchesDenUntersuchungsauftragAnnimmt; - } - - public Cluster getLaborWelchesDenUntersuchungsauftragAnnimmt() { - return this.laborWelchesDenUntersuchungsauftragAnnimmt ; - } - - public void setTestDetails(List testDetails) { - this.testDetails = testDetails; - } - - public List getTestDetails() { - return this.testDetails ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservationContainment.java deleted file mode 100644 index 75527aaf1..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservationContainment.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class LaborergebnisObservationContainment extends Containment { - public SelectAqlField LABORERGEBNIS_OBSERVATION = new AqlFieldImp(LaborergebnisObservation.class, "", "LaborergebnisObservation", LaborergebnisObservation.class, this); - - public SelectAqlField LABORTEST_BEZEICHNUNG_DEFINING_CODE = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|defining_code", "labortestBezeichnungDefiningCode", LabortestBezeichnungDefiningCode.class, this); - - public ListSelectAqlField PROBENDETAIL = new ListAqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0065]", "probendetail", Cluster.class, this); - - public SelectAqlField KOHLENDIOXIDPARTIALDRUCK = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]", "kohlendioxidpartialdruck", KohlendioxidpartialdruckCluster.class, this); - - public SelectAqlField SAUERSTOFFPARTIALDRUCK = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]", "sauerstoffpartialdruck", SauerstoffpartialdruckCluster.class, this); - - public SelectAqlField PH_WERT = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]", "phWert", PhWertCluster.class, this); - - public SelectAqlField SAUERSTOFFSATTIGUNG = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]", "sauerstoffsattigung", SauerstoffsattigungCluster.class, this); - - public ListSelectAqlField STRUKTURIERTE_TESTDIAGNOSTIK = new ListAqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0122]", "strukturierteTestdiagnostik", Cluster.class, this); - - public ListSelectAqlField MULTIMEDIA_DARSTELLUNG = new ListAqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0118]", "multimediaDarstellung", Cluster.class, this); - - public ListSelectAqlField STRUKTURIERTE_ERFASSUNG_DER_STORFAKTOREN = new ListAqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/state[at0112]/items[at0114]", "strukturierteErfassungDerStorfaktoren", Cluster.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public SelectAqlField LABOR_WELCHES_DEN_UNTERSUCHUNGSAUFTRAG_ANNIMMT = new AqlFieldImp(LaborergebnisObservation.class, "/protocol[at0004]/items[at0017]", "laborWelchesDenUntersuchungsauftragAnnimmt", Cluster.class, this); - - public ListSelectAqlField TEST_DETAILS = new ListAqlFieldImp(LaborergebnisObservation.class, "/protocol[at0004]/items[at0110]", "testDetails", Cluster.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(LaborergebnisObservation.class, "/protocol[at0004]/items[at0117]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(LaborergebnisObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(LaborergebnisObservation.class, "/language", "language", Language.class, this); - - private LaborergebnisObservationContainment() { - super("openEHR-EHR-OBSERVATION.laboratory_test_result.v1"); - } - - public static LaborergebnisObservationContainment getInstance() { - return new LaborergebnisObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LabortestBezeichnungDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LabortestBezeichnungDefiningCode.java deleted file mode 100644 index 1a165d92c..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LabortestBezeichnungDefiningCode.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum LabortestBezeichnungDefiningCode implements EnumValueSet { - GAS_PANEL_CAPILLARY_BLOOD("Gas panel - Capillary blood", "Gas panel - Capillary blood", "LOINC", "24337-8"), - - GAS_PANEL_ARTERIAL_BLOOD("Gas panel - Arterial blood", "Gas panel - Arterial blood", "LOINC", "24336-0"), - - GAS_PANEL_BLOOD("Gas panel - Blood", "Gas panel - Blood", "LOINC", "24338-6"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - LabortestBezeichnungDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java deleted file mode 100644 index 30121f0a5..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.Double; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") -public class PhWertCluster { - @Path("/items[at0024]/value|defining_code") - private UntersuchterAnalytDefiningCode3 untersuchterAnalytDefiningCode; - - @Path("/items[at0001]/value|magnitude") - private Double analytResultatMagnitude; - - @Path("/items[at0001]/value|units") - private String analytResultatUnits; - - @Path("/items[at0014]") - private List analyseergebnisDetails; - - @Path("/items[at0005]/value|value") - private String ergebnisStatusValue; - - public void setUntersuchterAnalytDefiningCode( - UntersuchterAnalytDefiningCode3 untersuchterAnalytDefiningCode) { - this.untersuchterAnalytDefiningCode = untersuchterAnalytDefiningCode; - } - - public UntersuchterAnalytDefiningCode3 getUntersuchterAnalytDefiningCode() { - return this.untersuchterAnalytDefiningCode ; - } - - public void setAnalytResultatMagnitude(Double analytResultatMagnitude) { - this.analytResultatMagnitude = analytResultatMagnitude; - } - - public Double getAnalytResultatMagnitude() { - return this.analytResultatMagnitude ; - } - - public void setAnalytResultatUnits(String analytResultatUnits) { - this.analytResultatUnits = analytResultatUnits; - } - - public String getAnalytResultatUnits() { - return this.analytResultatUnits ; - } - - public void setAnalyseergebnisDetails(List analyseergebnisDetails) { - this.analyseergebnisDetails = analyseergebnisDetails; - } - - public List getAnalyseergebnisDetails() { - return this.analyseergebnisDetails ; - } - - public void setErgebnisStatusValue(String ergebnisStatusValue) { - this.ergebnisStatusValue = ergebnisStatusValue; - } - - public String getErgebnisStatusValue() { - return this.ergebnisStatusValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertClusterContainment.java deleted file mode 100644 index 0c1d88771..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertClusterContainment.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.Double; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class PhWertClusterContainment extends Containment { - public SelectAqlField PH_WERT_CLUSTER = new AqlFieldImp(PhWertCluster.class, "", "PhWertCluster", PhWertCluster.class, this); - - public SelectAqlField UNTERSUCHTER_ANALYT_DEFINING_CODE = new AqlFieldImp(PhWertCluster.class, "/items[at0024]/value|defining_code", "untersuchterAnalytDefiningCode", UntersuchterAnalytDefiningCode3.class, this); - - public SelectAqlField ANALYT_RESULTAT_MAGNITUDE = new AqlFieldImp(PhWertCluster.class, "/items[at0001]/value|magnitude", "analytResultatMagnitude", Double.class, this); - - public SelectAqlField ANALYT_RESULTAT_UNITS = new AqlFieldImp(PhWertCluster.class, "/items[at0001]/value|units", "analytResultatUnits", String.class, this); - - public ListSelectAqlField ANALYSEERGEBNIS_DETAILS = new ListAqlFieldImp(PhWertCluster.class, "/items[at0014]", "analyseergebnisDetails", Cluster.class, this); - - public SelectAqlField ERGEBNIS_STATUS_VALUE = new AqlFieldImp(PhWertCluster.class, "/items[at0005]/value|value", "ergebnisStatusValue", String.class, this); - - private PhWertClusterContainment() { - super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); - } - - public static PhWertClusterContainment getInstance() { - return new PhWertClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java deleted file mode 100644 index 02c783230..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.Double; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") -public class SauerstoffpartialdruckCluster { - @Path("/items[at0024]/value|defining_code") - private UntersuchterAnalytDefiningCode2 untersuchterAnalytDefiningCode; - - @Path("/items[at0001]/value|magnitude") - private Double analytResultatMagnitude; - - @Path("/items[at0001]/value|units") - private String analytResultatUnits; - - @Path("/items[at0014]") - private List analyseergebnisDetails; - - @Path("/items[at0005]/value|value") - private String ergebnisStatusValue; - - public void setUntersuchterAnalytDefiningCode( - UntersuchterAnalytDefiningCode2 untersuchterAnalytDefiningCode) { - this.untersuchterAnalytDefiningCode = untersuchterAnalytDefiningCode; - } - - public UntersuchterAnalytDefiningCode2 getUntersuchterAnalytDefiningCode() { - return this.untersuchterAnalytDefiningCode ; - } - - public void setAnalytResultatMagnitude(Double analytResultatMagnitude) { - this.analytResultatMagnitude = analytResultatMagnitude; - } - - public Double getAnalytResultatMagnitude() { - return this.analytResultatMagnitude ; - } - - public void setAnalytResultatUnits(String analytResultatUnits) { - this.analytResultatUnits = analytResultatUnits; - } - - public String getAnalytResultatUnits() { - return this.analytResultatUnits ; - } - - public void setAnalyseergebnisDetails(List analyseergebnisDetails) { - this.analyseergebnisDetails = analyseergebnisDetails; - } - - public List getAnalyseergebnisDetails() { - return this.analyseergebnisDetails ; - } - - public void setErgebnisStatusValue(String ergebnisStatusValue) { - this.ergebnisStatusValue = ergebnisStatusValue; - } - - public String getErgebnisStatusValue() { - return this.ergebnisStatusValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckClusterContainment.java deleted file mode 100644 index d3d3cd454..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckClusterContainment.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.Double; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class SauerstoffpartialdruckClusterContainment extends Containment { - public SelectAqlField SAUERSTOFFPARTIALDRUCK_CLUSTER = new AqlFieldImp(SauerstoffpartialdruckCluster.class, "", "SauerstoffpartialdruckCluster", SauerstoffpartialdruckCluster.class, this); - - public SelectAqlField UNTERSUCHTER_ANALYT_DEFINING_CODE = new AqlFieldImp(SauerstoffpartialdruckCluster.class, "/items[at0024]/value|defining_code", "untersuchterAnalytDefiningCode", UntersuchterAnalytDefiningCode2.class, this); - - public SelectAqlField ANALYT_RESULTAT_MAGNITUDE = new AqlFieldImp(SauerstoffpartialdruckCluster.class, "/items[at0001]/value|magnitude", "analytResultatMagnitude", Double.class, this); - - public SelectAqlField ANALYT_RESULTAT_UNITS = new AqlFieldImp(SauerstoffpartialdruckCluster.class, "/items[at0001]/value|units", "analytResultatUnits", String.class, this); - - public ListSelectAqlField ANALYSEERGEBNIS_DETAILS = new ListAqlFieldImp(SauerstoffpartialdruckCluster.class, "/items[at0014]", "analyseergebnisDetails", Cluster.class, this); - - public SelectAqlField ERGEBNIS_STATUS_VALUE = new AqlFieldImp(SauerstoffpartialdruckCluster.class, "/items[at0005]/value|value", "ergebnisStatusValue", String.class, this); - - private SauerstoffpartialdruckClusterContainment() { - super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); - } - - public static SauerstoffpartialdruckClusterContainment getInstance() { - return new SauerstoffpartialdruckClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java deleted file mode 100644 index 25eded4cd..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.Double; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") -public class SauerstoffsattigungCluster { - @Path("/items[at0024]/value|defining_code") - private UntersuchterAnalytDefiningCode4 untersuchterAnalytDefiningCode; - - @Path("/items[at0001]/value|magnitude") - private Double analytResultatMagnitude; - - @Path("/items[at0001]/value|units") - private String analytResultatUnits; - - @Path("/items[at0014]") - private List analyseergebnisDetails; - - @Path("/items[at0005]/value|value") - private String ergebnisStatusValue; - - public void setUntersuchterAnalytDefiningCode( - UntersuchterAnalytDefiningCode4 untersuchterAnalytDefiningCode) { - this.untersuchterAnalytDefiningCode = untersuchterAnalytDefiningCode; - } - - public UntersuchterAnalytDefiningCode4 getUntersuchterAnalytDefiningCode() { - return this.untersuchterAnalytDefiningCode ; - } - - public void setAnalytResultatMagnitude(Double analytResultatMagnitude) { - this.analytResultatMagnitude = analytResultatMagnitude; - } - - public Double getAnalytResultatMagnitude() { - return this.analytResultatMagnitude ; - } - - public void setAnalytResultatUnits(String analytResultatUnits) { - this.analytResultatUnits = analytResultatUnits; - } - - public String getAnalytResultatUnits() { - return this.analytResultatUnits ; - } - - public void setAnalyseergebnisDetails(List analyseergebnisDetails) { - this.analyseergebnisDetails = analyseergebnisDetails; - } - - public List getAnalyseergebnisDetails() { - return this.analyseergebnisDetails ; - } - - public void setErgebnisStatusValue(String ergebnisStatusValue) { - this.ergebnisStatusValue = ergebnisStatusValue; - } - - public String getErgebnisStatusValue() { - return this.ergebnisStatusValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungClusterContainment.java deleted file mode 100644 index f97680f20..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungClusterContainment.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.Double; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class SauerstoffsattigungClusterContainment extends Containment { - public SelectAqlField SAUERSTOFFSATTIGUNG_CLUSTER = new AqlFieldImp(SauerstoffsattigungCluster.class, "", "SauerstoffsattigungCluster", SauerstoffsattigungCluster.class, this); - - public SelectAqlField UNTERSUCHTER_ANALYT_DEFINING_CODE = new AqlFieldImp(SauerstoffsattigungCluster.class, "/items[at0024]/value|defining_code", "untersuchterAnalytDefiningCode", UntersuchterAnalytDefiningCode4.class, this); - - public SelectAqlField ANALYT_RESULTAT_MAGNITUDE = new AqlFieldImp(SauerstoffsattigungCluster.class, "/items[at0001]/value|magnitude", "analytResultatMagnitude", Double.class, this); - - public SelectAqlField ANALYT_RESULTAT_UNITS = new AqlFieldImp(SauerstoffsattigungCluster.class, "/items[at0001]/value|units", "analytResultatUnits", String.class, this); - - public ListSelectAqlField ANALYSEERGEBNIS_DETAILS = new ListAqlFieldImp(SauerstoffsattigungCluster.class, "/items[at0014]", "analyseergebnisDetails", Cluster.class, this); - - public SelectAqlField ERGEBNIS_STATUS_VALUE = new AqlFieldImp(SauerstoffsattigungCluster.class, "/items[at0005]/value|value", "ergebnisStatusValue", String.class, this); - - private SauerstoffsattigungClusterContainment() { - super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); - } - - public static SauerstoffsattigungClusterContainment getInstance() { - return new SauerstoffsattigungClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/StatusDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/StatusDefiningcode.java deleted file mode 100644 index fe85e0cc1..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/StatusDefiningcode.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum StatusDefiningCode implements EnumValueSet { - VORLAUFIG("vorläufig", "*", "local", "at0011"), - - FINAL("final", "*", "local", "at0012"), - - REGISTRIERT("registriert", "*", "local", "at0010"), - - GEANDERT("geändert", "*", "local", "at0013"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - StatusDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode.java deleted file mode 100644 index dc8789a12..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum UntersuchterAnalytDefiningCode implements EnumValueSet { - CARBON_DIOXIDE_PARTIAL_PRESSURE_IN_CAPILLARY_BLOOD("Carbon dioxide [Partial pressure] in Capillary blood", "Carbon dioxide [Partial pressure] in Capillary blood", "LOINC", "2020-6"), - - CARBON_DIOXIDE_PARTIAL_PRESSURE_IN_BLOOD("Carbon dioxide [Partial pressure] in Blood", "Carbon dioxide [Partial pressure] in Blood", "LOINC", "11557-6"), - - CARBON_DIOXIDE_PARTIAL_PRESSURE_IN_ARTERIAL_BLOOD("Carbon dioxide [Partial pressure] in Arterial blood", "Carbon dioxide [Partial pressure] in Arterial blood", "LOINC", "2019-8"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - UntersuchterAnalytDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode2.java deleted file mode 100644 index 76393c5ea..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode2.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum UntersuchterAnalytDefiningCode2 implements EnumValueSet { - OXYGEN_PARTIAL_PRESSURE_IN_BLOOD("Oxygen [Partial pressure] in Blood", "Oxygen [Partial pressure] in Blood", "LOINC", "11556-8"), - - OXYGEN_PARTIAL_PRESSURE_IN_ARTERIAL_BLOOD("Oxygen [Partial pressure] in Arterial blood", "Oxygen [Partial pressure] in Arterial blood", "LOINC", "2703-7"), - - OXYGEN_PARTIAL_PRESSURE_IN_CAPILLARY_BLOOD("Oxygen [Partial pressure] in Capillary blood", "Oxygen [Partial pressure] in Capillary blood", "LOINC", "2704-5"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - UntersuchterAnalytDefiningCode2(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode3.java deleted file mode 100644 index 6b43c1f6a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode3.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum UntersuchterAnalytDefiningCode3 implements EnumValueSet { - PH_OF_VENOUS_BLOOD("pH of Venous blood", "pH of Venous blood", "LOINC", "2746-6"), - - PH_OF_CAPILLARY_BLOOD("pH of Capillary blood", "pH of Capillary blood", "LOINC", "2745-8"), - - PH_OF_ARTERIAL_BLOOD("pH of Arterial blood", "pH of Arterial blood", "LOINC", "2744-1"), - - PH_OF_MIXED_VENOUS_BLOOD("pH of Mixed venous blood", "pH of Mixed venous blood", "LOINC", "19213-8"), - - PH_OF_SERUM_OR_PLASMA("pH of Serum or Plasma", "pH of Serum or Plasma", "LOINC", "2753-2"), - - PH_OF_BLOOD("pH of Blood", "pH of Blood", "LOINC", "11558-4"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - UntersuchterAnalytDefiningCode3(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode4.java deleted file mode 100644 index 743b83b4f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningcode4.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum UntersuchterAnalytDefiningCode4 implements EnumValueSet { - OXYGEN_SATURATION_IN_BLOOD("Oxygen saturation in Blood", "Oxygen saturation in Blood", "LOINC", "20564-1"), - - OXYGEN_SATURATION_IN_ARTERIAL_BLOOD("Oxygen saturation in Arterial blood", "Oxygen saturation in Arterial blood", "LOINC", "2708-6"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - UntersuchterAnalytDefiningCode4(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java deleted file mode 100644 index e11fdfa4b..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java +++ /dev/null @@ -1,250 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -import com.nedap.archie.rm.datastructures.Cluster; -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 org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Id; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.AllgemeineAngabenSection; -import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.GeschichteHistorieObservation; -import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.KontaktSection; -import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.RisikogebietSection; -import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.SymptomeSection; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import org.ehrbase.client.openehrclient.VersionUid; - -@Entity -@Archetype("openEHR-EHR-COMPOSITION.report.v1") -@Template("Corona_Anamnese") -public class CoronaAnamneseComposition { - @Path("/context/other_context[at0001]/items[at0002]/value|value") - private String berichtIdValue; - - @Path("/context/other_context[at0001]/items[at0005]/value|value") - private String statusValue; - - @Path("/context/other_context[at0001]/items[at0006]") - private List erweiterung; - - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; - - @Path("/context/participations") - private List participations; - - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; - - @Path("/context/location") - private String location; - - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; - - @Path("/context/setting|defining_code") - private Setting settingDefiningCode; - - @Path("/content[openEHR-EHR-OBSERVATION.story.v1]") - private List geschichteHistorie; - - @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']") - private SymptomeSection symptome; - - @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']") - private KontaktSection kontakt; - - @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Risikogebiet']") - private RisikogebietSection risikogebiet; - - @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']") - private AllgemeineAngabenSection allgemeineAngaben; - - @Path("/composer") - private PartyProxy composer; - - @Path("/language") - private Language language; - - @Path("/feeder_audit") - private FeederAudit feederAudit; - - @Path("/category|defining_code") - private Category categoryDefiningCode; - - @Path("/territory") - private Territory territory; - - @Id - private VersionUid versionUid; - - public void setBerichtIdValue(String berichtIdValue) { - this.berichtIdValue = berichtIdValue; - } - - public String getBerichtIdValue() { - return this.berichtIdValue ; - } - - public void setStatusValue(String statusValue) { - this.statusValue = statusValue; - } - - public String getStatusValue() { - return this.statusValue ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - 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 setGeschichteHistorie(List geschichteHistorie) { - this.geschichteHistorie = geschichteHistorie; - } - - public List getGeschichteHistorie() { - return this.geschichteHistorie ; - } - - public void setSymptome(SymptomeSection symptome) { - this.symptome = symptome; - } - - public SymptomeSection getSymptome() { - return this.symptome ; - } - - public void setKontakt(KontaktSection kontakt) { - this.kontakt = kontakt; - } - - public KontaktSection getKontakt() { - return this.kontakt ; - } - - public void setRisikogebiet(RisikogebietSection risikogebiet) { - this.risikogebiet = risikogebiet; - } - - public RisikogebietSection getRisikogebiet() { - return this.risikogebiet ; - } - - public void setAllgemeineAngaben(AllgemeineAngabenSection allgemeineAngaben) { - this.allgemeineAngaben = allgemeineAngaben; - } - - public AllgemeineAngabenSection getAllgemeineAngaben() { - return this.allgemeineAngaben ; - } - - 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 setCategoryDefiningCode(Category categoryDefiningCode) { - this.categoryDefiningCode = categoryDefiningCode; - } - - public Category getCategoryDefiningCode() { - return this.categoryDefiningCode ; - } - - 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java deleted file mode 100644 index 7698e86e0..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java +++ /dev/null @@ -1,73 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -import com.nedap.archie.rm.datastructures.Cluster; -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 org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.AllgemeineAngabenSection; -import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.GeschichteHistorieObservation; -import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.KontaktSection; -import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.RisikogebietSection; -import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.SymptomeSection; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; - -public class CoronaAnamneseCompositionContainment extends Containment { - public SelectAqlField CORONA_ANAMNESE_COMPOSITION = new AqlFieldImp(CoronaAnamneseComposition.class, "", "CoronaAnamneseComposition", CoronaAnamneseComposition.class, this); - - public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); - - public SelectAqlField STATUS_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "statusValue", String.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/context/other_context[at0001]/items[at0006]", "erweiterung", Cluster.class, this); - - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/context/participations", "participations", Participation.class, this); - - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - - public SelectAqlField LOCATION = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/location", "location", String.class, this); - - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - - public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - - public ListSelectAqlField GESCHICHTE_HISTORIE = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-OBSERVATION.story.v1]", "geschichteHistorie", GeschichteHistorieObservation.class, this); - - public SelectAqlField SYMPTOME = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "symptome", SymptomeSection.class, this); - - public SelectAqlField KONTAKT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "kontakt", KontaktSection.class, this); - - public SelectAqlField RISIKOGEBIET = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "risikogebiet", RisikogebietSection.class, this); - - public SelectAqlField ALLGEMEINE_ANGABEN = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "allgemeineAngaben", AllgemeineAngabenSection.class, this); - - public SelectAqlField COMPOSER = new AqlFieldImp(CoronaAnamneseComposition.class, "/composer", "composer", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/language", "language", Language.class, this); - - public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(CoronaAnamneseComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - - public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - - public SelectAqlField TERRITORY = new AqlFieldImp(CoronaAnamneseComposition.class, "/territory", "territory", Territory.class, this); - - private CoronaAnamneseCompositionContainment() { - super("openEHR-EHR-COMPOSITION.report.v1"); - } - - public static CoronaAnamneseCompositionContainment getInstance() { - return new CoronaAnamneseCompositionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java deleted file mode 100644 index da3ee2756..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.address_cc.v0") -public class AdresseCluster { - @Path("/items[at0012]/value|value") - private String stadtValue; - - @Path("/items[at0015]/value|value") - private String landValue; - - public void setStadtValue(String stadtValue) { - this.stadtValue = stadtValue; - } - - public String getStadtValue() { - return this.stadtValue ; - } - - public void setLandValue(String landValue) { - this.landValue = landValue; - } - - public String getLandValue() { - return this.landValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseClusterContainment.java deleted file mode 100644 index f8f98504b..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseClusterContainment.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class AdresseClusterContainment extends Containment { - public SelectAqlField ADRESSE_CLUSTER = new AqlFieldImp(AdresseCluster.class, "", "AdresseCluster", AdresseCluster.class, this); - - public SelectAqlField STADT_VALUE = new AqlFieldImp(AdresseCluster.class, "/items[at0012]/value|value", "stadtValue", String.class, this); - - public SelectAqlField LAND_VALUE = new AqlFieldImp(AdresseCluster.class, "/items[at0015]/value|value", "landValue", String.class, this); - - private AdresseClusterContainment() { - super("openEHR-EHR-CLUSTER.address_cc.v0"); - } - - public static AdresseClusterContainment getInstance() { - return new AdresseClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java deleted file mode 100644 index 541fc885d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java +++ /dev/null @@ -1,114 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-SECTION.adhoc.v1") -public class AllgemeineAngabenSection { - @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Andere aktuelle Erkrankungen']") - private AndereAktuelleErkrankungenObservation andereAktuelleErkrankungen; - - @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Chronische Erkrankungen']") - private ChronischeErkrankungenObservation chronischeErkrankungen; - - @Path("/items[openEHR-EHR-EVALUATION.problem_diagnosis.v1]") - private List problemDiagnose; - - @Path("/items[openEHR-EHR-OBSERVATION.medication_use.v0]") - private FragebogenZumMedikationsScreeningObservation fragebogenZumMedikationsScreening; - - @Path("/items[openEHR-EHR-EVALUATION.occupation_summary.v1 and name/value='Gesundheitsbezogener Beruf']") - private GesundheitsbezogenerBerufEvaluation gesundheitsbezogenerBeruf; - - @Path("/items[openEHR-EHR-EVALUATION.living_arrangement.v0]") - private List wohnsituation; - - @Path("/items[openEHR-EHR-EVALUATION.health_risk.v1]") - private List bewertungDesGesundheitsrisikos; - - @Path("/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1 and name/value='Problem/Diganose Coronovirus']") - private ProblemDiganoseCoronovirusEvaluation problemDiganoseCoronovirus; - - @Path("/items[openEHR-EHR-INSTRUCTION.service_request.v1]") - private List dienstleistung; - - public void setAndereAktuelleErkrankungen( - AndereAktuelleErkrankungenObservation andereAktuelleErkrankungen) { - this.andereAktuelleErkrankungen = andereAktuelleErkrankungen; - } - - public AndereAktuelleErkrankungenObservation getAndereAktuelleErkrankungen() { - return this.andereAktuelleErkrankungen ; - } - - public void setChronischeErkrankungen(ChronischeErkrankungenObservation chronischeErkrankungen) { - this.chronischeErkrankungen = chronischeErkrankungen; - } - - public ChronischeErkrankungenObservation getChronischeErkrankungen() { - return this.chronischeErkrankungen ; - } - - public void setProblemDiagnose(List problemDiagnose) { - this.problemDiagnose = problemDiagnose; - } - - public List getProblemDiagnose() { - return this.problemDiagnose ; - } - - public void setFragebogenZumMedikationsScreening( - FragebogenZumMedikationsScreeningObservation fragebogenZumMedikationsScreening) { - this.fragebogenZumMedikationsScreening = fragebogenZumMedikationsScreening; - } - - public FragebogenZumMedikationsScreeningObservation getFragebogenZumMedikationsScreening() { - return this.fragebogenZumMedikationsScreening ; - } - - public void setGesundheitsbezogenerBeruf( - GesundheitsbezogenerBerufEvaluation gesundheitsbezogenerBeruf) { - this.gesundheitsbezogenerBeruf = gesundheitsbezogenerBeruf; - } - - public GesundheitsbezogenerBerufEvaluation getGesundheitsbezogenerBeruf() { - return this.gesundheitsbezogenerBeruf ; - } - - public void setWohnsituation(List wohnsituation) { - this.wohnsituation = wohnsituation; - } - - public List getWohnsituation() { - return this.wohnsituation ; - } - - public void setBewertungDesGesundheitsrisikos( - List bewertungDesGesundheitsrisikos) { - this.bewertungDesGesundheitsrisikos = bewertungDesGesundheitsrisikos; - } - - public List getBewertungDesGesundheitsrisikos() { - return this.bewertungDesGesundheitsrisikos ; - } - - public void setProblemDiganoseCoronovirus( - ProblemDiganoseCoronovirusEvaluation problemDiganoseCoronovirus) { - this.problemDiganoseCoronovirus = problemDiganoseCoronovirus; - } - - public ProblemDiganoseCoronovirusEvaluation getProblemDiganoseCoronovirus() { - return this.problemDiganoseCoronovirus ; - } - - public void setDienstleistung(List dienstleistung) { - this.dienstleistung = dienstleistung; - } - - public List getDienstleistung() { - return this.dienstleistung ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSectionContainment.java deleted file mode 100644 index 1606a7207..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSectionContainment.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class AllgemeineAngabenSectionContainment extends Containment { - public SelectAqlField ALLGEMEINE_ANGABEN_SECTION = new AqlFieldImp(AllgemeineAngabenSection.class, "", "AllgemeineAngabenSection", AllgemeineAngabenSection.class, this); - - public SelectAqlField ANDERE_AKTUELLE_ERKRANKUNGEN = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "andereAktuelleErkrankungen", AndereAktuelleErkrankungenObservation.class, this); - - public SelectAqlField CHRONISCHE_ERKRANKUNGEN = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "chronischeErkrankungen", ChronischeErkrankungenObservation.class, this); - - public ListSelectAqlField PROBLEM_DIAGNOSE = new ListAqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.problem_diagnosis.v1]", "problemDiagnose", ProblemDiagnoseEvaluation.class, this); - - public SelectAqlField FRAGEBOGEN_ZUM_MEDIKATIONS_SCREENING = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-OBSERVATION.medication_use.v0]", "fragebogenZumMedikationsScreening", FragebogenZumMedikationsScreeningObservation.class, this); - - public SelectAqlField GESUNDHEITSBEZOGENER_BERUF = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.occupation_summary.v1]", "gesundheitsbezogenerBeruf", GesundheitsbezogenerBerufEvaluation.class, this); - - public ListSelectAqlField WOHNSITUATION = new ListAqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.living_arrangement.v0]", "wohnsituation", WohnsituationEvaluation.class, this); - - public ListSelectAqlField BEWERTUNG_DES_GESUNDHEITSRISIKOS = new ListAqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.health_risk.v1]", "bewertungDesGesundheitsrisikos", BewertungDesGesundheitsrisikosEvaluation.class, this); - - public SelectAqlField PROBLEM_DIGANOSE_CORONOVIRUS = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1]", "problemDiganoseCoronovirus", ProblemDiganoseCoronovirusEvaluation.class, this); - - public ListSelectAqlField DIENSTLEISTUNG = new ListAqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-INSTRUCTION.service_request.v1]", "dienstleistung", DienstleistungInstruction.class, this); - - private AllgemeineAngabenSectionContainment() { - super("openEHR-EHR-SECTION.adhoc.v1"); - } - - public static AllgemeineAngabenSectionContainment getInstance() { - return new AllgemeineAngabenSectionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java deleted file mode 100644 index 489ca877a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class AndereAktuelleErkrankungenObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") - private String bezeichnungDesSymptomsOderAnzeichensValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") - private VorhandenDefiningCode vorhandenDefiningCode; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") - private List detaillierteAngabenZumSymptomAnzeichen; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0007]/items[at0021]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setBezeichnungDesSymptomsOderAnzeichensValue( - String bezeichnungDesSymptomsOderAnzeichensValue) { - this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; - } - - public String getBezeichnungDesSymptomsOderAnzeichensValue() { - return this.bezeichnungDesSymptomsOderAnzeichensValue ; - } - - public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { - this.vorhandenDefiningCode = vorhandenDefiningCode; - } - - public VorhandenDefiningCode getVorhandenDefiningCode() { - return this.vorhandenDefiningCode ; - } - - public void setDetaillierteAngabenZumSymptomAnzeichen( - List detaillierteAngabenZumSymptomAnzeichen) { - this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; - } - - public List getDetaillierteAngabenZumSymptomAnzeichen() { - return this.detaillierteAngabenZumSymptomAnzeichen ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java deleted file mode 100644 index 436b28080..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class AndereAktuelleErkrankungenObservationContainment extends Containment { - public SelectAqlField ANDERE_AKTUELLE_ERKRANKUNGEN_OBSERVATION = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "", "AndereAktuelleErkrankungenObservation", AndereAktuelleErkrankungenObservation.class, this); - - public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); - - public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); - - public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/language", "language", Language.class, this); - - private AndereAktuelleErkrankungenObservationContainment() { - super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); - } - - public static AndereAktuelleErkrankungenObservationContainment getInstance() { - return new AndereAktuelleErkrankungenObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java deleted file mode 100644 index ac6e28558..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ implements EnumValueSet { - JA("Ja", "Der Patient ist vor kurzem gereist.", "local", "at0112"), - - NEIN("Nein", "Der Patient ist in letzter Zeit nicht gereist.", "local", "at0113"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java deleted file mode 100644 index 21647db2e..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java +++ /dev/null @@ -1,126 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.exposure_assessment.v0") -public class AufenthaltInGesundheitseinrichtungObservation { - @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value") - private String agentEnValue; - - @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code") - private PresenceOfAnyExposureEnDefiningCode presenceOfAnyExposureEnDefiningCode; - - @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value") - private String exposureEnValue; - - @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code") - private VorhandenseinDefiningCode vorhandenseinDefiningCode; - - @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value") - private String kommentarValue; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0004]/items[at0056]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setAgentEnValue(String agentEnValue) { - this.agentEnValue = agentEnValue; - } - - public String getAgentEnValue() { - return this.agentEnValue ; - } - - public void setPresenceOfAnyExposureEnDefiningCode( - PresenceOfAnyExposureEnDefiningCode presenceOfAnyExposureEnDefiningCode) { - this.presenceOfAnyExposureEnDefiningCode = presenceOfAnyExposureEnDefiningCode; - } - - public PresenceOfAnyExposureEnDefiningCode getPresenceOfAnyExposureEnDefiningCode() { - return this.presenceOfAnyExposureEnDefiningCode ; - } - - public void setExposureEnValue(String exposureEnValue) { - this.exposureEnValue = exposureEnValue; - } - - public String getExposureEnValue() { - return this.exposureEnValue ; - } - - public void setVorhandenseinDefiningCode(VorhandenseinDefiningCode vorhandenseinDefiningCode) { - this.vorhandenseinDefiningCode = vorhandenseinDefiningCode; - } - - public VorhandenseinDefiningCode getVorhandenseinDefiningCode() { - return this.vorhandenseinDefiningCode ; - } - - public void setKommentarValue(String kommentarValue) { - this.kommentarValue = kommentarValue; - } - - public String getKommentarValue() { - return this.kommentarValue ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java deleted file mode 100644 index 15fe2e055..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class AufenthaltInGesundheitseinrichtungObservationContainment extends Containment { - public SelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG_OBSERVATION = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "", "AufenthaltInGesundheitseinrichtungObservation", AufenthaltInGesundheitseinrichtungObservation.class, this); - - public SelectAqlField AGENT_EN_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value", "agentEnValue", String.class, this); - - public SelectAqlField PRESENCE_OF_ANY_EXPOSURE_EN_DEFINING_CODE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code", "presenceOfAnyExposureEnDefiningCode", PresenceOfAnyExposureEnDefiningCode.class, this); - - public SelectAqlField EXPOSURE_EN_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value", "exposureEnValue", String.class, this); - - public SelectAqlField VORHANDENSEIN_DEFINING_CODE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code", "vorhandenseinDefiningCode", VorhandenseinDefiningCode.class, this); - - public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value", "kommentarValue", String.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/protocol[at0004]/items[at0056]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/language", "language", Language.class, this); - - private AufenthaltInGesundheitseinrichtungObservationContainment() { - super("openEHR-EHR-OBSERVATION.exposure_assessment.v0"); - } - - public static AufenthaltInGesundheitseinrichtungObservationContainment getInstance() { - return new AufenthaltInGesundheitseinrichtungObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java deleted file mode 100644 index f012cc41c..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.occupation_record.v1") -public class BeschaftigungCluster { - @Path("/items[at0005]/value|value") - private String berufsbezeichnungRolleValue; - - @Path("/items[openEHR-EHR-CLUSTER.organisation_cc.v0]") - private List organisation; - - @Path("/items[at0018]") - private List zusatzlicheAngaben; - - public void setBerufsbezeichnungRolleValue(String berufsbezeichnungRolleValue) { - this.berufsbezeichnungRolleValue = berufsbezeichnungRolleValue; - } - - public String getBerufsbezeichnungRolleValue() { - return this.berufsbezeichnungRolleValue ; - } - - public void setOrganisation(List organisation) { - this.organisation = organisation; - } - - public List getOrganisation() { - return this.organisation ; - } - - public void setZusatzlicheAngaben(List zusatzlicheAngaben) { - this.zusatzlicheAngaben = zusatzlicheAngaben; - } - - public List getZusatzlicheAngaben() { - return this.zusatzlicheAngaben ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java deleted file mode 100644 index f11fdc160..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class BeschaftigungClusterContainment extends Containment { - public SelectAqlField BESCHAFTIGUNG_CLUSTER = new AqlFieldImp(BeschaftigungCluster.class, "", "BeschaftigungCluster", BeschaftigungCluster.class, this); - - public SelectAqlField BERUFSBEZEICHNUNG_ROLLE_VALUE = new AqlFieldImp(BeschaftigungCluster.class, "/items[at0005]/value|value", "berufsbezeichnungRolleValue", String.class, this); - - public ListSelectAqlField ORGANISATION = new ListAqlFieldImp(BeschaftigungCluster.class, "/items[openEHR-EHR-CLUSTER.organisation_cc.v0]", "organisation", OrganisationCluster.class, this); - - public ListSelectAqlField ZUSATZLICHE_ANGABEN = new ListAqlFieldImp(BeschaftigungCluster.class, "/items[at0018]", "zusatzlicheAngaben", Cluster.class, this); - - private BeschaftigungClusterContainment() { - super("openEHR-EHR-CLUSTER.occupation_record.v1"); - } - - public static BeschaftigungClusterContainment getInstance() { - return new BeschaftigungClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java deleted file mode 100644 index 32426fdf3..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java +++ /dev/null @@ -1,160 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-EVALUATION.health_risk.v1") -public class BewertungDesGesundheitsrisikosEvaluation { - @Path("/data[at0001]/items[at0002]/value|value") - private String gesundheitsrisikoValue; - - @Path("/data[at0001]/items[at0016 and name/value='Spezifischer Risikofaktor']/items[at0013]/value|value") - private String spezifischerRisikofaktorRisikofaktorValue; - - @Path("/data[at0001]/items[at0016 and name/value='Spezifischer Risikofaktor']/items[at0017]/value|defining_code") - private VorhandenseinDefiningCode2 vorhandenseinDefiningCode; - - @Path("/data[at0001]/items[at0016 and name/value='Spezifischer Risikofaktor']/items[at0027]") - private List spezifischerRisikofaktorDetails; - - @Path("/data[at0001]/items[at0016 and name/value='Andere Risikofaktoren']/items[at0013]/value|value") - private String andereRisikofaktorenRisikofaktorValue; - - @Path("/data[at0001]/items[at0016 and name/value='Andere Risikofaktoren']/items[at0017]/value|defining_code") - private VorhandenseinDefiningCode2 vorhandenseinDefiningCode2; - - @Path("/data[at0001]/items[at0016 and name/value='Andere Risikofaktoren']/items[at0027]") - private List andereRisikofaktorenDetails; - - @Path("/data[at0001]/items[at0003]/value|value") - private String risikobewertungValue; - - @Path("/protocol[at0010]/items[at0024]/value|value") - private TemporalAccessor letzteAktualisierungValue; - - @Path("/protocol[at0010]/items[at0025]/value|value") - private String bewertungsmethodeValue; - - @Path("/protocol[at0010]/items[at0011]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setGesundheitsrisikoValue(String gesundheitsrisikoValue) { - this.gesundheitsrisikoValue = gesundheitsrisikoValue; - } - - public String getGesundheitsrisikoValue() { - return this.gesundheitsrisikoValue ; - } - - public void setSpezifischerRisikofaktorRisikofaktorValue( - String spezifischerRisikofaktorRisikofaktorValue) { - this.spezifischerRisikofaktorRisikofaktorValue = spezifischerRisikofaktorRisikofaktorValue; - } - - public String getSpezifischerRisikofaktorRisikofaktorValue() { - return this.spezifischerRisikofaktorRisikofaktorValue ; - } - - public void setVorhandenseinDefiningCode(VorhandenseinDefiningCode2 vorhandenseinDefiningCode) { - this.vorhandenseinDefiningCode = vorhandenseinDefiningCode; - } - - public VorhandenseinDefiningCode2 getVorhandenseinDefiningCode() { - return this.vorhandenseinDefiningCode ; - } - - public void setSpezifischerRisikofaktorDetails(List spezifischerRisikofaktorDetails) { - this.spezifischerRisikofaktorDetails = spezifischerRisikofaktorDetails; - } - - public List getSpezifischerRisikofaktorDetails() { - return this.spezifischerRisikofaktorDetails ; - } - - public void setAndereRisikofaktorenRisikofaktorValue( - String andereRisikofaktorenRisikofaktorValue) { - this.andereRisikofaktorenRisikofaktorValue = andereRisikofaktorenRisikofaktorValue; - } - - public String getAndereRisikofaktorenRisikofaktorValue() { - return this.andereRisikofaktorenRisikofaktorValue ; - } - - public void setVorhandenseinDefiningCode2(VorhandenseinDefiningCode2 vorhandenseinDefiningCode2) { - this.vorhandenseinDefiningCode2 = vorhandenseinDefiningCode2; - } - - public VorhandenseinDefiningCode2 getVorhandenseinDefiningCode2() { - return this.vorhandenseinDefiningCode2 ; - } - - public void setAndereRisikofaktorenDetails(List andereRisikofaktorenDetails) { - this.andereRisikofaktorenDetails = andereRisikofaktorenDetails; - } - - public List getAndereRisikofaktorenDetails() { - return this.andereRisikofaktorenDetails ; - } - - public void setRisikobewertungValue(String risikobewertungValue) { - this.risikobewertungValue = risikobewertungValue; - } - - public String getRisikobewertungValue() { - return this.risikobewertungValue ; - } - - public void setLetzteAktualisierungValue(TemporalAccessor letzteAktualisierungValue) { - this.letzteAktualisierungValue = letzteAktualisierungValue; - } - - public TemporalAccessor getLetzteAktualisierungValue() { - return this.letzteAktualisierungValue ; - } - - public void setBewertungsmethodeValue(String bewertungsmethodeValue) { - this.bewertungsmethodeValue = bewertungsmethodeValue; - } - - public String getBewertungsmethodeValue() { - return this.bewertungsmethodeValue ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java deleted file mode 100644 index 651c5cee5..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class BewertungDesGesundheitsrisikosEvaluationContainment extends Containment { - public SelectAqlField BEWERTUNG_DES_GESUNDHEITSRISIKOS_EVALUATION = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "", "BewertungDesGesundheitsrisikosEvaluation", BewertungDesGesundheitsrisikosEvaluation.class, this); - - public SelectAqlField GESUNDHEITSRISIKO_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0002]/value|value", "gesundheitsrisikoValue", String.class, this); - - public SelectAqlField SPEZIFISCHER_RISIKOFAKTOR_RISIKOFAKTOR_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0013]/value|value", "spezifischerRisikofaktorRisikofaktorValue", String.class, this); - - public SelectAqlField VORHANDENSEIN_DEFINING_CODE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0017]/value|defining_code", "vorhandenseinDefiningCode", VorhandenseinDefiningCode2.class, this); - - public ListSelectAqlField SPEZIFISCHER_RISIKOFAKTOR_DETAILS = new ListAqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0027]", "spezifischerRisikofaktorDetails", Cluster.class, this); - - public SelectAqlField ANDERE_RISIKOFAKTOREN_RISIKOFAKTOR_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0013]/value|value", "andereRisikofaktorenRisikofaktorValue", String.class, this); - - public SelectAqlField VORHANDENSEIN_DEFINING_CODE2 = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0017]/value|defining_code", "vorhandenseinDefiningCode2", VorhandenseinDefiningCode2.class, this); - - public ListSelectAqlField ANDERE_RISIKOFAKTOREN_DETAILS = new ListAqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0027]", "andereRisikofaktorenDetails", Cluster.class, this); - - public SelectAqlField RISIKOBEWERTUNG_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0003]/value|value", "risikobewertungValue", String.class, this); - - public SelectAqlField LETZTE_AKTUALISIERUNG_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/protocol[at0010]/items[at0024]/value|value", "letzteAktualisierungValue", TemporalAccessor.class, this); - - public SelectAqlField BEWERTUNGSMETHODE_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/protocol[at0010]/items[at0025]/value|value", "bewertungsmethodeValue", String.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/protocol[at0010]/items[at0011]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/language", "language", Language.class, this); - - private BewertungDesGesundheitsrisikosEvaluationContainment() { - super("openEHR-EHR-EVALUATION.health_risk.v1"); - } - - public static BewertungDesGesundheitsrisikosEvaluationContainment getInstance() { - return new BewertungDesGesundheitsrisikosEvaluationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java deleted file mode 100644 index c0c1c15cf..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class ChronischeErkrankungenObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") - private String bezeichnungDesSymptomsOderAnzeichensValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") - private VorhandenDefiningCode vorhandenDefiningCode; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") - private List detaillierteAngabenZumSymptomAnzeichen; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0007]/items[at0021]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setBezeichnungDesSymptomsOderAnzeichensValue( - String bezeichnungDesSymptomsOderAnzeichensValue) { - this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; - } - - public String getBezeichnungDesSymptomsOderAnzeichensValue() { - return this.bezeichnungDesSymptomsOderAnzeichensValue ; - } - - public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { - this.vorhandenDefiningCode = vorhandenDefiningCode; - } - - public VorhandenDefiningCode getVorhandenDefiningCode() { - return this.vorhandenDefiningCode ; - } - - public void setDetaillierteAngabenZumSymptomAnzeichen( - List detaillierteAngabenZumSymptomAnzeichen) { - this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; - } - - public List getDetaillierteAngabenZumSymptomAnzeichen() { - return this.detaillierteAngabenZumSymptomAnzeichen ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java deleted file mode 100644 index 43b886c6d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class ChronischeErkrankungenObservationContainment extends Containment { - public SelectAqlField CHRONISCHE_ERKRANKUNGEN_OBSERVATION = new AqlFieldImp(ChronischeErkrankungenObservation.class, "", "ChronischeErkrankungenObservation", ChronischeErkrankungenObservation.class, this); - - public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); - - public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); - - public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ChronischeErkrankungenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/language", "language", Language.class, this); - - private ChronischeErkrankungenObservationContainment() { - super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); - } - - public static ChronischeErkrankungenObservationContainment getInstance() { - return new ChronischeErkrankungenObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnosestatusDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnosestatusDefiningCode.java deleted file mode 100644 index 7ec11067a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnosestatusDefiningCode.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum DiagnosestatusDefiningCode implements EnumValueSet { - IN_BEARBEITUNG("In Bearbeitung", "Eine vorübergehende Diagnose, bei welcher Testergebnisse und klinische Hinweise oder Empfehlungen noch ausstehen, welche aber bereits auf einer soliden klinischen Sicherheit beruht. Sobald weitere Testresultate und klinische Hinweise oder Empfehlungen zur Verfügung stehen, kann sich die Diagnose noch ändern.", "local", "at0017"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - DiagnosestatusDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningCode.java deleted file mode 100644 index 73f2ae3ad..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningCode.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum DiagnostischeSicherheitDefiningCode implements EnumValueSet { - WAHRSCHEINLICH("Wahrscheinlich", "Die Diagnose wurde mit einem hohen Maß an Sicherheit gestellt.", "local", "at0075"), - - VERMUTET("Vermutet", "Die Diagnose wurde mit einem niedrigen Grad an Sicherheit gestellt.", "local", "at0074"), - - BESTATIGT("Bestätigt", "Die Diagnose wurde anhand anerkannter Kriterien bestätigt.", "local", "at0076"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - DiagnostischeSicherheitDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java deleted file mode 100644 index 0b6dccd7f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class DienstleistungAktuelleAktivitatActivity { - @Path("/description[at0009]/items[at0121]/value|value") - private String nameDerDienstleistungValue; - - @Path("/description[at0009]/items[at0062]") - private List grundFurDieAnforderung; - - @Path("/description[at0009]/items[at0151]") - private List komplexeZeitplanung; - - @Path("/description[at0009]/items[at0132]") - private List spezifischeDetails; - - @Path("/description[at0009]/items[at0149]") - private List unterstutzendeInformationen; - - @Path("/description[at0009]/items[at0116]") - private List anforderungenAnPatienten; - - @Path("/timing") - private DvParsable timing; - - public void setNameDerDienstleistungValue(String nameDerDienstleistungValue) { - this.nameDerDienstleistungValue = nameDerDienstleistungValue; - } - - public String getNameDerDienstleistungValue() { - return this.nameDerDienstleistungValue ; - } - - public void setGrundFurDieAnforderung( - List grundFurDieAnforderung) { - this.grundFurDieAnforderung = grundFurDieAnforderung; - } - - public List getGrundFurDieAnforderung() { - return this.grundFurDieAnforderung ; - } - - public void setKomplexeZeitplanung(List komplexeZeitplanung) { - this.komplexeZeitplanung = komplexeZeitplanung; - } - - public List getKomplexeZeitplanung() { - return this.komplexeZeitplanung ; - } - - public void setSpezifischeDetails(List spezifischeDetails) { - this.spezifischeDetails = spezifischeDetails; - } - - public List getSpezifischeDetails() { - return this.spezifischeDetails ; - } - - public void setUnterstutzendeInformationen(List unterstutzendeInformationen) { - this.unterstutzendeInformationen = unterstutzendeInformationen; - } - - public List getUnterstutzendeInformationen() { - return this.unterstutzendeInformationen ; - } - - public void setAnforderungenAnPatienten(List anforderungenAnPatienten) { - this.anforderungenAnPatienten = anforderungenAnPatienten; - } - - public List getAnforderungenAnPatienten() { - return this.anforderungenAnPatienten ; - } - - public void setTiming(DvParsable timing) { - this.timing = timing; - } - - public DvParsable getTiming() { - return this.timing ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java deleted file mode 100644 index ae73ac04b..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class DienstleistungGrundFurDieAnforderungElement { - @Path("/value|value") - private String value; - - public void setValue(String value) { - this.value = value; - } - - public String getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java deleted file mode 100644 index a8bea456d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java +++ /dev/null @@ -1,115 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-INSTRUCTION.service_request.v1") -public class DienstleistungInstruction { - @Path("/activities[at0001]") - private List aktuelleAktivitat; - - @Path("/protocol[at0008]/items[at0141]") - private Cluster einsender; - - @Path("/protocol[at0008]/items[at0142]") - private Cluster empfanger; - - @Path("/protocol[at0008]/items[at0128]") - private List verteilerliste; - - @Path("/protocol[at0008]/items[at0112]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/narrative|value") - private String narrativeValue; - - @Path("/language") - private Language language; - - @Path("/expiry_time|value") - private TemporalAccessor expiryTimeValue; - - public void setAktuelleAktivitat( - List aktuelleAktivitat) { - this.aktuelleAktivitat = aktuelleAktivitat; - } - - public List getAktuelleAktivitat() { - return this.aktuelleAktivitat ; - } - - public void setEinsender(Cluster einsender) { - this.einsender = einsender; - } - - public Cluster getEinsender() { - return this.einsender ; - } - - public void setEmpfanger(Cluster empfanger) { - this.empfanger = empfanger; - } - - public Cluster getEmpfanger() { - return this.empfanger ; - } - - public void setVerteilerliste(List verteilerliste) { - this.verteilerliste = verteilerliste; - } - - public List getVerteilerliste() { - return this.verteilerliste ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setNarrativeValue(String narrativeValue) { - this.narrativeValue = narrativeValue; - } - - public String getNarrativeValue() { - return this.narrativeValue ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } - - public void setExpiryTimeValue(TemporalAccessor expiryTimeValue) { - this.expiryTimeValue = expiryTimeValue; - } - - public TemporalAccessor getExpiryTimeValue() { - return this.expiryTimeValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java deleted file mode 100644 index 86f98dad8..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class DienstleistungInstructionContainment extends Containment { - public SelectAqlField DIENSTLEISTUNG_INSTRUCTION = new AqlFieldImp(DienstleistungInstruction.class, "", "DienstleistungInstruction", DienstleistungInstruction.class, this); - - public ListSelectAqlField AKTUELLE_AKTIVITAT = new ListAqlFieldImp(DienstleistungInstruction.class, "/activities[at0001]", "aktuelleAktivitat", DienstleistungAktuelleAktivitatActivity.class, this); - - public SelectAqlField EINSENDER = new AqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0141]", "einsender", Cluster.class, this); - - public SelectAqlField EMPFANGER = new AqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0142]", "empfanger", Cluster.class, this); - - public ListSelectAqlField VERTEILERLISTE = new ListAqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0128]", "verteilerliste", Cluster.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0112]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(DienstleistungInstruction.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField NARRATIVE_VALUE = new AqlFieldImp(DienstleistungInstruction.class, "/narrative|value", "narrativeValue", String.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(DienstleistungInstruction.class, "/language", "language", Language.class, this); - - public SelectAqlField EXPIRY_TIME_VALUE = new AqlFieldImp(DienstleistungInstruction.class, "/expiry_time|value", "expiryTimeValue", TemporalAccessor.class, this); - - private DienstleistungInstructionContainment() { - super("openEHR-EHR-INSTRUCTION.service_request.v1"); - } - - public static DienstleistungInstructionContainment getInstance() { - return new DienstleistungInstructionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java deleted file mode 100644 index 5f99f53a8..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class DurchfallObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") - private String bezeichnungDesSymptomsOderAnzeichensValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") - private VorhandenDefiningCode vorhandenDefiningCode; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") - private List detaillierteAngabenZumSymptomAnzeichen; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0007]/items[at0021]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setBezeichnungDesSymptomsOderAnzeichensValue( - String bezeichnungDesSymptomsOderAnzeichensValue) { - this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; - } - - public String getBezeichnungDesSymptomsOderAnzeichensValue() { - return this.bezeichnungDesSymptomsOderAnzeichensValue ; - } - - public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { - this.vorhandenDefiningCode = vorhandenDefiningCode; - } - - public VorhandenDefiningCode getVorhandenDefiningCode() { - return this.vorhandenDefiningCode ; - } - - public void setDetaillierteAngabenZumSymptomAnzeichen( - List detaillierteAngabenZumSymptomAnzeichen) { - this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; - } - - public List getDetaillierteAngabenZumSymptomAnzeichen() { - return this.detaillierteAngabenZumSymptomAnzeichen ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java deleted file mode 100644 index 7bdb007a1..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class DurchfallObservationContainment extends Containment { - public SelectAqlField DURCHFALL_OBSERVATION = new AqlFieldImp(DurchfallObservation.class, "", "DurchfallObservation", DurchfallObservation.class, this); - - public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); - - public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); - - public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(DurchfallObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(DurchfallObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(DurchfallObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(DurchfallObservation.class, "/language", "language", Language.class, this); - - private DurchfallObservationContainment() { - super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); - } - - public static DurchfallObservationContainment getInstance() { - return new DurchfallObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java deleted file mode 100644 index 1d3b2ecd7..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class FieberOderErhohteKorpertemperaturObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") - private String bezeichnungDesSymptomsOderAnzeichensValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") - private VorhandenDefiningCode vorhandenDefiningCode; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") - private List detaillierteAngabenZumSymptomAnzeichen; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0007]/items[at0021]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setBezeichnungDesSymptomsOderAnzeichensValue( - String bezeichnungDesSymptomsOderAnzeichensValue) { - this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; - } - - public String getBezeichnungDesSymptomsOderAnzeichensValue() { - return this.bezeichnungDesSymptomsOderAnzeichensValue ; - } - - public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { - this.vorhandenDefiningCode = vorhandenDefiningCode; - } - - public VorhandenDefiningCode getVorhandenDefiningCode() { - return this.vorhandenDefiningCode ; - } - - public void setDetaillierteAngabenZumSymptomAnzeichen( - List detaillierteAngabenZumSymptomAnzeichen) { - this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; - } - - public List getDetaillierteAngabenZumSymptomAnzeichen() { - return this.detaillierteAngabenZumSymptomAnzeichen ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java deleted file mode 100644 index 833a9d289..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class FieberOderErhohteKorpertemperaturObservationContainment extends Containment { - public SelectAqlField FIEBER_ODER_ERHOHTE_KORPERTEMPERATUR_OBSERVATION = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "", "FieberOderErhohteKorpertemperaturObservation", FieberOderErhohteKorpertemperaturObservation.class, this); - - public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); - - public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); - - public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/language", "language", Language.class, this); - - private FieberOderErhohteKorpertemperaturObservationContainment() { - super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); - } - - public static FieberOderErhohteKorpertemperaturObservationContainment getInstance() { - return new FieberOderErhohteKorpertemperaturObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java deleted file mode 100644 index cf6442814..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java +++ /dev/null @@ -1,120 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.medication_use.v0") -public class FragebogenZumMedikationsScreeningObservation { - @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0027]/value|defining_code") - private CodePhrase medikamenteInVerwendungDefiningCode; - - @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0002]/value|value") - private String nameDerMedikamentenklasseValue; - - @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0003]/value|defining_code") - private MedikamentenklasseInVerwendungDefiningCode medikamentenklasseInVerwendungDefiningCode; - - @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0008]") - private List spezifischeMedikamente; - - @Path("/data[at0022]/events[at0023]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0022]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0005]/items[at0019]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setMedikamenteInVerwendungDefiningCode( - CodePhrase medikamenteInVerwendungDefiningCode) { - this.medikamenteInVerwendungDefiningCode = medikamenteInVerwendungDefiningCode; - } - - public CodePhrase getMedikamenteInVerwendungDefiningCode() { - return this.medikamenteInVerwendungDefiningCode ; - } - - public void setNameDerMedikamentenklasseValue(String nameDerMedikamentenklasseValue) { - this.nameDerMedikamentenklasseValue = nameDerMedikamentenklasseValue; - } - - public String getNameDerMedikamentenklasseValue() { - return this.nameDerMedikamentenklasseValue ; - } - - public void setMedikamentenklasseInVerwendungDefiningCode( - MedikamentenklasseInVerwendungDefiningCode medikamentenklasseInVerwendungDefiningCode) { - this.medikamentenklasseInVerwendungDefiningCode = medikamentenklasseInVerwendungDefiningCode; - } - - public MedikamentenklasseInVerwendungDefiningCode getMedikamentenklasseInVerwendungDefiningCode( - ) { - return this.medikamentenklasseInVerwendungDefiningCode ; - } - - public void setSpezifischeMedikamente( - List spezifischeMedikamente) { - this.spezifischeMedikamente = spezifischeMedikamente; - } - - public List getSpezifischeMedikamente( - ) { - return this.spezifischeMedikamente ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java deleted file mode 100644 index 5a537f20f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class FragebogenZumMedikationsScreeningObservationContainment extends Containment { - public SelectAqlField FRAGEBOGEN_ZUM_MEDIKATIONS_SCREENING_OBSERVATION = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "", "FragebogenZumMedikationsScreeningObservation", FragebogenZumMedikationsScreeningObservation.class, this); - - public SelectAqlField MEDIKAMENTE_IN_VERWENDUNG_DEFINING_CODE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0027]/value|defining_code", "medikamenteInVerwendungDefiningCode", CodePhrase.class, this); - - public SelectAqlField NAME_DER_MEDIKAMENTENKLASSE_VALUE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0002]/value|value", "nameDerMedikamentenklasseValue", String.class, this); - - public SelectAqlField MEDIKAMENTENKLASSE_IN_VERWENDUNG_DEFINING_CODE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0003]/value|defining_code", "medikamentenklasseInVerwendungDefiningCode", MedikamentenklasseInVerwendungDefiningCode.class, this); - - public ListSelectAqlField SPEZIFISCHE_MEDIKAMENTE = new ListAqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0008]", "spezifischeMedikamente", FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/protocol[at0005]/items[at0019]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/language", "language", Language.class, this); - - private FragebogenZumMedikationsScreeningObservationContainment() { - super("openEHR-EHR-OBSERVATION.medication_use.v0"); - } - - public static FragebogenZumMedikationsScreeningObservationContainment getInstance() { - return new FragebogenZumMedikationsScreeningObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java deleted file mode 100644 index 583b84a2d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster { - @Path("/items[at0021]/value|value") - private String nameDesMedikamentsValue; - - @Path("/items[at0024]/value|defining_code") - private MedikamentInVerwendungDefiningCode medikamentInVerwendungDefiningCode; - - public void setNameDesMedikamentsValue(String nameDesMedikamentsValue) { - this.nameDesMedikamentsValue = nameDesMedikamentsValue; - } - - public String getNameDesMedikamentsValue() { - return this.nameDesMedikamentsValue ; - } - - public void setMedikamentInVerwendungDefiningCode( - MedikamentInVerwendungDefiningCode medikamentInVerwendungDefiningCode) { - this.medikamentInVerwendungDefiningCode = medikamentInVerwendungDefiningCode; - } - - public MedikamentInVerwendungDefiningCode getMedikamentInVerwendungDefiningCode() { - return this.medikamentInVerwendungDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java deleted file mode 100644 index 0e0258ddc..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -public interface GeschichteHistorieBeliebigesEreignisChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java deleted file mode 100644 index d36fb3102..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalAmount; -import java.util.List; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; - -@Entity -@OptionFor("INTERVAL_EVENT") -public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements GeschichteHistorieBeliebigesEreignisChoice { - @Path("/data[at0003]/items[at0004]") - private List geschichte; - - @Path("/data[at0003]/items[at0006]") - private List strukturierteAngabe; - - @Path("/time|value") - private TemporalAccessor timeValue; - - @Path("/width|value") - private TemporalAmount widthValue; - - @Path("/math_function|defining_code") - private MathFunction mathFunctionDefiningCode; - - public void setGeschichte(List geschichte) { - this.geschichte = geschichte; - } - - public List getGeschichte() { - return this.geschichte ; - } - - public void setStrukturierteAngabe(List strukturierteAngabe) { - this.strukturierteAngabe = strukturierteAngabe; - } - - public List getStrukturierteAngabe() { - return this.strukturierteAngabe ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setWidthValue(TemporalAmount widthValue) { - this.widthValue = widthValue; - } - - public TemporalAmount getWidthValue() { - return this.widthValue ; - } - - public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { - this.mathFunctionDefiningCode = mathFunctionDefiningCode; - } - - public MathFunction getMathFunctionDefiningCode() { - return this.mathFunctionDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java deleted file mode 100644 index 5a425fc26..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("POINT_EVENT") -public class GeschichteHistorieBeliebigesEreignisPointEvent implements GeschichteHistorieBeliebigesEreignisChoice { - @Path("/data[at0003]/items[at0004]") - private List geschichte; - - @Path("/data[at0003]/items[at0006]") - private List strukturierteAngabe; - - @Path("/time|value") - private TemporalAccessor timeValue; - - public void setGeschichte(List geschichte) { - this.geschichte = geschichte; - } - - public List getGeschichte() { - return this.geschichte ; - } - - public void setStrukturierteAngabe(List strukturierteAngabe) { - this.strukturierteAngabe = strukturierteAngabe; - } - - public List getStrukturierteAngabe() { - return this.strukturierteAngabe ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java deleted file mode 100644 index 68c3c7c45..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class GeschichteHistorieGeschichteElement { - @Path("/value|value") - private String value; - - public void setValue(String value) { - this.value = value; - } - - public String getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java deleted file mode 100644 index caa66e1d6..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import java.util.List; -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.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.story.v1") -public class GeschichteHistorieObservation { - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0007]/items[at0008]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - @Path("/data[at0001]/events[at0002]") - @Choice - private List beliebigesEreignis; - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } - - public void setBeliebigesEreignis( - List beliebigesEreignis) { - this.beliebigesEreignis = beliebigesEreignis; - } - - public List getBeliebigesEreignis() { - return this.beliebigesEreignis ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java deleted file mode 100644 index 5cc4f0c20..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class GeschichteHistorieObservationContainment extends Containment { - public SelectAqlField GESCHICHTE_HISTORIE_OBSERVATION = new AqlFieldImp(GeschichteHistorieObservation.class, "", "GeschichteHistorieObservation", GeschichteHistorieObservation.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(GeschichteHistorieObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GeschichteHistorieObservation.class, "/protocol[at0007]/items[at0008]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(GeschichteHistorieObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(GeschichteHistorieObservation.class, "/language", "language", Language.class, this); - - public ListSelectAqlField BELIEBIGES_EREIGNIS = new ListAqlFieldImp(GeschichteHistorieObservation.class, "/data[at0001]/events[at0002]", "beliebigesEreignis", GeschichteHistorieBeliebigesEreignisChoice.class, this); - - private GeschichteHistorieObservationContainment() { - super("openEHR-EHR-OBSERVATION.story.v1"); - } - - public static GeschichteHistorieObservationContainment getInstance() { - return new GeschichteHistorieObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java deleted file mode 100644 index 190420e6d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class GestorterGeruchssinnObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") - private String bezeichnungDesSymptomsOderAnzeichensValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") - private VorhandenDefiningCode vorhandenDefiningCode; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") - private List detaillierteAngabenZumSymptomAnzeichen; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0007]/items[at0021]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setBezeichnungDesSymptomsOderAnzeichensValue( - String bezeichnungDesSymptomsOderAnzeichensValue) { - this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; - } - - public String getBezeichnungDesSymptomsOderAnzeichensValue() { - return this.bezeichnungDesSymptomsOderAnzeichensValue ; - } - - public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { - this.vorhandenDefiningCode = vorhandenDefiningCode; - } - - public VorhandenDefiningCode getVorhandenDefiningCode() { - return this.vorhandenDefiningCode ; - } - - public void setDetaillierteAngabenZumSymptomAnzeichen( - List detaillierteAngabenZumSymptomAnzeichen) { - this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; - } - - public List getDetaillierteAngabenZumSymptomAnzeichen() { - return this.detaillierteAngabenZumSymptomAnzeichen ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java deleted file mode 100644 index eac3965fa..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class GestorterGeruchssinnObservationContainment extends Containment { - public SelectAqlField GESTORTER_GERUCHSSINN_OBSERVATION = new AqlFieldImp(GestorterGeruchssinnObservation.class, "", "GestorterGeruchssinnObservation", GestorterGeruchssinnObservation.class, this); - - public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); - - public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); - - public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GestorterGeruchssinnObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/language", "language", Language.class, this); - - private GestorterGeruchssinnObservationContainment() { - super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); - } - - public static GestorterGeruchssinnObservationContainment getInstance() { - return new GestorterGeruchssinnObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java deleted file mode 100644 index 58fcd7d49..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class GestorterGeschmackssinnObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") - private String bezeichnungDesSymptomsOderAnzeichensValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") - private VorhandenDefiningCode vorhandenDefiningCode; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") - private List detaillierteAngabenZumSymptomAnzeichen; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0007]/items[at0021]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setBezeichnungDesSymptomsOderAnzeichensValue( - String bezeichnungDesSymptomsOderAnzeichensValue) { - this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; - } - - public String getBezeichnungDesSymptomsOderAnzeichensValue() { - return this.bezeichnungDesSymptomsOderAnzeichensValue ; - } - - public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { - this.vorhandenDefiningCode = vorhandenDefiningCode; - } - - public VorhandenDefiningCode getVorhandenDefiningCode() { - return this.vorhandenDefiningCode ; - } - - public void setDetaillierteAngabenZumSymptomAnzeichen( - List detaillierteAngabenZumSymptomAnzeichen) { - this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; - } - - public List getDetaillierteAngabenZumSymptomAnzeichen() { - return this.detaillierteAngabenZumSymptomAnzeichen ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java deleted file mode 100644 index b39fc7247..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class GestorterGeschmackssinnObservationContainment extends Containment { - public SelectAqlField GESTORTER_GESCHMACKSSINN_OBSERVATION = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "", "GestorterGeschmackssinnObservation", GestorterGeschmackssinnObservation.class, this); - - public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); - - public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); - - public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GestorterGeschmackssinnObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/language", "language", Language.class, this); - - private GestorterGeschmackssinnObservationContainment() { - super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); - } - - public static GestorterGeschmackssinnObservationContainment getInstance() { - return new GestorterGeschmackssinnObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java deleted file mode 100644 index 82d2577b4..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java +++ /dev/null @@ -1,80 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-EVALUATION.occupation_summary.v1") -public class GesundheitsbezogenerBerufEvaluation { - @Path("/data[at0001]/items[at0004]/value|value") - private String beschaftigungsstatusValue; - - @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.occupation_record.v1]") - private List beschaftigung; - - @Path("/data[at0001]/items[at0005]") - private List zusatzlicheAngaben; - - @Path("/protocol[at0007]/items[at0008]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setBeschaftigungsstatusValue(String beschaftigungsstatusValue) { - this.beschaftigungsstatusValue = beschaftigungsstatusValue; - } - - public String getBeschaftigungsstatusValue() { - return this.beschaftigungsstatusValue ; - } - - public void setBeschaftigung(List beschaftigung) { - this.beschaftigung = beschaftigung; - } - - public List getBeschaftigung() { - return this.beschaftigung ; - } - - public void setZusatzlicheAngaben(List zusatzlicheAngaben) { - this.zusatzlicheAngaben = zusatzlicheAngaben; - } - - public List getZusatzlicheAngaben() { - return this.zusatzlicheAngaben ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java deleted file mode 100644 index 8383c0a16..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class GesundheitsbezogenerBerufEvaluationContainment extends Containment { - public SelectAqlField GESUNDHEITSBEZOGENER_BERUF_EVALUATION = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "", "GesundheitsbezogenerBerufEvaluation", GesundheitsbezogenerBerufEvaluation.class, this); - - public SelectAqlField BESCHAFTIGUNGSSTATUS_VALUE = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/data[at0001]/items[at0004]/value|value", "beschaftigungsstatusValue", String.class, this); - - public ListSelectAqlField BESCHAFTIGUNG = new ListAqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.occupation_record.v1]", "beschaftigung", BeschaftigungCluster.class, this); - - public ListSelectAqlField ZUSATZLICHE_ANGABEN = new ListAqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/data[at0001]/items[at0005]", "zusatzlicheAngaben", Cluster.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/protocol[at0007]/items[at0008]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/language", "language", Language.class, this); - - private GesundheitsbezogenerBerufEvaluationContainment() { - super("openEHR-EHR-EVALUATION.occupation_summary.v1"); - } - - public static GesundheitsbezogenerBerufEvaluationContainment getInstance() { - return new GesundheitsbezogenerBerufEvaluationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java deleted file mode 100644 index d217a6390..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class HeiserkeitObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") - private String bezeichnungDesSymptomsOderAnzeichensValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") - private VorhandenDefiningCode vorhandenDefiningCode; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") - private List detaillierteAngabenZumSymptomAnzeichen; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0007]/items[at0021]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setBezeichnungDesSymptomsOderAnzeichensValue( - String bezeichnungDesSymptomsOderAnzeichensValue) { - this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; - } - - public String getBezeichnungDesSymptomsOderAnzeichensValue() { - return this.bezeichnungDesSymptomsOderAnzeichensValue ; - } - - public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { - this.vorhandenDefiningCode = vorhandenDefiningCode; - } - - public VorhandenDefiningCode getVorhandenDefiningCode() { - return this.vorhandenDefiningCode ; - } - - public void setDetaillierteAngabenZumSymptomAnzeichen( - List detaillierteAngabenZumSymptomAnzeichen) { - this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; - } - - public List getDetaillierteAngabenZumSymptomAnzeichen() { - return this.detaillierteAngabenZumSymptomAnzeichen ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java deleted file mode 100644 index cbe61fa5f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class HeiserkeitObservationContainment extends Containment { - public SelectAqlField HEISERKEIT_OBSERVATION = new AqlFieldImp(HeiserkeitObservation.class, "", "HeiserkeitObservation", HeiserkeitObservation.class, this); - - public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); - - public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); - - public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(HeiserkeitObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(HeiserkeitObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(HeiserkeitObservation.class, "/language", "language", Language.class, this); - - private HeiserkeitObservationContainment() { - super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); - } - - public static HeiserkeitObservationContainment getInstance() { - return new HeiserkeitObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java deleted file mode 100644 index d8c6ea951..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.travel_history.v0") -public class HistorieDerReiseObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0111 and name/value='Aufenthalt in den letzten 14 Tage in einem der Risikogebiete für Coronainfektion oder Kontakt zu Menschen, die dort waren']/value|defining_code") - private AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0134]/items[openEHR-EHR-CLUSTER.location.v1]") - private StandortCluster standort; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0109]") - private List detaillierteAngabenZurExposition; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0100]/items[at0101]") - private List extensionEn; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setAufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode( - AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode) { - this.aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode = aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode; - } - - public AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ getAufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode( - ) { - return this.aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode ; - } - - public void setStandort(StandortCluster standort) { - this.standort = standort; - } - - public StandortCluster getStandort() { - return this.standort ; - } - - public void setDetaillierteAngabenZurExposition(List detaillierteAngabenZurExposition) { - this.detaillierteAngabenZurExposition = detaillierteAngabenZurExposition; - } - - public List getDetaillierteAngabenZurExposition() { - return this.detaillierteAngabenZurExposition ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setExtensionEn(List extensionEn) { - this.extensionEn = extensionEn; - } - - public List getExtensionEn() { - return this.extensionEn ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java deleted file mode 100644 index 50ae4316c..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class HistorieDerReiseObservationContainment extends Containment { - public SelectAqlField HISTORIE_DER_REISE_OBSERVATION = new AqlFieldImp(HistorieDerReiseObservation.class, "", "HistorieDerReiseObservation", HistorieDerReiseObservation.class, this); - - public SelectAqlField AUFENTHALT_IN_DEN_LETZTEN14_TAGE_IN_EINEM_DER_RISIKOGEBIETE_FUR_CORONAINFEKTION_ODER_KONTAKT_ZU_MENSCHEN_DIE_DORT_WAREN_DEFINING_CODE = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0111]/value|defining_code", "aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode", AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.class, this); - - public SelectAqlField STANDORT = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0134]/items[openEHR-EHR-CLUSTER.location.v1]", "standort", StandortCluster.class, this); - - public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUR_EXPOSITION = new ListAqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0109]", "detaillierteAngabenZurExposition", Cluster.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField EXTENSION_EN = new ListAqlFieldImp(HistorieDerReiseObservation.class, "/protocol[at0100]/items[at0101]", "extensionEn", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(HistorieDerReiseObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(HistorieDerReiseObservation.class, "/language", "language", Language.class, this); - - private HistorieDerReiseObservationContainment() { - super("openEHR-EHR-OBSERVATION.travel_history.v0"); - } - - public static HistorieDerReiseObservationContainment getInstance() { - return new HistorieDerReiseObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java deleted file mode 100644 index e6c6e3b03..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class HustenObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") - private String bezeichnungDesSymptomsOderAnzeichensValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") - private VorhandenDefiningCode vorhandenDefiningCode; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") - private List detaillierteAngabenZumSymptomAnzeichen; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0007]/items[at0021]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setBezeichnungDesSymptomsOderAnzeichensValue( - String bezeichnungDesSymptomsOderAnzeichensValue) { - this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; - } - - public String getBezeichnungDesSymptomsOderAnzeichensValue() { - return this.bezeichnungDesSymptomsOderAnzeichensValue ; - } - - public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { - this.vorhandenDefiningCode = vorhandenDefiningCode; - } - - public VorhandenDefiningCode getVorhandenDefiningCode() { - return this.vorhandenDefiningCode ; - } - - public void setDetaillierteAngabenZumSymptomAnzeichen( - List detaillierteAngabenZumSymptomAnzeichen) { - this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; - } - - public List getDetaillierteAngabenZumSymptomAnzeichen() { - return this.detaillierteAngabenZumSymptomAnzeichen ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservationContainment.java deleted file mode 100644 index a4e03a368..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservationContainment.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class HustenObservationContainment extends Containment { - public SelectAqlField HUSTEN_OBSERVATION = new AqlFieldImp(HustenObservation.class, "", "HustenObservation", HustenObservation.class, this); - - public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); - - public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); - - public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(HustenObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(HustenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(HustenObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(HustenObservation.class, "/language", "language", Language.class, this); - - private HustenObservationContainment() { - super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); - } - - public static HustenObservationContainment getInstance() { - return new HustenObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/InlandAuslandDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/InlandAuslandDefiningcode.java deleted file mode 100644 index 483633758..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/InlandAuslandDefiningcode.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum InlandAuslandDefiningCode implements EnumValueSet { - INLANDSREISE("Inlandsreise", "Die Person ist innerhalb des angegebenen Zeitraums im Inland gereist.", "local", "at0028"), - - INLANDS_UND_AUSLANDSREISE("Inlands- und Auslandsreise", "Die Person ist innerhalb des festgelegten Zeitraums sowohl im Inland als auch international gereist.", "local", "at0030"), - - AUSLANDREISE("Auslandreise", "Die Person ist innerhalb des angegebenen Zeitraums international gereist.", "local", "at0029"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - InlandAuslandDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java deleted file mode 100644 index faf97531b..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-SECTION.adhoc.v1") -public class KontaktSection { - @Path("/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Personenkontakt']") - private PersonenkontaktObservation personenkontakt; - - @Path("/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Aufenthalt in Gesundheitseinrichtung']") - private AufenthaltInGesundheitseinrichtungObservation aufenthaltInGesundheitseinrichtung; - - public void setPersonenkontakt(PersonenkontaktObservation personenkontakt) { - this.personenkontakt = personenkontakt; - } - - public PersonenkontaktObservation getPersonenkontakt() { - return this.personenkontakt ; - } - - public void setAufenthaltInGesundheitseinrichtung( - AufenthaltInGesundheitseinrichtungObservation aufenthaltInGesundheitseinrichtung) { - this.aufenthaltInGesundheitseinrichtung = aufenthaltInGesundheitseinrichtung; - } - - public AufenthaltInGesundheitseinrichtungObservation getAufenthaltInGesundheitseinrichtung() { - return this.aufenthaltInGesundheitseinrichtung ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSectionContainment.java deleted file mode 100644 index cd530a6dd..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSectionContainment.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class KontaktSectionContainment extends Containment { - public SelectAqlField KONTAKT_SECTION = new AqlFieldImp(KontaktSection.class, "", "KontaktSection", KontaktSection.class, this); - - public SelectAqlField PERSONENKONTAKT = new AqlFieldImp(KontaktSection.class, "/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]", "personenkontakt", PersonenkontaktObservation.class, this); - - public SelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG = new AqlFieldImp(KontaktSection.class, "/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]", "aufenthaltInGesundheitseinrichtung", AufenthaltInGesundheitseinrichtungObservation.class, this); - - private KontaktSectionContainment() { - super("openEHR-EHR-SECTION.adhoc.v1"); - } - - public static KontaktSectionContainment getInstance() { - return new KontaktSectionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java deleted file mode 100644 index bcad74060..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java +++ /dev/null @@ -1,149 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Double; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.body_temperature.v2") -public class KorpertemperaturObservation { - @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude") - private Double temperaturMagnitude; - - @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units") - private String temperaturUnits; - - @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0066]") - private List storfaktoren; - - @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0056]") - private List umgebungsbedingungen; - - @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0057]") - private Cluster betatigung; - - @Path("/data[at0002]/events[at0003]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0002]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0020]/items[at0064]") - private List strukturierteLokalisationDerMessung; - - @Path("/protocol[at0020]/items[at0059]") - private Cluster gerat; - - @Path("/protocol[at0020]/items[at0062]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setTemperaturMagnitude(Double temperaturMagnitude) { - this.temperaturMagnitude = temperaturMagnitude; - } - - public Double getTemperaturMagnitude() { - return this.temperaturMagnitude ; - } - - public void setTemperaturUnits(String temperaturUnits) { - this.temperaturUnits = temperaturUnits; - } - - public String getTemperaturUnits() { - return this.temperaturUnits ; - } - - public void setStorfaktoren(List storfaktoren) { - this.storfaktoren = storfaktoren; - } - - public List getStorfaktoren() { - return this.storfaktoren ; - } - - public void setUmgebungsbedingungen(List umgebungsbedingungen) { - this.umgebungsbedingungen = umgebungsbedingungen; - } - - public List getUmgebungsbedingungen() { - return this.umgebungsbedingungen ; - } - - public void setBetatigung(Cluster betatigung) { - this.betatigung = betatigung; - } - - public Cluster getBetatigung() { - return this.betatigung ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setStrukturierteLokalisationDerMessung( - List strukturierteLokalisationDerMessung) { - this.strukturierteLokalisationDerMessung = strukturierteLokalisationDerMessung; - } - - public List getStrukturierteLokalisationDerMessung() { - return this.strukturierteLokalisationDerMessung ; - } - - public void setGerat(Cluster gerat) { - this.gerat = gerat; - } - - public Cluster getGerat() { - return this.gerat ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java deleted file mode 100644 index 4ac95d65f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Double; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class KorpertemperaturObservationContainment extends Containment { - public SelectAqlField KORPERTEMPERATUR_OBSERVATION = new AqlFieldImp(KorpertemperaturObservation.class, "", "KorpertemperaturObservation", KorpertemperaturObservation.class, this); - - public SelectAqlField TEMPERATUR_MAGNITUDE = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude", "temperaturMagnitude", Double.class, this); - - public SelectAqlField TEMPERATUR_UNITS = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units", "temperaturUnits", String.class, this); - - public ListSelectAqlField STORFAKTOREN = new ListAqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0066]", "storfaktoren", KorpertemperaturStorfaktorenElement.class, this); - - public ListSelectAqlField UMGEBUNGSBEDINGUNGEN = new ListAqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0056]", "umgebungsbedingungen", Cluster.class, this); - - public SelectAqlField BETATIGUNG = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0057]", "betatigung", Cluster.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField STRUKTURIERTE_LOKALISATION_DER_MESSUNG = new ListAqlFieldImp(KorpertemperaturObservation.class, "/protocol[at0020]/items[at0064]", "strukturierteLokalisationDerMessung", Cluster.class, this); - - public SelectAqlField GERAT = new AqlFieldImp(KorpertemperaturObservation.class, "/protocol[at0020]/items[at0059]", "gerat", Cluster.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(KorpertemperaturObservation.class, "/protocol[at0020]/items[at0062]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(KorpertemperaturObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(KorpertemperaturObservation.class, "/language", "language", Language.class, this); - - private KorpertemperaturObservationContainment() { - super("openEHR-EHR-OBSERVATION.body_temperature.v2"); - } - - public static KorpertemperaturObservationContainment getInstance() { - return new KorpertemperaturObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java deleted file mode 100644 index b20737943..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class KorpertemperaturStorfaktorenElement { - @Path("/value|value") - private String value; - - public void setValue(String value) { - this.value = value; - } - - public String getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/LetzteReiseDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/LetzteReiseDefiningcode.java deleted file mode 100644 index c8d35a6bb..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/LetzteReiseDefiningcode.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum LetzteReiseDefiningCode implements EnumValueSet { - NEIN("Nein", "Die Person ist nicht innerhalb des angegebenen Zeitraums gereist.", "local", "at0005"), - - UNBEKANNT("Unbekannt", "Es ist nicht bekannt, ob die Person innerhalb des angegebenen Zeitinraumss gereist ist.", "local", "at0027"), - - JA_NATIONAL("Ja - national", "Die Person ist innerhalb des angegebenen Zeitraums national gereist.", "local", "at0006"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - LetzteReiseDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningcode.java deleted file mode 100644 index 2d0686e62..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningcode.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum MedikamentInVerwendungDefiningCode implements EnumValueSet { - NICHT_IN_VERWENDUNG("Nicht in Verwendung", "Die Person verwendet das Medikament zum Zeitpunkt des Ergebnis oder währendessen nicht oder hat es nicht verwendet.", "local", "at0032"), - - UNBEKANNT("Unbekannt", "Es ist unbekannt, ob die Person das Medikament zum Zeitpunkt des Ergebnis oder währendessen verwendet oder es verwendet hat.", "local", "at0033"), - - IN_VERWENDUNG("In Verwendung", "Die Person verwendet das Medikament zum Zeitpunkt des Ergebnis oder währendessen oder hat es verwendet.", "local", "at0031"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - MedikamentInVerwendungDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningcode.java deleted file mode 100644 index 656a99a11..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningcode.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum MedikamentenklasseInVerwendungDefiningCode implements EnumValueSet { - IN_VERWENDUNG("In Verwendung", "Die Person verwendet die Medikamentenklasse zum Zeitpunkt des Ergebnis oder währendessen oder hat sie verwendet.", "local", "at0028"), - - UNBEKANNT("Unbekannt", "Es ist unbekannt, ob die Person die Medikamentenklasse zum Zeitpunkt des Ergebnis oder währendessen verwendet oder sie verwendet hat.", "local", "at0030"), - - NICHT_IN_VERWENDUNG("Nicht in Verwendung", "Die Person verwendet die Medikamentenklasse zum Zeitpunkt des Ergebnis oder währendessen nicht oder hat sie nicht verwendet.", "local", "at0029"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - MedikamentenklasseInVerwendungDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java deleted file mode 100644 index 8b3363d47..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.organisation_cc.v0") -public class OrganisationCluster { - @Path("/items[at0018]") - private List identifier; - - @Path("/items[at0012 and name/value='Name der Einrichtung']/value|value") - private String nameDerEinrichtungValue; - - @Path("/items[at0014]") - private List telefon; - - @Path("/items[openEHR-EHR-CLUSTER.address_cc.v0]") - private List adresse; - - @Path("/items[at0017]") - private List teilVon; - - @Path("/items[at0016]") - private List kontakt; - - public void setIdentifier(List identifier) { - this.identifier = identifier; - } - - public List getIdentifier() { - return this.identifier ; - } - - public void setNameDerEinrichtungValue(String nameDerEinrichtungValue) { - this.nameDerEinrichtungValue = nameDerEinrichtungValue; - } - - public String getNameDerEinrichtungValue() { - return this.nameDerEinrichtungValue ; - } - - public void setTelefon(List telefon) { - this.telefon = telefon; - } - - public List getTelefon() { - return this.telefon ; - } - - public void setAdresse(List adresse) { - this.adresse = adresse; - } - - public List getAdresse() { - return this.adresse ; - } - - public void setTeilVon(List teilVon) { - this.teilVon = teilVon; - } - - public List getTeilVon() { - return this.teilVon ; - } - - public void setKontakt(List kontakt) { - this.kontakt = kontakt; - } - - public List getKontakt() { - return this.kontakt ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java deleted file mode 100644 index 995a412fa..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class OrganisationClusterContainment extends Containment { - public SelectAqlField ORGANISATION_CLUSTER = new AqlFieldImp(OrganisationCluster.class, "", "OrganisationCluster", OrganisationCluster.class, this); - - public ListSelectAqlField IDENTIFIER = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0018]", "identifier", Cluster.class, this); - - public SelectAqlField NAME_DER_EINRICHTUNG_VALUE = new AqlFieldImp(OrganisationCluster.class, "/items[at0012]/value|value", "nameDerEinrichtungValue", String.class, this); - - public ListSelectAqlField TELEFON = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0014]", "telefon", Cluster.class, this); - - public ListSelectAqlField ADRESSE = new ListAqlFieldImp(OrganisationCluster.class, "/items[openEHR-EHR-CLUSTER.address_cc.v0]", "adresse", AdresseCluster.class, this); - - public ListSelectAqlField TEIL_VON = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0017]", "teilVon", Cluster.class, this); - - public ListSelectAqlField KONTAKT = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0016]", "kontakt", Cluster.class, this); - - private OrganisationClusterContainment() { - super("openEHR-EHR-CLUSTER.organisation_cc.v0"); - } - - public static OrganisationClusterContainment getInstance() { - return new OrganisationClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java deleted file mode 100644 index b69ccd489..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java +++ /dev/null @@ -1,126 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.exposure_assessment.v0") -public class PersonenkontaktObservation { - @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value") - private String agentEnValue; - - @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code") - private PresenceOfAnyExposureEnDefiningCode presenceOfAnyExposureEnDefiningCode; - - @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value") - private String exposureEnValue; - - @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code") - private VorhandenseinDefiningCode vorhandenseinDefiningCode; - - @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value") - private String kommentarValue; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0004]/items[at0056]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setAgentEnValue(String agentEnValue) { - this.agentEnValue = agentEnValue; - } - - public String getAgentEnValue() { - return this.agentEnValue ; - } - - public void setPresenceOfAnyExposureEnDefiningCode( - PresenceOfAnyExposureEnDefiningCode presenceOfAnyExposureEnDefiningCode) { - this.presenceOfAnyExposureEnDefiningCode = presenceOfAnyExposureEnDefiningCode; - } - - public PresenceOfAnyExposureEnDefiningCode getPresenceOfAnyExposureEnDefiningCode() { - return this.presenceOfAnyExposureEnDefiningCode ; - } - - public void setExposureEnValue(String exposureEnValue) { - this.exposureEnValue = exposureEnValue; - } - - public String getExposureEnValue() { - return this.exposureEnValue ; - } - - public void setVorhandenseinDefiningCode(VorhandenseinDefiningCode vorhandenseinDefiningCode) { - this.vorhandenseinDefiningCode = vorhandenseinDefiningCode; - } - - public VorhandenseinDefiningCode getVorhandenseinDefiningCode() { - return this.vorhandenseinDefiningCode ; - } - - public void setKommentarValue(String kommentarValue) { - this.kommentarValue = kommentarValue; - } - - public String getKommentarValue() { - return this.kommentarValue ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java deleted file mode 100644 index 0945a5d9a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class PersonenkontaktObservationContainment extends Containment { - public SelectAqlField PERSONENKONTAKT_OBSERVATION = new AqlFieldImp(PersonenkontaktObservation.class, "", "PersonenkontaktObservation", PersonenkontaktObservation.class, this); - - public SelectAqlField AGENT_EN_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value", "agentEnValue", String.class, this); - - public SelectAqlField PRESENCE_OF_ANY_EXPOSURE_EN_DEFINING_CODE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code", "presenceOfAnyExposureEnDefiningCode", PresenceOfAnyExposureEnDefiningCode.class, this); - - public SelectAqlField EXPOSURE_EN_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value", "exposureEnValue", String.class, this); - - public SelectAqlField VORHANDENSEIN_DEFINING_CODE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code", "vorhandenseinDefiningCode", VorhandenseinDefiningCode.class, this); - - public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value", "kommentarValue", String.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(PersonenkontaktObservation.class, "/protocol[at0004]/items[at0056]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(PersonenkontaktObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(PersonenkontaktObservation.class, "/language", "language", Language.class, this); - - private PersonenkontaktObservationContainment() { - super("openEHR-EHR-OBSERVATION.exposure_assessment.v0"); - } - - public static PersonenkontaktObservationContainment getInstance() { - return new PersonenkontaktObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningcode.java deleted file mode 100644 index 8b3743fb8..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningcode.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum PresenceOfAnyExposureEnDefiningCode implements EnumValueSet { - N_ABSENT_EN("*Absent (en)", "*Exposure is or has been absent at or during the event. (en)", "local", "at0059"), - - N_UNKNOWN_EN("*Unknown (en)", "*It is not known whether any exposure is or has been present or absent at or during the event. (en)", "local", "at0060"), - - N_PRESENT_EN("*Present (en)", "*Exposure is or has been present at or during the event. (en)", "local", "at0058"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - PresenceOfAnyExposureEnDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java deleted file mode 100644 index 395f5dc60..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java +++ /dev/null @@ -1,91 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-EVALUATION.problem_diagnosis.v1") -public class ProblemDiagnoseEvaluation { - @Path("/data[at0001]/items[at0002]/value|value") - private String nameDesProblemsDerDiagnoseValue; - - @Path("/data[at0001]/items[at0039]") - private List anatomischeStelleStrukturiert; - - @Path("/data[at0001]/items[at0043]") - private List spezifischeAngaben; - - @Path("/data[at0001]/items[at0046]") - private List status; - - @Path("/protocol[at0032]/items[at0071]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setNameDesProblemsDerDiagnoseValue(String nameDesProblemsDerDiagnoseValue) { - this.nameDesProblemsDerDiagnoseValue = nameDesProblemsDerDiagnoseValue; - } - - public String getNameDesProblemsDerDiagnoseValue() { - return this.nameDesProblemsDerDiagnoseValue ; - } - - public void setAnatomischeStelleStrukturiert(List anatomischeStelleStrukturiert) { - this.anatomischeStelleStrukturiert = anatomischeStelleStrukturiert; - } - - public List getAnatomischeStelleStrukturiert() { - return this.anatomischeStelleStrukturiert ; - } - - public void setSpezifischeAngaben(List spezifischeAngaben) { - this.spezifischeAngaben = spezifischeAngaben; - } - - public List getSpezifischeAngaben() { - return this.spezifischeAngaben ; - } - - public void setStatus(List status) { - this.status = status; - } - - public List getStatus() { - return this.status ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java deleted file mode 100644 index fc547d363..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class ProblemDiagnoseEvaluationContainment extends Containment { - public SelectAqlField PROBLEM_DIAGNOSE_EVALUATION = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "", "ProblemDiagnoseEvaluation", ProblemDiagnoseEvaluation.class, this); - - public SelectAqlField NAME_DES_PROBLEMS_DER_DIAGNOSE_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0002]/value|value", "nameDesProblemsDerDiagnoseValue", String.class, this); - - public ListSelectAqlField ANATOMISCHE_STELLE_STRUKTURIERT = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0039]", "anatomischeStelleStrukturiert", Cluster.class, this); - - public ListSelectAqlField SPEZIFISCHE_ANGABEN = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0043]", "spezifischeAngaben", Cluster.class, this); - - public ListSelectAqlField STATUS = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0046]", "status", Cluster.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/protocol[at0032]/items[at0071]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/language", "language", Language.class, this); - - private ProblemDiagnoseEvaluationContainment() { - super("openEHR-EHR-EVALUATION.problem_diagnosis.v1"); - } - - public static ProblemDiagnoseEvaluationContainment getInstance() { - return new ProblemDiagnoseEvaluationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java deleted file mode 100644 index 254a3d0c0..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -public interface ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java deleted file mode 100644 index e3cf68796..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText implements ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { - @Path("|defining_code") - private DiagnostischeSicherheitDefiningCode diagnostischeSicherheitDefiningCode; - - public void setDiagnostischeSicherheitDefiningCode( - DiagnostischeSicherheitDefiningCode diagnostischeSicherheitDefiningCode) { - this.diagnostischeSicherheitDefiningCode = diagnostischeSicherheitDefiningCode; - } - - public DiagnostischeSicherheitDefiningCode getDiagnostischeSicherheitDefiningCode() { - return this.diagnostischeSicherheitDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java deleted file mode 100644 index 036e0b57a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText implements ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { - @Path("|value") - private String diagnostischeSicherheitValue; - - public void setDiagnostischeSicherheitValue(String diagnostischeSicherheitValue) { - this.diagnostischeSicherheitValue = diagnostischeSicherheitValue; - } - - public String getDiagnostischeSicherheitValue() { - return this.diagnostischeSicherheitValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java deleted file mode 100644 index 73f92c3b9..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java +++ /dev/null @@ -1,128 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -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.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1") -public class ProblemDiganoseCoronovirusEvaluation { - @Path("/data[at0001]/items[at0002]/value|value") - private String nameDesProblemsDerDiagnoseValue; - - @Path("/data[at0001]/items[at0039]") - private List anatomischeStelleStrukturiert; - - @Path("/data[at0001]/items[at0043]") - private List spezifischeAngaben; - - @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.problem_qualifier.v1 and name/value='Status']") - private StatusCluster status; - - @Path("/data[at0001]/items[at0069]/value|value") - private String kommentarValue; - - @Path("/protocol[at0032]/items[at0070]/value|value") - private TemporalAccessor zuletztAktualisiertValue; - - @Path("/protocol[at0032]/items[at0071]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - @Path("/data[at0001]/items[at0073]/value") - @Choice - private ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice diagnostischeSicherheit; - - public void setNameDesProblemsDerDiagnoseValue(String nameDesProblemsDerDiagnoseValue) { - this.nameDesProblemsDerDiagnoseValue = nameDesProblemsDerDiagnoseValue; - } - - public String getNameDesProblemsDerDiagnoseValue() { - return this.nameDesProblemsDerDiagnoseValue ; - } - - public void setAnatomischeStelleStrukturiert(List anatomischeStelleStrukturiert) { - this.anatomischeStelleStrukturiert = anatomischeStelleStrukturiert; - } - - public List getAnatomischeStelleStrukturiert() { - return this.anatomischeStelleStrukturiert ; - } - - public void setSpezifischeAngaben(List spezifischeAngaben) { - this.spezifischeAngaben = spezifischeAngaben; - } - - public List getSpezifischeAngaben() { - return this.spezifischeAngaben ; - } - - public void setStatus(StatusCluster status) { - this.status = status; - } - - public StatusCluster getStatus() { - return this.status ; - } - - public void setKommentarValue(String kommentarValue) { - this.kommentarValue = kommentarValue; - } - - public String getKommentarValue() { - return this.kommentarValue ; - } - - public void setZuletztAktualisiertValue(TemporalAccessor zuletztAktualisiertValue) { - this.zuletztAktualisiertValue = zuletztAktualisiertValue; - } - - public TemporalAccessor getZuletztAktualisiertValue() { - return this.zuletztAktualisiertValue ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } - - public void setDiagnostischeSicherheit( - ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice diagnostischeSicherheit) { - this.diagnostischeSicherheit = diagnostischeSicherheit; - } - - public ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice getDiagnostischeSicherheit() { - return this.diagnostischeSicherheit ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java deleted file mode 100644 index e34ec2001..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class ProblemDiganoseCoronovirusEvaluationContainment extends Containment { - public SelectAqlField PROBLEM_DIGANOSE_CORONOVIRUS_EVALUATION = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "", "ProblemDiganoseCoronovirusEvaluation", ProblemDiganoseCoronovirusEvaluation.class, this); - - public SelectAqlField NAME_DES_PROBLEMS_DER_DIAGNOSE_VALUE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0002]/value|value", "nameDesProblemsDerDiagnoseValue", String.class, this); - - public ListSelectAqlField ANATOMISCHE_STELLE_STRUKTURIERT = new ListAqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0039]", "anatomischeStelleStrukturiert", Cluster.class, this); - - public ListSelectAqlField SPEZIFISCHE_ANGABEN = new ListAqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0043]", "spezifischeAngaben", Cluster.class, this); - - public SelectAqlField STATUS = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.problem_qualifier.v1]", "status", StatusCluster.class, this); - - public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0069]/value|value", "kommentarValue", String.class, this); - - public SelectAqlField ZULETZT_AKTUALISIERT_VALUE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/protocol[at0032]/items[at0070]/value|value", "zuletztAktualisiertValue", TemporalAccessor.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/protocol[at0032]/items[at0071]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/language", "language", Language.class, this); - - public SelectAqlField DIAGNOSTISCHE_SICHERHEIT = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0073]/value", "diagnostischeSicherheit", ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.class, this); - - private ProblemDiganoseCoronovirusEvaluationContainment() { - super("openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1"); - } - - public static ProblemDiganoseCoronovirusEvaluationContainment getInstance() { - return new ProblemDiganoseCoronovirusEvaluationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java deleted file mode 100644 index 6801442c8..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalAmount; -import java.util.List; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; - -@Entity -public class ReisefallBeliebigesIntervallereignisIntervalEvent { - @Path("/data[at0003]/items[at0004 and name/value='Letzte Reise?']/value|defining_code") - private LetzteReiseDefiningCode letzteReiseDefiningCode; - - @Path("/data[at0003]/items[at0026]/value|defining_code") - private InlandAuslandDefiningCode inlandAuslandDefiningCode; - - @Path("/data[at0003]/items[at0008]") - private List bestimmteReise; - - @Path("/math_function|defining_code") - private MathFunction mathFunctionDefiningCode; - - @Path("/width|value") - private TemporalAmount widthValue; - - @Path("/time|value") - private TemporalAccessor timeValue; - - public void setLetzteReiseDefiningCode(LetzteReiseDefiningCode letzteReiseDefiningCode) { - this.letzteReiseDefiningCode = letzteReiseDefiningCode; - } - - public LetzteReiseDefiningCode getLetzteReiseDefiningCode() { - return this.letzteReiseDefiningCode ; - } - - public void setInlandAuslandDefiningCode(InlandAuslandDefiningCode inlandAuslandDefiningCode) { - this.inlandAuslandDefiningCode = inlandAuslandDefiningCode; - } - - public InlandAuslandDefiningCode getInlandAuslandDefiningCode() { - return this.inlandAuslandDefiningCode ; - } - - public void setBestimmteReise(List bestimmteReise) { - this.bestimmteReise = bestimmteReise; - } - - public List getBestimmteReise() { - return this.bestimmteReise ; - } - - public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { - this.mathFunctionDefiningCode = mathFunctionDefiningCode; - } - - public MathFunction getMathFunctionDefiningCode() { - return this.mathFunctionDefiningCode ; - } - - public void setWidthValue(TemporalAmount widthValue) { - this.widthValue = widthValue; - } - - public TemporalAmount getWidthValue() { - return this.widthValue ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java deleted file mode 100644 index ac6312008..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class ReisefallBestimmteReiseCluster { - @Path("/items[at0010]") - private List bestimmtesReiseziel; - - @Path("/items[at0025]") - private List zusatzlicheReisedetails; - - @Path("/items[at0019]/value|value") - private TemporalAccessor ruckreisedatumValue; - - public void setBestimmtesReiseziel( - List bestimmtesReiseziel) { - this.bestimmtesReiseziel = bestimmtesReiseziel; - } - - public List getBestimmtesReiseziel() { - return this.bestimmtesReiseziel ; - } - - public void setZusatzlicheReisedetails(List zusatzlicheReisedetails) { - this.zusatzlicheReisedetails = zusatzlicheReisedetails; - } - - public List getZusatzlicheReisedetails() { - return this.zusatzlicheReisedetails ; - } - - public void setRuckreisedatumValue(TemporalAccessor ruckreisedatumValue) { - this.ruckreisedatumValue = ruckreisedatumValue; - } - - public TemporalAccessor getRuckreisedatumValue() { - return this.ruckreisedatumValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java deleted file mode 100644 index 28a423b7a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class ReisefallBestimmtesReisezielCluster { - @Path("/items[at0011]/value|value") - private String landValue; - - @Path("/items[at0012]/value|value") - private String bundeslandRegionValue; - - @Path("/items[at0013]/value|value") - private String stadtValue; - - @Path("/items[at0031]/value|value") - private String bestimmteGegendValue; - - @Path("/items[at0024]") - private List zusatzlicheAngabenZumZielort; - - public void setLandValue(String landValue) { - this.landValue = landValue; - } - - public String getLandValue() { - return this.landValue ; - } - - public void setBundeslandRegionValue(String bundeslandRegionValue) { - this.bundeslandRegionValue = bundeslandRegionValue; - } - - public String getBundeslandRegionValue() { - return this.bundeslandRegionValue ; - } - - public void setStadtValue(String stadtValue) { - this.stadtValue = stadtValue; - } - - public String getStadtValue() { - return this.stadtValue ; - } - - public void setBestimmteGegendValue(String bestimmteGegendValue) { - this.bestimmteGegendValue = bestimmteGegendValue; - } - - public String getBestimmteGegendValue() { - return this.bestimmteGegendValue ; - } - - public void setZusatzlicheAngabenZumZielort(List zusatzlicheAngabenZumZielort) { - this.zusatzlicheAngabenZumZielort = zusatzlicheAngabenZumZielort; - } - - public List getZusatzlicheAngabenZumZielort() { - return this.zusatzlicheAngabenZumZielort ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java deleted file mode 100644 index 39d049e3f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.travel_event.v0") -public class ReisefallObservation { - @Path("/data[at0001]/events[at0002]") - private List beliebigesIntervallereignis; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0007]/items[at0021]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setBeliebigesIntervallereignis( - List beliebigesIntervallereignis) { - this.beliebigesIntervallereignis = beliebigesIntervallereignis; - } - - public List getBeliebigesIntervallereignis() { - return this.beliebigesIntervallereignis ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java deleted file mode 100644 index 5964ada00..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class ReisefallObservationContainment extends Containment { - public SelectAqlField REISEFALL_OBSERVATION = new AqlFieldImp(ReisefallObservation.class, "", "ReisefallObservation", ReisefallObservation.class, this); - - public ListSelectAqlField BELIEBIGES_INTERVALLEREIGNIS = new ListAqlFieldImp(ReisefallObservation.class, "/data[at0001]/events[at0002]", "beliebigesIntervallereignis", ReisefallBeliebigesIntervallereignisIntervalEvent.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(ReisefallObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ReisefallObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(ReisefallObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(ReisefallObservation.class, "/language", "language", Language.class, this); - - private ReisefallObservationContainment() { - super("openEHR-EHR-OBSERVATION.travel_event.v0"); - } - - public static ReisefallObservationContainment getInstance() { - return new ReisefallObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java deleted file mode 100644 index 0498d6306..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-SECTION.adhoc.v1") -public class RisikogebietSection { - @Path("/items[openEHR-EHR-OBSERVATION.travel_history.v0]") - private List historieDerReise; - - @Path("/items[openEHR-EHR-OBSERVATION.travel_event.v0]") - private List reisefall; - - public void setHistorieDerReise(List historieDerReise) { - this.historieDerReise = historieDerReise; - } - - public List getHistorieDerReise() { - return this.historieDerReise ; - } - - public void setReisefall(List reisefall) { - this.reisefall = reisefall; - } - - public List getReisefall() { - return this.reisefall ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSectionContainment.java deleted file mode 100644 index 94fd30af1..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSectionContainment.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class RisikogebietSectionContainment extends Containment { - public SelectAqlField RISIKOGEBIET_SECTION = new AqlFieldImp(RisikogebietSection.class, "", "RisikogebietSection", RisikogebietSection.class, this); - - public ListSelectAqlField HISTORIE_DER_REISE = new ListAqlFieldImp(RisikogebietSection.class, "/items[openEHR-EHR-OBSERVATION.travel_history.v0]", "historieDerReise", HistorieDerReiseObservation.class, this); - - public ListSelectAqlField REISEFALL = new ListAqlFieldImp(RisikogebietSection.class, "/items[openEHR-EHR-OBSERVATION.travel_event.v0]", "reisefall", ReisefallObservation.class, this); - - private RisikogebietSectionContainment() { - super("openEHR-EHR-SECTION.adhoc.v1"); - } - - public static RisikogebietSectionContainment getInstance() { - return new RisikogebietSectionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java deleted file mode 100644 index ff4c107ca..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class SchnupfenObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") - private String bezeichnungDesSymptomsOderAnzeichensValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") - private VorhandenDefiningCode vorhandenDefiningCode; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") - private List detaillierteAngabenZumSymptomAnzeichen; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0007]/items[at0021]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setBezeichnungDesSymptomsOderAnzeichensValue( - String bezeichnungDesSymptomsOderAnzeichensValue) { - this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; - } - - public String getBezeichnungDesSymptomsOderAnzeichensValue() { - return this.bezeichnungDesSymptomsOderAnzeichensValue ; - } - - public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { - this.vorhandenDefiningCode = vorhandenDefiningCode; - } - - public VorhandenDefiningCode getVorhandenDefiningCode() { - return this.vorhandenDefiningCode ; - } - - public void setDetaillierteAngabenZumSymptomAnzeichen( - List detaillierteAngabenZumSymptomAnzeichen) { - this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; - } - - public List getDetaillierteAngabenZumSymptomAnzeichen() { - return this.detaillierteAngabenZumSymptomAnzeichen ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java deleted file mode 100644 index 05af8ef1b..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class SchnupfenObservationContainment extends Containment { - public SelectAqlField SCHNUPFEN_OBSERVATION = new AqlFieldImp(SchnupfenObservation.class, "", "SchnupfenObservation", SchnupfenObservation.class, this); - - public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); - - public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); - - public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(SchnupfenObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(SchnupfenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(SchnupfenObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(SchnupfenObservation.class, "/language", "language", Language.class, this); - - private SchnupfenObservationContainment() { - super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); - } - - public static SchnupfenObservationContainment getInstance() { - return new SchnupfenObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java deleted file mode 100644 index 5a9148200..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.location.v1") -public class StandortCluster { - @Path("/items[at0046]/value|value") - private String standortbeschreibungValue; - - @Path("/items[at0047]") - private List details; - - public void setStandortbeschreibungValue(String standortbeschreibungValue) { - this.standortbeschreibungValue = standortbeschreibungValue; - } - - public String getStandortbeschreibungValue() { - return this.standortbeschreibungValue ; - } - - public void setDetails(List details) { - this.details = details; - } - - public List getDetails() { - return this.details ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortClusterContainment.java deleted file mode 100644 index 07b79556f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortClusterContainment.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class StandortClusterContainment extends Containment { - public SelectAqlField STANDORT_CLUSTER = new AqlFieldImp(StandortCluster.class, "", "StandortCluster", StandortCluster.class, this); - - public SelectAqlField STANDORTBESCHREIBUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0046]/value|value", "standortbeschreibungValue", String.class, this); - - public ListSelectAqlField DETAILS = new ListAqlFieldImp(StandortCluster.class, "/items[at0047]", "details", Cluster.class, this); - - private StandortClusterContainment() { - super("openEHR-EHR-CLUSTER.location.v1"); - } - - public static StandortClusterContainment getInstance() { - return new StandortClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java deleted file mode 100644 index 08efbfbde..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.problem_qualifier.v1") -public class StatusCluster { - @Path("/items[at0004]/value|defining_code") - private DiagnosestatusDefiningCode diagnosestatusDefiningCode; - - public void setDiagnosestatusDefiningCode(DiagnosestatusDefiningCode diagnosestatusDefiningCode) { - this.diagnosestatusDefiningCode = diagnosestatusDefiningCode; - } - - public DiagnosestatusDefiningCode getDiagnosestatusDefiningCode() { - return this.diagnosestatusDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusClusterContainment.java deleted file mode 100644 index 0758bd30d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusClusterContainment.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class StatusClusterContainment extends Containment { - public SelectAqlField STATUS_CLUSTER = new AqlFieldImp(StatusCluster.class, "", "StatusCluster", StatusCluster.class, this); - - public SelectAqlField DIAGNOSESTATUS_DEFINING_CODE = new AqlFieldImp(StatusCluster.class, "/items[at0004]/value|defining_code", "diagnosestatusDefiningCode", DiagnosestatusDefiningCode.class, this); - - private StatusClusterContainment() { - super("openEHR-EHR-CLUSTER.problem_qualifier.v1"); - } - - public static StatusClusterContainment getInstance() { - return new StatusClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java deleted file mode 100644 index ff5650378..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-SECTION.adhoc.v1") -public class SymptomeSection { - @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Husten']") - private HustenObservation husten; - - @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Schnupfen']") - private SchnupfenObservation schnupfen; - - @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Heiserkeit']") - private HeiserkeitObservation heiserkeit; - - @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Fieber oder erhöhte Körpertemperatur']") - private FieberOderErhohteKorpertemperaturObservation fieberOderErhohteKorpertemperatur; - - @Path("/items[openEHR-EHR-OBSERVATION.body_temperature.v2]") - private KorpertemperaturObservation korpertemperatur; - - @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geruchssinn']") - private GestorterGeruchssinnObservation gestorterGeruchssinn; - - @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geschmackssinn']") - private GestorterGeschmackssinnObservation gestorterGeschmackssinn; - - @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Durchfall']") - private DurchfallObservation durchfall; - - @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Weitere Symptome']") - private WeitereSymptomeObservation weitereSymptome; - - public void setHusten(HustenObservation husten) { - this.husten = husten; - } - - public HustenObservation getHusten() { - return this.husten ; - } - - public void setSchnupfen(SchnupfenObservation schnupfen) { - this.schnupfen = schnupfen; - } - - public SchnupfenObservation getSchnupfen() { - return this.schnupfen ; - } - - public void setHeiserkeit(HeiserkeitObservation heiserkeit) { - this.heiserkeit = heiserkeit; - } - - public HeiserkeitObservation getHeiserkeit() { - return this.heiserkeit ; - } - - public void setFieberOderErhohteKorpertemperatur( - FieberOderErhohteKorpertemperaturObservation fieberOderErhohteKorpertemperatur) { - this.fieberOderErhohteKorpertemperatur = fieberOderErhohteKorpertemperatur; - } - - public FieberOderErhohteKorpertemperaturObservation getFieberOderErhohteKorpertemperatur() { - return this.fieberOderErhohteKorpertemperatur ; - } - - public void setKorpertemperatur(KorpertemperaturObservation korpertemperatur) { - this.korpertemperatur = korpertemperatur; - } - - public KorpertemperaturObservation getKorpertemperatur() { - return this.korpertemperatur ; - } - - public void setGestorterGeruchssinn(GestorterGeruchssinnObservation gestorterGeruchssinn) { - this.gestorterGeruchssinn = gestorterGeruchssinn; - } - - public GestorterGeruchssinnObservation getGestorterGeruchssinn() { - return this.gestorterGeruchssinn ; - } - - public void setGestorterGeschmackssinn( - GestorterGeschmackssinnObservation gestorterGeschmackssinn) { - this.gestorterGeschmackssinn = gestorterGeschmackssinn; - } - - public GestorterGeschmackssinnObservation getGestorterGeschmackssinn() { - return this.gestorterGeschmackssinn ; - } - - public void setDurchfall(DurchfallObservation durchfall) { - this.durchfall = durchfall; - } - - public DurchfallObservation getDurchfall() { - return this.durchfall ; - } - - public void setWeitereSymptome(WeitereSymptomeObservation weitereSymptome) { - this.weitereSymptome = weitereSymptome; - } - - public WeitereSymptomeObservation getWeitereSymptome() { - return this.weitereSymptome ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSectionContainment.java deleted file mode 100644 index a15572738..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSectionContainment.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class SymptomeSectionContainment extends Containment { - public SelectAqlField SYMPTOME_SECTION = new AqlFieldImp(SymptomeSection.class, "", "SymptomeSection", SymptomeSection.class, this); - - public SelectAqlField HUSTEN = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "husten", HustenObservation.class, this); - - public SelectAqlField SCHNUPFEN = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "schnupfen", SchnupfenObservation.class, this); - - public SelectAqlField HEISERKEIT = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "heiserkeit", HeiserkeitObservation.class, this); - - public SelectAqlField FIEBER_ODER_ERHOHTE_KORPERTEMPERATUR = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "fieberOderErhohteKorpertemperatur", FieberOderErhohteKorpertemperaturObservation.class, this); - - public SelectAqlField KORPERTEMPERATUR = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.body_temperature.v2]", "korpertemperatur", KorpertemperaturObservation.class, this); - - public SelectAqlField GESTORTER_GERUCHSSINN = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "gestorterGeruchssinn", GestorterGeruchssinnObservation.class, this); - - public SelectAqlField GESTORTER_GESCHMACKSSINN = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "gestorterGeschmackssinn", GestorterGeschmackssinnObservation.class, this); - - public SelectAqlField DURCHFALL = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "durchfall", DurchfallObservation.class, this); - - public SelectAqlField WEITERE_SYMPTOME = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "weitereSymptome", WeitereSymptomeObservation.class, this); - - private SymptomeSectionContainment() { - super("openEHR-EHR-SECTION.adhoc.v1"); - } - - public static SymptomeSectionContainment getInstance() { - return new SymptomeSectionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode.java deleted file mode 100644 index 548e8a567..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum VorhandenDefiningCode implements EnumValueSet { - NICHT_VORHANDEN("Nicht vorhanden", "Das spezifische Symptom oder Anzeichen ist nicht vorhanden.", "local", "at0024"), - - VORHANDEN("Vorhanden", "Das spezifische Symptom oder Anzeichen ist vorhanden.", "local", "at0023"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - VorhandenDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode2.java deleted file mode 100644 index e82a30d95..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode2.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum VorhandenDefiningCode2 implements EnumValueSet { - NICHT_VORHANDEN("Nicht vorhanden", "Das spezifische Symptom oder Anzeichen ist nicht vorhanden.", "local", "at0024"), - - VORHANDEN("Vorhanden", "Das spezifische Symptom oder Anzeichen ist vorhanden.", "local", "at0023"), - - UNBEKANNT("Unbekannt", "Es ist nicht bekannt, ob das Symptom oder Anzeichen vorhanden ist oder nicht.", "local", "at0027"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - VorhandenDefiningCode2(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java deleted file mode 100644 index 03cb0b364..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum VorhandenseinDefiningCode2 implements EnumValueSet { - VORHANDEN("Vorhanden", "Der Risikofaktor wurde bei der Person identifiziert.", "local", "at0018"), - - UNBESTIMMT("Unbestimmt", "Es ist nicht möglich festzustellen, ob der Risikofaktor vorhanden oder nicht vorhanden ist.", "local", "at0026"), - - NICHT_VORHANDEN("Nicht vorhanden", "Der Risikofaktor wurde bei der Person nicht festgestellt.", "local", "at0019"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - VorhandenseinDefiningCode2(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningcode.java deleted file mode 100644 index 766dd1904..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningcode.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum VorhandenseinDefiningCode implements EnumValueSet { - NICHT_VORHANDEN("Nicht vorhanden", "*The specific exposure is or has been absent at or during the event.(en)", "local", "at0049"), - - VORHANDEN("Vorhanden", "*The specific exposure is or has been present at or during the event.(en)", "local", "at0047"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - VorhandenseinDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java deleted file mode 100644 index adb51777b..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -public interface WeitereSymptomeBeliebigesEreignisChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java deleted file mode 100644 index 4028f35a0..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalAmount; -import java.util.List; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; - -@Entity -@OptionFor("INTERVAL_EVENT") -public class WeitereSymptomeBeliebigesEreignisIntervalEvent implements WeitereSymptomeBeliebigesEreignisChoice { - @Path("/data[at0003]/items[at0022]") - private List spezifischesSymptomAnzeichen; - - @Path("/time|value") - private TemporalAccessor timeValue; - - @Path("/width|value") - private TemporalAmount widthValue; - - @Path("/math_function|defining_code") - private MathFunction mathFunctionDefiningCode; - - public void setSpezifischesSymptomAnzeichen( - List spezifischesSymptomAnzeichen) { - this.spezifischesSymptomAnzeichen = spezifischesSymptomAnzeichen; - } - - public List getSpezifischesSymptomAnzeichen( - ) { - return this.spezifischesSymptomAnzeichen ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setWidthValue(TemporalAmount widthValue) { - this.widthValue = widthValue; - } - - public TemporalAmount getWidthValue() { - return this.widthValue ; - } - - public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { - this.mathFunctionDefiningCode = mathFunctionDefiningCode; - } - - public MathFunction getMathFunctionDefiningCode() { - return this.mathFunctionDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java deleted file mode 100644 index 7ea76b09c..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("POINT_EVENT") -public class WeitereSymptomeBeliebigesEreignisPointEvent implements WeitereSymptomeBeliebigesEreignisChoice { - @Path("/data[at0003]/items[at0022]") - private List spezifischesSymptomAnzeichen; - - @Path("/time|value") - private TemporalAccessor timeValue; - - public void setSpezifischesSymptomAnzeichen( - List spezifischesSymptomAnzeichen) { - this.spezifischesSymptomAnzeichen = spezifischesSymptomAnzeichen; - } - - public List getSpezifischesSymptomAnzeichen( - ) { - return this.spezifischesSymptomAnzeichen ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java deleted file mode 100644 index 4269af5d5..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import java.util.List; -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.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class WeitereSymptomeObservation { - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0007]/items[at0021]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - @Path("/data[at0001]/events[at0002]") - @Choice - private List beliebigesEreignis; - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } - - public void setBeliebigesEreignis( - List beliebigesEreignis) { - this.beliebigesEreignis = beliebigesEreignis; - } - - public List getBeliebigesEreignis() { - return this.beliebigesEreignis ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java deleted file mode 100644 index e6f84b771..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class WeitereSymptomeObservationContainment extends Containment { - public SelectAqlField WEITERE_SYMPTOME_OBSERVATION = new AqlFieldImp(WeitereSymptomeObservation.class, "", "WeitereSymptomeObservation", WeitereSymptomeObservation.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(WeitereSymptomeObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(WeitereSymptomeObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(WeitereSymptomeObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(WeitereSymptomeObservation.class, "/language", "language", Language.class, this); - - public ListSelectAqlField BELIEBIGES_EREIGNIS = new ListAqlFieldImp(WeitereSymptomeObservation.class, "/data[at0001]/events[at0002]", "beliebigesEreignis", WeitereSymptomeBeliebigesEreignisChoice.class, this); - - private WeitereSymptomeObservationContainment() { - super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); - } - - public static WeitereSymptomeObservationContainment getInstance() { - return new WeitereSymptomeObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java deleted file mode 100644 index 60bcd238b..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class WeitereSymptomeSpezifischesSymptomAnzeichenCluster { - @Path("/items[at0004]/value|value") - private String bezeichnungDesSymptomsOderAnzeichensValue; - - @Path("/items[at0005]/value|defining_code") - private VorhandenDefiningCode2 vorhandenDefiningCode; - - @Path("/items[at0026]") - private List detaillierteAngabenZumSymptomAnzeichen; - - @Path("/items[at0035]/value|value") - private String kommentarValue; - - public void setBezeichnungDesSymptomsOderAnzeichensValue( - String bezeichnungDesSymptomsOderAnzeichensValue) { - this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; - } - - public String getBezeichnungDesSymptomsOderAnzeichensValue() { - return this.bezeichnungDesSymptomsOderAnzeichensValue ; - } - - public void setVorhandenDefiningCode(VorhandenDefiningCode2 vorhandenDefiningCode) { - this.vorhandenDefiningCode = vorhandenDefiningCode; - } - - public VorhandenDefiningCode2 getVorhandenDefiningCode() { - return this.vorhandenDefiningCode ; - } - - public void setDetaillierteAngabenZumSymptomAnzeichen( - List detaillierteAngabenZumSymptomAnzeichen) { - this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; - } - - public List getDetaillierteAngabenZumSymptomAnzeichen() { - return this.detaillierteAngabenZumSymptomAnzeichen ; - } - - public void setKommentarValue(String kommentarValue) { - this.kommentarValue = kommentarValue; - } - - public String getKommentarValue() { - return this.kommentarValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java deleted file mode 100644 index cf669e5af..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java +++ /dev/null @@ -1,81 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Long; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-EVALUATION.living_arrangement.v0") -public class WohnsituationEvaluation { - @Path("/data[at0001]/items[at0003]/value|value") - private String beschreibungValue; - - @Path("/data[at0001]/items[at0007]/value|magnitude") - private Long anzahlDerHaushaltsmitgliederMagnitude; - - @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.dwelling.v0]") - private List wohnstatte; - - @Path("/protocol[at0002]/items[at0011]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setBeschreibungValue(String beschreibungValue) { - this.beschreibungValue = beschreibungValue; - } - - public String getBeschreibungValue() { - return this.beschreibungValue ; - } - - public void setAnzahlDerHaushaltsmitgliederMagnitude(Long anzahlDerHaushaltsmitgliederMagnitude) { - this.anzahlDerHaushaltsmitgliederMagnitude = anzahlDerHaushaltsmitgliederMagnitude; - } - - public Long getAnzahlDerHaushaltsmitgliederMagnitude() { - return this.anzahlDerHaushaltsmitgliederMagnitude ; - } - - public void setWohnstatte(List wohnstatte) { - this.wohnstatte = wohnstatte; - } - - public List getWohnstatte() { - return this.wohnstatte ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java deleted file mode 100644 index cbc31e8f4..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Long; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class WohnsituationEvaluationContainment extends Containment { - public SelectAqlField WOHNSITUATION_EVALUATION = new AqlFieldImp(WohnsituationEvaluation.class, "", "WohnsituationEvaluation", WohnsituationEvaluation.class, this); - - public SelectAqlField BESCHREIBUNG_VALUE = new AqlFieldImp(WohnsituationEvaluation.class, "/data[at0001]/items[at0003]/value|value", "beschreibungValue", String.class, this); - - public SelectAqlField ANZAHL_DER_HAUSHALTSMITGLIEDER_MAGNITUDE = new AqlFieldImp(WohnsituationEvaluation.class, "/data[at0001]/items[at0007]/value|magnitude", "anzahlDerHaushaltsmitgliederMagnitude", Long.class, this); - - public ListSelectAqlField WOHNSTATTE = new ListAqlFieldImp(WohnsituationEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.dwelling.v0]", "wohnstatte", WohnstatteCluster.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(WohnsituationEvaluation.class, "/protocol[at0002]/items[at0011]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(WohnsituationEvaluation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(WohnsituationEvaluation.class, "/language", "language", Language.class, this); - - private WohnsituationEvaluationContainment() { - super("openEHR-EHR-EVALUATION.living_arrangement.v0"); - } - - public static WohnsituationEvaluationContainment getInstance() { - return new WohnsituationEvaluationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java deleted file mode 100644 index fc9502ecc..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.Long; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.dwelling.v0") -public class WohnstatteCluster { - @Path("/items[at0028]/value|magnitude") - private Long anzahlDerSchlafzimmerMagnitude; - - @Path("/items[at0003]") - private List erganzendeDetails; - - public void setAnzahlDerSchlafzimmerMagnitude(Long anzahlDerSchlafzimmerMagnitude) { - this.anzahlDerSchlafzimmerMagnitude = anzahlDerSchlafzimmerMagnitude; - } - - public Long getAnzahlDerSchlafzimmerMagnitude() { - return this.anzahlDerSchlafzimmerMagnitude ; - } - - public void setErganzendeDetails(List erganzendeDetails) { - this.erganzendeDetails = erganzendeDetails; - } - - public List getErganzendeDetails() { - return this.erganzendeDetails ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java deleted file mode 100644 index cc1d048f6..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.Long; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class WohnstatteClusterContainment extends Containment { - public SelectAqlField WOHNSTATTE_CLUSTER = new AqlFieldImp(WohnstatteCluster.class, "", "WohnstatteCluster", WohnstatteCluster.class, this); - - public SelectAqlField ANZAHL_DER_SCHLAFZIMMER_MAGNITUDE = new AqlFieldImp(WohnstatteCluster.class, "/items[at0028]/value|magnitude", "anzahlDerSchlafzimmerMagnitude", Long.class, this); - - public ListSelectAqlField ERGANZENDE_DETAILS = new ListAqlFieldImp(WohnstatteCluster.class, "/items[at0003]", "erganzendeDetails", Cluster.class, this); - - private WohnstatteClusterContainment() { - super("openEHR-EHR-CLUSTER.dwelling.v0"); - } - - public static WohnstatteClusterContainment getInstance() { - return new WohnstatteClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java deleted file mode 100644 index b336bb511..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java +++ /dev/null @@ -1,191 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -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 org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Id; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition.FallidentifikationCluster; -import org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition.ProblemDiagnoseEvaluation; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import org.ehrbase.client.openehrclient.VersionUid; - -@Entity -@Archetype("openEHR-EHR-COMPOSITION.report.v1") -@Template("Diagnose") -public class DiagnoseComposition { - @Path("/context/other_context[at0001]/items[at0002]/value|value") - private String berichtIdValue; - - @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]") - private FallidentifikationCluster fallidentifikation; - - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; - - @Path("/context/participations") - private List participations; - - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; - - @Path("/context/location") - private String location; - - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; - - @Path("/context/setting|defining_code") - private Setting settingDefiningCode; - - @Path("/content[openEHR-EHR-EVALUATION.problem_diagnosis.v1]") - private ProblemDiagnoseEvaluation problemDiagnose; - - @Path("/composer") - private PartyProxy composer; - - @Path("/language") - private Language language; - - @Path("/feeder_audit") - private FeederAudit feederAudit; - - @Path("/category|defining_code") - private Category categoryDefiningCode; - - @Path("/territory") - private Territory territory; - - @Id - private VersionUid versionUid; - - public void setBerichtIdValue(String berichtIdValue) { - this.berichtIdValue = berichtIdValue; - } - - public String getBerichtIdValue() { - return this.berichtIdValue ; - } - - public void setFallidentifikation(FallidentifikationCluster fallidentifikation) { - this.fallidentifikation = fallidentifikation; - } - - public FallidentifikationCluster getFallidentifikation() { - return this.fallidentifikation ; - } - - 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 setProblemDiagnose(ProblemDiagnoseEvaluation problemDiagnose) { - this.problemDiagnose = problemDiagnose; - } - - public ProblemDiagnoseEvaluation getProblemDiagnose() { - return this.problemDiagnose ; - } - - 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 setCategoryDefiningCode(Category categoryDefiningCode) { - this.categoryDefiningCode = categoryDefiningCode; - } - - public Category getCategoryDefiningCode() { - return this.categoryDefiningCode ; - } - - 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseCompositionContainment.java deleted file mode 100644 index 38cdaa960..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseCompositionContainment.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -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 org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition.FallidentifikationCluster; -import org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition.ProblemDiagnoseEvaluation; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; - -public class DiagnoseCompositionContainment extends Containment { - public SelectAqlField DIAGNOSE_COMPOSITION = new AqlFieldImp(DiagnoseComposition.class, "", "DiagnoseComposition", DiagnoseComposition.class, this); - - public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(DiagnoseComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); - - public SelectAqlField FALLIDENTIFIKATION = new AqlFieldImp(DiagnoseComposition.class, "/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]", "fallidentifikation", FallidentifikationCluster.class, this); - - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(DiagnoseComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(DiagnoseComposition.class, "/context/participations", "participations", Participation.class, this); - - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(DiagnoseComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - - public SelectAqlField LOCATION = new AqlFieldImp(DiagnoseComposition.class, "/context/location", "location", String.class, this); - - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(DiagnoseComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - - public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(DiagnoseComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - - public SelectAqlField PROBLEM_DIAGNOSE = new AqlFieldImp(DiagnoseComposition.class, "/content[openEHR-EHR-EVALUATION.problem_diagnosis.v1]", "problemDiagnose", ProblemDiagnoseEvaluation.class, this); - - public SelectAqlField COMPOSER = new AqlFieldImp(DiagnoseComposition.class, "/composer", "composer", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(DiagnoseComposition.class, "/language", "language", Language.class, this); - - public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(DiagnoseComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - - public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(DiagnoseComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - - public SelectAqlField TERRITORY = new AqlFieldImp(DiagnoseComposition.class, "/territory", "territory", Territory.class, this); - - private DiagnoseCompositionContainment() { - super("openEHR-EHR-COMPOSITION.report.v1"); - } - - public static DiagnoseCompositionContainment getInstance() { - return new DiagnoseCompositionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java deleted file mode 100644 index 0b1d9dc89..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.anatomical_location.v1") -public class AnatomischeLokalisationCluster { - @Path("/items[at0001]/value|value") - private String nameDerKorperstelleValue; - - @Path("/items[at0002]/value|defining_code") - private LateralitatDefiningCode lateralitatDefiningCode; - - @Path("/items[at0053]") - private List alternativeStruktur; - - @Path("/items[at0054]") - private List multimedialeDarstellung; - - public void setNameDerKorperstelleValue(String nameDerKorperstelleValue) { - this.nameDerKorperstelleValue = nameDerKorperstelleValue; - } - - public String getNameDerKorperstelleValue() { - return this.nameDerKorperstelleValue ; - } - - public void setLateralitatDefiningCode(LateralitatDefiningCode lateralitatDefiningCode) { - this.lateralitatDefiningCode = lateralitatDefiningCode; - } - - public LateralitatDefiningCode getLateralitatDefiningCode() { - return this.lateralitatDefiningCode ; - } - - public void setAlternativeStruktur(List alternativeStruktur) { - this.alternativeStruktur = alternativeStruktur; - } - - public List getAlternativeStruktur() { - return this.alternativeStruktur ; - } - - public void setMultimedialeDarstellung(List multimedialeDarstellung) { - this.multimedialeDarstellung = multimedialeDarstellung; - } - - public List getMultimedialeDarstellung() { - return this.multimedialeDarstellung ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationClusterContainment.java deleted file mode 100644 index 2024cf025..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationClusterContainment.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class AnatomischeLokalisationClusterContainment extends Containment { - public SelectAqlField ANATOMISCHE_LOKALISATION_CLUSTER = new AqlFieldImp(AnatomischeLokalisationCluster.class, "", "AnatomischeLokalisationCluster", AnatomischeLokalisationCluster.class, this); - - public SelectAqlField NAME_DER_KORPERSTELLE_VALUE = new AqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0001]/value|value", "nameDerKorperstelleValue", String.class, this); - - public SelectAqlField LATERALITAT_DEFINING_CODE = new AqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0002]/value|defining_code", "lateralitatDefiningCode", LateralitatDefiningCode.class, this); - - public ListSelectAqlField ALTERNATIVE_STRUKTUR = new ListAqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0053]", "alternativeStruktur", Cluster.class, this); - - public ListSelectAqlField MULTIMEDIALE_DARSTELLUNG = new ListAqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0054]", "multimedialeDarstellung", Cluster.class, this); - - private AnatomischeLokalisationClusterContainment() { - super("openEHR-EHR-CLUSTER.anatomical_location.v1"); - } - - public static AnatomischeLokalisationClusterContainment getInstance() { - return new AnatomischeLokalisationClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java deleted file mode 100644 index f0ca7cbe2..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import org.ehrbase.client.annotations.Choice; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class AtiopathogeneseAtiologieDerKrankheitElement { - @Path("/value") - @Choice - private AtiopathogeneseValueChoice value; - - public void setValue(AtiopathogeneseValueChoice value) { - this.value = value; - } - - public AtiopathogeneseValueChoice getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java deleted file mode 100644 index f366a1d19..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class AtiopathogeneseBeschreibungDesEntstehensElement { - @Path("/value|value") - private String value; - - public void setValue(String value) { - this.value = value; - } - - public String getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java deleted file mode 100644 index 3c6220c13..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.etiology.v1") -public class AtiopathogeneseCluster { - @Path("/items[at0001]") - private List atiologieDerKrankheit; - - @Path("/items[at0017]") - private List beschreibungDesEntstehens; - - public void setAtiologieDerKrankheit( - List atiologieDerKrankheit) { - this.atiologieDerKrankheit = atiologieDerKrankheit; - } - - public List getAtiologieDerKrankheit() { - return this.atiologieDerKrankheit ; - } - - public void setBeschreibungDesEntstehens( - List beschreibungDesEntstehens) { - this.beschreibungDesEntstehens = beschreibungDesEntstehens; - } - - public List getBeschreibungDesEntstehens() { - return this.beschreibungDesEntstehens ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseClusterContainment.java deleted file mode 100644 index 1537a1842..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseClusterContainment.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class AtiopathogeneseClusterContainment extends Containment { - public SelectAqlField ATIOPATHOGENESE_CLUSTER = new AqlFieldImp(AtiopathogeneseCluster.class, "", "AtiopathogeneseCluster", AtiopathogeneseCluster.class, this); - - public ListSelectAqlField ATIOLOGIE_DER_KRANKHEIT = new ListAqlFieldImp(AtiopathogeneseCluster.class, "/items[at0001]", "atiologieDerKrankheit", AtiopathogeneseAtiologieDerKrankheitElement.class, this); - - public ListSelectAqlField BESCHREIBUNG_DES_ENTSTEHENS = new ListAqlFieldImp(AtiopathogeneseCluster.class, "/items[at0017]", "beschreibungDesEntstehens", AtiopathogeneseBeschreibungDesEntstehensElement.class, this); - - private AtiopathogeneseClusterContainment() { - super("openEHR-EHR-CLUSTER.etiology.v1"); - } - - public static AtiopathogeneseClusterContainment getInstance() { - return new AtiopathogeneseClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueChoice.java deleted file mode 100644 index 0d9980666..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -public interface AtiopathogeneseValueChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java deleted file mode 100644 index eae7a5b08..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class AtiopathogeneseValueDvCodedText implements AtiopathogeneseValueChoice { - @Path("|defining_code") - private ValueDefiningCode valueDefiningCode; - - public void setValueDefiningCode(ValueDefiningCode valueDefiningCode) { - this.valueDefiningCode = valueDefiningCode; - } - - public ValueDefiningCode getValueDefiningCode() { - return this.valueDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java deleted file mode 100644 index a949ba251..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class AtiopathogeneseValueDvText implements AtiopathogeneseValueChoice { - @Path("|value") - private String valueValue; - - public void setValueValue(String valueValue) { - this.valueValue = valueValue; - } - - public String getValueValue() { - return this.valueValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java deleted file mode 100644 index f2a27f682..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import java.lang.Boolean; -import java.lang.String; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.diagnose_details.v0") -public class DiagnosedetailsCluster { - @Path("/items[at0001]/value|value") - private String begrundungVonAusnahmenValue; - - @Path("/items[at0002]/value|value") - private String diagnosetypValue; - - @Path("/items[at0016]/value|value") - private Boolean vorhandenBeiAufnahmeValue; - - @Path("/items[at0017]/value|value") - private Boolean vorhandenBeiEntlassungValue; - - public void setBegrundungVonAusnahmenValue(String begrundungVonAusnahmenValue) { - this.begrundungVonAusnahmenValue = begrundungVonAusnahmenValue; - } - - public String getBegrundungVonAusnahmenValue() { - return this.begrundungVonAusnahmenValue ; - } - - public void setDiagnosetypValue(String diagnosetypValue) { - this.diagnosetypValue = diagnosetypValue; - } - - public String getDiagnosetypValue() { - return this.diagnosetypValue ; - } - - public void setVorhandenBeiAufnahmeValue(Boolean vorhandenBeiAufnahmeValue) { - this.vorhandenBeiAufnahmeValue = vorhandenBeiAufnahmeValue; - } - - public Boolean isVorhandenBeiAufnahmeValue() { - return this.vorhandenBeiAufnahmeValue ; - } - - public void setVorhandenBeiEntlassungValue(Boolean vorhandenBeiEntlassungValue) { - this.vorhandenBeiEntlassungValue = vorhandenBeiEntlassungValue; - } - - public Boolean isVorhandenBeiEntlassungValue() { - return this.vorhandenBeiEntlassungValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsClusterContainment.java deleted file mode 100644 index 711fc365e..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsClusterContainment.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import java.lang.Boolean; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class DiagnosedetailsClusterContainment extends Containment { - public SelectAqlField DIAGNOSEDETAILS_CLUSTER = new AqlFieldImp(DiagnosedetailsCluster.class, "", "DiagnosedetailsCluster", DiagnosedetailsCluster.class, this); - - public SelectAqlField BEGRUNDUNG_VON_AUSNAHMEN_VALUE = new AqlFieldImp(DiagnosedetailsCluster.class, "/items[at0001]/value|value", "begrundungVonAusnahmenValue", String.class, this); - - public SelectAqlField DIAGNOSETYP_VALUE = new AqlFieldImp(DiagnosedetailsCluster.class, "/items[at0002]/value|value", "diagnosetypValue", String.class, this); - - public SelectAqlField VORHANDEN_BEI_AUFNAHME_VALUE = new AqlFieldImp(DiagnosedetailsCluster.class, "/items[at0016]/value|value", "vorhandenBeiAufnahmeValue", Boolean.class, this); - - public SelectAqlField VORHANDEN_BEI_ENTLASSUNG_VALUE = new AqlFieldImp(DiagnosedetailsCluster.class, "/items[at0017]/value|value", "vorhandenBeiEntlassungValue", Boolean.class, this); - - private DiagnosedetailsClusterContainment() { - super("openEHR-EHR-CLUSTER.diagnose_details.v0"); - } - - public static DiagnosedetailsClusterContainment getInstance() { - return new DiagnosedetailsClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnostischeSicherheitDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnostischeSicherheitDefiningcode.java deleted file mode 100644 index 46bbc223c..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnostischeSicherheitDefiningcode.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum DiagnostischeSicherheitDefiningCode implements EnumValueSet { - WAHRSCHEINLICH("Wahrscheinlich", "Die Diagnose wurde mit einem hohen Maß an Sicherheit gestellt.", "local", "at0075"), - - VERMUTET("Vermutet", "Die Diagnose wurde mit einem niedrigen Grad an Sicherheit gestellt.", "local", "at0074"), - - BESTATIGT("Bestätigt", "Die Diagnose wurde anhand anerkannter Kriterien bestätigt.", "local", "at0076"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - DiagnostischeSicherheitDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java deleted file mode 100644 index a4a8fe88f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.case_identification.v0") -public class FallidentifikationCluster { - @Path("/items[at0001]/value|value") - private String fallKennungValue; - - public void setFallKennungValue(String fallKennungValue) { - this.fallKennungValue = fallKennungValue; - } - - public String getFallKennungValue() { - return this.fallKennungValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationClusterContainment.java deleted file mode 100644 index de91985e6..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationClusterContainment.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class FallidentifikationClusterContainment extends Containment { - public SelectAqlField FALLIDENTIFIKATION_CLUSTER = new AqlFieldImp(FallidentifikationCluster.class, "", "FallidentifikationCluster", FallidentifikationCluster.class, this); - - public SelectAqlField FALL_KENNUNG_VALUE = new AqlFieldImp(FallidentifikationCluster.class, "/items[at0001]/value|value", "fallKennungValue", String.class, this); - - private FallidentifikationClusterContainment() { - super("openEHR-EHR-CLUSTER.case_identification.v0"); - } - - public static FallidentifikationClusterContainment getInstance() { - return new FallidentifikationClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/LateralitatDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/LateralitatDefiningcode.java deleted file mode 100644 index 7750c3f15..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/LateralitatDefiningcode.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum LateralitatDefiningCode implements EnumValueSet { - LINKS_UND_RECHTS("Links und Rechts", "Beide Körperseiten.", "local", "at0086"), - - LINKS("Links", "Die linke Körperseite.", "local", "at0003"), - - RECHTS("Rechts", "Die rechte Körperseite.", "local", "at0004"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - LateralitatDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/NameDesProblemsDerDiagnoseDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/NameDesProblemsDerDiagnoseDefiningcode.java deleted file mode 100644 index 1c1938d9c..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/NameDesProblemsDerDiagnoseDefiningcode.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum NameDesProblemsDerDiagnoseDefiningCode implements EnumValueSet { - COVID19_VIRUS_NACHGEWIESEN("COVID-19, Virus nachgewiesen", "COVID-19, Virus nachgewiesen", "ICD-10-GM-2020", "U07.1"), - - INFEKTION_DURCH_KORONAVIREN_NICHT_NAHER_BEZEICHNETER_LOKALISATION("Infektion durch Koronaviren nicht näher bezeichneter Lokalisation", "Infektion durch Koronaviren nicht näher bezeichneter Lokalisation", "ICD-10-GM-2020", "B34.2"), - - KORONAVIREN_ALS_URSACHE_VON_KRANKHEITEN_DIE_IN_ANDEREN_KAPITELN_KLASSIFIZIERT_SIND("Koronaviren als Ursache von Krankheiten, die in anderen Kapiteln klassifiziert sind", "Koronaviren als Ursache von Krankheiten, die in anderen Kapiteln klassifiziert sind", "ICD-10-GM-2020", "B97.2"), - - COVID19_VIRUS_NICHT_NACHGEWIESEN("COVID-19, Virus nicht nachgewiesen", "COVID-19, Virus nicht nachgewiesen", "ICD-10-GM-2020", "U07.2"); - - 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitChoice.java deleted file mode 100644 index 0315f86e9..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -public interface ProblemDiagnoseDiagnostischeSicherheitChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java deleted file mode 100644 index 914e22dd8..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class ProblemDiagnoseDiagnostischeSicherheitDvCodedText implements ProblemDiagnoseDiagnostischeSicherheitChoice { - @Path("|defining_code") - private DiagnostischeSicherheitDefiningCode diagnostischeSicherheitDefiningCode; - - public void setDiagnostischeSicherheitDefiningCode( - DiagnostischeSicherheitDefiningCode diagnostischeSicherheitDefiningCode) { - this.diagnostischeSicherheitDefiningCode = diagnostischeSicherheitDefiningCode; - } - - public DiagnostischeSicherheitDefiningCode getDiagnostischeSicherheitDefiningCode() { - return this.diagnostischeSicherheitDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java deleted file mode 100644 index c5c0ef601..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class ProblemDiagnoseDiagnostischeSicherheitDvText implements ProblemDiagnoseDiagnostischeSicherheitChoice { - @Path("|value") - private String diagnostischeSicherheitValue; - - public void setDiagnostischeSicherheitValue(String diagnostischeSicherheitValue) { - this.diagnostischeSicherheitValue = diagnostischeSicherheitValue; - } - - public String getDiagnostischeSicherheitValue() { - return this.diagnostischeSicherheitValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java deleted file mode 100644 index 9c34f3cd1..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java +++ /dev/null @@ -1,209 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -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.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-EVALUATION.problem_diagnosis.v1") -public class ProblemDiagnoseEvaluation { - @Path("/data[at0001]/items[at0002]/value|defining_code") - private NameDesProblemsDerDiagnoseDefiningCode nameDesProblemsDerDiagnoseDefiningCode; - - @Path("/data[at0001]/items[at0009 and name/value='Freitextbeschreibung']/value|value") - private String freitextbeschreibungValue; - - @Path("/data[at0001]/items[at0012 and name/value='Lokalisation']/value|value") - private String lokalisationValue; - - @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.anatomical_location.v1]") - private List anatomischeLokalisation; - - @Path("/data[at0001]/items[at0077 and name/value='Datum des Auftretens/der Erstdiagnose']/value|value") - private TemporalAccessor datumDesAuftretensDerErstdiagnoseValue; - - @Path("/data[at0001]/items[at0003 and name/value='Feststellungsdatum']/value|value") - private TemporalAccessor feststellungsdatumValue; - - @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.diagnose_details.v0]") - private DiagnosedetailsCluster diagnosedetails; - - @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.etiology.v1]") - private AtiopathogeneseCluster atiopathogenese; - - @Path("/data[at0001]/items[at0030]/value|value") - private TemporalAccessor datumZeitpunktDerGenesungValue; - - @Path("/data[at0001]/items[at0046]") - private List status; - - @Path("/data[at0001]/items[at0069 and name/value='Diagnoseerläuterung']/value|value") - private String diagnoseerlauterungValue; - - @Path("/protocol[at0032]/items[at0070 and name/value='Letztes Dokumentationsdatum']/value|value") - private TemporalAccessor letztesDokumentationsdatumValue; - - @Path("/protocol[at0032]/items[at0071]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - @Path("/data[at0001]/items[at0073]/value") - @Choice - private ProblemDiagnoseDiagnostischeSicherheitChoice diagnostischeSicherheit; - - @Path("/data[at0001]/items[at0005]/value") - @Choice - private ProblemDiagnoseSchweregradChoice schweregrad; - - public void setNameDesProblemsDerDiagnoseDefiningCode( - NameDesProblemsDerDiagnoseDefiningCode nameDesProblemsDerDiagnoseDefiningCode) { - this.nameDesProblemsDerDiagnoseDefiningCode = nameDesProblemsDerDiagnoseDefiningCode; - } - - public NameDesProblemsDerDiagnoseDefiningCode getNameDesProblemsDerDiagnoseDefiningCode() { - return this.nameDesProblemsDerDiagnoseDefiningCode ; - } - - public void setFreitextbeschreibungValue(String freitextbeschreibungValue) { - this.freitextbeschreibungValue = freitextbeschreibungValue; - } - - public String getFreitextbeschreibungValue() { - return this.freitextbeschreibungValue ; - } - - public void setLokalisationValue(String lokalisationValue) { - this.lokalisationValue = lokalisationValue; - } - - public String getLokalisationValue() { - return this.lokalisationValue ; - } - - public void setAnatomischeLokalisation( - List anatomischeLokalisation) { - this.anatomischeLokalisation = anatomischeLokalisation; - } - - public List getAnatomischeLokalisation() { - return this.anatomischeLokalisation ; - } - - public void setDatumDesAuftretensDerErstdiagnoseValue( - TemporalAccessor datumDesAuftretensDerErstdiagnoseValue) { - this.datumDesAuftretensDerErstdiagnoseValue = datumDesAuftretensDerErstdiagnoseValue; - } - - public TemporalAccessor getDatumDesAuftretensDerErstdiagnoseValue() { - return this.datumDesAuftretensDerErstdiagnoseValue ; - } - - public void setFeststellungsdatumValue(TemporalAccessor feststellungsdatumValue) { - this.feststellungsdatumValue = feststellungsdatumValue; - } - - public TemporalAccessor getFeststellungsdatumValue() { - return this.feststellungsdatumValue ; - } - - public void setDiagnosedetails(DiagnosedetailsCluster diagnosedetails) { - this.diagnosedetails = diagnosedetails; - } - - public DiagnosedetailsCluster getDiagnosedetails() { - return this.diagnosedetails ; - } - - public void setAtiopathogenese(AtiopathogeneseCluster atiopathogenese) { - this.atiopathogenese = atiopathogenese; - } - - public AtiopathogeneseCluster getAtiopathogenese() { - return this.atiopathogenese ; - } - - public void setDatumZeitpunktDerGenesungValue(TemporalAccessor datumZeitpunktDerGenesungValue) { - this.datumZeitpunktDerGenesungValue = datumZeitpunktDerGenesungValue; - } - - public TemporalAccessor getDatumZeitpunktDerGenesungValue() { - return this.datumZeitpunktDerGenesungValue ; - } - - public void setStatus(List status) { - this.status = status; - } - - public List getStatus() { - return this.status ; - } - - public void setDiagnoseerlauterungValue(String diagnoseerlauterungValue) { - this.diagnoseerlauterungValue = diagnoseerlauterungValue; - } - - public String getDiagnoseerlauterungValue() { - return this.diagnoseerlauterungValue ; - } - - public void setLetztesDokumentationsdatumValue(TemporalAccessor letztesDokumentationsdatumValue) { - this.letztesDokumentationsdatumValue = letztesDokumentationsdatumValue; - } - - public TemporalAccessor getLetztesDokumentationsdatumValue() { - return this.letztesDokumentationsdatumValue ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } - - public void setDiagnostischeSicherheit( - ProblemDiagnoseDiagnostischeSicherheitChoice diagnostischeSicherheit) { - this.diagnostischeSicherheit = diagnostischeSicherheit; - } - - public ProblemDiagnoseDiagnostischeSicherheitChoice getDiagnostischeSicherheit() { - return this.diagnostischeSicherheit ; - } - - public void setSchweregrad(ProblemDiagnoseSchweregradChoice schweregrad) { - this.schweregrad = schweregrad; - } - - public ProblemDiagnoseSchweregradChoice getSchweregrad() { - return this.schweregrad ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluationContainment.java deleted file mode 100644 index 0f6791fce..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluationContainment.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class ProblemDiagnoseEvaluationContainment extends Containment { - public SelectAqlField PROBLEM_DIAGNOSE_EVALUATION = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "", "ProblemDiagnoseEvaluation", ProblemDiagnoseEvaluation.class, this); - - public SelectAqlField NAME_DES_PROBLEMS_DER_DIAGNOSE_DEFINING_CODE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0002]/value|defining_code", "nameDesProblemsDerDiagnoseDefiningCode", NameDesProblemsDerDiagnoseDefiningCode.class, this); - - public SelectAqlField FREITEXTBESCHREIBUNG_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0009]/value|value", "freitextbeschreibungValue", String.class, this); - - public SelectAqlField LOKALISATION_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0012]/value|value", "lokalisationValue", String.class, this); - - public ListSelectAqlField ANATOMISCHE_LOKALISATION = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.anatomical_location.v1]", "anatomischeLokalisation", AnatomischeLokalisationCluster.class, this); - - public SelectAqlField DATUM_DES_AUFTRETENS_DER_ERSTDIAGNOSE_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0077]/value|value", "datumDesAuftretensDerErstdiagnoseValue", TemporalAccessor.class, this); - - public SelectAqlField FESTSTELLUNGSDATUM_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0003]/value|value", "feststellungsdatumValue", TemporalAccessor.class, this); - - public SelectAqlField DIAGNOSEDETAILS = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.diagnose_details.v0]", "diagnosedetails", DiagnosedetailsCluster.class, this); - - public SelectAqlField ATIOPATHOGENESE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.etiology.v1]", "atiopathogenese", AtiopathogeneseCluster.class, this); - - public SelectAqlField DATUM_ZEITPUNKT_DER_GENESUNG_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0030]/value|value", "datumZeitpunktDerGenesungValue", TemporalAccessor.class, this); - - public ListSelectAqlField STATUS = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0046]", "status", Cluster.class, this); - - public SelectAqlField DIAGNOSEERLAUTERUNG_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0069]/value|value", "diagnoseerlauterungValue", String.class, this); - - public SelectAqlField LETZTES_DOKUMENTATIONSDATUM_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/protocol[at0032]/items[at0070]/value|value", "letztesDokumentationsdatumValue", TemporalAccessor.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/protocol[at0032]/items[at0071]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/language", "language", Language.class, this); - - public SelectAqlField DIAGNOSTISCHE_SICHERHEIT = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0073]/value", "diagnostischeSicherheit", ProblemDiagnoseDiagnostischeSicherheitChoice.class, this); - - public SelectAqlField SCHWEREGRAD = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0005]/value", "schweregrad", ProblemDiagnoseSchweregradChoice.class, this); - - private ProblemDiagnoseEvaluationContainment() { - super("openEHR-EHR-EVALUATION.problem_diagnosis.v1"); - } - - public static ProblemDiagnoseEvaluationContainment getInstance() { - return new ProblemDiagnoseEvaluationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradChoice.java deleted file mode 100644 index e7ad2f230..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -public interface ProblemDiagnoseSchweregradChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java deleted file mode 100644 index 2cd7ab223..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class ProblemDiagnoseSchweregradDvCodedText implements ProblemDiagnoseSchweregradChoice { - @Path("|defining_code") - private SchweregradDefiningCode schweregradDefiningCode; - - public void setSchweregradDefiningCode(SchweregradDefiningCode schweregradDefiningCode) { - this.schweregradDefiningCode = schweregradDefiningCode; - } - - public SchweregradDefiningCode getSchweregradDefiningCode() { - return this.schweregradDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java deleted file mode 100644 index 40ca76c9f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class ProblemDiagnoseSchweregradDvText implements ProblemDiagnoseSchweregradChoice { - @Path("|value") - private String schweregradValue; - - public void setSchweregradValue(String schweregradValue) { - this.schweregradValue = schweregradValue; - } - - public String getSchweregradValue() { - return this.schweregradValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/SchweregradDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/SchweregradDefiningcode.java deleted file mode 100644 index d2c8cd49a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/SchweregradDefiningcode.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum SchweregradDefiningCode implements EnumValueSet { - SCHWER("Schwer", "Das Problem oder die Diagnose verhindert die normale Aktivität oder verursacht schwerwiegende gesundheitliche Schäden, falls es nicht behandelt wird.", "local", "at0049"), - - MASSIG("Mäßig", "Das Problem oder die Diagnose beeinträchtigt die normale Aktivität oder verursacht bleibende gesundheitliche Schäden, falls es nicht behandelt wird.", "local", "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.", "local", "at0047"); - - private String value; - - private String description; - - private String terminologyId; - - private String 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 getDescription() { - return this.description ; - } - - public String getTerminologyId() { - return this.terminologyId ; - } - - public String getCode() { - return this.code ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ValueDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ValueDefiningcode.java deleted file mode 100644 index 4cccc7739..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ValueDefiningcode.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum ValueDefiningCode implements EnumValueSet { - LEBENSWANDEL_BEZOGENE_FAKTOREN("Lebenswandel-bezogene Faktoren", "z. B. Rauchen, Alkoholismus", "local", "at0013"), - - GENETISCHE_HERKUNFT("Genetische Herkunft", "z. B Sichelzellenanämie", "local", "at0009"), - - KORPERLICHE_VERLETZUNG("Körperliche Verletzung", "z.B. Kopftrauma, Hitzeerschöpfung, Verletzung durch Strahlenbelastung", "local", "at0012"), - - ARBEITSRISIKOFAKTOREN("Arbeitsrisikofaktoren", "z.B. Asbestexposition", "local", "at0005"), - - IMMUNOLOGISCHE_HERKUNFT("Immunologische Herkunft", "z.B. systemische Lupus erythematodes, AIDS (als Grundursache für Kaposis Sarkom)", "local", "at0010"), - - BIOLOGISCH("Biologisch", "z.B. Alter, Geschlecht", "local", "at0006"), - - INFEKTION("Infektion", "z.B. Hepatitis C", "local", "at0011"), - - NEUROPSYCHIATRISCHE_HERKUNFT("Neuropsychiatrische Herkunft", "z. B. Alzheimer-Krankheit, Depression", "local", "at0015"), - - METABOLISCH_ENDOKRINER_HERKUNFT("Metabolisch-endokriner Herkunft", "z. B. Akromegalie, Diabetes", "local", "at0014"), - - UMWELTEXPOSITION("Umweltexposition", "z.B. UV-Strahlung aussetzen, Feinstaub Aussetzung", "local", "at0016"), - - SONSTIGES("Sonstiges", "Sonstige Ursachen, die mit vorgegebenen Werten nicht dargestellt werden können", "local", "at0018"), - - CHEMISCHE_VERLETZUNG("Chemische Verletzung", "z. B. Gift, Medikament", "local", "at0007"), - - ERNAHRUNGSRELEVANTE_FAKTOREN("Ernährungsrelevante Faktoren", "z. B. Eisenmangel, kohlenhydratreiche Ernährung", "local", "at0008"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - ValueDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java deleted file mode 100644 index b71f402dc..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java +++ /dev/null @@ -1,182 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -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 org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Id; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.BloodPressureTrainingSampleObservation; -import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.DeviceDetailsTrainingSampleCluster; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import org.ehrbase.client.openehrclient.VersionUid; - -@Entity -@Archetype("openEHR-EHR-COMPOSITION.sample_encounter.v1") -@Template("ehrbase_blood_pressure_simple.de.v0") -public class EhrbaseBloodPressureSimpleDeV0Composition { - @Path("/context/other_context[at0001]/items[at0006]/items[openEHR-EHR-CLUSTER.sample_device.v1]") - private List deviceDetailsTrainingSample; - - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; - - @Path("/context/participations") - private List participations; - - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; - - @Path("/context/location") - private String location; - - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; - - @Path("/context/setting|defining_code") - private Setting settingDefiningCode; - - @Path("/content[openEHR-EHR-OBSERVATION.sample_blood_pressure.v1]") - private List bloodPressureTrainingSample; - - @Path("/composer") - private PartyProxy composer; - - @Path("/language") - private Language language; - - @Path("/feeder_audit") - private FeederAudit feederAudit; - - @Path("/category|defining_code") - private Category categoryDefiningCode; - - @Path("/territory") - private Territory territory; - - @Id - private VersionUid versionUid; - - public void setDeviceDetailsTrainingSample( - List deviceDetailsTrainingSample) { - this.deviceDetailsTrainingSample = deviceDetailsTrainingSample; - } - - public List getDeviceDetailsTrainingSample() { - return this.deviceDetailsTrainingSample ; - } - - 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 setBloodPressureTrainingSample( - List bloodPressureTrainingSample) { - this.bloodPressureTrainingSample = bloodPressureTrainingSample; - } - - public List getBloodPressureTrainingSample() { - return this.bloodPressureTrainingSample ; - } - - 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 setCategoryDefiningCode(Category categoryDefiningCode) { - this.categoryDefiningCode = categoryDefiningCode; - } - - public Category getCategoryDefiningCode() { - return this.categoryDefiningCode ; - } - - 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java deleted file mode 100644 index 0685ac3c8..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -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 org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.BloodPressureTrainingSampleObservation; -import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.DeviceDetailsTrainingSampleCluster; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; - -public class EhrbaseBloodPressureSimpleDeV0CompositionContainment extends Containment { - public SelectAqlField EHRBASE_BLOOD_PRESSURE_SIMPLE_DE_V0_COMPOSITION = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "", "EhrbaseBloodPressureSimpleDeV0Composition", EhrbaseBloodPressureSimpleDeV0Composition.class, this); - - public ListSelectAqlField DEVICE_DETAILS_TRAINING_SAMPLE = new ListAqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/other_context[at0001]/items[at0006]/items[openEHR-EHR-CLUSTER.sample_device.v1]", "deviceDetailsTrainingSample", DeviceDetailsTrainingSampleCluster.class, this); - - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/participations", "participations", Participation.class, this); - - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - - public SelectAqlField LOCATION = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/location", "location", String.class, this); - - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - - public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - - public ListSelectAqlField BLOOD_PRESSURE_TRAINING_SAMPLE = new ListAqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/content[openEHR-EHR-OBSERVATION.sample_blood_pressure.v1]", "bloodPressureTrainingSample", BloodPressureTrainingSampleObservation.class, this); - - public SelectAqlField COMPOSER = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/composer", "composer", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/language", "language", Language.class, this); - - public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - - public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - - public SelectAqlField TERRITORY = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/territory", "territory", Territory.class, this); - - private EhrbaseBloodPressureSimpleDeV0CompositionContainment() { - super("openEHR-EHR-COMPOSITION.sample_encounter.v1"); - } - - public static EhrbaseBloodPressureSimpleDeV0CompositionContainment getInstance() { - return new EhrbaseBloodPressureSimpleDeV0CompositionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java deleted file mode 100644 index 84af6356c..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java +++ /dev/null @@ -1,249 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Double; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.sample_blood_pressure.v1") -public class BloodPressureTrainingSampleObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude") - private Double systolicMagnitude; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units") - private String systolicUnits; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|magnitude") - private Double diastolicMagnitude; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|units") - private String diastolicUnits; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|magnitude") - private Double meanArterialPressureMagnitude; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|units") - private String meanArterialPressureUnits; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|magnitude") - private Double pulsePressureMagnitude; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|units") - private String pulsePressureUnits; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0033]/value|value") - private String commentValue; - - @Path("/data[at0001]/events[at0002]/state[at0007]/items[at0008]/value|defining_code") - private PositionDefiningCode positionDefiningCode; - - @Path("/data[at0001]/events[at0002]/state[at0007]/items[at1030]") - private List levelOfExertion; - - @Path("/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|magnitude") - private Double tiltMagnitude; - - @Path("/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|units") - private String tiltUnits; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0011]/items[at0013]/value|defining_code") - private CuffSizeDefiningCode cuffSizeDefiningCode; - - @Path("/protocol[at0011]/items[at0014]/value|defining_code") - private LocationOfMeasurementDefiningCode locationOfMeasurementDefiningCode; - - @Path("/protocol[at0011]/items[at1010]/value|defining_code") - private KorotkoffSoundsDefiningCode korotkoffSoundsDefiningCode; - - @Path("/protocol[at0011]/items[at1025]") - private List device; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setSystolicMagnitude(Double systolicMagnitude) { - this.systolicMagnitude = systolicMagnitude; - } - - public Double getSystolicMagnitude() { - return this.systolicMagnitude ; - } - - public void setSystolicUnits(String systolicUnits) { - this.systolicUnits = systolicUnits; - } - - public String getSystolicUnits() { - return this.systolicUnits ; - } - - public void setDiastolicMagnitude(Double diastolicMagnitude) { - this.diastolicMagnitude = diastolicMagnitude; - } - - public Double getDiastolicMagnitude() { - return this.diastolicMagnitude ; - } - - public void setDiastolicUnits(String diastolicUnits) { - this.diastolicUnits = diastolicUnits; - } - - public String getDiastolicUnits() { - return this.diastolicUnits ; - } - - public void setMeanArterialPressureMagnitude(Double meanArterialPressureMagnitude) { - this.meanArterialPressureMagnitude = meanArterialPressureMagnitude; - } - - public Double getMeanArterialPressureMagnitude() { - return this.meanArterialPressureMagnitude ; - } - - public void setMeanArterialPressureUnits(String meanArterialPressureUnits) { - this.meanArterialPressureUnits = meanArterialPressureUnits; - } - - public String getMeanArterialPressureUnits() { - return this.meanArterialPressureUnits ; - } - - public void setPulsePressureMagnitude(Double pulsePressureMagnitude) { - this.pulsePressureMagnitude = pulsePressureMagnitude; - } - - public Double getPulsePressureMagnitude() { - return this.pulsePressureMagnitude ; - } - - public void setPulsePressureUnits(String pulsePressureUnits) { - this.pulsePressureUnits = pulsePressureUnits; - } - - public String getPulsePressureUnits() { - return this.pulsePressureUnits ; - } - - public void setCommentValue(String commentValue) { - this.commentValue = commentValue; - } - - public String getCommentValue() { - return this.commentValue ; - } - - public void setPositionDefiningCode(PositionDefiningCode positionDefiningCode) { - this.positionDefiningCode = positionDefiningCode; - } - - public PositionDefiningCode getPositionDefiningCode() { - return this.positionDefiningCode ; - } - - public void setLevelOfExertion(List levelOfExertion) { - this.levelOfExertion = levelOfExertion; - } - - public List getLevelOfExertion() { - return this.levelOfExertion ; - } - - public void setTiltMagnitude(Double tiltMagnitude) { - this.tiltMagnitude = tiltMagnitude; - } - - public Double getTiltMagnitude() { - return this.tiltMagnitude ; - } - - public void setTiltUnits(String tiltUnits) { - this.tiltUnits = tiltUnits; - } - - public String getTiltUnits() { - return this.tiltUnits ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setCuffSizeDefiningCode(CuffSizeDefiningCode cuffSizeDefiningCode) { - this.cuffSizeDefiningCode = cuffSizeDefiningCode; - } - - public CuffSizeDefiningCode getCuffSizeDefiningCode() { - return this.cuffSizeDefiningCode ; - } - - public void setLocationOfMeasurementDefiningCode( - LocationOfMeasurementDefiningCode locationOfMeasurementDefiningCode) { - this.locationOfMeasurementDefiningCode = locationOfMeasurementDefiningCode; - } - - public LocationOfMeasurementDefiningCode getLocationOfMeasurementDefiningCode() { - return this.locationOfMeasurementDefiningCode ; - } - - public void setKorotkoffSoundsDefiningCode( - KorotkoffSoundsDefiningCode korotkoffSoundsDefiningCode) { - this.korotkoffSoundsDefiningCode = korotkoffSoundsDefiningCode; - } - - public KorotkoffSoundsDefiningCode getKorotkoffSoundsDefiningCode() { - return this.korotkoffSoundsDefiningCode ; - } - - public void setDevice(List device) { - this.device = device; - } - - public List getDevice() { - return this.device ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java deleted file mode 100644 index 3b944c814..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Double; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class BloodPressureTrainingSampleObservationContainment extends Containment { - public SelectAqlField BLOOD_PRESSURE_TRAINING_SAMPLE_OBSERVATION = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "", "BloodPressureTrainingSampleObservation", BloodPressureTrainingSampleObservation.class, this); - - public SelectAqlField SYSTOLIC_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude", "systolicMagnitude", Double.class, this); - - public SelectAqlField SYSTOLIC_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units", "systolicUnits", String.class, this); - - public SelectAqlField DIASTOLIC_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|magnitude", "diastolicMagnitude", Double.class, this); - - public SelectAqlField DIASTOLIC_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|units", "diastolicUnits", String.class, this); - - public SelectAqlField MEAN_ARTERIAL_PRESSURE_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|magnitude", "meanArterialPressureMagnitude", Double.class, this); - - public SelectAqlField MEAN_ARTERIAL_PRESSURE_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|units", "meanArterialPressureUnits", String.class, this); - - public SelectAqlField PULSE_PRESSURE_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|magnitude", "pulsePressureMagnitude", Double.class, this); - - public SelectAqlField PULSE_PRESSURE_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|units", "pulsePressureUnits", String.class, this); - - public SelectAqlField COMMENT_VALUE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0033]/value|value", "commentValue", String.class, this); - - public SelectAqlField POSITION_DEFINING_CODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/state[at0007]/items[at0008]/value|defining_code", "positionDefiningCode", PositionDefiningCode.class, this); - - public ListSelectAqlField LEVEL_OF_EXERTION = new ListAqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/state[at0007]/items[at1030]", "levelOfExertion", Cluster.class, this); - - public SelectAqlField TILT_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|magnitude", "tiltMagnitude", Double.class, this); - - public SelectAqlField TILT_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|units", "tiltUnits", String.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public SelectAqlField CUFF_SIZE_DEFINING_CODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at0013]/value|defining_code", "cuffSizeDefiningCode", CuffSizeDefiningCode.class, this); - - public SelectAqlField LOCATION_OF_MEASUREMENT_DEFINING_CODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at0014]/value|defining_code", "locationOfMeasurementDefiningCode", LocationOfMeasurementDefiningCode.class, this); - - public SelectAqlField KOROTKOFF_SOUNDS_DEFINING_CODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at1010]/value|defining_code", "korotkoffSoundsDefiningCode", KorotkoffSoundsDefiningCode.class, this); - - public ListSelectAqlField DEVICE = new ListAqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at1025]", "device", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/language", "language", Language.class, this); - - private BloodPressureTrainingSampleObservationContainment() { - super("openEHR-EHR-OBSERVATION.sample_blood_pressure.v1"); - } - - public static BloodPressureTrainingSampleObservationContainment getInstance() { - return new BloodPressureTrainingSampleObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningcode.java deleted file mode 100644 index 90849c773..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningcode.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum CuffSizeDefiningCode implements EnumValueSet { - PAEDIATRIC_CHILD("Paediatric/Child", "A cuff that is appropriate for a child or thin arm - bladder approx 8cm x 21\n" - + " cm\n" - + " ", "local", "at0017"), - - ADULT_THIGH("Adult Thigh", "A cuff used for an adult thigh - bladder approx 20cm x 42 cm", "local", "at1008"), - - LARGE_ADULT("Large Adult", "A cuff for adults with larger arms - bladder approx 16cm x 38cm", "local", "at0016"), - - ADULT("Adult", "A cuff that is standard for an adult - bladder approx 13cm x 30cm", "local", "at0015"), - - INFANT("Infant", "A cuff used for infants - bladder approx 5cm x 15cm", "local", "at1018"), - - NEONATAL("Neonatal", "A cuff used for a new born - bladder approx 3cm x 6cm", "local", "at1009"), - - SMALL_ADULT("Small Adult", "A cuff used for a small adult - bladder approx 10cm x 24 cm", "local", "at1019"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - CuffSizeDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java deleted file mode 100644 index 75d4972c0..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java +++ /dev/null @@ -1,111 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.sample_device.v1") -public class DeviceDetailsTrainingSampleCluster { - @Path("/items[at0001]/value|value") - private String nameValue; - - @Path("/items[at0002]/value|value") - private String descriptionValue; - - @Path("/items[at0004]/items[at0003]/value|value") - private String manufacturerValue; - - @Path("/items[at0004]/items[at0005]/value|value") - private String modelValue; - - @Path("/items[at0004]/items[at0006]/value|value") - private String serialNumberValue; - - @Path("/items[at0007]") - private Cluster components; - - @Path("/items[at0008]/items[at0009]/value|value") - private TemporalAccessor dateLastServicedValue; - - @Path("/items[at0008]/items[at0010]/value|value") - private TemporalAccessor dateLastCalibrationValue; - - @Path("/items[at0008]/items[at0011]/value|value") - private String servicedByValue; - - public void setNameValue(String nameValue) { - this.nameValue = nameValue; - } - - public String getNameValue() { - return this.nameValue ; - } - - public void setDescriptionValue(String descriptionValue) { - this.descriptionValue = descriptionValue; - } - - public String getDescriptionValue() { - return this.descriptionValue ; - } - - public void setManufacturerValue(String manufacturerValue) { - this.manufacturerValue = manufacturerValue; - } - - public String getManufacturerValue() { - return this.manufacturerValue ; - } - - public void setModelValue(String modelValue) { - this.modelValue = modelValue; - } - - public String getModelValue() { - return this.modelValue ; - } - - public void setSerialNumberValue(String serialNumberValue) { - this.serialNumberValue = serialNumberValue; - } - - public String getSerialNumberValue() { - return this.serialNumberValue ; - } - - public void setComponents(Cluster components) { - this.components = components; - } - - public Cluster getComponents() { - return this.components ; - } - - public void setDateLastServicedValue(TemporalAccessor dateLastServicedValue) { - this.dateLastServicedValue = dateLastServicedValue; - } - - public TemporalAccessor getDateLastServicedValue() { - return this.dateLastServicedValue ; - } - - public void setDateLastCalibrationValue(TemporalAccessor dateLastCalibrationValue) { - this.dateLastCalibrationValue = dateLastCalibrationValue; - } - - public TemporalAccessor getDateLastCalibrationValue() { - return this.dateLastCalibrationValue ; - } - - public void setServicedByValue(String servicedByValue) { - this.servicedByValue = servicedByValue; - } - - public String getServicedByValue() { - return this.servicedByValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java deleted file mode 100644 index 1f0d8e94f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class DeviceDetailsTrainingSampleClusterContainment extends Containment { - public SelectAqlField DEVICE_DETAILS_TRAINING_SAMPLE_CLUSTER = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "", "DeviceDetailsTrainingSampleCluster", DeviceDetailsTrainingSampleCluster.class, this); - - public SelectAqlField NAME_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0001]/value|value", "nameValue", String.class, this); - - public SelectAqlField DESCRIPTION_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0002]/value|value", "descriptionValue", String.class, this); - - public SelectAqlField MANUFACTURER_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0004]/items[at0003]/value|value", "manufacturerValue", String.class, this); - - public SelectAqlField MODEL_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0004]/items[at0005]/value|value", "modelValue", String.class, this); - - public SelectAqlField SERIAL_NUMBER_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0004]/items[at0006]/value|value", "serialNumberValue", String.class, this); - - public SelectAqlField COMPONENTS = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0007]", "components", Cluster.class, this); - - public SelectAqlField DATE_LAST_SERVICED_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0008]/items[at0009]/value|value", "dateLastServicedValue", TemporalAccessor.class, this); - - public SelectAqlField DATE_LAST_CALIBRATION_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0008]/items[at0010]/value|value", "dateLastCalibrationValue", TemporalAccessor.class, this); - - public SelectAqlField SERVICED_BY_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0008]/items[at0011]/value|value", "servicedByValue", String.class, this); - - private DeviceDetailsTrainingSampleClusterContainment() { - super("openEHR-EHR-CLUSTER.sample_device.v1"); - } - - public static DeviceDetailsTrainingSampleClusterContainment getInstance() { - return new DeviceDetailsTrainingSampleClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningcode.java deleted file mode 100644 index 82ff05098..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningcode.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum KorotkoffSoundsDefiningCode implements EnumValueSet { - FIFTH_SOUND("Fifth sound", "The fifth Korotkoff sound is identified by absence of sounds as the cuff\n" - + " pressure drops below the diastolic blood pressure\n" - + " ", "local", "at1012"), - - FOURTH_SOUND("Fourth sound", "The fourth Korotkoff sound is identified as an abrupt muffling of sounds\n" - + " ", "local", "at1011"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - KorotkoffSoundsDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningcode.java deleted file mode 100644 index 4ee4484ad..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningcode.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum LocationOfMeasurementDefiningCode implements EnumValueSet { - LEFT_THIGH("Left thigh", "The left thigh of the person", "local", "at0028"), - - INTRA_ARTERIAL("Intra-arterial", "Blood pressure monitored via an intra-arterial line", "local", "at0032"), - - FINGER("Finger", "A finger of the person", "local", "at1026"), - - RIGHT_ANKLE("Right ankle", "The right ankle of the person", "local", "at1031"), - - LEFT_WRIST("Left wrist", "The left wrist of the person", "local", "at1021"), - - RIGHT_WRIST("Right wrist", "The right wrist of the person", "local", "at1020"), - - LEFT_ARM("Left arm", "The left arm of the person", "local", "at0026"), - - LEFT_ANKLE("Left ankle", "The left ankle of the person", "local", "at1032"), - - RIGHT_THIGH("Right thigh", "The right thigh of the person", "local", "at0027"), - - RIGHT_ARM("Right arm", "The right arm of the person", "local", "at0025"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - LocationOfMeasurementDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningcode.java deleted file mode 100644 index bf0068793..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningcode.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum PositionDefiningCode implements EnumValueSet { - STANDING("Standing", "Standing at the time of blood pressure measurement", "local", "at1000"), - - LYING("Lying", "Lying flat at the time of blood pressure measurement", "local", "at1003"), - - RECLINING("Reclining", "Reclining at the time of blood pressure measurement", "local", "at1002"), - - TRENDELENBURG("Trendelenburg", "Lying flat on the back (supine position) with the feet higher than the head\n" - + " at the time of blood pressure measurement\n" - + " ", "local", "at1013"), - - LEFT_LATERAL("Left Lateral", "Lying on the left side at the time of blood pressure measurement", "local", "at1014"), - - SITTING("Sitting", "Sitting (for example on bed or chair) at the time of blood pressure\n" - + " measurement\n" - + " ", "local", "at1001"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - PositionDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java deleted file mode 100644 index b48942342..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java +++ /dev/null @@ -1,180 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -import com.nedap.archie.rm.datastructures.Cluster; -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 org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Id; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureObservation; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import org.ehrbase.client.openehrclient.VersionUid; - -@Entity -@Archetype("openEHR-EHR-COMPOSITION.encounter.v1") -@Template("ehrbase_multi_occurrence.de.v1") -public class EhrbaseMultiOccurrenceDeV1Composition { - @Path("/context/other_context[at0001]/items[at0002]") - private List extension; - - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; - - @Path("/context/participations") - private List participations; - - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; - - @Path("/context/location") - private String location; - - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; - - @Path("/context/setting|defining_code") - private Setting settingDefiningCode; - - @Path("/content[openEHR-EHR-OBSERVATION.body_temperature.v2]") - private List bodyTemperature; - - @Path("/composer") - private PartyProxy composer; - - @Path("/language") - private Language language; - - @Path("/feeder_audit") - private FeederAudit feederAudit; - - @Path("/category|defining_code") - private Category categoryDefiningCode; - - @Path("/territory") - private Territory territory; - - @Id - private VersionUid versionUid; - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - 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 setBodyTemperature(List bodyTemperature) { - this.bodyTemperature = bodyTemperature; - } - - public List getBodyTemperature() { - return this.bodyTemperature ; - } - - 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 setCategoryDefiningCode(Category categoryDefiningCode) { - this.categoryDefiningCode = categoryDefiningCode; - } - - public Category getCategoryDefiningCode() { - return this.categoryDefiningCode ; - } - - 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1CompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1CompositionContainment.java deleted file mode 100644 index 60cdce008..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1CompositionContainment.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -import com.nedap.archie.rm.datastructures.Cluster; -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 org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureObservation; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; - -public class EhrbaseMultiOccurrenceDeV1CompositionContainment extends Containment { - public SelectAqlField EHRBASE_MULTI_OCCURRENCE_DE_V1_COMPOSITION = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "", "EhrbaseMultiOccurrenceDeV1Composition", EhrbaseMultiOccurrenceDeV1Composition.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/other_context[at0001]/items[at0002]", "extension", Cluster.class, this); - - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/participations", "participations", Participation.class, this); - - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - - public SelectAqlField LOCATION = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/location", "location", String.class, this); - - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - - public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - - public ListSelectAqlField BODY_TEMPERATURE = new ListAqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/content[openEHR-EHR-OBSERVATION.body_temperature.v2]", "bodyTemperature", BodyTemperatureObservation.class, this); - - public SelectAqlField COMPOSER = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/composer", "composer", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/language", "language", Language.class, this); - - public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - - public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - - public SelectAqlField TERRITORY = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/territory", "territory", Territory.class, this); - - private EhrbaseMultiOccurrenceDeV1CompositionContainment() { - super("openEHR-EHR-COMPOSITION.encounter.v1"); - } - - public static EhrbaseMultiOccurrenceDeV1CompositionContainment getInstance() { - return new EhrbaseMultiOccurrenceDeV1CompositionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyExposureDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyExposureDefiningcode.java deleted file mode 100644 index 581f9d6d9..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyExposureDefiningcode.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum BodyExposureDefiningCode implements EnumValueSet { - INCREASED_CLOTHING_BEDDING("Increased clothing/bedding", "The person is covered by an increased amount of clothing or bedding than\n" - + " deemed appropriate for the environmental circumstances.\n" - + " ", "local", "at0034"), - - REDUCED_CLOTHING_BEDDING("Reduced clothing/bedding", "The person is covered by a lesser amount of clothing or bedding than deemed\n" - + " appropriate for the environmental circumstances.\n" - + " ", "local", "at0032"), - - APPROPRIATE_CLOTHING_BEDDING("Appropriate clothing/bedding", "The person is covered by an amount of clothing or bedding deemed appropriate\n" - + " for the environmental circumstances.\n" - + " ", "local", "at0033"), - - NAKED("Naked", "No clothing, bedding or covering.", "local", "at0031"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - BodyExposureDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventChoice.java deleted file mode 100644 index 2f2c73fba..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; - -public interface BodyTemperatureAnyEventChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java deleted file mode 100644 index a1b9c83a7..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java +++ /dev/null @@ -1,129 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.Double; -import java.lang.Long; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalAmount; -import java.util.List; -import org.ehrbase.client.annotations.Choice; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; - -@Entity -@OptionFor("INTERVAL_EVENT") -public class BodyTemperatureAnyEventIntervalEvent implements BodyTemperatureAnyEventChoice { - @Path("/data[at0001]/items[at0004]/value|magnitude") - private Double temperatureMagnitude; - - @Path("/data[at0001]/items[at0004]/value|units") - private String temperatureUnits; - - @Path("/state[at0029]/items[at0041]/value|value") - private String descriptionOfThermalStressValue; - - @Path("/state[at0029]/items[at0065]/value|magnitude") - private Long currentDayOfMenstrualCycleMagnitude; - - @Path("/state[at0029]/items[at0056]") - private List environmentalConditions; - - @Path("/state[at0029]/items[at0057]") - private Cluster exertion; - - @Path("/time|value") - private TemporalAccessor timeValue; - - @Path("/width|value") - private TemporalAmount widthValue; - - @Path("/math_function|defining_code") - private MathFunction mathFunctionDefiningCode; - - @Path("/state[at0029]/items[at0030]/value") - @Choice - private BodyTemperatureBodyExposureChoice bodyExposure; - - public void setTemperatureMagnitude(Double temperatureMagnitude) { - this.temperatureMagnitude = temperatureMagnitude; - } - - public Double getTemperatureMagnitude() { - return this.temperatureMagnitude ; - } - - public void setTemperatureUnits(String temperatureUnits) { - this.temperatureUnits = temperatureUnits; - } - - public String getTemperatureUnits() { - return this.temperatureUnits ; - } - - public void setDescriptionOfThermalStressValue(String descriptionOfThermalStressValue) { - this.descriptionOfThermalStressValue = descriptionOfThermalStressValue; - } - - public String getDescriptionOfThermalStressValue() { - return this.descriptionOfThermalStressValue ; - } - - public void setCurrentDayOfMenstrualCycleMagnitude(Long currentDayOfMenstrualCycleMagnitude) { - this.currentDayOfMenstrualCycleMagnitude = currentDayOfMenstrualCycleMagnitude; - } - - public Long getCurrentDayOfMenstrualCycleMagnitude() { - return this.currentDayOfMenstrualCycleMagnitude ; - } - - public void setEnvironmentalConditions(List environmentalConditions) { - this.environmentalConditions = environmentalConditions; - } - - public List getEnvironmentalConditions() { - return this.environmentalConditions ; - } - - public void setExertion(Cluster exertion) { - this.exertion = exertion; - } - - public Cluster getExertion() { - return this.exertion ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setWidthValue(TemporalAmount widthValue) { - this.widthValue = widthValue; - } - - public TemporalAmount getWidthValue() { - return this.widthValue ; - } - - public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { - this.mathFunctionDefiningCode = mathFunctionDefiningCode; - } - - public MathFunction getMathFunctionDefiningCode() { - return this.mathFunctionDefiningCode ; - } - - public void setBodyExposure(BodyTemperatureBodyExposureChoice bodyExposure) { - this.bodyExposure = bodyExposure; - } - - public BodyTemperatureBodyExposureChoice getBodyExposure() { - return this.bodyExposure ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java deleted file mode 100644 index 505a566e2..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.Double; -import java.lang.Long; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Choice; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("POINT_EVENT") -public class BodyTemperatureAnyEventPointEvent implements BodyTemperatureAnyEventChoice { - @Path("/data[at0001]/items[at0004]/value|magnitude") - private Double temperatureMagnitude; - - @Path("/data[at0001]/items[at0004]/value|units") - private String temperatureUnits; - - @Path("/state[at0029]/items[at0041]/value|value") - private String descriptionOfThermalStressValue; - - @Path("/state[at0029]/items[at0065]/value|magnitude") - private Long currentDayOfMenstrualCycleMagnitude; - - @Path("/state[at0029]/items[at0056]") - private List environmentalConditions; - - @Path("/state[at0029]/items[at0057]") - private Cluster exertion; - - @Path("/time|value") - private TemporalAccessor timeValue; - - @Path("/state[at0029]/items[at0030]/value") - @Choice - private BodyTemperatureBodyExposureChoice bodyExposure; - - public void setTemperatureMagnitude(Double temperatureMagnitude) { - this.temperatureMagnitude = temperatureMagnitude; - } - - public Double getTemperatureMagnitude() { - return this.temperatureMagnitude ; - } - - public void setTemperatureUnits(String temperatureUnits) { - this.temperatureUnits = temperatureUnits; - } - - public String getTemperatureUnits() { - return this.temperatureUnits ; - } - - public void setDescriptionOfThermalStressValue(String descriptionOfThermalStressValue) { - this.descriptionOfThermalStressValue = descriptionOfThermalStressValue; - } - - public String getDescriptionOfThermalStressValue() { - return this.descriptionOfThermalStressValue ; - } - - public void setCurrentDayOfMenstrualCycleMagnitude(Long currentDayOfMenstrualCycleMagnitude) { - this.currentDayOfMenstrualCycleMagnitude = currentDayOfMenstrualCycleMagnitude; - } - - public Long getCurrentDayOfMenstrualCycleMagnitude() { - return this.currentDayOfMenstrualCycleMagnitude ; - } - - public void setEnvironmentalConditions(List environmentalConditions) { - this.environmentalConditions = environmentalConditions; - } - - public List getEnvironmentalConditions() { - return this.environmentalConditions ; - } - - public void setExertion(Cluster exertion) { - this.exertion = exertion; - } - - public Cluster getExertion() { - return this.exertion ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setBodyExposure(BodyTemperatureBodyExposureChoice bodyExposure) { - this.bodyExposure = bodyExposure; - } - - public BodyTemperatureBodyExposureChoice getBodyExposure() { - return this.bodyExposure ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureChoice.java deleted file mode 100644 index 0eba59b01..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; - -public interface BodyTemperatureBodyExposureChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvCodedText.java deleted file mode 100644 index cd68266c2..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvCodedText.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class BodyTemperatureBodyExposureDvCodedText implements BodyTemperatureBodyExposureChoice { - @Path("|defining_code") - private BodyExposureDefiningCode bodyExposureDefiningCode; - - public void setBodyExposureDefiningCode(BodyExposureDefiningCode bodyExposureDefiningCode) { - this.bodyExposureDefiningCode = bodyExposureDefiningCode; - } - - public BodyExposureDefiningCode getBodyExposureDefiningCode() { - return this.bodyExposureDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java deleted file mode 100644 index 9a914dd21..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class BodyTemperatureBodyExposureDvText implements BodyTemperatureBodyExposureChoice { - @Path("|value") - private String bodyExposureValue; - - public void setBodyExposureValue(String bodyExposureValue) { - this.bodyExposureValue = bodyExposureValue; - } - - public String getBodyExposureValue() { - return this.bodyExposureValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementChoice.java deleted file mode 100644 index 9ad06b1cc..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; - -public interface BodyTemperatureLocationOfMeasurementChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvCodedText.java deleted file mode 100644 index dace78986..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvCodedText.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class BodyTemperatureLocationOfMeasurementDvCodedText implements BodyTemperatureLocationOfMeasurementChoice { - @Path("|defining_code") - private LocationOfMeasurementDefiningCode locationOfMeasurementDefiningCode; - - public void setLocationOfMeasurementDefiningCode( - LocationOfMeasurementDefiningCode locationOfMeasurementDefiningCode) { - this.locationOfMeasurementDefiningCode = locationOfMeasurementDefiningCode; - } - - public LocationOfMeasurementDefiningCode getLocationOfMeasurementDefiningCode() { - return this.locationOfMeasurementDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java deleted file mode 100644 index 2ec7ca97a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class BodyTemperatureLocationOfMeasurementDvText implements BodyTemperatureLocationOfMeasurementChoice { - @Path("|value") - private String locationOfMeasurementValue; - - public void setLocationOfMeasurementValue(String locationOfMeasurementValue) { - this.locationOfMeasurementValue = locationOfMeasurementValue; - } - - public String getLocationOfMeasurementValue() { - return this.locationOfMeasurementValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java deleted file mode 100644 index 11a8519c4..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java +++ /dev/null @@ -1,106 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import java.util.List; -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.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.body_temperature.v2") -public class BodyTemperatureObservation { - @Path("/data[at0002]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0020]/items[at0064]") - private List structuredMeasurementLocation; - - @Path("/protocol[at0020]/items[at0059]") - private Cluster device; - - @Path("/protocol[at0020]/items[at0062]") - private List extension; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - @Path("/protocol[at0020]/items[at0021]/value") - @Choice - private BodyTemperatureLocationOfMeasurementChoice locationOfMeasurement; - - @Path("/data[at0002]/events[at0003]") - @Choice - private List anyEvent; - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setStructuredMeasurementLocation(List structuredMeasurementLocation) { - this.structuredMeasurementLocation = structuredMeasurementLocation; - } - - public List getStructuredMeasurementLocation() { - return this.structuredMeasurementLocation ; - } - - public void setDevice(Cluster device) { - this.device = device; - } - - public Cluster getDevice() { - return this.device ; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } - - public void setLocationOfMeasurement( - BodyTemperatureLocationOfMeasurementChoice locationOfMeasurement) { - this.locationOfMeasurement = locationOfMeasurement; - } - - public BodyTemperatureLocationOfMeasurementChoice getLocationOfMeasurement() { - return this.locationOfMeasurement ; - } - - public void setAnyEvent(List anyEvent) { - this.anyEvent = anyEvent; - } - - public List getAnyEvent() { - return this.anyEvent ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservationContainment.java deleted file mode 100644 index e44fbd1f6..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservationContainment.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class BodyTemperatureObservationContainment extends Containment { - public SelectAqlField BODY_TEMPERATURE_OBSERVATION = new AqlFieldImp(BodyTemperatureObservation.class, "", "BodyTemperatureObservation", BodyTemperatureObservation.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(BodyTemperatureObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField STRUCTURED_MEASUREMENT_LOCATION = new ListAqlFieldImp(BodyTemperatureObservation.class, "/protocol[at0020]/items[at0064]", "structuredMeasurementLocation", Cluster.class, this); - - public SelectAqlField DEVICE = new AqlFieldImp(BodyTemperatureObservation.class, "/protocol[at0020]/items[at0059]", "device", Cluster.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(BodyTemperatureObservation.class, "/protocol[at0020]/items[at0062]", "extension", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(BodyTemperatureObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(BodyTemperatureObservation.class, "/language", "language", Language.class, this); - - public SelectAqlField LOCATION_OF_MEASUREMENT = new AqlFieldImp(BodyTemperatureObservation.class, "/protocol[at0020]/items[at0021]/value", "locationOfMeasurement", BodyTemperatureLocationOfMeasurementChoice.class, this); - - public ListSelectAqlField ANY_EVENT = new ListAqlFieldImp(BodyTemperatureObservation.class, "/data[at0002]/events[at0003]", "anyEvent", BodyTemperatureAnyEventChoice.class, this); - - private BodyTemperatureObservationContainment() { - super("openEHR-EHR-OBSERVATION.body_temperature.v2"); - } - - public static BodyTemperatureObservationContainment getInstance() { - return new BodyTemperatureObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/LocationOfMeasurementDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/LocationOfMeasurementDefiningcode.java deleted file mode 100644 index 1d2a1e76c..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/LocationOfMeasurementDefiningcode.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum LocationOfMeasurementDefiningCode implements EnumValueSet { - TEMPLE("Temple", "Temperature is measured at the temple, over the superficial temporal\n" - + " artery.\n" - + " ", "local", "at0060"), - - INTRAVASCULAR("Intravascular", "Temperature is measured within the vascular system.", "local", "at0028"), - - URINARY_BLADDER("Urinary bladder", "Temperature is measured in the urinary bladder.", "local", "at0027"), - - NASOPHARYNX("Nasopharynx", "Temperature is measured within the nasopharynx.", "local", "at0026"), - - VAGINA("Vagina", "Temperature is measured within the vagina.", "local", "at0051"), - - RECTUM("Rectum", "Temperature measured within the rectum.", "local", "at0025"), - - SKIN("Skin", "Temperature is measured from exposed skin.", "local", "at0043"), - - MOUTH("Mouth", "Temperature is measured within the mouth.", "local", "at0022"), - - AXILLA("Axilla", "Temperature is measured from the skin of the axilla with the arm positioned\n" - + " down by the side.\n" - + " ", "local", "at0024"), - - OESOPHAGUS("Oesophagus", "Temperatue is measured within the oesophagus.", "local", "at0054"), - - INGUINAL_SKIN_CREASE("Inguinal skin crease", "Temperature is measured in the inguinal skin crease between the leg and\n" - + " abdominal wall.\n" - + " ", "local", "at0055"), - - FOREHEAD("Forehead", "Temperature is measured on the forehead.", "local", "at0061"), - - EAR_CANAL("Ear canal", "Temperature is measured from within the external auditory canal.", "local", "at0023"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - LocationOfMeasurementDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java deleted file mode 100644 index abd114203..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java +++ /dev/null @@ -1,168 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -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 org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Id; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition.EpisodeofcareAdminEntry; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import org.ehrbase.client.openehrclient.VersionUid; - -@Entity -@Archetype("openEHR-EHR-COMPOSITION.versorgungsfall.v0") -@Template("EpisodeOfCare") -public class EpisodeOfCareComposition { - @Path("/content[openEHR-EHR-ADMIN_ENTRY.episodeofcare.v0]") - private List episodeofcare; - - @Path("/composer") - private PartyProxy composer; - - @Path("/language") - private Language language; - - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; - - @Path("/context/participations") - private List participations; - - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; - - @Path("/context/location") - private String location; - - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; - - @Path("/context/setting|defining_code") - private Setting settingDefiningCode; - - @Path("/feeder_audit") - private FeederAudit feederAudit; - - @Path("/category|defining_code") - private Category categoryDefiningCode; - - @Path("/territory") - private Territory territory; - - @Id - private VersionUid versionUid; - - public void setEpisodeofcare(List episodeofcare) { - this.episodeofcare = episodeofcare; - } - - public List getEpisodeofcare() { - return this.episodeofcare ; - } - - 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 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 setFeederAudit(FeederAudit feederAudit) { - this.feederAudit = feederAudit; - } - - public FeederAudit getFeederAudit() { - return this.feederAudit ; - } - - public void setCategoryDefiningCode(Category categoryDefiningCode) { - this.categoryDefiningCode = categoryDefiningCode; - } - - public Category getCategoryDefiningCode() { - return this.categoryDefiningCode ; - } - - 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareCompositionContainment.java deleted file mode 100644 index eb6781267..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareCompositionContainment.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -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 org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition.EpisodeofcareAdminEntry; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; - -public class EpisodeOfCareCompositionContainment extends Containment { - public SelectAqlField EPISODE_OF_CARE_COMPOSITION = new AqlFieldImp(EpisodeOfCareComposition.class, "", "EpisodeOfCareComposition", EpisodeOfCareComposition.class, this); - - public ListSelectAqlField EPISODEOFCARE = new ListAqlFieldImp(EpisodeOfCareComposition.class, "/content[openEHR-EHR-ADMIN_ENTRY.episodeofcare.v0]", "episodeofcare", EpisodeofcareAdminEntry.class, this); - - public SelectAqlField COMPOSER = new AqlFieldImp(EpisodeOfCareComposition.class, "/composer", "composer", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(EpisodeOfCareComposition.class, "/language", "language", Language.class, this); - - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(EpisodeOfCareComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(EpisodeOfCareComposition.class, "/context/participations", "participations", Participation.class, this); - - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(EpisodeOfCareComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - - public SelectAqlField LOCATION = new AqlFieldImp(EpisodeOfCareComposition.class, "/context/location", "location", String.class, this); - - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(EpisodeOfCareComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - - public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(EpisodeOfCareComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - - public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(EpisodeOfCareComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - - public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(EpisodeOfCareComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - - public SelectAqlField TERRITORY = new AqlFieldImp(EpisodeOfCareComposition.class, "/territory", "territory", Territory.class, this); - - private EpisodeOfCareCompositionContainment() { - super("openEHR-EHR-COMPOSITION.versorgungsfall.v0"); - } - - public static EpisodeOfCareCompositionContainment getInstance() { - return new EpisodeOfCareCompositionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java deleted file mode 100644 index d8ec76761..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java +++ /dev/null @@ -1,159 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; - -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Boolean; -import java.lang.String; -import java.net.URI; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-ADMIN_ENTRY.episodeofcare.v0") -public class EpisodeofcareAdminEntry { - @Path("/data[at0001]/items[at0002]") - private List identifier; - - @Path("/data[at0001]/items[at0003]/value|defining_code") - private StatusDefiningCode statusDefiningCode; - - @Path("/data[at0001]/items[at0011]/value|value") - private String typeValue; - - @Path("/data[at0001]/items[at0014]/value/upper|value") - private TemporalAccessor upperValue; - - @Path("/data[at0001]/items[at0014]/value/lower|value") - private TemporalAccessor lowerValue; - - @Path("/data[at0001]/items[at0014]/value/lower_included") - private Boolean lowerIncluded; - - @Path("/data[at0001]/items[at0014]/value/upper_included") - private Boolean upperIncluded; - - @Path("/data[at0001]/items[at0018]") - private List diagnosis; - - @Path("/data[at0001]/items[at0012]/value|value") - private URI careManagerValue; - - @Path("/data[at0001]/items[at0017]/value|value") - private URI managingOrganizationValue; - - @Path("/data[at0001]/items[at0013]") - private List team; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setIdentifier(List identifier) { - this.identifier = identifier; - } - - public List getIdentifier() { - return this.identifier ; - } - - public void setStatusDefiningCode(StatusDefiningCode statusDefiningCode) { - this.statusDefiningCode = statusDefiningCode; - } - - public StatusDefiningCode getStatusDefiningCode() { - return this.statusDefiningCode ; - } - - public void setTypeValue(String typeValue) { - this.typeValue = typeValue; - } - - public String getTypeValue() { - return this.typeValue ; - } - - public void setUpperValue(TemporalAccessor upperValue) { - this.upperValue = upperValue; - } - - public TemporalAccessor getUpperValue() { - return this.upperValue ; - } - - public void setLowerValue(TemporalAccessor lowerValue) { - this.lowerValue = lowerValue; - } - - public TemporalAccessor getLowerValue() { - return this.lowerValue ; - } - - public void setLowerIncluded(Boolean lowerIncluded) { - this.lowerIncluded = lowerIncluded; - } - - public Boolean isLowerIncluded() { - return this.lowerIncluded ; - } - - public void setUpperIncluded(Boolean upperIncluded) { - this.upperIncluded = upperIncluded; - } - - public Boolean isUpperIncluded() { - return this.upperIncluded ; - } - - public void setDiagnosis(List diagnosis) { - this.diagnosis = diagnosis; - } - - public List getDiagnosis() { - return this.diagnosis ; - } - - public void setCareManagerValue(URI careManagerValue) { - this.careManagerValue = careManagerValue; - } - - public URI getCareManagerValue() { - return this.careManagerValue ; - } - - public void setManagingOrganizationValue(URI managingOrganizationValue) { - this.managingOrganizationValue = managingOrganizationValue; - } - - public URI getManagingOrganizationValue() { - return this.managingOrganizationValue ; - } - - public void setTeam(List team) { - this.team = team; - } - - public List getTeam() { - return this.team ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntryContainment.java deleted file mode 100644 index 5eb5cabde..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntryContainment.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; - -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Boolean; -import java.lang.String; -import java.net.URI; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class EpisodeofcareAdminEntryContainment extends Containment { - public SelectAqlField EPISODEOFCARE_ADMIN_ENTRY = new AqlFieldImp(EpisodeofcareAdminEntry.class, "", "EpisodeofcareAdminEntry", EpisodeofcareAdminEntry.class, this); - - public ListSelectAqlField IDENTIFIER = new ListAqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0002]", "identifier", EpisodeofcareIdentifierElement.class, this); - - public SelectAqlField STATUS_DEFINING_CODE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0003]/value|defining_code", "statusDefiningCode", StatusDefiningCode.class, this); - - public SelectAqlField TYPE_VALUE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0011]/value|value", "typeValue", String.class, this); - - public SelectAqlField UPPER_VALUE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0014]/value/upper|value", "upperValue", TemporalAccessor.class, this); - - public SelectAqlField LOWER_VALUE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0014]/value/lower|value", "lowerValue", TemporalAccessor.class, this); - - public SelectAqlField LOWER_INCLUDED = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0014]/value/lower_included", "lowerIncluded", Boolean.class, this); - - public SelectAqlField UPPER_INCLUDED = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0014]/value/upper_included", "upperIncluded", Boolean.class, this); - - public ListSelectAqlField DIAGNOSIS = new ListAqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0018]", "diagnosis", EpisodeofcareDiagnosisCluster.class, this); - - public SelectAqlField CARE_MANAGER_VALUE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0012]/value|value", "careManagerValue", URI.class, this); - - public SelectAqlField MANAGING_ORGANIZATION_VALUE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0017]/value|value", "managingOrganizationValue", URI.class, this); - - public ListSelectAqlField TEAM = new ListAqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0013]", "team", EpisodeofcareTeamElement.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/language", "language", Language.class, this); - - private EpisodeofcareAdminEntryContainment() { - super("openEHR-EHR-ADMIN_ENTRY.episodeofcare.v0"); - } - - public static EpisodeofcareAdminEntryContainment getInstance() { - return new EpisodeofcareAdminEntryContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java deleted file mode 100644 index 169f6025b..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; - -import com.nedap.archie.rm.datavalues.DvEHRURI; -import java.lang.Long; -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class EpisodeofcareDiagnosisCluster { - @Path("/items[at0019]/value") - private DvEHRURI diagnosisEntry; - - @Path("/items[at0020]/value|value") - private String roleValue; - - @Path("/items[at0021]/value|magnitude") - private Long rankMagnitude; - - public void setDiagnosisEntry(DvEHRURI diagnosisEntry) { - this.diagnosisEntry = diagnosisEntry; - } - - public DvEHRURI getDiagnosisEntry() { - return this.diagnosisEntry ; - } - - public void setRoleValue(String roleValue) { - this.roleValue = roleValue; - } - - public String getRoleValue() { - return this.roleValue ; - } - - public void setRankMagnitude(Long rankMagnitude) { - this.rankMagnitude = rankMagnitude; - } - - public Long getRankMagnitude() { - return this.rankMagnitude ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java deleted file mode 100644 index ec1c16347..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; - -import com.nedap.archie.rm.datavalues.DvIdentifier; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class EpisodeofcareIdentifierElement { - @Path("/value") - private DvIdentifier value; - - public void setValue(DvIdentifier value) { - this.value = value; - } - - public DvIdentifier getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java deleted file mode 100644 index 3fe2d4a99..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; - -import java.net.URI; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class EpisodeofcareTeamElement { - @Path("/value|value") - private URI value; - - public void setValue(URI value) { - this.value = value; - } - - public URI getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/StatusDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/StatusDefiningCode.java deleted file mode 100644 index f77dab15f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/StatusDefiningCode.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum StatusDefiningCode implements EnumValueSet { - WAITLIST("waitlist", "*", "local", "at0005"), - - CANCELLED("cancelled", "*", "local", "at0009"), - - ENTERED_IN_ERROR("entered-in-error", "*", "local", "at0010"), - - ACTIVE("active", "*", "local", "at0006"), - - PLANNED("planned", "*", "local", "at0004"), - - ONHOLD("onhold", "*", "local", "at0007"), - - FINISHED("finished", "*", "local", "at0008"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - StatusDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java deleted file mode 100644 index 53e115edc..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java +++ /dev/null @@ -1,216 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -import com.nedap.archie.rm.datastructures.Cluster; -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 org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Id; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.AssessmentSection; -import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.BackgroundSection; -import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.ResponseSection; -import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.SituationSection; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import org.ehrbase.client.openehrclient.VersionUid; - -@Entity -@Archetype("openEHR-EHR-COMPOSITION.encounter.v1") -@Template("open_eREACT-Care") -public class OpenEREACTCareComposition { - @Path("/context/other_context[at0001]/items[at0002]") - private List extension; - - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; - - @Path("/context/participations") - private List participations; - - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; - - @Path("/context/location") - private String location; - - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; - - @Path("/context/setting|defining_code") - private Setting settingDefiningCode; - - @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Situation']") - private SituationSection situation; - - @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Background']") - private BackgroundSection background; - - @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Assessment']") - private AssessmentSection assessment; - - @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Response']") - private ResponseSection response; - - @Path("/composer") - private PartyProxy composer; - - @Path("/language") - private Language language; - - @Path("/feeder_audit") - private FeederAudit feederAudit; - - @Path("/category|defining_code") - private Category categoryDefiningCode; - - @Path("/territory") - private Territory territory; - - @Id - private VersionUid versionUid; - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - 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 setSituation(SituationSection situation) { - this.situation = situation; - } - - public SituationSection getSituation() { - return this.situation ; - } - - public void setBackground(BackgroundSection background) { - this.background = background; - } - - public BackgroundSection getBackground() { - return this.background ; - } - - public void setAssessment(AssessmentSection assessment) { - this.assessment = assessment; - } - - public AssessmentSection getAssessment() { - return this.assessment ; - } - - public void setResponse(ResponseSection response) { - this.response = response; - } - - public ResponseSection getResponse() { - return this.response ; - } - - 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 setCategoryDefiningCode(Category categoryDefiningCode) { - this.categoryDefiningCode = categoryDefiningCode; - } - - public Category getCategoryDefiningCode() { - return this.categoryDefiningCode ; - } - - 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareCompositionContainment.java deleted file mode 100644 index a8ccef628..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareCompositionContainment.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -import com.nedap.archie.rm.datastructures.Cluster; -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 org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.AssessmentSection; -import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.BackgroundSection; -import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.ResponseSection; -import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.SituationSection; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; - -public class OpenEREACTCareCompositionContainment extends Containment { - public SelectAqlField OPEN_E_R_E_A_C_T_CARE_COMPOSITION = new AqlFieldImp(OpenEREACTCareComposition.class, "", "OpenEREACTCareComposition", OpenEREACTCareComposition.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(OpenEREACTCareComposition.class, "/context/other_context[at0001]/items[at0002]", "extension", Cluster.class, this); - - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(OpenEREACTCareComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(OpenEREACTCareComposition.class, "/context/participations", "participations", Participation.class, this); - - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(OpenEREACTCareComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - - public SelectAqlField LOCATION = new AqlFieldImp(OpenEREACTCareComposition.class, "/context/location", "location", String.class, this); - - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(OpenEREACTCareComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - - public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(OpenEREACTCareComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - - public SelectAqlField SITUATION = new AqlFieldImp(OpenEREACTCareComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "situation", SituationSection.class, this); - - public SelectAqlField BACKGROUND = new AqlFieldImp(OpenEREACTCareComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "background", BackgroundSection.class, this); - - public SelectAqlField ASSESSMENT = new AqlFieldImp(OpenEREACTCareComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "assessment", AssessmentSection.class, this); - - public SelectAqlField RESPONSE = new AqlFieldImp(OpenEREACTCareComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "response", ResponseSection.class, this); - - public SelectAqlField COMPOSER = new AqlFieldImp(OpenEREACTCareComposition.class, "/composer", "composer", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(OpenEREACTCareComposition.class, "/language", "language", Language.class, this); - - public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(OpenEREACTCareComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - - public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(OpenEREACTCareComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - - public SelectAqlField TERRITORY = new AqlFieldImp(OpenEREACTCareComposition.class, "/territory", "territory", Territory.class, this); - - private OpenEREACTCareCompositionContainment() { - super("openEHR-EHR-COMPOSITION.encounter.v1"); - } - - public static OpenEREACTCareCompositionContainment getInstance() { - return new OpenEREACTCareCompositionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java deleted file mode 100644 index fa8789045..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") -public class AbdomenSymptomCluster { - @Path("/items[at0001.1]/value|defining_code") - private CodePhrase symptomSignNameDefiningCode; - - @Path("/items[at0147]") - private List structuredBodySite; - - @Path("/items[at0153]") - private List specificDetails; - - @Path("/items[at0146]") - private List previousEpisodes; - - @Path("/items[at0063]") - private List associatedSymptomSign; - - @Path("/items[at0.1 and name/value='Presence']/value|defining_code") - private PresenceDefiningCode presenceDefiningCode; - - public void setSymptomSignNameDefiningCode(CodePhrase symptomSignNameDefiningCode) { - this.symptomSignNameDefiningCode = symptomSignNameDefiningCode; - } - - public CodePhrase getSymptomSignNameDefiningCode() { - return this.symptomSignNameDefiningCode ; - } - - public void setStructuredBodySite(List structuredBodySite) { - this.structuredBodySite = structuredBodySite; - } - - public List getStructuredBodySite() { - return this.structuredBodySite ; - } - - public void setSpecificDetails(List specificDetails) { - this.specificDetails = specificDetails; - } - - public List getSpecificDetails() { - return this.specificDetails ; - } - - public void setPreviousEpisodes(List previousEpisodes) { - this.previousEpisodes = previousEpisodes; - } - - public List getPreviousEpisodes() { - return this.previousEpisodes ; - } - - public void setAssociatedSymptomSign(List associatedSymptomSign) { - this.associatedSymptomSign = associatedSymptomSign; - } - - public List getAssociatedSymptomSign() { - return this.associatedSymptomSign ; - } - - public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { - this.presenceDefiningCode = presenceDefiningCode; - } - - public PresenceDefiningCode getPresenceDefiningCode() { - return this.presenceDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomClusterContainment.java deleted file mode 100644 index 2b0da992d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomClusterContainment.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class AbdomenSymptomClusterContainment extends Containment { - public SelectAqlField ABDOMEN_SYMPTOM_CLUSTER = new AqlFieldImp(AbdomenSymptomCluster.class, "", "AbdomenSymptomCluster", AbdomenSymptomCluster.class, this); - - public SelectAqlField SYMPTOM_SIGN_NAME_DEFINING_CODE = new AqlFieldImp(AbdomenSymptomCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningCode", CodePhrase.class, this); - - public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(AbdomenSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); - - public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(AbdomenSymptomCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); - - public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(AbdomenSymptomCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); - - public ListSelectAqlField ASSOCIATED_SYMPTOM_SIGN = new ListAqlFieldImp(AbdomenSymptomCluster.class, "/items[at0063]", "associatedSymptomSign", Cluster.class, this); - - public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(AbdomenSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); - - private AbdomenSymptomClusterContainment() { - super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); - } - - public static AbdomenSymptomClusterContainment getInstance() { - return new AbdomenSymptomClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuDefiningcode.java deleted file mode 100644 index faffef258..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuDefiningcode.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum AcvpuDefiningCode implements EnumValueSet { - CONFUSION("Confusion", "A new onset or worsening confusion, delirium or any other altered mentation.", "local", "at0015"), - - UNRESPONSIVE("Unresponsive", "No response to voice or pain stimuli.", "local", "at0008"), - - VOICE("Voice", "Any verbal, motor or eye response to a voice stimulus.", "local", "at0006"), - - PAIN("Pain", "Any verbal, motor or eye response to a pain stimulus.", "local", "at0007"), - - ALERT("Alert", "Fully awake. Spontaneous opening of the eyes, responds to voice and have motor function.", "local", "at0005"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - AcvpuDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java deleted file mode 100644 index 53b2f3fd9..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java +++ /dev/null @@ -1,92 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datastructures.ItemTree; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.acvpu.v0") -public class AcvpuScaleObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|defining_code") - private AcvpuDefiningCode acvpuDefiningCode; - - @Path("/data[at0001]/events[at0002]/state[at0013]") - private ItemTree tree; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0009]/items[at0011]") - private List extension; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setAcvpuDefiningCode(AcvpuDefiningCode acvpuDefiningCode) { - this.acvpuDefiningCode = acvpuDefiningCode; - } - - public AcvpuDefiningCode getAcvpuDefiningCode() { - return this.acvpuDefiningCode ; - } - - public void setTree(ItemTree tree) { - this.tree = tree; - } - - public ItemTree getTree() { - return this.tree ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservationContainment.java deleted file mode 100644 index 5a2da7e1f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservationContainment.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datastructures.ItemTree; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class AcvpuScaleObservationContainment extends Containment { - public SelectAqlField ACVPU_SCALE_OBSERVATION = new AqlFieldImp(AcvpuScaleObservation.class, "", "AcvpuScaleObservation", AcvpuScaleObservation.class, this); - - public SelectAqlField ACVPU_DEFINING_CODE = new AqlFieldImp(AcvpuScaleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|defining_code", "acvpuDefiningCode", AcvpuDefiningCode.class, this); - - public SelectAqlField TREE = new AqlFieldImp(AcvpuScaleObservation.class, "/data[at0001]/events[at0002]/state[at0013]", "tree", ItemTree.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(AcvpuScaleObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(AcvpuScaleObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(AcvpuScaleObservation.class, "/protocol[at0009]/items[at0011]", "extension", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(AcvpuScaleObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(AcvpuScaleObservation.class, "/language", "language", Language.class, this); - - private AcvpuScaleObservationContainment() { - super("openEHR-EHR-OBSERVATION.acvpu.v0"); - } - - public static AcvpuScaleObservationContainment getInstance() { - return new AcvpuScaleObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java deleted file mode 100644 index d5c906fa7..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") -public class AllergiesEvaluation { - @Path("/data[at0001]/items[at0002]/value|value") - private String synopsisValue; - - @Path("/protocol[at0003]/items[at0004]") - private List extension; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setSynopsisValue(String synopsisValue) { - this.synopsisValue = synopsisValue; - } - - public String getSynopsisValue() { - return this.synopsisValue ; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluationContainment.java deleted file mode 100644 index eb96cf87f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluationContainment.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class AllergiesEvaluationContainment extends Containment { - public SelectAqlField ALLERGIES_EVALUATION = new AqlFieldImp(AllergiesEvaluation.class, "", "AllergiesEvaluation", AllergiesEvaluation.class, this); - - public SelectAqlField SYNOPSIS_VALUE = new AqlFieldImp(AllergiesEvaluation.class, "/data[at0001]/items[at0002]/value|value", "synopsisValue", String.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(AllergiesEvaluation.class, "/protocol[at0003]/items[at0004]", "extension", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(AllergiesEvaluation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(AllergiesEvaluation.class, "/language", "language", Language.class, this); - - private AllergiesEvaluationContainment() { - super("openEHR-EHR-EVALUATION.clinical_synopsis.v1"); - } - - public static AllergiesEvaluationContainment getInstance() { - return new AllergiesEvaluationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AmberFlagAcuteDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AmberFlagAcuteDefiningCode.java deleted file mode 100644 index 3cfbeab52..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AmberFlagAcuteDefiningCode.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum AmberFlagAcuteDefiningCode implements EnumValueSet { - ACUTE_DETERIORATION_IN_FUNCTIONAL_ABILITY("Acute deterioration in functional ability", "Acute deterioration in functional ability", "local", "at0091"), - - HEART_RATE91130_OR_NEW_DYSRHYTHMIA("Heart rate 91-130 or new dysrhythmia", "Heart rate 91-130 or new dysrhythmia", "local", "at0095"), - - CLINICAL_SIGNS_OF_WOUND_INFECTION("Clinical signs of wound infection", "Clinical signs of wound infection", "local", "at0097"), - - SYSTOLIC_BP91100_MMHG("Systolic BP 91-100 mmHg", "Systolic BP 91-100 mmHg", "local", "at0094"), - - TEMPERATURE36_C("Temperature <36°C", "Temperature <36°C", "local", "at0096"), - - RELATIVES_CONCERNED_ABOUT_MENTAL_STATUS_REQUIRED("Relatives concerned about mental status REQUIRED:", "Relatives concerned about mental status REQUIRED:", "local", "at0090"), - - RESPIRATORY_RATE2124("Respiratory rate 21-24", "Respiratory rate 21-24", "local", "at0093"), - - TRAUMA_SURGERY_PROCEDURE_IN_LAST8_WEEKS("Trauma / surgery / procedure in last 8 weeks", "Trauma / surgery / procedure in last 8 weeks", "local", "at0092"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - AmberFlagAcuteDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java deleted file mode 100644 index 2a36077f6..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-SECTION.adhoc.v1") -public class AssessmentSection { - @Path("/items[openEHR-EHR-OBSERVATION.denwis.v0]") - private DenwisObservation denwis; - - @Path("/items[openEHR-EHR-SECTION.adhoc.v1 and name/value='Sepsis']") - private SepsisSection sepsis; - - @Path("/items[openEHR-EHR-SECTION.adhoc.v1 and name/value='Covid']") - private CovidSection covid; - - @Path("/items[openEHR-EHR-SECTION.adhoc.v1 and name/value='NEWS2']") - private News2Section news2; - - public void setDenwis(DenwisObservation denwis) { - this.denwis = denwis; - } - - public DenwisObservation getDenwis() { - return this.denwis ; - } - - public void setSepsis(SepsisSection sepsis) { - this.sepsis = sepsis; - } - - public SepsisSection getSepsis() { - return this.sepsis ; - } - - public void setCovid(CovidSection covid) { - this.covid = covid; - } - - public CovidSection getCovid() { - return this.covid ; - } - - public void setNews2(News2Section news2) { - this.news2 = news2; - } - - public News2Section getNews2() { - return this.news2 ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSectionContainment.java deleted file mode 100644 index 6ec7c205e..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSectionContainment.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class AssessmentSectionContainment extends Containment { - public SelectAqlField ASSESSMENT_SECTION = new AqlFieldImp(AssessmentSection.class, "", "AssessmentSection", AssessmentSection.class, this); - - public SelectAqlField DENWIS = new AqlFieldImp(AssessmentSection.class, "/items[openEHR-EHR-OBSERVATION.denwis.v0]", "denwis", DenwisObservation.class, this); - - public SelectAqlField SEPSIS = new AqlFieldImp(AssessmentSection.class, "/items[openEHR-EHR-SECTION.adhoc.v1]", "sepsis", SepsisSection.class, this); - - public SelectAqlField COVID = new AqlFieldImp(AssessmentSection.class, "/items[openEHR-EHR-SECTION.adhoc.v1]", "covid", CovidSection.class, this); - - public SelectAqlField NEWS2 = new AqlFieldImp(AssessmentSection.class, "/items[openEHR-EHR-SECTION.adhoc.v1]", "news2", News2Section.class, this); - - private AssessmentSectionContainment() { - super("openEHR-EHR-SECTION.adhoc.v1"); - } - - public static AssessmentSectionContainment getInstance() { - return new AssessmentSectionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java deleted file mode 100644 index 7799a5574..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-SECTION.adhoc.v1") -public class BackgroundSection { - @Path("/items[openEHR-EHR-OBSERVATION.height.v2 and name/value='Height']") - private HeightObservation height; - - @Path("/items[openEHR-EHR-OBSERVATION.body_weight.v2 and name/value='Weight']") - private WeightObservation weight; - - @Path("/items[openEHR-EHR-OBSERVATION.clinical_frailty_scale.v1 and name/value='Frailty']") - private FrailtyObservation frailty; - - @Path("/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Past history']") - private PastHistoryEvaluation pastHistory; - - @Path("/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Medication']") - private MedicationEvaluation medication; - - @Path("/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Allergies']") - private AllergiesEvaluation allergies; - - public void setHeight(HeightObservation height) { - this.height = height; - } - - public HeightObservation getHeight() { - return this.height ; - } - - public void setWeight(WeightObservation weight) { - this.weight = weight; - } - - public WeightObservation getWeight() { - return this.weight ; - } - - public void setFrailty(FrailtyObservation frailty) { - this.frailty = frailty; - } - - public FrailtyObservation getFrailty() { - return this.frailty ; - } - - public void setPastHistory(PastHistoryEvaluation pastHistory) { - this.pastHistory = pastHistory; - } - - public PastHistoryEvaluation getPastHistory() { - return this.pastHistory ; - } - - public void setMedication(MedicationEvaluation medication) { - this.medication = medication; - } - - public MedicationEvaluation getMedication() { - return this.medication ; - } - - public void setAllergies(AllergiesEvaluation allergies) { - this.allergies = allergies; - } - - public AllergiesEvaluation getAllergies() { - return this.allergies ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSectionContainment.java deleted file mode 100644 index 30369facf..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSectionContainment.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class BackgroundSectionContainment extends Containment { - public SelectAqlField BACKGROUND_SECTION = new AqlFieldImp(BackgroundSection.class, "", "BackgroundSection", BackgroundSection.class, this); - - public SelectAqlField HEIGHT = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-OBSERVATION.height.v2]", "height", HeightObservation.class, this); - - public SelectAqlField WEIGHT = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-OBSERVATION.body_weight.v2]", "weight", WeightObservation.class, this); - - public SelectAqlField FRAILTY = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-OBSERVATION.clinical_frailty_scale.v1]", "frailty", FrailtyObservation.class, this); - - public SelectAqlField PAST_HISTORY = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1]", "pastHistory", PastHistoryEvaluation.class, this); - - public SelectAqlField MEDICATION = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1]", "medication", MedicationEvaluation.class, this); - - public SelectAqlField ALLERGIES = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1]", "allergies", AllergiesEvaluation.class, this); - - private BackgroundSectionContainment() { - super("openEHR-EHR-SECTION.adhoc.v1"); - } - - public static BackgroundSectionContainment getInstance() { - return new BackgroundSectionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java deleted file mode 100644 index 621f13f4e..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java +++ /dev/null @@ -1,148 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Double; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.blood_pressure.v2") -public class BloodPressureObservation { - @Path("/data[at0001]/events[at0006]/data[at0003]/items[at0004]/value|magnitude") - private Double systolicMagnitude; - - @Path("/data[at0001]/events[at0006]/data[at0003]/items[at0004]/value|units") - private String systolicUnits; - - @Path("/data[at0001]/events[at0006]/data[at0003]/items[at0005]/value|magnitude") - private Double diastolicMagnitude; - - @Path("/data[at0001]/events[at0006]/data[at0003]/items[at0005]/value|units") - private String diastolicUnits; - - @Path("/data[at0001]/events[at0006]/state[at0007]/items[at1030]") - private Cluster exertion; - - @Path("/data[at0001]/events[at0006]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0011]/items[at1057]") - private List structuredMeasurementLocation; - - @Path("/protocol[at0011]/items[at1025]") - private Cluster device; - - @Path("/protocol[at0011]/items[at1058]") - private List extension; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setSystolicMagnitude(Double systolicMagnitude) { - this.systolicMagnitude = systolicMagnitude; - } - - public Double getSystolicMagnitude() { - return this.systolicMagnitude ; - } - - public void setSystolicUnits(String systolicUnits) { - this.systolicUnits = systolicUnits; - } - - public String getSystolicUnits() { - return this.systolicUnits ; - } - - public void setDiastolicMagnitude(Double diastolicMagnitude) { - this.diastolicMagnitude = diastolicMagnitude; - } - - public Double getDiastolicMagnitude() { - return this.diastolicMagnitude ; - } - - public void setDiastolicUnits(String diastolicUnits) { - this.diastolicUnits = diastolicUnits; - } - - public String getDiastolicUnits() { - return this.diastolicUnits ; - } - - public void setExertion(Cluster exertion) { - this.exertion = exertion; - } - - public Cluster getExertion() { - return this.exertion ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setStructuredMeasurementLocation(List structuredMeasurementLocation) { - this.structuredMeasurementLocation = structuredMeasurementLocation; - } - - public List getStructuredMeasurementLocation() { - return this.structuredMeasurementLocation ; - } - - public void setDevice(Cluster device) { - this.device = device; - } - - public Cluster getDevice() { - return this.device ; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservationContainment.java deleted file mode 100644 index e983654f9..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservationContainment.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Double; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class BloodPressureObservationContainment extends Containment { - public SelectAqlField BLOOD_PRESSURE_OBSERVATION = new AqlFieldImp(BloodPressureObservation.class, "", "BloodPressureObservation", BloodPressureObservation.class, this); - - public SelectAqlField SYSTOLIC_MAGNITUDE = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/events[at0006]/data[at0003]/items[at0004]/value|magnitude", "systolicMagnitude", Double.class, this); - - public SelectAqlField SYSTOLIC_UNITS = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/events[at0006]/data[at0003]/items[at0004]/value|units", "systolicUnits", String.class, this); - - public SelectAqlField DIASTOLIC_MAGNITUDE = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/events[at0006]/data[at0003]/items[at0005]/value|magnitude", "diastolicMagnitude", Double.class, this); - - public SelectAqlField DIASTOLIC_UNITS = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/events[at0006]/data[at0003]/items[at0005]/value|units", "diastolicUnits", String.class, this); - - public SelectAqlField EXERTION = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/events[at0006]/state[at0007]/items[at1030]", "exertion", Cluster.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/events[at0006]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField STRUCTURED_MEASUREMENT_LOCATION = new ListAqlFieldImp(BloodPressureObservation.class, "/protocol[at0011]/items[at1057]", "structuredMeasurementLocation", Cluster.class, this); - - public SelectAqlField DEVICE = new AqlFieldImp(BloodPressureObservation.class, "/protocol[at0011]/items[at1025]", "device", Cluster.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(BloodPressureObservation.class, "/protocol[at0011]/items[at1058]", "extension", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(BloodPressureObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(BloodPressureObservation.class, "/language", "language", Language.class, this); - - private BloodPressureObservationContainment() { - super("openEHR-EHR-OBSERVATION.blood_pressure.v2"); - } - - public static BloodPressureObservationContainment getInstance() { - return new BloodPressureObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BreathingIndicatorDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BreathingIndicatorDefiningCode.java deleted file mode 100644 index 8bd16182d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BreathingIndicatorDefiningCode.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum BreathingIndicatorDefiningCode implements EnumValueSet { - UNABLE_TO_SPEAK_FULL_SENTENCES("Unable to speak full sentences", "Unable to speak in full sentences.", "local", "at0069"), - - NOISY_BREATHING("Noisy breathing", "Noisy breathing.", "local", "at0067"), - - SHORT_OF_BREATH("Short of breath", "Short of breath.", "local", "at0068"), - - USE_ACCESSORY_MUSCLES("Use accessory muscles", "Use accessory muscles.", "local", "at0070"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - BreathingIndicatorDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CareflowStepDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CareflowStepDefiningCode.java deleted file mode 100644 index dc2e12890..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CareflowStepDefiningCode.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum CareflowStepDefiningCode implements EnumValueSet { - SERVICE_PLANNED("Service planned", "Service request to healthcare provider is planned.", null, "at0002"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - CareflowStepDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java deleted file mode 100644 index 6a6405886..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") -public class ChestSymptomCluster { - @Path("/items[at0001.1]/value|defining_code") - private CodePhrase symptomSignNameDefiningCode; - - @Path("/items[at0147]") - private List structuredBodySite; - - @Path("/items[at0153]") - private List specificDetails; - - @Path("/items[at0146]") - private List previousEpisodes; - - @Path("/items[at0063]") - private List associatedSymptomSign; - - @Path("/items[at0.1 and name/value='Presence']/value|defining_code") - private PresenceDefiningCode presenceDefiningCode; - - public void setSymptomSignNameDefiningCode(CodePhrase symptomSignNameDefiningCode) { - this.symptomSignNameDefiningCode = symptomSignNameDefiningCode; - } - - public CodePhrase getSymptomSignNameDefiningCode() { - return this.symptomSignNameDefiningCode ; - } - - public void setStructuredBodySite(List structuredBodySite) { - this.structuredBodySite = structuredBodySite; - } - - public List getStructuredBodySite() { - return this.structuredBodySite ; - } - - public void setSpecificDetails(List specificDetails) { - this.specificDetails = specificDetails; - } - - public List getSpecificDetails() { - return this.specificDetails ; - } - - public void setPreviousEpisodes(List previousEpisodes) { - this.previousEpisodes = previousEpisodes; - } - - public List getPreviousEpisodes() { - return this.previousEpisodes ; - } - - public void setAssociatedSymptomSign(List associatedSymptomSign) { - this.associatedSymptomSign = associatedSymptomSign; - } - - public List getAssociatedSymptomSign() { - return this.associatedSymptomSign ; - } - - public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { - this.presenceDefiningCode = presenceDefiningCode; - } - - public PresenceDefiningCode getPresenceDefiningCode() { - return this.presenceDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomClusterContainment.java deleted file mode 100644 index c899af271..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomClusterContainment.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class ChestSymptomClusterContainment extends Containment { - public SelectAqlField CHEST_SYMPTOM_CLUSTER = new AqlFieldImp(ChestSymptomCluster.class, "", "ChestSymptomCluster", ChestSymptomCluster.class, this); - - public SelectAqlField SYMPTOM_SIGN_NAME_DEFINING_CODE = new AqlFieldImp(ChestSymptomCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningCode", CodePhrase.class, this); - - public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(ChestSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); - - public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(ChestSymptomCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); - - public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(ChestSymptomCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); - - public ListSelectAqlField ASSOCIATED_SYMPTOM_SIGN = new ListAqlFieldImp(ChestSymptomCluster.class, "/items[at0063]", "associatedSymptomSign", Cluster.class, this); - - public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(ChestSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); - - private ChestSymptomClusterContainment() { - super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); - } - - public static ChestSymptomClusterContainment getInstance() { - return new ChestSymptomClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CirculationIndicatorDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CirculationIndicatorDefiningCode.java deleted file mode 100644 index b9755cab4..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CirculationIndicatorDefiningCode.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum CirculationIndicatorDefiningCode implements EnumValueSet { - COLDNESS("Coldness", "Coldness.", "local", "at0098"), - - IMPAIRED_PERFUSION("Impaired perfusion", "Impaired perfusion.", "local", "at0099"), - - SWEATY_CLAMMY("Sweaty/clammy", "Sweaty/clammy.", "local", "at0097"), - - COLOUR_CHANGES_PALE_GREY("Colour changes: pale, grey", "Colour changes: pale, grey.", "local", "at0096"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - CirculationIndicatorDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ClinicalRiskCategoryDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ClinicalRiskCategoryDefiningcode.java deleted file mode 100644 index c99c0e2ec..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ClinicalRiskCategoryDefiningcode.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum ClinicalRiskCategoryDefiningCode implements EnumValueSet { - MEDIUM("Medium", "Key threshold for urgent response.", "local", "at0059"), - - LOW("Low", "Ward-based response.", "local", "at0057"), - - LOW_MEDIUM("Low-medium", "Urgent ward-based response.", "local", "at0058"), - - HIGH("High", "Urgent or emergency response.", "local", "at0060"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - ClinicalRiskCategoryDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java deleted file mode 100644 index 074b2354a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java +++ /dev/null @@ -1,169 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-EVALUATION.health_risk-covid.v0") -public class Covid19ExposureEvaluation { - @Path("/data[at0001]/items[at0002.1]/value|defining_code") - private HealthRiskDefiningCode healthRiskDefiningCode; - - @Path("/data[at0001]/items[at0016 and name/value='Care home has suspected/confirmed Covid-19']/items[at0013.1]/value|defining_code") - private RiskFactorDefiningCode riskFactorDefiningCode; - - @Path("/data[at0001]/items[at0016 and name/value='Care home has suspected/confirmed Covid-19']/items[at0017.1]/value|defining_code") - private PresenceDefiningCode2 presenceDefiningCode; - - @Path("/data[at0001]/items[at0016 and name/value='Care home has suspected/confirmed Covid-19']/items[at0027.1]") - private List careHomeHasSuspectedConfirmedCovid19Detail; - - @Path("/data[at0001]/items[at0016 and name/value='Contact with confirmed case']/items[at0013.1]/value|defining_code") - private RiskFactorDefiningCode2 riskFactorDefiningCode2; - - @Path("/data[at0001]/items[at0016 and name/value='Contact with confirmed case']/items[at0017.1]/value|defining_code") - private PresenceDefiningCode2 presenceDefiningCode2; - - @Path("/data[at0001]/items[at0016 and name/value='Contact with confirmed case']/items[at0027.1]") - private List contactWithConfirmedCaseDetail; - - @Path("/data[at0001]/items[at0016 and name/value='Other residents/household members unwell']/items[at0013.1]/value|defining_code") - private RiskFactorDefiningCode3 riskFactorDefiningCode3; - - @Path("/data[at0001]/items[at0016 and name/value='Other residents/household members unwell']/items[at0017.1]/value|defining_code") - private PresenceDefiningCode2 presenceDefiningCode3; - - @Path("/data[at0001]/items[at0016 and name/value='Other residents/household members unwell']/items[at0027.1]") - private List otherResidentsHouseholdMembersUnwellDetail; - - @Path("/data[at0001]/items[at0003.1]/value|defining_code") - private RiskAssessmentDefiningCode riskAssessmentDefiningCode; - - @Path("/protocol[at0010]/items[at0011]") - private List extension; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setHealthRiskDefiningCode(HealthRiskDefiningCode healthRiskDefiningCode) { - this.healthRiskDefiningCode = healthRiskDefiningCode; - } - - public HealthRiskDefiningCode getHealthRiskDefiningCode() { - return this.healthRiskDefiningCode ; - } - - public void setRiskFactorDefiningCode(RiskFactorDefiningCode riskFactorDefiningCode) { - this.riskFactorDefiningCode = riskFactorDefiningCode; - } - - public RiskFactorDefiningCode getRiskFactorDefiningCode() { - return this.riskFactorDefiningCode ; - } - - public void setPresenceDefiningCode(PresenceDefiningCode2 presenceDefiningCode) { - this.presenceDefiningCode = presenceDefiningCode; - } - - public PresenceDefiningCode2 getPresenceDefiningCode() { - return this.presenceDefiningCode ; - } - - public void setCareHomeHasSuspectedConfirmedCovid19Detail( - List careHomeHasSuspectedConfirmedCovid19Detail) { - this.careHomeHasSuspectedConfirmedCovid19Detail = careHomeHasSuspectedConfirmedCovid19Detail; - } - - public List getCareHomeHasSuspectedConfirmedCovid19Detail() { - return this.careHomeHasSuspectedConfirmedCovid19Detail ; - } - - public void setRiskFactorDefiningCode2(RiskFactorDefiningCode2 riskFactorDefiningCode2) { - this.riskFactorDefiningCode2 = riskFactorDefiningCode2; - } - - public RiskFactorDefiningCode2 getRiskFactorDefiningCode2() { - return this.riskFactorDefiningCode2 ; - } - - public void setPresenceDefiningCode2(PresenceDefiningCode2 presenceDefiningCode2) { - this.presenceDefiningCode2 = presenceDefiningCode2; - } - - public PresenceDefiningCode2 getPresenceDefiningCode2() { - return this.presenceDefiningCode2 ; - } - - public void setContactWithConfirmedCaseDetail(List contactWithConfirmedCaseDetail) { - this.contactWithConfirmedCaseDetail = contactWithConfirmedCaseDetail; - } - - public List getContactWithConfirmedCaseDetail() { - return this.contactWithConfirmedCaseDetail ; - } - - public void setRiskFactorDefiningCode3(RiskFactorDefiningCode3 riskFactorDefiningCode3) { - this.riskFactorDefiningCode3 = riskFactorDefiningCode3; - } - - public RiskFactorDefiningCode3 getRiskFactorDefiningCode3() { - return this.riskFactorDefiningCode3 ; - } - - public void setPresenceDefiningCode3(PresenceDefiningCode2 presenceDefiningCode3) { - this.presenceDefiningCode3 = presenceDefiningCode3; - } - - public PresenceDefiningCode2 getPresenceDefiningCode3() { - return this.presenceDefiningCode3 ; - } - - public void setOtherResidentsHouseholdMembersUnwellDetail( - List otherResidentsHouseholdMembersUnwellDetail) { - this.otherResidentsHouseholdMembersUnwellDetail = otherResidentsHouseholdMembersUnwellDetail; - } - - public List getOtherResidentsHouseholdMembersUnwellDetail() { - return this.otherResidentsHouseholdMembersUnwellDetail ; - } - - public void setRiskAssessmentDefiningCode(RiskAssessmentDefiningCode riskAssessmentDefiningCode) { - this.riskAssessmentDefiningCode = riskAssessmentDefiningCode; - } - - public RiskAssessmentDefiningCode getRiskAssessmentDefiningCode() { - return this.riskAssessmentDefiningCode ; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluationContainment.java deleted file mode 100644 index 90021c0a1..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluationContainment.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class Covid19ExposureEvaluationContainment extends Containment { - public SelectAqlField COVID19_EXPOSURE_EVALUATION = new AqlFieldImp(Covid19ExposureEvaluation.class, "", "Covid19ExposureEvaluation", Covid19ExposureEvaluation.class, this); - - public SelectAqlField HEALTH_RISK_DEFINING_CODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0002.1]/value|defining_code", "healthRiskDefiningCode", HealthRiskDefiningCode.class, this); - - public SelectAqlField RISK_FACTOR_DEFINING_CODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0013.1]/value|defining_code", "riskFactorDefiningCode", RiskFactorDefiningCode.class, this); - - public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0017.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode2.class, this); - - public ListSelectAqlField CARE_HOME_HAS_SUSPECTED_CONFIRMED_COVID19_DETAIL = new ListAqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0027.1]", "careHomeHasSuspectedConfirmedCovid19Detail", Cluster.class, this); - - public SelectAqlField RISK_FACTOR_DEFINING_CODE2 = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0013.1]/value|defining_code", "riskFactorDefiningCode2", RiskFactorDefiningCode2.class, this); - - public SelectAqlField PRESENCE_DEFINING_CODE2 = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0017.1]/value|defining_code", "presenceDefiningCode2", PresenceDefiningCode2.class, this); - - public ListSelectAqlField CONTACT_WITH_CONFIRMED_CASE_DETAIL = new ListAqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0027.1]", "contactWithConfirmedCaseDetail", Cluster.class, this); - - public SelectAqlField RISK_FACTOR_DEFINING_CODE3 = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0013.1]/value|defining_code", "riskFactorDefiningCode3", RiskFactorDefiningCode3.class, this); - - public SelectAqlField PRESENCE_DEFINING_CODE3 = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0017.1]/value|defining_code", "presenceDefiningCode3", PresenceDefiningCode2.class, this); - - public ListSelectAqlField OTHER_RESIDENTS_HOUSEHOLD_MEMBERS_UNWELL_DETAIL = new ListAqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0027.1]", "otherResidentsHouseholdMembersUnwellDetail", Cluster.class, this); - - public SelectAqlField RISK_ASSESSMENT_DEFINING_CODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0003.1]/value|defining_code", "riskAssessmentDefiningCode", RiskAssessmentDefiningCode.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(Covid19ExposureEvaluation.class, "/protocol[at0010]/items[at0011]", "extension", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(Covid19ExposureEvaluation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/language", "language", Language.class, this); - - private Covid19ExposureEvaluationContainment() { - super("openEHR-EHR-EVALUATION.health_risk-covid.v0"); - } - - public static Covid19ExposureEvaluationContainment getInstance() { - return new Covid19ExposureEvaluationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java deleted file mode 100644 index 1f5f03c16..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") -public class CovidNotesEvaluation { - @Path("/data[at0001]/items[at0002]/value|value") - private String synopsisValue; - - @Path("/protocol[at0003]/items[at0004]") - private List extension; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setSynopsisValue(String synopsisValue) { - this.synopsisValue = synopsisValue; - } - - public String getSynopsisValue() { - return this.synopsisValue ; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluationContainment.java deleted file mode 100644 index c24e3bf4e..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluationContainment.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class CovidNotesEvaluationContainment extends Containment { - public SelectAqlField COVID_NOTES_EVALUATION = new AqlFieldImp(CovidNotesEvaluation.class, "", "CovidNotesEvaluation", CovidNotesEvaluation.class, this); - - public SelectAqlField SYNOPSIS_VALUE = new AqlFieldImp(CovidNotesEvaluation.class, "/data[at0001]/items[at0002]/value|value", "synopsisValue", String.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(CovidNotesEvaluation.class, "/protocol[at0003]/items[at0004]", "extension", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(CovidNotesEvaluation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(CovidNotesEvaluation.class, "/language", "language", Language.class, this); - - private CovidNotesEvaluationContainment() { - super("openEHR-EHR-EVALUATION.clinical_synopsis.v1"); - } - - public static CovidNotesEvaluationContainment getInstance() { - return new CovidNotesEvaluationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java deleted file mode 100644 index da4c76b4a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-SECTION.adhoc.v1") -public class CovidSection { - @Path("/items[openEHR-EHR-OBSERVATION.story.v1 and name/value='Covid symptoms']") - private CovidSymptomsObservation covidSymptoms; - - @Path("/items[openEHR-EHR-EVALUATION.health_risk-covid.v0 and name/value='Covid-19 exposure']") - private Covid19ExposureEvaluation covid19Exposure; - - @Path("/items[openEHR-EHR-OBSERVATION.laboratory_test_result.v1 and name/value='Latest Covid-19 test']") - private LatestCovid19TestObservation latestCovid19Test; - - @Path("/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Covid notes']") - private CovidNotesEvaluation covidNotes; - - public void setCovidSymptoms(CovidSymptomsObservation covidSymptoms) { - this.covidSymptoms = covidSymptoms; - } - - public CovidSymptomsObservation getCovidSymptoms() { - return this.covidSymptoms ; - } - - public void setCovid19Exposure(Covid19ExposureEvaluation covid19Exposure) { - this.covid19Exposure = covid19Exposure; - } - - public Covid19ExposureEvaluation getCovid19Exposure() { - return this.covid19Exposure ; - } - - public void setLatestCovid19Test(LatestCovid19TestObservation latestCovid19Test) { - this.latestCovid19Test = latestCovid19Test; - } - - public LatestCovid19TestObservation getLatestCovid19Test() { - return this.latestCovid19Test ; - } - - public void setCovidNotes(CovidNotesEvaluation covidNotes) { - this.covidNotes = covidNotes; - } - - public CovidNotesEvaluation getCovidNotes() { - return this.covidNotes ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSectionContainment.java deleted file mode 100644 index 8449d844e..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSectionContainment.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class CovidSectionContainment extends Containment { - public SelectAqlField COVID_SECTION = new AqlFieldImp(CovidSection.class, "", "CovidSection", CovidSection.class, this); - - public SelectAqlField COVID_SYMPTOMS = new AqlFieldImp(CovidSection.class, "/items[openEHR-EHR-OBSERVATION.story.v1]", "covidSymptoms", CovidSymptomsObservation.class, this); - - public SelectAqlField COVID19_EXPOSURE = new AqlFieldImp(CovidSection.class, "/items[openEHR-EHR-EVALUATION.health_risk-covid.v0]", "covid19Exposure", Covid19ExposureEvaluation.class, this); - - public SelectAqlField LATEST_COVID19_TEST = new AqlFieldImp(CovidSection.class, "/items[openEHR-EHR-OBSERVATION.laboratory_test_result.v1]", "latestCovid19Test", LatestCovid19TestObservation.class, this); - - public SelectAqlField COVID_NOTES = new AqlFieldImp(CovidSection.class, "/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1]", "covidNotes", CovidNotesEvaluation.class, this); - - private CovidSectionContainment() { - super("openEHR-EHR-SECTION.adhoc.v1"); - } - - public static CovidSectionContainment getInstance() { - return new CovidSectionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java deleted file mode 100644 index 33e9050d5..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java +++ /dev/null @@ -1,147 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.story.v1") -public class CovidSymptomsObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value") - private String storyValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='First symptoms']") - private FirstSymptomsCluster firstSymptoms; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Key Covid symptom']") - private List keyCovidSymptom; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Chest symptom']") - private List chestSymptom; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Abdomen symptom']") - private List abdomenSymptom; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Neuro symptom']") - private List neuroSymptom; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Other symptom']") - private List otherSymptom; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0007]/items[at0008]") - private List extension; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setStoryValue(String storyValue) { - this.storyValue = storyValue; - } - - public String getStoryValue() { - return this.storyValue ; - } - - public void setFirstSymptoms(FirstSymptomsCluster firstSymptoms) { - this.firstSymptoms = firstSymptoms; - } - - public FirstSymptomsCluster getFirstSymptoms() { - return this.firstSymptoms ; - } - - public void setKeyCovidSymptom(List keyCovidSymptom) { - this.keyCovidSymptom = keyCovidSymptom; - } - - public List getKeyCovidSymptom() { - return this.keyCovidSymptom ; - } - - public void setChestSymptom(List chestSymptom) { - this.chestSymptom = chestSymptom; - } - - public List getChestSymptom() { - return this.chestSymptom ; - } - - public void setAbdomenSymptom(List abdomenSymptom) { - this.abdomenSymptom = abdomenSymptom; - } - - public List getAbdomenSymptom() { - return this.abdomenSymptom ; - } - - public void setNeuroSymptom(List neuroSymptom) { - this.neuroSymptom = neuroSymptom; - } - - public List getNeuroSymptom() { - return this.neuroSymptom ; - } - - public void setOtherSymptom(List otherSymptom) { - this.otherSymptom = otherSymptom; - } - - public List getOtherSymptom() { - return this.otherSymptom ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservationContainment.java deleted file mode 100644 index 38c324465..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservationContainment.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class CovidSymptomsObservationContainment extends Containment { - public SelectAqlField COVID_SYMPTOMS_OBSERVATION = new AqlFieldImp(CovidSymptomsObservation.class, "", "CovidSymptomsObservation", CovidSymptomsObservation.class, this); - - public SelectAqlField STORY_VALUE = new AqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value", "storyValue", String.class, this); - - public SelectAqlField FIRST_SYMPTOMS = new AqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0]", "firstSymptoms", FirstSymptomsCluster.class, this); - - public ListSelectAqlField KEY_COVID_SYMPTOM = new ListAqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0]", "keyCovidSymptom", KeyCovidSymptomCluster.class, this); - - public ListSelectAqlField CHEST_SYMPTOM = new ListAqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0]", "chestSymptom", ChestSymptomCluster.class, this); - - public ListSelectAqlField ABDOMEN_SYMPTOM = new ListAqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0]", "abdomenSymptom", AbdomenSymptomCluster.class, this); - - public ListSelectAqlField NEURO_SYMPTOM = new ListAqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0]", "neuroSymptom", NeuroSymptomCluster.class, this); - - public ListSelectAqlField OTHER_SYMPTOM = new ListAqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0]", "otherSymptom", OtherSymptomCluster.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(CovidSymptomsObservation.class, "/protocol[at0007]/items[at0008]", "extension", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(CovidSymptomsObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(CovidSymptomsObservation.class, "/language", "language", Language.class, this); - - private CovidSymptomsObservationContainment() { - super("openEHR-EHR-OBSERVATION.story.v1"); - } - - public static CovidSymptomsObservationContainment getInstance() { - return new CovidSymptomsObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CurrentStateDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CurrentStateDefiningCode.java deleted file mode 100644 index 00ea91ce9..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CurrentStateDefiningCode.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum CurrentStateDefiningCode implements EnumValueSet { - PLANNED("planned", "planned", null, "526"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - CurrentStateDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java deleted file mode 100644 index 8a0fbe296..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Choice; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class DenwisAgitationIndicatorElement { - @Path("/value") - @Choice - private DenwisValueChoice2 value; - - public void setValue(DenwisValueChoice2 value) { - this.value = value; - } - - public DenwisValueChoice2 getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java deleted file mode 100644 index 196ef822a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class DenwisBreathingIndicatorElement { - @Path("/value|defining_code") - private BreathingIndicatorDefiningCode value; - - public void setValue(BreathingIndicatorDefiningCode value) { - this.value = value; - } - - public BreathingIndicatorDefiningCode getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java deleted file mode 100644 index 4f9dd4bd5..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class DenwisCirculationIndicatorElement { - @Path("/value|defining_code") - private CirculationIndicatorDefiningCode value; - - public void setValue(CirculationIndicatorDefiningCode value) { - this.value = value; - } - - public CirculationIndicatorDefiningCode getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java deleted file mode 100644 index d363466c0..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Choice; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class DenwisMentationIndicatorElement { - @Path("/value") - @Choice - private DenwisValueChoice2 value; - - public void setValue(DenwisValueChoice2 value) { - this.value = value; - } - - public DenwisValueChoice2 getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java deleted file mode 100644 index a1a43f8f3..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Choice; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class DenwisNurseSubjectiveIndicatorElement { - @Path("/value") - @Choice - private DenwisValueChoice6 value; - - public void setValue(DenwisValueChoice6 value) { - this.value = value; - } - - public DenwisValueChoice6 getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java deleted file mode 100644 index c72f3b9f3..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java +++ /dev/null @@ -1,307 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datastructures.ItemTree; -import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Long; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.denwis.v0") -public class DenwisObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0028]/value") - private DvOrdinal q1Breathing; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0062]") - private List breathingIndicator; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0033]/value") - private DvOrdinal q2Circulation; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0071]") - private List circulationIndicator; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0038]/value") - private DvOrdinal q3Temperature; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0076]") - private List temperatureIndicator; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0043]/value") - private DvOrdinal q4Mentation; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0078]") - private List mentationIndicator; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0047]/value") - private DvOrdinal q5Agitation; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0081]") - private List agitationIndicator; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0050]/value") - private DvOrdinal q6Pain; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0084]") - private List painIndicator; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0053]/value") - private DvOrdinal q7Trajectory; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0087]") - private List trajectoryIndicator; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0056]/value") - private DvOrdinal q8PatientSubjective; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0090]") - private List patientIndicator; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0059]/value") - private DvOrdinal q9NurseSubjective; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0093]") - private List nurseSubjectiveIndicator; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0027]/value|value") - private String q10OtherCommentValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|magnitude") - private Long totalScoreMagnitude; - - @Path("/data[at0001]/events[at0002]/state[at0006]") - private ItemTree tree; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0004]/items[at0005]") - private List extension; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setQ1Breathing(DvOrdinal q1Breathing) { - this.q1Breathing = q1Breathing; - } - - public DvOrdinal getQ1Breathing() { - return this.q1Breathing ; - } - - public void setBreathingIndicator(List breathingIndicator) { - this.breathingIndicator = breathingIndicator; - } - - public List getBreathingIndicator() { - return this.breathingIndicator ; - } - - public void setQ2Circulation(DvOrdinal q2Circulation) { - this.q2Circulation = q2Circulation; - } - - public DvOrdinal getQ2Circulation() { - return this.q2Circulation ; - } - - public void setCirculationIndicator( - List circulationIndicator) { - this.circulationIndicator = circulationIndicator; - } - - public List getCirculationIndicator() { - return this.circulationIndicator ; - } - - public void setQ3Temperature(DvOrdinal q3Temperature) { - this.q3Temperature = q3Temperature; - } - - public DvOrdinal getQ3Temperature() { - return this.q3Temperature ; - } - - public void setTemperatureIndicator( - List temperatureIndicator) { - this.temperatureIndicator = temperatureIndicator; - } - - public List getTemperatureIndicator() { - return this.temperatureIndicator ; - } - - public void setQ4Mentation(DvOrdinal q4Mentation) { - this.q4Mentation = q4Mentation; - } - - public DvOrdinal getQ4Mentation() { - return this.q4Mentation ; - } - - public void setMentationIndicator(List mentationIndicator) { - this.mentationIndicator = mentationIndicator; - } - - public List getMentationIndicator() { - return this.mentationIndicator ; - } - - public void setQ5Agitation(DvOrdinal q5Agitation) { - this.q5Agitation = q5Agitation; - } - - public DvOrdinal getQ5Agitation() { - return this.q5Agitation ; - } - - public void setAgitationIndicator(List agitationIndicator) { - this.agitationIndicator = agitationIndicator; - } - - public List getAgitationIndicator() { - return this.agitationIndicator ; - } - - public void setQ6Pain(DvOrdinal q6Pain) { - this.q6Pain = q6Pain; - } - - public DvOrdinal getQ6Pain() { - return this.q6Pain ; - } - - public void setPainIndicator(List painIndicator) { - this.painIndicator = painIndicator; - } - - public List getPainIndicator() { - return this.painIndicator ; - } - - public void setQ7Trajectory(DvOrdinal q7Trajectory) { - this.q7Trajectory = q7Trajectory; - } - - public DvOrdinal getQ7Trajectory() { - return this.q7Trajectory ; - } - - public void setTrajectoryIndicator(List trajectoryIndicator) { - this.trajectoryIndicator = trajectoryIndicator; - } - - public List getTrajectoryIndicator() { - return this.trajectoryIndicator ; - } - - public void setQ8PatientSubjective(DvOrdinal q8PatientSubjective) { - this.q8PatientSubjective = q8PatientSubjective; - } - - public DvOrdinal getQ8PatientSubjective() { - return this.q8PatientSubjective ; - } - - public void setPatientIndicator(List patientIndicator) { - this.patientIndicator = patientIndicator; - } - - public List getPatientIndicator() { - return this.patientIndicator ; - } - - public void setQ9NurseSubjective(DvOrdinal q9NurseSubjective) { - this.q9NurseSubjective = q9NurseSubjective; - } - - public DvOrdinal getQ9NurseSubjective() { - return this.q9NurseSubjective ; - } - - public void setNurseSubjectiveIndicator( - List nurseSubjectiveIndicator) { - this.nurseSubjectiveIndicator = nurseSubjectiveIndicator; - } - - public List getNurseSubjectiveIndicator() { - return this.nurseSubjectiveIndicator ; - } - - public void setQ10OtherCommentValue(String q10OtherCommentValue) { - this.q10OtherCommentValue = q10OtherCommentValue; - } - - public String getQ10OtherCommentValue() { - return this.q10OtherCommentValue ; - } - - public void setTotalScoreMagnitude(Long totalScoreMagnitude) { - this.totalScoreMagnitude = totalScoreMagnitude; - } - - public Long getTotalScoreMagnitude() { - return this.totalScoreMagnitude ; - } - - public void setTree(ItemTree tree) { - this.tree = tree; - } - - public ItemTree getTree() { - return this.tree ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservationContainment.java deleted file mode 100644 index cc7287566..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservationContainment.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datastructures.ItemTree; -import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Long; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class DenwisObservationContainment extends Containment { - public SelectAqlField DENWIS_OBSERVATION = new AqlFieldImp(DenwisObservation.class, "", "DenwisObservation", DenwisObservation.class, this); - - public SelectAqlField Q1_BREATHING = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0028]/value", "q1Breathing", DvOrdinal.class, this); - - public ListSelectAqlField BREATHING_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0062]", "breathingIndicator", DenwisBreathingIndicatorElement.class, this); - - public SelectAqlField Q2_CIRCULATION = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0033]/value", "q2Circulation", DvOrdinal.class, this); - - public ListSelectAqlField CIRCULATION_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0071]", "circulationIndicator", DenwisCirculationIndicatorElement.class, this); - - public SelectAqlField Q3_TEMPERATURE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0038]/value", "q3Temperature", DvOrdinal.class, this); - - public ListSelectAqlField TEMPERATURE_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0076]", "temperatureIndicator", DenwisTemperatureIndicatorElement.class, this); - - public SelectAqlField Q4_MENTATION = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0043]/value", "q4Mentation", DvOrdinal.class, this); - - public ListSelectAqlField MENTATION_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0078]", "mentationIndicator", DenwisMentationIndicatorElement.class, this); - - public SelectAqlField Q5_AGITATION = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0047]/value", "q5Agitation", DvOrdinal.class, this); - - public ListSelectAqlField AGITATION_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0081]", "agitationIndicator", DenwisAgitationIndicatorElement.class, this); - - public SelectAqlField Q6_PAIN = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0050]/value", "q6Pain", DvOrdinal.class, this); - - public ListSelectAqlField PAIN_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0084]", "painIndicator", DenwisPainIndicatorElement.class, this); - - public SelectAqlField Q7_TRAJECTORY = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0053]/value", "q7Trajectory", DvOrdinal.class, this); - - public ListSelectAqlField TRAJECTORY_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0087]", "trajectoryIndicator", DenwisTrajectoryIndicatorElement.class, this); - - public SelectAqlField Q8_PATIENT_SUBJECTIVE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0056]/value", "q8PatientSubjective", DvOrdinal.class, this); - - public ListSelectAqlField PATIENT_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0090]", "patientIndicator", DenwisPatientIndicatorElement.class, this); - - public SelectAqlField Q9_NURSE_SUBJECTIVE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0059]/value", "q9NurseSubjective", DvOrdinal.class, this); - - public ListSelectAqlField NURSE_SUBJECTIVE_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0093]", "nurseSubjectiveIndicator", DenwisNurseSubjectiveIndicatorElement.class, this); - - public SelectAqlField Q10_OTHER_COMMENT_VALUE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0027]/value|value", "q10OtherCommentValue", String.class, this); - - public SelectAqlField TOTAL_SCORE_MAGNITUDE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|magnitude", "totalScoreMagnitude", Long.class, this); - - public SelectAqlField TREE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/state[at0006]", "tree", ItemTree.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(DenwisObservation.class, "/protocol[at0004]/items[at0005]", "extension", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(DenwisObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(DenwisObservation.class, "/language", "language", Language.class, this); - - private DenwisObservationContainment() { - super("openEHR-EHR-OBSERVATION.denwis.v0"); - } - - public static DenwisObservationContainment getInstance() { - return new DenwisObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java deleted file mode 100644 index 9957e73d7..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Choice; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class DenwisPainIndicatorElement { - @Path("/value") - @Choice - private DenwisValueChoice3 value; - - public void setValue(DenwisValueChoice3 value) { - this.value = value; - } - - public DenwisValueChoice3 getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java deleted file mode 100644 index 7db2a5e7f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Choice; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class DenwisPatientIndicatorElement { - @Path("/value") - @Choice - private DenwisValueChoice5 value; - - public void setValue(DenwisValueChoice5 value) { - this.value = value; - } - - public DenwisValueChoice5 getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java deleted file mode 100644 index 1546423c3..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Choice; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class DenwisTemperatureIndicatorElement { - @Path("/value") - @Choice - private DenwisValueChoice value; - - public void setValue(DenwisValueChoice value) { - this.value = value; - } - - public DenwisValueChoice getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java deleted file mode 100644 index a786771a8..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Choice; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class DenwisTrajectoryIndicatorElement { - @Path("/value") - @Choice - private DenwisValueChoice4 value; - - public void setValue(DenwisValueChoice4 value) { - this.value = value; - } - - public DenwisValueChoice4 getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice.java deleted file mode 100644 index f5090eda1..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -public interface DenwisValueChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice2.java deleted file mode 100644 index 7811059ec..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice2.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -public interface DenwisValueChoice2 { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice3.java deleted file mode 100644 index dec67cc7d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice3.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -public interface DenwisValueChoice3 { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice4.java deleted file mode 100644 index 5f32501e4..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice4.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -public interface DenwisValueChoice4 { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice5.java deleted file mode 100644 index 188762530..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice5.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -public interface DenwisValueChoice5 { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice6.java deleted file mode 100644 index b58b44c78..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice6.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -public interface DenwisValueChoice6 { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java deleted file mode 100644 index ebe18d0cb..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class DenwisValueDvCodedText implements DenwisValueChoice { - @Path("|defining_code") - private ValueDefiningCode valueDefiningCode; - - public void setValueDefiningCode(ValueDefiningCode valueDefiningCode) { - this.valueDefiningCode = valueDefiningCode; - } - - public ValueDefiningCode getValueDefiningCode() { - return this.valueDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java deleted file mode 100644 index 1621d836e..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class DenwisValueDvCodedText2 implements DenwisValueChoice2 { - @Path("|defining_code") - private ValueDefiningCode2 valueDefiningCode; - - public void setValueDefiningCode(ValueDefiningCode2 valueDefiningCode) { - this.valueDefiningCode = valueDefiningCode; - } - - public ValueDefiningCode2 getValueDefiningCode() { - return this.valueDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java deleted file mode 100644 index 0be21a1ac..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class DenwisValueDvCodedText3 implements DenwisValueChoice3 { - @Path("|defining_code") - private ValueDefiningCode3 valueDefiningCode; - - public void setValueDefiningCode(ValueDefiningCode3 valueDefiningCode) { - this.valueDefiningCode = valueDefiningCode; - } - - public ValueDefiningCode3 getValueDefiningCode() { - return this.valueDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java deleted file mode 100644 index ceec297ae..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class DenwisValueDvCodedText4 implements DenwisValueChoice4 { - @Path("|defining_code") - private ValueDefiningCode4 valueDefiningCode; - - public void setValueDefiningCode(ValueDefiningCode4 valueDefiningCode) { - this.valueDefiningCode = valueDefiningCode; - } - - public ValueDefiningCode4 getValueDefiningCode() { - return this.valueDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java deleted file mode 100644 index 45d52851d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class DenwisValueDvCodedText5 implements DenwisValueChoice5 { - @Path("|defining_code") - private ValueDefiningCode5 valueDefiningCode; - - public void setValueDefiningCode(ValueDefiningCode5 valueDefiningCode) { - this.valueDefiningCode = valueDefiningCode; - } - - public ValueDefiningCode5 getValueDefiningCode() { - return this.valueDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java deleted file mode 100644 index b8ec39f42..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class DenwisValueDvCodedText6 implements DenwisValueChoice6 { - @Path("|defining_code") - private ValueDefiningCode6 valueDefiningCode; - - public void setValueDefiningCode(ValueDefiningCode6 valueDefiningCode) { - this.valueDefiningCode = valueDefiningCode; - } - - public ValueDefiningCode6 getValueDefiningCode() { - return this.valueDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java deleted file mode 100644 index 113be1a3c..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class DenwisValueDvText implements DenwisValueChoice { - @Path("|value") - private String valueValue; - - public void setValueValue(String valueValue) { - this.valueValue = valueValue; - } - - public String getValueValue() { - return this.valueValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java deleted file mode 100644 index db19ab582..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class DenwisValueDvText2 implements DenwisValueChoice2 { - @Path("|value") - private String valueValue; - - public void setValueValue(String valueValue) { - this.valueValue = valueValue; - } - - public String getValueValue() { - return this.valueValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java deleted file mode 100644 index fb3622e75..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class DenwisValueDvText3 implements DenwisValueChoice3 { - @Path("|value") - private String valueValue; - - public void setValueValue(String valueValue) { - this.valueValue = valueValue; - } - - public String getValueValue() { - return this.valueValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java deleted file mode 100644 index d1c2cf438..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class DenwisValueDvText4 implements DenwisValueChoice4 { - @Path("|value") - private String valueValue; - - public void setValueValue(String valueValue) { - this.valueValue = valueValue; - } - - public String getValueValue() { - return this.valueValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java deleted file mode 100644 index ea8124987..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class DenwisValueDvText5 implements DenwisValueChoice5 { - @Path("|value") - private String valueValue; - - public void setValueValue(String valueValue) { - this.valueValue = valueValue; - } - - public String getValueValue() { - return this.valueValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java deleted file mode 100644 index a3dd218c3..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class DenwisValueDvText6 implements DenwisValueChoice6 { - @Path("|value") - private String valueValue; - - public void setValueValue(String valueValue) { - this.valueValue = valueValue; - } - - public String getValueValue() { - return this.valueValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java deleted file mode 100644 index ac608eb0c..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java +++ /dev/null @@ -1,125 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalAmount; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") -public class FirstSymptomsCluster { - @Path("/items[at0001.1]/value|defining_code") - private CodePhrase symptomSignNameDefiningCode; - - @Path("/items[at0147]") - private List structuredBodySite; - - @Path("/items[at0152 and name/value='Date of onset of first symptoms']/value|value") - private TemporalAccessor dateOfOnsetOfFirstSymptomsValue; - - @Path("/items[at0028]/value|value") - private TemporalAmount durationValue; - - @Path("/items[at0180 and name/value='Trend']/value|defining_code") - private TrendDefiningCode trendDefiningCode; - - @Path("/items[at0155]/value|value") - private String impactValue; - - @Path("/items[at0153]") - private List specificDetails; - - @Path("/items[at0146]") - private List previousEpisodes; - - @Path("/items[at0063]") - private List associatedSymptomSign; - - @Path("/items[at0.1]/value|defining_code") - private PresenceDefiningCode presenceDefiningCode; - - public void setSymptomSignNameDefiningCode(CodePhrase symptomSignNameDefiningCode) { - this.symptomSignNameDefiningCode = symptomSignNameDefiningCode; - } - - public CodePhrase getSymptomSignNameDefiningCode() { - return this.symptomSignNameDefiningCode ; - } - - public void setStructuredBodySite(List structuredBodySite) { - this.structuredBodySite = structuredBodySite; - } - - public List getStructuredBodySite() { - return this.structuredBodySite ; - } - - public void setDateOfOnsetOfFirstSymptomsValue(TemporalAccessor dateOfOnsetOfFirstSymptomsValue) { - this.dateOfOnsetOfFirstSymptomsValue = dateOfOnsetOfFirstSymptomsValue; - } - - public TemporalAccessor getDateOfOnsetOfFirstSymptomsValue() { - return this.dateOfOnsetOfFirstSymptomsValue ; - } - - public void setDurationValue(TemporalAmount durationValue) { - this.durationValue = durationValue; - } - - public TemporalAmount getDurationValue() { - return this.durationValue ; - } - - public void setTrendDefiningCode(TrendDefiningCode trendDefiningCode) { - this.trendDefiningCode = trendDefiningCode; - } - - public TrendDefiningCode getTrendDefiningCode() { - return this.trendDefiningCode ; - } - - public void setImpactValue(String impactValue) { - this.impactValue = impactValue; - } - - public String getImpactValue() { - return this.impactValue ; - } - - public void setSpecificDetails(List specificDetails) { - this.specificDetails = specificDetails; - } - - public List getSpecificDetails() { - return this.specificDetails ; - } - - public void setPreviousEpisodes(List previousEpisodes) { - this.previousEpisodes = previousEpisodes; - } - - public List getPreviousEpisodes() { - return this.previousEpisodes ; - } - - public void setAssociatedSymptomSign(List associatedSymptomSign) { - this.associatedSymptomSign = associatedSymptomSign; - } - - public List getAssociatedSymptomSign() { - return this.associatedSymptomSign ; - } - - public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { - this.presenceDefiningCode = presenceDefiningCode; - } - - public PresenceDefiningCode getPresenceDefiningCode() { - return this.presenceDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java deleted file mode 100644 index dd6d4bbdf..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalAmount; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class FirstSymptomsClusterContainment extends Containment { - public SelectAqlField FIRST_SYMPTOMS_CLUSTER = new AqlFieldImp(FirstSymptomsCluster.class, "", "FirstSymptomsCluster", FirstSymptomsCluster.class, this); - - public SelectAqlField SYMPTOM_SIGN_NAME_DEFINING_CODE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningCode", CodePhrase.class, this); - - public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(FirstSymptomsCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); - - public SelectAqlField DATE_OF_ONSET_OF_FIRST_SYMPTOMS_VALUE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0152]/value|value", "dateOfOnsetOfFirstSymptomsValue", TemporalAccessor.class, this); - - public SelectAqlField DURATION_VALUE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0028]/value|value", "durationValue", TemporalAmount.class, this); - - public SelectAqlField TREND_DEFINING_CODE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0180]/value|defining_code", "trendDefiningCode", TrendDefiningCode.class, this); - - public SelectAqlField IMPACT_VALUE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0155]/value|value", "impactValue", String.class, this); - - public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(FirstSymptomsCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); - - public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(FirstSymptomsCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); - - public ListSelectAqlField ASSOCIATED_SYMPTOM_SIGN = new ListAqlFieldImp(FirstSymptomsCluster.class, "/items[at0063]", "associatedSymptomSign", Cluster.class, this); - - public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); - - private FirstSymptomsClusterContainment() { - super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); - } - - public static FirstSymptomsClusterContainment getInstance() { - return new FirstSymptomsClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java deleted file mode 100644 index f4af802a0..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java +++ /dev/null @@ -1,81 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.clinical_frailty_scale.v1") -public class FrailtyObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value") - private DvOrdinal assessment; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0014]/items[at0015]") - private List extension; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setAssessment(DvOrdinal assessment) { - this.assessment = assessment; - } - - public DvOrdinal getAssessment() { - return this.assessment ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservationContainment.java deleted file mode 100644 index 5af020b9b..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservationContainment.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class FrailtyObservationContainment extends Containment { - public SelectAqlField FRAILTY_OBSERVATION = new AqlFieldImp(FrailtyObservation.class, "", "FrailtyObservation", FrailtyObservation.class, this); - - public SelectAqlField ASSESSMENT = new AqlFieldImp(FrailtyObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value", "assessment", DvOrdinal.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(FrailtyObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(FrailtyObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(FrailtyObservation.class, "/protocol[at0014]/items[at0015]", "extension", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(FrailtyObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(FrailtyObservation.class, "/language", "language", Language.class, this); - - private FrailtyObservationContainment() { - super("openEHR-EHR-OBSERVATION.clinical_frailty_scale.v1"); - } - - public static FrailtyObservationContainment getInstance() { - return new FrailtyObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HealthRiskDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HealthRiskDefiningcode.java deleted file mode 100644 index 8717e7b68..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HealthRiskDefiningcode.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum HealthRiskDefiningCode implements EnumValueSet { - COVID19_RISK_ASSESSMENT("COVID-19 Risk assessment", "Assessment of risk of COVID-19 infection.", "local", "at0.1"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - HealthRiskDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java deleted file mode 100644 index 932ecf48c..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java +++ /dev/null @@ -1,116 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datastructures.ItemTree; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Double; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.height.v2") -public class HeightObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude") - private Double heightLengthMagnitude; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units") - private String heightLengthUnits; - - @Path("/data[at0001]/events[at0002]/state[at0013]") - private ItemTree tree; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0007]/items[at0011]") - private Cluster device; - - @Path("/protocol[at0007]/items[at0022]") - private List extension; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setHeightLengthMagnitude(Double heightLengthMagnitude) { - this.heightLengthMagnitude = heightLengthMagnitude; - } - - public Double getHeightLengthMagnitude() { - return this.heightLengthMagnitude ; - } - - public void setHeightLengthUnits(String heightLengthUnits) { - this.heightLengthUnits = heightLengthUnits; - } - - public String getHeightLengthUnits() { - return this.heightLengthUnits ; - } - - public void setTree(ItemTree tree) { - this.tree = tree; - } - - public ItemTree getTree() { - return this.tree ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setDevice(Cluster device) { - this.device = device; - } - - public Cluster getDevice() { - return this.device ; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservationContainment.java deleted file mode 100644 index 6e7a8e2b5..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservationContainment.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datastructures.ItemTree; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Double; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class HeightObservationContainment extends Containment { - public SelectAqlField HEIGHT_OBSERVATION = new AqlFieldImp(HeightObservation.class, "", "HeightObservation", HeightObservation.class, this); - - public SelectAqlField HEIGHT_LENGTH_MAGNITUDE = new AqlFieldImp(HeightObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude", "heightLengthMagnitude", Double.class, this); - - public SelectAqlField HEIGHT_LENGTH_UNITS = new AqlFieldImp(HeightObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units", "heightLengthUnits", String.class, this); - - public SelectAqlField TREE = new AqlFieldImp(HeightObservation.class, "/data[at0001]/events[at0002]/state[at0013]", "tree", ItemTree.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(HeightObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(HeightObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public SelectAqlField DEVICE = new AqlFieldImp(HeightObservation.class, "/protocol[at0007]/items[at0011]", "device", Cluster.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(HeightObservation.class, "/protocol[at0007]/items[at0022]", "extension", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(HeightObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(HeightObservation.class, "/language", "language", Language.class, this); - - private HeightObservationContainment() { - super("openEHR-EHR-OBSERVATION.height.v2"); - } - - public static HeightObservationContainment getInstance() { - return new HeightObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java deleted file mode 100644 index 42d83d5f2..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") -public class KeyCovidSymptomCluster { - @Path("/items[at0001.1]/value|defining_code") - private CodePhrase symptomSignNameDefiningCode; - - @Path("/items[at0147]") - private List structuredBodySite; - - @Path("/items[at0153]") - private List specificDetails; - - @Path("/items[at0146]") - private List previousEpisodes; - - @Path("/items[at0063]") - private List associatedSymptomSign; - - @Path("/items[at0.1 and name/value='Presence']/value|defining_code") - private PresenceDefiningCode presenceDefiningCode; - - public void setSymptomSignNameDefiningCode(CodePhrase symptomSignNameDefiningCode) { - this.symptomSignNameDefiningCode = symptomSignNameDefiningCode; - } - - public CodePhrase getSymptomSignNameDefiningCode() { - return this.symptomSignNameDefiningCode ; - } - - public void setStructuredBodySite(List structuredBodySite) { - this.structuredBodySite = structuredBodySite; - } - - public List getStructuredBodySite() { - return this.structuredBodySite ; - } - - public void setSpecificDetails(List specificDetails) { - this.specificDetails = specificDetails; - } - - public List getSpecificDetails() { - return this.specificDetails ; - } - - public void setPreviousEpisodes(List previousEpisodes) { - this.previousEpisodes = previousEpisodes; - } - - public List getPreviousEpisodes() { - return this.previousEpisodes ; - } - - public void setAssociatedSymptomSign(List associatedSymptomSign) { - this.associatedSymptomSign = associatedSymptomSign; - } - - public List getAssociatedSymptomSign() { - return this.associatedSymptomSign ; - } - - public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { - this.presenceDefiningCode = presenceDefiningCode; - } - - public PresenceDefiningCode getPresenceDefiningCode() { - return this.presenceDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomClusterContainment.java deleted file mode 100644 index f072031f2..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomClusterContainment.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class KeyCovidSymptomClusterContainment extends Containment { - public SelectAqlField KEY_COVID_SYMPTOM_CLUSTER = new AqlFieldImp(KeyCovidSymptomCluster.class, "", "KeyCovidSymptomCluster", KeyCovidSymptomCluster.class, this); - - public SelectAqlField SYMPTOM_SIGN_NAME_DEFINING_CODE = new AqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningCode", CodePhrase.class, this); - - public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); - - public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); - - public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); - - public ListSelectAqlField ASSOCIATED_SYMPTOM_SIGN = new ListAqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0063]", "associatedSymptomSign", Cluster.class, this); - - public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); - - private KeyCovidSymptomClusterContainment() { - super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); - } - - public static KeyCovidSymptomClusterContainment getInstance() { - return new KeyCovidSymptomClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java deleted file mode 100644 index 017957406..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java +++ /dev/null @@ -1,194 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -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.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.laboratory_test_result.v1") -public class LatestCovid19TestObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value") - private String testNameValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0065]") - private List specimenDetail; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0097]") - private List testResult; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0098]/value|value") - private String testDiagnosisValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0122]") - private List structuredTestDiagnosis; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0118]") - private List multimediaRepresentation; - - @Path("/data[at0001]/events[at0002]/state[at0112]/items[at0114]") - private List structuredConfoundingFactors; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0004]/items[at0017]") - private Cluster receivingLaboratory; - - @Path("/protocol[at0004]/items[at0094]") - private List testRequestDetails; - - @Path("/protocol[at0004]/items[at0110]") - private List testingDetails; - - @Path("/protocol[at0004]/items[at0117]") - private List extension; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0073]/value") - @Choice - private LatestCovid19TestOverallTestStatusChoice overallTestStatus; - - public void setTestNameValue(String testNameValue) { - this.testNameValue = testNameValue; - } - - public String getTestNameValue() { - return this.testNameValue ; - } - - public void setSpecimenDetail(List specimenDetail) { - this.specimenDetail = specimenDetail; - } - - public List getSpecimenDetail() { - return this.specimenDetail ; - } - - public void setTestResult(List testResult) { - this.testResult = testResult; - } - - public List getTestResult() { - return this.testResult ; - } - - public void setTestDiagnosisValue(String testDiagnosisValue) { - this.testDiagnosisValue = testDiagnosisValue; - } - - public String getTestDiagnosisValue() { - return this.testDiagnosisValue ; - } - - public void setStructuredTestDiagnosis(List structuredTestDiagnosis) { - this.structuredTestDiagnosis = structuredTestDiagnosis; - } - - public List getStructuredTestDiagnosis() { - return this.structuredTestDiagnosis ; - } - - public void setMultimediaRepresentation(List multimediaRepresentation) { - this.multimediaRepresentation = multimediaRepresentation; - } - - public List getMultimediaRepresentation() { - return this.multimediaRepresentation ; - } - - public void setStructuredConfoundingFactors(List structuredConfoundingFactors) { - this.structuredConfoundingFactors = structuredConfoundingFactors; - } - - public List getStructuredConfoundingFactors() { - return this.structuredConfoundingFactors ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setReceivingLaboratory(Cluster receivingLaboratory) { - this.receivingLaboratory = receivingLaboratory; - } - - public Cluster getReceivingLaboratory() { - return this.receivingLaboratory ; - } - - public void setTestRequestDetails( - List testRequestDetails) { - this.testRequestDetails = testRequestDetails; - } - - public List getTestRequestDetails() { - return this.testRequestDetails ; - } - - public void setTestingDetails(List testingDetails) { - this.testingDetails = testingDetails; - } - - public List getTestingDetails() { - return this.testingDetails ; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } - - public void setOverallTestStatus(LatestCovid19TestOverallTestStatusChoice overallTestStatus) { - this.overallTestStatus = overallTestStatus; - } - - public LatestCovid19TestOverallTestStatusChoice getOverallTestStatus() { - return this.overallTestStatus ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservationContainment.java deleted file mode 100644 index 7a8edbedf..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservationContainment.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class LatestCovid19TestObservationContainment extends Containment { - public SelectAqlField LATEST_COVID19_TEST_OBSERVATION = new AqlFieldImp(LatestCovid19TestObservation.class, "", "LatestCovid19TestObservation", LatestCovid19TestObservation.class, this); - - public SelectAqlField TEST_NAME_VALUE = new AqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value", "testNameValue", String.class, this); - - public ListSelectAqlField SPECIMEN_DETAIL = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0065]", "specimenDetail", Cluster.class, this); - - public ListSelectAqlField TEST_RESULT = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0097]", "testResult", Cluster.class, this); - - public SelectAqlField TEST_DIAGNOSIS_VALUE = new AqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0098]/value|value", "testDiagnosisValue", String.class, this); - - public ListSelectAqlField STRUCTURED_TEST_DIAGNOSIS = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0122]", "structuredTestDiagnosis", Cluster.class, this); - - public ListSelectAqlField MULTIMEDIA_REPRESENTATION = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0118]", "multimediaRepresentation", Cluster.class, this); - - public ListSelectAqlField STRUCTURED_CONFOUNDING_FACTORS = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/state[at0112]/items[at0114]", "structuredConfoundingFactors", Cluster.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public SelectAqlField RECEIVING_LABORATORY = new AqlFieldImp(LatestCovid19TestObservation.class, "/protocol[at0004]/items[at0017]", "receivingLaboratory", Cluster.class, this); - - public ListSelectAqlField TEST_REQUEST_DETAILS = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/protocol[at0004]/items[at0094]", "testRequestDetails", LatestCovid19TestTestRequestDetailsCluster.class, this); - - public ListSelectAqlField TESTING_DETAILS = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/protocol[at0004]/items[at0110]", "testingDetails", Cluster.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/protocol[at0004]/items[at0117]", "extension", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(LatestCovid19TestObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(LatestCovid19TestObservation.class, "/language", "language", Language.class, this); - - public SelectAqlField OVERALL_TEST_STATUS = new AqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0073]/value", "overallTestStatus", LatestCovid19TestOverallTestStatusChoice.class, this); - - private LatestCovid19TestObservationContainment() { - super("openEHR-EHR-OBSERVATION.laboratory_test_result.v1"); - } - - public static LatestCovid19TestObservationContainment getInstance() { - return new LatestCovid19TestObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusChoice.java deleted file mode 100644 index e264889eb..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -public interface LatestCovid19TestOverallTestStatusChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvCodedText.java deleted file mode 100644 index 22c633880..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvCodedText.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class LatestCovid19TestOverallTestStatusDvCodedText implements LatestCovid19TestOverallTestStatusChoice { - @Path("|defining_code") - private OverallTestStatusDefiningCode overallTestStatusDefiningCode; - - public void setOverallTestStatusDefiningCode( - OverallTestStatusDefiningCode overallTestStatusDefiningCode) { - this.overallTestStatusDefiningCode = overallTestStatusDefiningCode; - } - - public OverallTestStatusDefiningCode getOverallTestStatusDefiningCode() { - return this.overallTestStatusDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java deleted file mode 100644 index ffa8a2859..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class LatestCovid19TestOverallTestStatusDvText implements LatestCovid19TestOverallTestStatusChoice { - @Path("|value") - private String overallTestStatusValue; - - public void setOverallTestStatusValue(String overallTestStatusValue) { - this.overallTestStatusValue = overallTestStatusValue; - } - - public String getOverallTestStatusValue() { - return this.overallTestStatusValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java deleted file mode 100644 index af4946d03..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.util.List; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class LatestCovid19TestTestRequestDetailsCluster { - @Path("/items[at0090]") - private Cluster requester; - - @Path("/items[at0035]") - private List distributionList; - - public void setRequester(Cluster requester) { - this.requester = requester; - } - - public Cluster getRequester() { - return this.requester ; - } - - public void setDistributionList(List distributionList) { - this.distributionList = distributionList; - } - - public List getDistributionList() { - return this.distributionList ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java deleted file mode 100644 index 984525739..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") -public class MedicationEvaluation { - @Path("/data[at0001]/items[at0002]/value|value") - private String synopsisValue; - - @Path("/protocol[at0003]/items[at0004]") - private List extension; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setSynopsisValue(String synopsisValue) { - this.synopsisValue = synopsisValue; - } - - public String getSynopsisValue() { - return this.synopsisValue ; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluationContainment.java deleted file mode 100644 index a279c542c..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluationContainment.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class MedicationEvaluationContainment extends Containment { - public SelectAqlField MEDICATION_EVALUATION = new AqlFieldImp(MedicationEvaluation.class, "", "MedicationEvaluation", MedicationEvaluation.class, this); - - public SelectAqlField SYNOPSIS_VALUE = new AqlFieldImp(MedicationEvaluation.class, "/data[at0001]/items[at0002]/value|value", "synopsisValue", String.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(MedicationEvaluation.class, "/protocol[at0003]/items[at0004]", "extension", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(MedicationEvaluation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(MedicationEvaluation.class, "/language", "language", Language.class, this); - - private MedicationEvaluationContainment() { - super("openEHR-EHR-EVALUATION.clinical_synopsis.v1"); - } - - public static MedicationEvaluationContainment getInstance() { - return new MedicationEvaluationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/N999FlagDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/N999FlagDefiningCode.java deleted file mode 100644 index 689b3db4e..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/N999FlagDefiningCode.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum N999FlagDefiningCode implements EnumValueSet { - N_I_FEEL_I_MIGHT_DIE("‘I feel I might die’", "The patient stated ‘I feel I might die’.", "local", "at0041"), - - EXTREME_SHIVERING_OR_MUSCLE_PAIN("Extreme shivering or muscle pain", "The patient has extreme shivering or muscle pain.", "local", "at0038"), - - SEVERE_BREATHLESSNESS("Severe breathlessness", "The patient has severe breathlessness.", "local", "at0040"), - - SKIN_MOTTLED_ASHEN_BLUE_OR_VERY_PALE("Skin mottled, ashen, blue or very pale", "The patient has skin which is mottled, ashen, blue or very pale.", "local", "at0042"), - - SLURRED_SPEECH_OR_CONFUSION("Slurred speech or confusion", "The patient has slurred speech or confusion.", "local", "at0037"), - - PASSING_NO_URINE_IN_A_DAY("Passing no urine (in a day)", "The patient is passing no urine (in a day).", "local", "at0039"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - N999FlagDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java deleted file mode 100644 index 41fdd3ada..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") -public class NeuroSymptomCluster { - @Path("/items[at0001.1]/value|defining_code") - private CodePhrase symptomSignNameDefiningCode; - - @Path("/items[at0147]") - private List structuredBodySite; - - @Path("/items[at0153]") - private List specificDetails; - - @Path("/items[at0146]") - private List previousEpisodes; - - @Path("/items[at0063]") - private List associatedSymptomSign; - - @Path("/items[at0.1 and name/value='Presence']/value|defining_code") - private PresenceDefiningCode presenceDefiningCode; - - public void setSymptomSignNameDefiningCode(CodePhrase symptomSignNameDefiningCode) { - this.symptomSignNameDefiningCode = symptomSignNameDefiningCode; - } - - public CodePhrase getSymptomSignNameDefiningCode() { - return this.symptomSignNameDefiningCode ; - } - - public void setStructuredBodySite(List structuredBodySite) { - this.structuredBodySite = structuredBodySite; - } - - public List getStructuredBodySite() { - return this.structuredBodySite ; - } - - public void setSpecificDetails(List specificDetails) { - this.specificDetails = specificDetails; - } - - public List getSpecificDetails() { - return this.specificDetails ; - } - - public void setPreviousEpisodes(List previousEpisodes) { - this.previousEpisodes = previousEpisodes; - } - - public List getPreviousEpisodes() { - return this.previousEpisodes ; - } - - public void setAssociatedSymptomSign(List associatedSymptomSign) { - this.associatedSymptomSign = associatedSymptomSign; - } - - public List getAssociatedSymptomSign() { - return this.associatedSymptomSign ; - } - - public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { - this.presenceDefiningCode = presenceDefiningCode; - } - - public PresenceDefiningCode getPresenceDefiningCode() { - return this.presenceDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomClusterContainment.java deleted file mode 100644 index f73d095b8..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomClusterContainment.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class NeuroSymptomClusterContainment extends Containment { - public SelectAqlField NEURO_SYMPTOM_CLUSTER = new AqlFieldImp(NeuroSymptomCluster.class, "", "NeuroSymptomCluster", NeuroSymptomCluster.class, this); - - public SelectAqlField SYMPTOM_SIGN_NAME_DEFINING_CODE = new AqlFieldImp(NeuroSymptomCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningCode", CodePhrase.class, this); - - public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(NeuroSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); - - public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(NeuroSymptomCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); - - public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(NeuroSymptomCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); - - public ListSelectAqlField ASSOCIATED_SYMPTOM_SIGN = new ListAqlFieldImp(NeuroSymptomCluster.class, "/items[at0063]", "associatedSymptomSign", Cluster.class, this); - - public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(NeuroSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); - - private NeuroSymptomClusterContainment() { - super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); - } - - public static NeuroSymptomClusterContainment getInstance() { - return new NeuroSymptomClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java deleted file mode 100644 index 01a94a542..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java +++ /dev/null @@ -1,182 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Long; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.news2.v1") -public class News2ScoreObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value") - private DvOrdinal respirationRate; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0029]/value") - private DvOrdinal spoScale1; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0047]/value") - private DvOrdinal spoScale2; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0034]/value") - private DvOrdinal airOrOxygen; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value") - private DvOrdinal systolicBloodPressure; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value") - private DvOrdinal pulse; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value") - private DvOrdinal consciousness; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value") - private DvOrdinal temperature; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0028]/value|magnitude") - private Long totalScoreMagnitude; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0056]/value|defining_code") - private ClinicalRiskCategoryDefiningCode clinicalRiskCategoryDefiningCode; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0045]/items[at0046]") - private List extension; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setRespirationRate(DvOrdinal respirationRate) { - this.respirationRate = respirationRate; - } - - public DvOrdinal getRespirationRate() { - return this.respirationRate ; - } - - public void setSpoScale1(DvOrdinal spoScale1) { - this.spoScale1 = spoScale1; - } - - public DvOrdinal getSpoScale1() { - return this.spoScale1 ; - } - - public void setSpoScale2(DvOrdinal spoScale2) { - this.spoScale2 = spoScale2; - } - - public DvOrdinal getSpoScale2() { - return this.spoScale2 ; - } - - public void setAirOrOxygen(DvOrdinal airOrOxygen) { - this.airOrOxygen = airOrOxygen; - } - - public DvOrdinal getAirOrOxygen() { - return this.airOrOxygen ; - } - - public void setSystolicBloodPressure(DvOrdinal systolicBloodPressure) { - this.systolicBloodPressure = systolicBloodPressure; - } - - public DvOrdinal getSystolicBloodPressure() { - return this.systolicBloodPressure ; - } - - public void setPulse(DvOrdinal pulse) { - this.pulse = pulse; - } - - public DvOrdinal getPulse() { - return this.pulse ; - } - - public void setConsciousness(DvOrdinal consciousness) { - this.consciousness = consciousness; - } - - public DvOrdinal getConsciousness() { - return this.consciousness ; - } - - public void setTemperature(DvOrdinal temperature) { - this.temperature = temperature; - } - - public DvOrdinal getTemperature() { - return this.temperature ; - } - - public void setTotalScoreMagnitude(Long totalScoreMagnitude) { - this.totalScoreMagnitude = totalScoreMagnitude; - } - - public Long getTotalScoreMagnitude() { - return this.totalScoreMagnitude ; - } - - public void setClinicalRiskCategoryDefiningCode( - ClinicalRiskCategoryDefiningCode clinicalRiskCategoryDefiningCode) { - this.clinicalRiskCategoryDefiningCode = clinicalRiskCategoryDefiningCode; - } - - public ClinicalRiskCategoryDefiningCode getClinicalRiskCategoryDefiningCode() { - return this.clinicalRiskCategoryDefiningCode ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservationContainment.java deleted file mode 100644 index e4924dfb2..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservationContainment.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Long; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class News2ScoreObservationContainment extends Containment { - public SelectAqlField NEWS2_SCORE_OBSERVATION = new AqlFieldImp(News2ScoreObservation.class, "", "News2ScoreObservation", News2ScoreObservation.class, this); - - public SelectAqlField RESPIRATION_RATE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value", "respirationRate", DvOrdinal.class, this); - - public SelectAqlField SPO_SCALE1 = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0029]/value", "spoScale1", DvOrdinal.class, this); - - public SelectAqlField SPO_SCALE2 = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0047]/value", "spoScale2", DvOrdinal.class, this); - - public SelectAqlField AIR_OR_OXYGEN = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0034]/value", "airOrOxygen", DvOrdinal.class, this); - - public SelectAqlField SYSTOLIC_BLOOD_PRESSURE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value", "systolicBloodPressure", DvOrdinal.class, this); - - public SelectAqlField PULSE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value", "pulse", DvOrdinal.class, this); - - public SelectAqlField CONSCIOUSNESS = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value", "consciousness", DvOrdinal.class, this); - - public SelectAqlField TEMPERATURE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value", "temperature", DvOrdinal.class, this); - - public SelectAqlField TOTAL_SCORE_MAGNITUDE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0028]/value|magnitude", "totalScoreMagnitude", Long.class, this); - - public SelectAqlField CLINICAL_RISK_CATEGORY_DEFINING_CODE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0056]/value|defining_code", "clinicalRiskCategoryDefiningCode", ClinicalRiskCategoryDefiningCode.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(News2ScoreObservation.class, "/protocol[at0045]/items[at0046]", "extension", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(News2ScoreObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(News2ScoreObservation.class, "/language", "language", Language.class, this); - - private News2ScoreObservationContainment() { - super("openEHR-EHR-OBSERVATION.news2.v1"); - } - - public static News2ScoreObservationContainment getInstance() { - return new News2ScoreObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java deleted file mode 100644 index ff28009d6..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-SECTION.adhoc.v1") -public class News2Section { - @Path("/items[openEHR-EHR-OBSERVATION.body_temperature.v1 and name/value='Temperature']") - private TemperatureObservation temperature; - - @Path("/items[openEHR-EHR-OBSERVATION.pulse_oximetry.v1]") - private PulseOximetryObservation pulseOximetry; - - @Path("/items[openEHR-EHR-OBSERVATION.pulse.v1 and name/value='Pulse']") - private PulseObservation pulse; - - @Path("/items[openEHR-EHR-OBSERVATION.respiration.v1]") - private RespirationsObservation respirations; - - @Path("/items[openEHR-EHR-OBSERVATION.acvpu.v0]") - private AcvpuScaleObservation acvpuScale; - - @Path("/items[openEHR-EHR-OBSERVATION.blood_pressure.v2]") - private BloodPressureObservation bloodPressure; - - @Path("/items[openEHR-EHR-OBSERVATION.news2.v1]") - private News2ScoreObservation news2Score; - - public void setTemperature(TemperatureObservation temperature) { - this.temperature = temperature; - } - - public TemperatureObservation getTemperature() { - return this.temperature ; - } - - public void setPulseOximetry(PulseOximetryObservation pulseOximetry) { - this.pulseOximetry = pulseOximetry; - } - - public PulseOximetryObservation getPulseOximetry() { - return this.pulseOximetry ; - } - - public void setPulse(PulseObservation pulse) { - this.pulse = pulse; - } - - public PulseObservation getPulse() { - return this.pulse ; - } - - public void setRespirations(RespirationsObservation respirations) { - this.respirations = respirations; - } - - public RespirationsObservation getRespirations() { - return this.respirations ; - } - - public void setAcvpuScale(AcvpuScaleObservation acvpuScale) { - this.acvpuScale = acvpuScale; - } - - public AcvpuScaleObservation getAcvpuScale() { - return this.acvpuScale ; - } - - public void setBloodPressure(BloodPressureObservation bloodPressure) { - this.bloodPressure = bloodPressure; - } - - public BloodPressureObservation getBloodPressure() { - return this.bloodPressure ; - } - - public void setNews2Score(News2ScoreObservation news2Score) { - this.news2Score = news2Score; - } - - public News2ScoreObservation getNews2Score() { - return this.news2Score ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2SectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2SectionContainment.java deleted file mode 100644 index b33bbc2f5..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2SectionContainment.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class News2SectionContainment extends Containment { - public SelectAqlField NEWS2_SECTION = new AqlFieldImp(News2Section.class, "", "News2Section", News2Section.class, this); - - public SelectAqlField TEMPERATURE = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.body_temperature.v1]", "temperature", TemperatureObservation.class, this); - - public SelectAqlField PULSE_OXIMETRY = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.pulse_oximetry.v1]", "pulseOximetry", PulseOximetryObservation.class, this); - - public SelectAqlField PULSE = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.pulse.v1]", "pulse", PulseObservation.class, this); - - public SelectAqlField RESPIRATIONS = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.respiration.v1]", "respirations", RespirationsObservation.class, this); - - public SelectAqlField ACVPU_SCALE = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.acvpu.v0]", "acvpuScale", AcvpuScaleObservation.class, this); - - public SelectAqlField BLOOD_PRESSURE = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.blood_pressure.v2]", "bloodPressure", BloodPressureObservation.class, this); - - public SelectAqlField NEWS2_SCORE = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.news2.v1]", "news2Score", News2ScoreObservation.class, this); - - private News2SectionContainment() { - super("openEHR-EHR-SECTION.adhoc.v1"); - } - - public static News2SectionContainment getInstance() { - return new News2SectionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java deleted file mode 100644 index 74673cd18..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") -public class OtherSymptomCluster { - @Path("/items[at0001.1]/value|value") - private String symptomSignNameValue; - - @Path("/items[at0147]") - private List structuredBodySite; - - @Path("/items[at0153]") - private List specificDetails; - - @Path("/items[at0146]") - private List previousEpisodes; - - @Path("/items[at0063]") - private List associatedSymptomSign; - - @Path("/items[at0.1 and name/value='Presence']/value|defining_code") - private PresenceDefiningCode presenceDefiningCode; - - public void setSymptomSignNameValue(String symptomSignNameValue) { - this.symptomSignNameValue = symptomSignNameValue; - } - - public String getSymptomSignNameValue() { - return this.symptomSignNameValue ; - } - - public void setStructuredBodySite(List structuredBodySite) { - this.structuredBodySite = structuredBodySite; - } - - public List getStructuredBodySite() { - return this.structuredBodySite ; - } - - public void setSpecificDetails(List specificDetails) { - this.specificDetails = specificDetails; - } - - public List getSpecificDetails() { - return this.specificDetails ; - } - - public void setPreviousEpisodes(List previousEpisodes) { - this.previousEpisodes = previousEpisodes; - } - - public List getPreviousEpisodes() { - return this.previousEpisodes ; - } - - public void setAssociatedSymptomSign(List associatedSymptomSign) { - this.associatedSymptomSign = associatedSymptomSign; - } - - public List getAssociatedSymptomSign() { - return this.associatedSymptomSign ; - } - - public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { - this.presenceDefiningCode = presenceDefiningCode; - } - - public PresenceDefiningCode getPresenceDefiningCode() { - return this.presenceDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomClusterContainment.java deleted file mode 100644 index 2a2afe576..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomClusterContainment.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class OtherSymptomClusterContainment extends Containment { - public SelectAqlField OTHER_SYMPTOM_CLUSTER = new AqlFieldImp(OtherSymptomCluster.class, "", "OtherSymptomCluster", OtherSymptomCluster.class, this); - - public SelectAqlField SYMPTOM_SIGN_NAME_VALUE = new AqlFieldImp(OtherSymptomCluster.class, "/items[at0001.1]/value|value", "symptomSignNameValue", String.class, this); - - public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(OtherSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); - - public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(OtherSymptomCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); - - public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(OtherSymptomCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); - - public ListSelectAqlField ASSOCIATED_SYMPTOM_SIGN = new ListAqlFieldImp(OtherSymptomCluster.class, "/items[at0063]", "associatedSymptomSign", Cluster.class, this); - - public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(OtherSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); - - private OtherSymptomClusterContainment() { - super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); - } - - public static OtherSymptomClusterContainment getInstance() { - return new OtherSymptomClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OverallTestStatusDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OverallTestStatusDefiningcode.java deleted file mode 100644 index 140db621a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OverallTestStatusDefiningcode.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum OverallTestStatusDefiningCode implements EnumValueSet { - AMENDED("Amended", "The result has been modified subsequent to being Final, and is complete and verified by the responsible pathologist, and result data has been changed.", "local", "at0040"), - - PRELIMINARY("Preliminary", "Verified early results are available, but not all results are final. This is a sub-category of 'Partial'.", "local", "at0120"), - - FINAL("Final", "The Test result is complete and verified by an authorised person.", "local", "at0038"), - - APPENDED("Appended", "Subsequent to being final, the report has been modified by adding new content. The existing content is unchanged. This is a sub-category of 'Amended'.", "local", "at0119"), - - CORRECTED("Corrected", "The result has been modified subsequent to being Final, and is complete and verified by the responsible pathologist. This is a sub-category of 'Amended'.", "local", "at0115"), - - CANCELLED("Cancelled", "The result is unavailable because the test was not started or not completed (also sometimes called 'aborted').", "local", "at0074"), - - ENTERED_IN_ERROR("Entered in error", "The Test Result has been withdrawn following previous Final release.", "local", "at0116"), - - PARTIAL("Partial", "This is a partial (e.g. initial, interim or preliminary) Test Result: data in the Test Result may be incomplete or unverified.", "local", "at0037"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - OverallTestStatusDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java deleted file mode 100644 index dafd48f9f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") -public class PastHistoryEvaluation { - @Path("/data[at0001]/items[at0002]/value|value") - private String synopsisValue; - - @Path("/protocol[at0003]/items[at0004]") - private List extension; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setSynopsisValue(String synopsisValue) { - this.synopsisValue = synopsisValue; - } - - public String getSynopsisValue() { - return this.synopsisValue ; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluationContainment.java deleted file mode 100644 index 1621376cf..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluationContainment.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class PastHistoryEvaluationContainment extends Containment { - public SelectAqlField PAST_HISTORY_EVALUATION = new AqlFieldImp(PastHistoryEvaluation.class, "", "PastHistoryEvaluation", PastHistoryEvaluation.class, this); - - public SelectAqlField SYNOPSIS_VALUE = new AqlFieldImp(PastHistoryEvaluation.class, "/data[at0001]/items[at0002]/value|value", "synopsisValue", String.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(PastHistoryEvaluation.class, "/protocol[at0003]/items[at0004]", "extension", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(PastHistoryEvaluation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(PastHistoryEvaluation.class, "/language", "language", Language.class, this); - - private PastHistoryEvaluationContainment() { - super("openEHR-EHR-EVALUATION.clinical_synopsis.v1"); - } - - public static PastHistoryEvaluationContainment getInstance() { - return new PastHistoryEvaluationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningCode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningCode2.java deleted file mode 100644 index b4c15cf91..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningCode2.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum PresenceDefiningCode2 implements EnumValueSet { - PRESENT("Present", "The risk factor has been identified for this individual.", "local", "at0018"), - - UNKNOWN("Unknown", "No information is available for this risk factor.", "local", "at0.15"), - - ABSENT("Absent", "The risk factor has not been identified for this individual.", "local", "at0019"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - PresenceDefiningCode2(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningcode.java deleted file mode 100644 index fd1a5563f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningcode.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum PresenceDefiningCode implements EnumValueSet { - UNKNOWN("Unknown", "It is not known if the symptom is present.", "local", "at0.4"), - - ABSENT("Absent", "The symptom is absent.", "local", "at0.3"), - - PRESENT("Present", "The symptom is present.", "local", "at0.2"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - PresenceDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java deleted file mode 100644 index 3da25bd7a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java +++ /dev/null @@ -1,115 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Double; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.pulse.v1") -public class PulseObservation { - @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004 and name/value='Pulse Rate']/value|magnitude") - private Double pulseRateMagnitude; - - @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004 and name/value='Pulse Rate']/value|units") - private String pulseRateUnits; - - @Path("/data[at0002]/events[at0003]/state[at0012]/items[at1017]") - private List exertion; - - @Path("/data[at0002]/events[at0003]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0002]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0010]/items[at1013]") - private Cluster device; - - @Path("/protocol[at0010]/items[at1056]") - private List extension; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setPulseRateMagnitude(Double pulseRateMagnitude) { - this.pulseRateMagnitude = pulseRateMagnitude; - } - - public Double getPulseRateMagnitude() { - return this.pulseRateMagnitude ; - } - - public void setPulseRateUnits(String pulseRateUnits) { - this.pulseRateUnits = pulseRateUnits; - } - - public String getPulseRateUnits() { - return this.pulseRateUnits ; - } - - public void setExertion(List exertion) { - this.exertion = exertion; - } - - public List getExertion() { - return this.exertion ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setDevice(Cluster device) { - this.device = device; - } - - public Cluster getDevice() { - return this.device ; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservationContainment.java deleted file mode 100644 index fb7f4eb2a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservationContainment.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Double; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class PulseObservationContainment extends Containment { - public SelectAqlField PULSE_OBSERVATION = new AqlFieldImp(PulseObservation.class, "", "PulseObservation", PulseObservation.class, this); - - public SelectAqlField PULSE_RATE_MAGNITUDE = new AqlFieldImp(PulseObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude", "pulseRateMagnitude", Double.class, this); - - public SelectAqlField PULSE_RATE_UNITS = new AqlFieldImp(PulseObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units", "pulseRateUnits", String.class, this); - - public ListSelectAqlField EXERTION = new ListAqlFieldImp(PulseObservation.class, "/data[at0002]/events[at0003]/state[at0012]/items[at1017]", "exertion", Cluster.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(PulseObservation.class, "/data[at0002]/events[at0003]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(PulseObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); - - public SelectAqlField DEVICE = new AqlFieldImp(PulseObservation.class, "/protocol[at0010]/items[at1013]", "device", Cluster.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(PulseObservation.class, "/protocol[at0010]/items[at1056]", "extension", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(PulseObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(PulseObservation.class, "/language", "language", Language.class, this); - - private PulseObservationContainment() { - super("openEHR-EHR-OBSERVATION.pulse.v1"); - } - - public static PulseObservationContainment getInstance() { - return new PulseObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java deleted file mode 100644 index dcd5e5a51..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java +++ /dev/null @@ -1,136 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datavalues.quantity.DvProportion; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.pulse_oximetry.v1") -public class PulseOximetryObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value") - private DvProportion spo; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0054]") - private List waveform; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0060]") - private List multimediaImage; - - @Path("/data[at0001]/events[at0002]/state[at0014]/items[at0034]") - private Cluster exertion; - - @Path("/data[at0001]/events[at0002]/state[at0014]/items[at0015]") - private Cluster inspiredOxygen; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0007]/items[at0018]") - private Cluster oximetryDevice; - - @Path("/protocol[at0007]/items[at0059]") - private List extension; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setSpo(DvProportion spo) { - this.spo = spo; - } - - public DvProportion getSpo() { - return this.spo ; - } - - public void setWaveform(List waveform) { - this.waveform = waveform; - } - - public List getWaveform() { - return this.waveform ; - } - - public void setMultimediaImage(List multimediaImage) { - this.multimediaImage = multimediaImage; - } - - public List getMultimediaImage() { - return this.multimediaImage ; - } - - public void setExertion(Cluster exertion) { - this.exertion = exertion; - } - - public Cluster getExertion() { - return this.exertion ; - } - - public void setInspiredOxygen(Cluster inspiredOxygen) { - this.inspiredOxygen = inspiredOxygen; - } - - public Cluster getInspiredOxygen() { - return this.inspiredOxygen ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setOximetryDevice(Cluster oximetryDevice) { - this.oximetryDevice = oximetryDevice; - } - - public Cluster getOximetryDevice() { - return this.oximetryDevice ; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservationContainment.java deleted file mode 100644 index 6a5967d4d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservationContainment.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datavalues.quantity.DvProportion; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class PulseOximetryObservationContainment extends Containment { - public SelectAqlField PULSE_OXIMETRY_OBSERVATION = new AqlFieldImp(PulseOximetryObservation.class, "", "PulseOximetryObservation", PulseOximetryObservation.class, this); - - public SelectAqlField SPO = new AqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value", "spo", DvProportion.class, this); - - public ListSelectAqlField WAVEFORM = new ListAqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0054]", "waveform", Cluster.class, this); - - public ListSelectAqlField MULTIMEDIA_IMAGE = new ListAqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0060]", "multimediaImage", Cluster.class, this); - - public SelectAqlField EXERTION = new AqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/state[at0014]/items[at0034]", "exertion", Cluster.class, this); - - public SelectAqlField INSPIRED_OXYGEN = new AqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/state[at0014]/items[at0015]", "inspiredOxygen", Cluster.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public SelectAqlField OXIMETRY_DEVICE = new AqlFieldImp(PulseOximetryObservation.class, "/protocol[at0007]/items[at0018]", "oximetryDevice", Cluster.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(PulseOximetryObservation.class, "/protocol[at0007]/items[at0059]", "extension", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(PulseOximetryObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(PulseOximetryObservation.class, "/language", "language", Language.class, this); - - private PulseOximetryObservationContainment() { - super("openEHR-EHR-OBSERVATION.pulse_oximetry.v1"); - } - - public static PulseOximetryObservationContainment getInstance() { - return new PulseOximetryObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java deleted file mode 100644 index e94af5370..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-EVALUATION.recommendation.v1") -public class RecommendationEvaluation { - @Path("/data[at0001]/items[at0002]") - private List recommendation; - - @Path("/protocol[at0004]/items[at0005]") - private List extension; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setRecommendation(List recommendation) { - this.recommendation = recommendation; - } - - public List getRecommendation() { - return this.recommendation ; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluationContainment.java deleted file mode 100644 index ebfa5a3bd..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluationContainment.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class RecommendationEvaluationContainment extends Containment { - public SelectAqlField RECOMMENDATION_EVALUATION = new AqlFieldImp(RecommendationEvaluation.class, "", "RecommendationEvaluation", RecommendationEvaluation.class, this); - - public ListSelectAqlField RECOMMENDATION = new ListAqlFieldImp(RecommendationEvaluation.class, "/data[at0001]/items[at0002]", "recommendation", RecommendationRecommendationElement.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(RecommendationEvaluation.class, "/protocol[at0004]/items[at0005]", "extension", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(RecommendationEvaluation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(RecommendationEvaluation.class, "/language", "language", Language.class, this); - - private RecommendationEvaluationContainment() { - super("openEHR-EHR-EVALUATION.recommendation.v1"); - } - - public static RecommendationEvaluationContainment getInstance() { - return new RecommendationEvaluationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java deleted file mode 100644 index 1dbefb506..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class RecommendationRecommendationElement { - @Path("/value|value") - private String value; - - public void setValue(String value) { - this.value = value; - } - - public String getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RedFlagAcuteDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RedFlagAcuteDefiningCode.java deleted file mode 100644 index e5de6abc1..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RedFlagAcuteDefiningCode.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum RedFlagAcuteDefiningCode implements EnumValueSet { - RESPIRATORY_RATE25_PER_MINUTE("Respiratory rate ≥ 25 per minute", "Respiratory rate ≥ 25 per minute", "local", "at0077"), - - SYSTOLIC_BP90_MMHG_OR_DROP_OF40_FROM_NORMAL("Systolic BP ≤ 90 mmHg (or drop of >40 from normal)", "Systolic BP ≤ 90 mmHg (or drop of >40 from normal)", "local", "at0075"), - - NEEDS_O2_TO_KEEP_SPO29288_IN_COPD("Needs O2 to keep SpO2 ≥ 92% (88% in COPD)", "Needs O2 to keep SpO2 ≥ 92% (88% in COPD)", "local", "at0078"), - - RECENT_CHEMOTHERAPY("Recent chemotherapy", "Recent chemotherapy", "local", "at0081"), - - NOT_PASSED_URINE_IN18_HOURS05ML_KG_HR_IF_CATHETERISED("Not passed urine in 18 hours (<0.5ml/kg/hr if catheterised)", "Not passed urine in 18 hours (<0.5ml/kg/hr if catheterised)", "local", "at0082"), - - HEART_RATE130_PER_MINUTE("Heart rate ≥ 130 per minute", "Heart rate ≥ 130 per minute", "local", "at0076"), - - LACTATE2_MMOL_L("Lactate ≥ 2 mmol/l", "Lactate ≥ 2 mmol/l", "local", "at0080"), - - OBJECTIVE_EVIDENCE_OF_NEW_OR_ALTERED_MENTAL_STATE("Objective evidence of new or altered mental state", "Objective evidence of new or altered mental state", "local", "at0074"), - - NON_BLANCHING_RASH_MOTTLED_ASHEN_CYANOTIC("Non-blanching rash / mottled / ashen / cyanotic", "Non-blanching rash / mottled / ashen / cyanotic", "local", "at0079"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - RedFlagAcuteDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java deleted file mode 100644 index e368e07f0..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java +++ /dev/null @@ -1,115 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Double; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.respiration.v1") -public class RespirationsObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude") - private Double rateMagnitude; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units") - private String rateUnits; - - @Path("/data[at0001]/events[at0002]/state[at0022]/items[at0055]") - private Cluster inspiredOxygen; - - @Path("/data[at0001]/events[at0002]/state[at0022]/items[at0037]") - private Cluster exertion; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0057]/items[at0058]") - private List extension; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setRateMagnitude(Double rateMagnitude) { - this.rateMagnitude = rateMagnitude; - } - - public Double getRateMagnitude() { - return this.rateMagnitude ; - } - - public void setRateUnits(String rateUnits) { - this.rateUnits = rateUnits; - } - - public String getRateUnits() { - return this.rateUnits ; - } - - public void setInspiredOxygen(Cluster inspiredOxygen) { - this.inspiredOxygen = inspiredOxygen; - } - - public Cluster getInspiredOxygen() { - return this.inspiredOxygen ; - } - - public void setExertion(Cluster exertion) { - this.exertion = exertion; - } - - public Cluster getExertion() { - return this.exertion ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservationContainment.java deleted file mode 100644 index fa07ce9f9..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservationContainment.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Double; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class RespirationsObservationContainment extends Containment { - public SelectAqlField RESPIRATIONS_OBSERVATION = new AqlFieldImp(RespirationsObservation.class, "", "RespirationsObservation", RespirationsObservation.class, this); - - public SelectAqlField RATE_MAGNITUDE = new AqlFieldImp(RespirationsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude", "rateMagnitude", Double.class, this); - - public SelectAqlField RATE_UNITS = new AqlFieldImp(RespirationsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units", "rateUnits", String.class, this); - - public SelectAqlField INSPIRED_OXYGEN = new AqlFieldImp(RespirationsObservation.class, "/data[at0001]/events[at0002]/state[at0022]/items[at0055]", "inspiredOxygen", Cluster.class, this); - - public SelectAqlField EXERTION = new AqlFieldImp(RespirationsObservation.class, "/data[at0001]/events[at0002]/state[at0022]/items[at0037]", "exertion", Cluster.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(RespirationsObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(RespirationsObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(RespirationsObservation.class, "/protocol[at0057]/items[at0058]", "extension", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(RespirationsObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(RespirationsObservation.class, "/language", "language", Language.class, this); - - private RespirationsObservationContainment() { - super("openEHR-EHR-OBSERVATION.respiration.v1"); - } - - public static RespirationsObservationContainment getInstance() { - return new RespirationsObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java deleted file mode 100644 index bddc3f7fc..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-SECTION.adhoc.v1") -public class ResponseSection { - @Path("/items[openEHR-EHR-EVALUATION.recommendation.v1]") - private RecommendationEvaluation recommendation; - - @Path("/items[openEHR-EHR-INSTRUCTION.service_request.v1]") - private List serviceRequest; - - @Path("/items[openEHR-EHR-ACTION.service.v0]") - private List service; - - public void setRecommendation(RecommendationEvaluation recommendation) { - this.recommendation = recommendation; - } - - public RecommendationEvaluation getRecommendation() { - return this.recommendation ; - } - - public void setServiceRequest(List serviceRequest) { - this.serviceRequest = serviceRequest; - } - - public List getServiceRequest() { - return this.serviceRequest ; - } - - public void setService(List service) { - this.service = service; - } - - public List getService() { - return this.service ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSectionContainment.java deleted file mode 100644 index b382f757e..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSectionContainment.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class ResponseSectionContainment extends Containment { - public SelectAqlField RESPONSE_SECTION = new AqlFieldImp(ResponseSection.class, "", "ResponseSection", ResponseSection.class, this); - - public SelectAqlField RECOMMENDATION = new AqlFieldImp(ResponseSection.class, "/items[openEHR-EHR-EVALUATION.recommendation.v1]", "recommendation", RecommendationEvaluation.class, this); - - public ListSelectAqlField SERVICE_REQUEST = new ListAqlFieldImp(ResponseSection.class, "/items[openEHR-EHR-INSTRUCTION.service_request.v1]", "serviceRequest", ServiceRequestInstruction.class, this); - - public ListSelectAqlField SERVICE = new ListAqlFieldImp(ResponseSection.class, "/items[openEHR-EHR-ACTION.service.v0]", "service", ServiceAction.class, this); - - private ResponseSectionContainment() { - super("openEHR-EHR-SECTION.adhoc.v1"); - } - - public static ResponseSectionContainment getInstance() { - return new ResponseSectionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskAssessmentDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskAssessmentDefiningcode.java deleted file mode 100644 index 50b6e5ec2..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskAssessmentDefiningcode.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum RiskAssessmentDefiningCode implements EnumValueSet { - LOW_RISK("Low risk", "The risk of the a patient having a Covid-19 infection is assessed to be low.", "local", "at0.16"), - - HIGH_RISK("High risk", "The risk of the a patient having a Covid-19 infection is assessed to be high.", "local", "at0.17"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - RiskAssessmentDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode2.java deleted file mode 100644 index 48f9a7c80..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode2.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum RiskFactorDefiningCode2 implements EnumValueSet { - CONTACT_WITH_CONFIRMED_COVID19_CASE("Contact with confirmed Covid-19 case", "Contact with confirmed Covid-19 case within 14 days before symptom onset.", "local", "at0.9"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - RiskFactorDefiningCode2(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode3.java deleted file mode 100644 index 17fc633d6..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode3.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum RiskFactorDefiningCode3 implements EnumValueSet { - OTHER_HOUSEHOLD_MEMBERS_ARE_ILL("Other household members are ill", "The patient is in a house with other household members who are ill", "local", "at0.19"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - RiskFactorDefiningCode3(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningcode.java deleted file mode 100644 index 36ca74158..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningcode.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum RiskFactorDefiningCode implements EnumValueSet { - POTENTIAL_CONTACT_EXPOSURE_BASED_ON_LOCATION("Potential contact exposure based on location", "Potential contact exposure based on location.", "local", "at0.14"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - RiskFactorDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorsForSepsisDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorsForSepsisDefiningCode.java deleted file mode 100644 index 0ac5634b0..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorsForSepsisDefiningCode.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum RiskFactorsForSepsisDefiningCode implements EnumValueSet { - AGE_OVER75("Age over 75", "Patient is over 75.", "local", "at0007"), - - IMPAIRED_IMMUNITY_E_G_DIABETES_STEROIDS_CHEMOTHERAPY("Impaired immunity (e.g diabetes, steroids, chemotherapy)", "Patient has impaired immunity.", "local", "at0008"), - - INDWELLING_LINES_IVDU_BROKEN_SKIN("Indwelling lines / IVDU / broken skin", "Patient has indwelling lines, IVDU or broken skin.", "local", "at0010"), - - RECENT_TRAUMA_SURGERY_INVASIVE_PROCEDURE("Recent trauma / surgery / invasive procedure", "Patient has had recent trauma, surgery or an invasive procedure.", "local", "at0009"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - RiskFactorsForSepsisDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java deleted file mode 100644 index f05d2a319..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class SepsisScreening999FlagElement { - @Path("/value|defining_code") - private N999FlagDefiningCode value; - - public void setValue(N999FlagDefiningCode value) { - this.value = value; - } - - public N999FlagDefiningCode getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java deleted file mode 100644 index bc2f981b2..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class SepsisScreeningAmberFlagAcuteElement { - @Path("/value|defining_code") - private AmberFlagAcuteDefiningCode value; - - public void setValue(AmberFlagAcuteDefiningCode value) { - this.value = value; - } - - public AmberFlagAcuteDefiningCode getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java deleted file mode 100644 index 58bbab93c..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Choice; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class SepsisScreeningLikelySourceOfInfectionElement { - @Path("/value") - @Choice - private SepsisScreeningValueChoice value; - - public void setValue(SepsisScreeningValueChoice value) { - this.value = value; - } - - public SepsisScreeningValueChoice getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java deleted file mode 100644 index 3287b4621..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java +++ /dev/null @@ -1,126 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.sepsis_screening_tool.v0") -public class SepsisScreeningObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]") - private List riskFactorsForSepsis; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0011]") - private List likelySourceOfInfection; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0058]") - private List redFlagAcute; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0083]") - private List amberFlagAcute; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0036]") - private List N999Flag; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0004]/items[at0005]") - private List extension; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setRiskFactorsForSepsis( - List riskFactorsForSepsis) { - this.riskFactorsForSepsis = riskFactorsForSepsis; - } - - public List getRiskFactorsForSepsis() { - return this.riskFactorsForSepsis ; - } - - public void setLikelySourceOfInfection( - List likelySourceOfInfection) { - this.likelySourceOfInfection = likelySourceOfInfection; - } - - public List getLikelySourceOfInfection() { - return this.likelySourceOfInfection ; - } - - public void setRedFlagAcute(List redFlagAcute) { - this.redFlagAcute = redFlagAcute; - } - - public List getRedFlagAcute() { - return this.redFlagAcute ; - } - - public void setAmberFlagAcute(List amberFlagAcute) { - this.amberFlagAcute = amberFlagAcute; - } - - public List getAmberFlagAcute() { - return this.amberFlagAcute ; - } - - public void setN999Flag(List N999Flag) { - this.N999Flag = N999Flag; - } - - public List getN999Flag() { - return this.N999Flag ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservationContainment.java deleted file mode 100644 index 272af5b11..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservationContainment.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class SepsisScreeningObservationContainment extends Containment { - public SelectAqlField SEPSIS_SCREENING_OBSERVATION = new AqlFieldImp(SepsisScreeningObservation.class, "", "SepsisScreeningObservation", SepsisScreeningObservation.class, this); - - public ListSelectAqlField RISK_FACTORS_FOR_SEPSIS = new ListAqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]", "riskFactorsForSepsis", SepsisScreeningRiskFactorsForSepsisElement.class, this); - - public ListSelectAqlField LIKELY_SOURCE_OF_INFECTION = new ListAqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0011]", "likelySourceOfInfection", SepsisScreeningLikelySourceOfInfectionElement.class, this); - - public ListSelectAqlField RED_FLAG_ACUTE = new ListAqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0058]", "redFlagAcute", SepsisScreeningRedFlagAcuteElement.class, this); - - public ListSelectAqlField AMBER_FLAG_ACUTE = new ListAqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0083]", "amberFlagAcute", SepsisScreeningAmberFlagAcuteElement.class, this); - - public ListSelectAqlField N999_FLAG = new ListAqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0036]", "N999Flag", SepsisScreening999FlagElement.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(SepsisScreeningObservation.class, "/protocol[at0004]/items[at0005]", "extension", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(SepsisScreeningObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(SepsisScreeningObservation.class, "/language", "language", Language.class, this); - - private SepsisScreeningObservationContainment() { - super("openEHR-EHR-OBSERVATION.sepsis_screening_tool.v0"); - } - - public static SepsisScreeningObservationContainment getInstance() { - return new SepsisScreeningObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java deleted file mode 100644 index 1bd91c293..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class SepsisScreeningRedFlagAcuteElement { - @Path("/value|defining_code") - private RedFlagAcuteDefiningCode value; - - public void setValue(RedFlagAcuteDefiningCode value) { - this.value = value; - } - - public RedFlagAcuteDefiningCode getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java deleted file mode 100644 index 48134e9c0..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class SepsisScreeningRiskFactorsForSepsisElement { - @Path("/value|defining_code") - private RiskFactorsForSepsisDefiningCode value; - - public void setValue(RiskFactorsForSepsisDefiningCode value) { - this.value = value; - } - - public RiskFactorsForSepsisDefiningCode getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueChoice.java deleted file mode 100644 index d6637e372..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -public interface SepsisScreeningValueChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java deleted file mode 100644 index d33a51fe8..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_CODED_TEXT") -public class SepsisScreeningValueDvCodedText implements SepsisScreeningValueChoice { - @Path("|defining_code") - private ValueDefiningCode7 valueDefiningCode; - - public void setValueDefiningCode(ValueDefiningCode7 valueDefiningCode) { - this.valueDefiningCode = valueDefiningCode; - } - - public ValueDefiningCode7 getValueDefiningCode() { - return this.valueDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java deleted file mode 100644 index 63fe4b3e7..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_TEXT") -public class SepsisScreeningValueDvText implements SepsisScreeningValueChoice { - @Path("|value") - private String valueValue; - - public void setValueValue(String valueValue) { - this.valueValue = valueValue; - } - - public String getValueValue() { - return this.valueValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java deleted file mode 100644 index 86eb4cb31..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-SECTION.adhoc.v1") -public class SepsisSection { - @Path("/items[openEHR-EHR-OBSERVATION.sepsis_screening_tool.v0 and name/value='Sepsis screening']") - private SepsisScreeningObservation sepsisScreening; - - public void setSepsisScreening(SepsisScreeningObservation sepsisScreening) { - this.sepsisScreening = sepsisScreening; - } - - public SepsisScreeningObservation getSepsisScreening() { - return this.sepsisScreening ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSectionContainment.java deleted file mode 100644 index 20516876a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSectionContainment.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class SepsisSectionContainment extends Containment { - public SelectAqlField SEPSIS_SECTION = new AqlFieldImp(SepsisSection.class, "", "SepsisSection", SepsisSection.class, this); - - public SelectAqlField SEPSIS_SCREENING = new AqlFieldImp(SepsisSection.class, "/items[openEHR-EHR-OBSERVATION.sepsis_screening_tool.v0]", "sepsisScreening", SepsisScreeningObservation.class, this); - - private SepsisSectionContainment() { - super("openEHR-EHR-SECTION.adhoc.v1"); - } - - public static SepsisSectionContainment getInstance() { - return new SepsisSectionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java deleted file mode 100644 index 22433ab0d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java +++ /dev/null @@ -1,148 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-ACTION.service.v0") -public class ServiceAction { - @Path("/description[at0001]/items[at0011]/value|defining_code") - private CodePhrase serviceNameDefiningCode; - - @Path("/description[at0001]/items[at0013]/value|value") - private String descriptionValue; - - @Path("/description[at0001]/items[at0027]") - private List serviceDetail; - - @Path("/description[at0001]/items[at0029]") - private List multimedia; - - @Path("/protocol[at0015]/items[at0017]") - private List requestor; - - @Path("/protocol[at0015]/items[at0019]") - private List receiver; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - @Path("/time|value") - private TemporalAccessor timeValue; - - @Path("/ism_transition/careflow_step|defining_code") - private CareflowStepDefiningCode careflowStepDefiningCode; - - @Path("/ism_transition/current_state|defining_code") - private CurrentStateDefiningCode currentStateDefiningCode; - - @Path("/ism_transition/transition|defining_code") - private CodePhrase transitionDefiningCode; - - public void setServiceNameDefiningCode(CodePhrase serviceNameDefiningCode) { - this.serviceNameDefiningCode = serviceNameDefiningCode; - } - - public CodePhrase getServiceNameDefiningCode() { - return this.serviceNameDefiningCode ; - } - - public void setDescriptionValue(String descriptionValue) { - this.descriptionValue = descriptionValue; - } - - public String getDescriptionValue() { - return this.descriptionValue ; - } - - public void setServiceDetail(List serviceDetail) { - this.serviceDetail = serviceDetail; - } - - public List getServiceDetail() { - return this.serviceDetail ; - } - - public void setMultimedia(List multimedia) { - this.multimedia = multimedia; - } - - public List getMultimedia() { - return this.multimedia ; - } - - public void setRequestor(List requestor) { - this.requestor = requestor; - } - - public List getRequestor() { - return this.requestor ; - } - - public void setReceiver(List receiver) { - this.receiver = receiver; - } - - public List getReceiver() { - return this.receiver ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setCareflowStepDefiningCode(CareflowStepDefiningCode careflowStepDefiningCode) { - this.careflowStepDefiningCode = careflowStepDefiningCode; - } - - public CareflowStepDefiningCode getCareflowStepDefiningCode() { - return this.careflowStepDefiningCode ; - } - - public void setCurrentStateDefiningCode(CurrentStateDefiningCode currentStateDefiningCode) { - this.currentStateDefiningCode = currentStateDefiningCode; - } - - public CurrentStateDefiningCode getCurrentStateDefiningCode() { - return this.currentStateDefiningCode ; - } - - public void setTransitionDefiningCode(CodePhrase transitionDefiningCode) { - this.transitionDefiningCode = transitionDefiningCode; - } - - public CodePhrase getTransitionDefiningCode() { - return this.transitionDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java deleted file mode 100644 index f5563384b..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class ServiceActionContainment extends Containment { - public SelectAqlField SERVICE_ACTION = new AqlFieldImp(ServiceAction.class, "", "ServiceAction", ServiceAction.class, this); - - public SelectAqlField SERVICE_NAME_DEFINING_CODE = new AqlFieldImp(ServiceAction.class, "/description[at0001]/items[at0011]/value|defining_code", "serviceNameDefiningCode", CodePhrase.class, this); - - public SelectAqlField DESCRIPTION_VALUE = new AqlFieldImp(ServiceAction.class, "/description[at0001]/items[at0013]/value|value", "descriptionValue", String.class, this); - - public ListSelectAqlField SERVICE_DETAIL = new ListAqlFieldImp(ServiceAction.class, "/description[at0001]/items[at0027]", "serviceDetail", Cluster.class, this); - - public ListSelectAqlField MULTIMEDIA = new ListAqlFieldImp(ServiceAction.class, "/description[at0001]/items[at0029]", "multimedia", Cluster.class, this); - - public ListSelectAqlField REQUESTOR = new ListAqlFieldImp(ServiceAction.class, "/protocol[at0015]/items[at0017]", "requestor", Cluster.class, this); - - public ListSelectAqlField RECEIVER = new ListAqlFieldImp(ServiceAction.class, "/protocol[at0015]/items[at0019]", "receiver", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(ServiceAction.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(ServiceAction.class, "/language", "language", Language.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(ServiceAction.class, "/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField CAREFLOW_STEP_DEFINING_CODE = new AqlFieldImp(ServiceAction.class, "/ism_transition/careflow_step|defining_code", "careflowStepDefiningCode", CareflowStepDefiningCode.class, this); - - public SelectAqlField CURRENT_STATE_DEFINING_CODE = new AqlFieldImp(ServiceAction.class, "/ism_transition/current_state|defining_code", "currentStateDefiningCode", CurrentStateDefiningCode.class, this); - - public SelectAqlField TRANSITION_DEFINING_CODE = new AqlFieldImp(ServiceAction.class, "/ism_transition/transition|defining_code", "transitionDefiningCode", CodePhrase.class, this); - - private ServiceActionContainment() { - super("openEHR-EHR-ACTION.service.v0"); - } - - public static ServiceActionContainment getInstance() { - return new ServiceActionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java deleted file mode 100644 index ac2143f0a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java +++ /dev/null @@ -1,123 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; -import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class ServiceRequestCurrentActivityActivity { - @Path("/description[at0009]/items[at0121]/value|defining_code") - private CodePhrase serviceNameDefiningCode; - - @Path("/description[at0009]/items[at0062]") - private List reasonForRequest; - - @Path("/description[at0009]/items[at0064 and name/value='Reason for isolation']/value|value") - private String reasonForIsolationValue; - - @Path("/description[at0009]/items[at0151]") - private List complexTiming; - - @Path("/description[at0009]/items[at0145 and name/value='Date isolation due to start']/value|value") - private TemporalAccessor dateIsolationDueToStartValue; - - @Path("/description[at0009]/items[at0144 and name/value='Date isolation due to end']/value|value") - private TemporalAccessor dateIsolationDueToEndValue; - - @Path("/description[at0009]/items[at0132]") - private List specificDetails; - - @Path("/description[at0009]/items[at0149]") - private List supportingInformation; - - @Path("/description[at0009]/items[at0116]") - private List patientRequirements; - - @Path("/timing") - private DvParsable timing; - - public void setServiceNameDefiningCode(CodePhrase serviceNameDefiningCode) { - this.serviceNameDefiningCode = serviceNameDefiningCode; - } - - public CodePhrase getServiceNameDefiningCode() { - return this.serviceNameDefiningCode ; - } - - public void setReasonForRequest(List reasonForRequest) { - this.reasonForRequest = reasonForRequest; - } - - public List getReasonForRequest() { - return this.reasonForRequest ; - } - - public void setReasonForIsolationValue(String reasonForIsolationValue) { - this.reasonForIsolationValue = reasonForIsolationValue; - } - - public String getReasonForIsolationValue() { - return this.reasonForIsolationValue ; - } - - public void setComplexTiming(List complexTiming) { - this.complexTiming = complexTiming; - } - - public List getComplexTiming() { - return this.complexTiming ; - } - - public void setDateIsolationDueToStartValue(TemporalAccessor dateIsolationDueToStartValue) { - this.dateIsolationDueToStartValue = dateIsolationDueToStartValue; - } - - public TemporalAccessor getDateIsolationDueToStartValue() { - return this.dateIsolationDueToStartValue ; - } - - public void setDateIsolationDueToEndValue(TemporalAccessor dateIsolationDueToEndValue) { - this.dateIsolationDueToEndValue = dateIsolationDueToEndValue; - } - - public TemporalAccessor getDateIsolationDueToEndValue() { - return this.dateIsolationDueToEndValue ; - } - - public void setSpecificDetails(List specificDetails) { - this.specificDetails = specificDetails; - } - - public List getSpecificDetails() { - return this.specificDetails ; - } - - public void setSupportingInformation(List supportingInformation) { - this.supportingInformation = supportingInformation; - } - - public List getSupportingInformation() { - return this.supportingInformation ; - } - - public void setPatientRequirements(List patientRequirements) { - this.patientRequirements = patientRequirements; - } - - public List getPatientRequirements() { - return this.patientRequirements ; - } - - public void setTiming(DvParsable timing) { - this.timing = timing; - } - - public DvParsable getTiming() { - return this.timing ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java deleted file mode 100644 index e8b2f0d05..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java +++ /dev/null @@ -1,114 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-INSTRUCTION.service_request.v1") -public class ServiceRequestInstruction { - @Path("/activities[at0001]") - private List currentActivity; - - @Path("/protocol[at0008]/items[at0141]") - private Cluster requester; - - @Path("/protocol[at0008]/items[at0142]") - private Cluster receiver; - - @Path("/protocol[at0008]/items[at0128]") - private List distributionList; - - @Path("/protocol[at0008]/items[at0112]") - private List extension; - - @Path("/subject") - private PartyProxy subject; - - @Path("/narrative|value") - private String narrativeValue; - - @Path("/language") - private Language language; - - @Path("/expiry_time|value") - private TemporalAccessor expiryTimeValue; - - public void setCurrentActivity(List currentActivity) { - this.currentActivity = currentActivity; - } - - public List getCurrentActivity() { - return this.currentActivity ; - } - - public void setRequester(Cluster requester) { - this.requester = requester; - } - - public Cluster getRequester() { - return this.requester ; - } - - public void setReceiver(Cluster receiver) { - this.receiver = receiver; - } - - public Cluster getReceiver() { - return this.receiver ; - } - - public void setDistributionList(List distributionList) { - this.distributionList = distributionList; - } - - public List getDistributionList() { - return this.distributionList ; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setNarrativeValue(String narrativeValue) { - this.narrativeValue = narrativeValue; - } - - public String getNarrativeValue() { - return this.narrativeValue ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } - - public void setExpiryTimeValue(TemporalAccessor expiryTimeValue) { - this.expiryTimeValue = expiryTimeValue; - } - - public TemporalAccessor getExpiryTimeValue() { - return this.expiryTimeValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstructionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstructionContainment.java deleted file mode 100644 index 4efc80642..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstructionContainment.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class ServiceRequestInstructionContainment extends Containment { - public SelectAqlField SERVICE_REQUEST_INSTRUCTION = new AqlFieldImp(ServiceRequestInstruction.class, "", "ServiceRequestInstruction", ServiceRequestInstruction.class, this); - - public ListSelectAqlField CURRENT_ACTIVITY = new ListAqlFieldImp(ServiceRequestInstruction.class, "/activities[at0001]", "currentActivity", ServiceRequestCurrentActivityActivity.class, this); - - public SelectAqlField REQUESTER = new AqlFieldImp(ServiceRequestInstruction.class, "/protocol[at0008]/items[at0141]", "requester", Cluster.class, this); - - public SelectAqlField RECEIVER = new AqlFieldImp(ServiceRequestInstruction.class, "/protocol[at0008]/items[at0142]", "receiver", Cluster.class, this); - - public ListSelectAqlField DISTRIBUTION_LIST = new ListAqlFieldImp(ServiceRequestInstruction.class, "/protocol[at0008]/items[at0128]", "distributionList", Cluster.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(ServiceRequestInstruction.class, "/protocol[at0008]/items[at0112]", "extension", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(ServiceRequestInstruction.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField NARRATIVE_VALUE = new AqlFieldImp(ServiceRequestInstruction.class, "/narrative|value", "narrativeValue", String.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(ServiceRequestInstruction.class, "/language", "language", Language.class, this); - - public SelectAqlField EXPIRY_TIME_VALUE = new AqlFieldImp(ServiceRequestInstruction.class, "/expiry_time|value", "expiryTimeValue", TemporalAccessor.class, this); - - private ServiceRequestInstructionContainment() { - super("openEHR-EHR-INSTRUCTION.service_request.v1"); - } - - public static ServiceRequestInstructionContainment getInstance() { - return new ServiceRequestInstructionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java deleted file mode 100644 index 3db324ab5..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datatypes.CodePhrase; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class ServiceRequestReasonForRequestElement { - @Path("/value|defining_code") - private CodePhrase value; - - public void setValue(CodePhrase value) { - this.value = value; - } - - public CodePhrase getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java deleted file mode 100644 index 299642f88..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-SECTION.adhoc.v1") -public class SituationSection { - @Path("/items[openEHR-EHR-OBSERVATION.story.v1]") - private StoryHistoryObservation storyHistory; - - public void setStoryHistory(StoryHistoryObservation storyHistory) { - this.storyHistory = storyHistory; - } - - public StoryHistoryObservation getStoryHistory() { - return this.storyHistory ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSectionContainment.java deleted file mode 100644 index dbbc9ec4f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSectionContainment.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class SituationSectionContainment extends Containment { - public SelectAqlField SITUATION_SECTION = new AqlFieldImp(SituationSection.class, "", "SituationSection", SituationSection.class, this); - - public SelectAqlField STORY_HISTORY = new AqlFieldImp(SituationSection.class, "/items[openEHR-EHR-OBSERVATION.story.v1]", "storyHistory", StoryHistoryObservation.class, this); - - private SituationSectionContainment() { - super("openEHR-EHR-SECTION.adhoc.v1"); - } - - public static SituationSectionContainment getInstance() { - return new SituationSectionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java deleted file mode 100644 index 23bcdf0d0..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java +++ /dev/null @@ -1,103 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.story.v1") -public class StoryHistoryObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004 and name/value='Soft signs']") - private List softSigns; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004 and name/value='Notes']/value|value") - private String notesValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]") - private List structuredDetail; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0007]/items[at0008]") - private List extension; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setSoftSigns(List softSigns) { - this.softSigns = softSigns; - } - - public List getSoftSigns() { - return this.softSigns ; - } - - public void setNotesValue(String notesValue) { - this.notesValue = notesValue; - } - - public String getNotesValue() { - return this.notesValue ; - } - - public void setStructuredDetail(List structuredDetail) { - this.structuredDetail = structuredDetail; - } - - public List getStructuredDetail() { - return this.structuredDetail ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservationContainment.java deleted file mode 100644 index 0f1758a3b..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservationContainment.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class StoryHistoryObservationContainment extends Containment { - public SelectAqlField STORY_HISTORY_OBSERVATION = new AqlFieldImp(StoryHistoryObservation.class, "", "StoryHistoryObservation", StoryHistoryObservation.class, this); - - public ListSelectAqlField SOFT_SIGNS = new ListAqlFieldImp(StoryHistoryObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]", "softSigns", StoryHistorySoftSignsElement.class, this); - - public SelectAqlField NOTES_VALUE = new AqlFieldImp(StoryHistoryObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value", "notesValue", String.class, this); - - public ListSelectAqlField STRUCTURED_DETAIL = new ListAqlFieldImp(StoryHistoryObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]", "structuredDetail", Cluster.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(StoryHistoryObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(StoryHistoryObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(StoryHistoryObservation.class, "/protocol[at0007]/items[at0008]", "extension", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(StoryHistoryObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(StoryHistoryObservation.class, "/language", "language", Language.class, this); - - private StoryHistoryObservationContainment() { - super("openEHR-EHR-OBSERVATION.story.v1"); - } - - public static StoryHistoryObservationContainment getInstance() { - return new StoryHistoryObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java deleted file mode 100644 index 15eb48c4a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class StoryHistorySoftSignsElement { - @Path("/value|value") - private String value; - - public void setValue(String value) { - this.value = value; - } - - public String getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java deleted file mode 100644 index e07b98ba6..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java +++ /dev/null @@ -1,126 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datastructures.Element; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Double; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.body_temperature.v1") -public class TemperatureObservation { - @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude") - private Double temperatureMagnitude; - - @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units") - private String temperatureUnits; - - @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0056]") - private Cluster environmentalConditions; - - @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0057]") - private Cluster exertion; - - @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0058]") - private Element menstrualCycle; - - @Path("/data[at0002]/events[at0003]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0002]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0020]/items[at0059]") - private Cluster device; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setTemperatureMagnitude(Double temperatureMagnitude) { - this.temperatureMagnitude = temperatureMagnitude; - } - - public Double getTemperatureMagnitude() { - return this.temperatureMagnitude ; - } - - public void setTemperatureUnits(String temperatureUnits) { - this.temperatureUnits = temperatureUnits; - } - - public String getTemperatureUnits() { - return this.temperatureUnits ; - } - - public void setEnvironmentalConditions(Cluster environmentalConditions) { - this.environmentalConditions = environmentalConditions; - } - - public Cluster getEnvironmentalConditions() { - return this.environmentalConditions ; - } - - public void setExertion(Cluster exertion) { - this.exertion = exertion; - } - - public Cluster getExertion() { - return this.exertion ; - } - - public void setMenstrualCycle(Element menstrualCycle) { - this.menstrualCycle = menstrualCycle; - } - - public Element getMenstrualCycle() { - return this.menstrualCycle ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setDevice(Cluster device) { - this.device = device; - } - - public Cluster getDevice() { - return this.device ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservationContainment.java deleted file mode 100644 index 36c4cf756..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservationContainment.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datastructures.Element; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Double; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class TemperatureObservationContainment extends Containment { - public SelectAqlField TEMPERATURE_OBSERVATION = new AqlFieldImp(TemperatureObservation.class, "", "TemperatureObservation", TemperatureObservation.class, this); - - public SelectAqlField TEMPERATURE_MAGNITUDE = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude", "temperatureMagnitude", Double.class, this); - - public SelectAqlField TEMPERATURE_UNITS = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units", "temperatureUnits", String.class, this); - - public SelectAqlField ENVIRONMENTAL_CONDITIONS = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0056]", "environmentalConditions", Cluster.class, this); - - public SelectAqlField EXERTION = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0057]", "exertion", Cluster.class, this); - - public SelectAqlField MENSTRUAL_CYCLE = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0058]", "menstrualCycle", Element.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); - - public SelectAqlField DEVICE = new AqlFieldImp(TemperatureObservation.class, "/protocol[at0020]/items[at0059]", "device", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(TemperatureObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(TemperatureObservation.class, "/language", "language", Language.class, this); - - private TemperatureObservationContainment() { - super("openEHR-EHR-OBSERVATION.body_temperature.v1"); - } - - public static TemperatureObservationContainment getInstance() { - return new TemperatureObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TrendDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TrendDefiningcode.java deleted file mode 100644 index 4620eeba4..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TrendDefiningcode.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum TrendDefiningCode implements EnumValueSet { - WORSENING("Worsening", "The severity of the symptom or sign has worsened overall during this episode.", "local", "at0183"), - - IMPROVING("Improving", "The severity of the symptom or sign has improved overall during this episode.", "local", "at0181"), - - UNCHANGED("Unchanged", "The severity of the symptom or sign has not changed overall during this episode.", "local", "at0182"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - TrendDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode.java deleted file mode 100644 index 116bfe4ba..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum ValueDefiningCode implements EnumValueSet { - RIGORS("Rigors", "Rigors.", "local", "at0100"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - ValueDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode2.java deleted file mode 100644 index 9d68bd02b..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode2.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum ValueDefiningCode2 implements EnumValueSet { - LETHARGIC("Lethargic", "Lethargic.", "local", "at0101"), - - CONFUSED("Confused", "Confused.", "local", "at0102"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - ValueDefiningCode2(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode3.java deleted file mode 100644 index 8193255d6..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode3.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum ValueDefiningCode3 implements EnumValueSet { - NEW_PAIN("New pain", "New pain.", "local", "at0106"), - - INCREASING_OR_CONSISTING_PAIN("Increasing or consisting pain", "Increasing or consisting pain.", "local", "at0107"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - ValueDefiningCode3(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode4.java deleted file mode 100644 index 49fbd0fbf..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode4.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum ValueDefiningCode4 implements EnumValueSet { - ABDOMINAL_DISTENSION_NAUSEA_BLEEDING("Abdominal distension/nausea/bleeding", "Abdominal distension/nausea/bleeding.", "local", "at0109"), - - NO_PROGRESS("No progress", "No progress.", "local", "at0108"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - ValueDefiningCode4(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode5.java deleted file mode 100644 index c232fb457..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode5.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum ValueDefiningCode5 implements EnumValueSet { - FEELING_OF_IMPENDING_DOOM("Feeling of impending doom", "Feeling of impending doom.", "local", "at0111"), - - NOT_FEELING_WELL("Not feeling well", "Not feeling well.", "local", "at0110"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - ValueDefiningCode5(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode6.java deleted file mode 100644 index 888136b15..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode6.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum ValueDefiningCode6 implements EnumValueSet { - DOESN_T_LOOK_GOOD("Doesn't look good", "Doesn't look good.", "local", "at0113"), - - CHANGE_IN_BEHAVIOUR("Change in behaviour", "Change in behaviour.", "local", "at0112"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - ValueDefiningCode6(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode7.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode7.java deleted file mode 100644 index 339136461..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningcode7.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum ValueDefiningCode7 implements EnumValueSet { - SKIN_JOINT_WOUND("Skin / joint/ wound", "The likely source of infection is skin, joint or wound.", "local", "at0026"), - - URINE("Urine", "The likely source of infection is urine.", "local", "at0014"), - - INDWELLING_DEVICE("Indwelling device", "The likely source of infection is an indwelling device.", "local", "at0027"), - - RESPIRATORY("Respiratory", "The likely source of infection is respiratory.", "local", "at0012"), - - SURGICAL("Surgical", "The likely source of infection is surgical.", "local", "at0015"), - - BRAIN("Brain", "The likely source of infection is brain.", "local", "at0013"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - ValueDefiningCode7(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java deleted file mode 100644 index d0cdf2597..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java +++ /dev/null @@ -1,116 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datastructures.ItemTree; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Double; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.body_weight.v2") -public class WeightObservation { - @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude") - private Double weightMagnitude; - - @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units") - private String weightUnits; - - @Path("/data[at0002]/events[at0003]/state[at0008]") - private ItemTree stateStructure; - - @Path("/data[at0002]/events[at0003]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0002]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0015]/items[at0020]") - private Cluster device; - - @Path("/protocol[at0015]/items[at0027]") - private List extension; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setWeightMagnitude(Double weightMagnitude) { - this.weightMagnitude = weightMagnitude; - } - - public Double getWeightMagnitude() { - return this.weightMagnitude ; - } - - public void setWeightUnits(String weightUnits) { - this.weightUnits = weightUnits; - } - - public String getWeightUnits() { - return this.weightUnits ; - } - - public void setStateStructure(ItemTree stateStructure) { - this.stateStructure = stateStructure; - } - - public ItemTree getStateStructure() { - return this.stateStructure ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setDevice(Cluster device) { - this.device = device; - } - - public Cluster getDevice() { - return this.device ; - } - - public void setExtension(List extension) { - this.extension = extension; - } - - public List getExtension() { - return this.extension ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservationContainment.java deleted file mode 100644 index cc1af55b6..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservationContainment.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datastructures.ItemTree; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Double; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class WeightObservationContainment extends Containment { - public SelectAqlField WEIGHT_OBSERVATION = new AqlFieldImp(WeightObservation.class, "", "WeightObservation", WeightObservation.class, this); - - public SelectAqlField WEIGHT_MAGNITUDE = new AqlFieldImp(WeightObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude", "weightMagnitude", Double.class, this); - - public SelectAqlField WEIGHT_UNITS = new AqlFieldImp(WeightObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units", "weightUnits", String.class, this); - - public SelectAqlField STATE_STRUCTURE = new AqlFieldImp(WeightObservation.class, "/data[at0002]/events[at0003]/state[at0008]", "stateStructure", ItemTree.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(WeightObservation.class, "/data[at0002]/events[at0003]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(WeightObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); - - public SelectAqlField DEVICE = new AqlFieldImp(WeightObservation.class, "/protocol[at0015]/items[at0020]", "device", Cluster.class, this); - - public ListSelectAqlField EXTENSION = new ListAqlFieldImp(WeightObservation.class, "/protocol[at0015]/items[at0027]", "extension", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(WeightObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(WeightObservation.class, "/language", "language", Language.class, this); - - private WeightObservationContainment() { - super("openEHR-EHR-OBSERVATION.body_weight.v2"); - } - - public static WeightObservationContainment getInstance() { - return new WeightObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java deleted file mode 100644 index 2bd930c05..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java +++ /dev/null @@ -1,192 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -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 org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Id; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.AbteilungsfallCluster; -import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.VersorgungsfallCluster; -import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.VersorgungsortAdminEntry; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import org.ehrbase.client.openehrclient.VersionUid; - -@Entity -@Archetype("openEHR-EHR-COMPOSITION.event_summary.v0") -@Template("Patientenaufenthalt") -public class PatientenaufenthaltComposition { - @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0 and name/value='Versorgungsfall']") - private VersorgungsfallCluster versorgungsfall; - - @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0 and name/value='Abteilungsfall']") - private AbteilungsfallCluster abteilungsfall; - - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; - - @Path("/context/participations") - private List participations; - - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; - - @Path("/context/location") - private String location; - - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; - - @Path("/context/setting|defining_code") - private Setting settingDefiningCode; - - @Path("/content[openEHR-EHR-ADMIN_ENTRY.hospitalization.v0 and name/value='Versorgungsort']") - private VersorgungsortAdminEntry versorgungsort; - - @Path("/composer") - private PartyProxy composer; - - @Path("/language") - private Language language; - - @Path("/feeder_audit") - private FeederAudit feederAudit; - - @Path("/category|defining_code") - private Category categoryDefiningCode; - - @Path("/territory") - private Territory territory; - - @Id - private VersionUid versionUid; - - public void setVersorgungsfall(VersorgungsfallCluster versorgungsfall) { - this.versorgungsfall = versorgungsfall; - } - - public VersorgungsfallCluster getVersorgungsfall() { - return this.versorgungsfall ; - } - - public void setAbteilungsfall(AbteilungsfallCluster abteilungsfall) { - this.abteilungsfall = abteilungsfall; - } - - public AbteilungsfallCluster getAbteilungsfall() { - return this.abteilungsfall ; - } - - 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 setVersorgungsort(VersorgungsortAdminEntry versorgungsort) { - this.versorgungsort = versorgungsort; - } - - public VersorgungsortAdminEntry getVersorgungsort() { - return this.versorgungsort ; - } - - 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 setCategoryDefiningCode(Category categoryDefiningCode) { - this.categoryDefiningCode = categoryDefiningCode; - } - - public Category getCategoryDefiningCode() { - return this.categoryDefiningCode ; - } - - 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltCompositionContainment.java deleted file mode 100644 index c5a5f02a1..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltCompositionContainment.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -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 org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.AbteilungsfallCluster; -import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.VersorgungsfallCluster; -import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.VersorgungsortAdminEntry; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; - -public class PatientenaufenthaltCompositionContainment extends Containment { - public SelectAqlField PATIENTENAUFENTHALT_COMPOSITION = new AqlFieldImp(PatientenaufenthaltComposition.class, "", "PatientenaufenthaltComposition", PatientenaufenthaltComposition.class, this); - - public SelectAqlField VERSORGUNGSFALL = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]", "versorgungsfall", VersorgungsfallCluster.class, this); - - public SelectAqlField ABTEILUNGSFALL = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]", "abteilungsfall", AbteilungsfallCluster.class, this); - - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(PatientenaufenthaltComposition.class, "/context/participations", "participations", Participation.class, this); - - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - - public SelectAqlField LOCATION = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/location", "location", String.class, this); - - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - - public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - - public SelectAqlField VERSORGUNGSORT = new AqlFieldImp(PatientenaufenthaltComposition.class, "/content[openEHR-EHR-ADMIN_ENTRY.hospitalization.v0]", "versorgungsort", VersorgungsortAdminEntry.class, this); - - public SelectAqlField COMPOSER = new AqlFieldImp(PatientenaufenthaltComposition.class, "/composer", "composer", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(PatientenaufenthaltComposition.class, "/language", "language", Language.class, this); - - public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(PatientenaufenthaltComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - - public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(PatientenaufenthaltComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - - public SelectAqlField TERRITORY = new AqlFieldImp(PatientenaufenthaltComposition.class, "/territory", "territory", Territory.class, this); - - private PatientenaufenthaltCompositionContainment() { - super("openEHR-EHR-COMPOSITION.event_summary.v0"); - } - - public static PatientenaufenthaltCompositionContainment getInstance() { - return new PatientenaufenthaltCompositionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java deleted file mode 100644 index e062578bf..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.case_identification.v0") -public class AbteilungsfallCluster { - @Path("/items[at0001 and name/value='Zugehörige Abteilungsfall-Kennung']/value|value") - private String zugehorigeAbteilungsfallKennungValue; - - public void setZugehorigeAbteilungsfallKennungValue(String zugehorigeAbteilungsfallKennungValue) { - this.zugehorigeAbteilungsfallKennungValue = zugehorigeAbteilungsfallKennungValue; - } - - public String getZugehorigeAbteilungsfallKennungValue() { - return this.zugehorigeAbteilungsfallKennungValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallClusterContainment.java deleted file mode 100644 index 64a9ce533..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallClusterContainment.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; - -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class AbteilungsfallClusterContainment extends Containment { - public SelectAqlField ABTEILUNGSFALL_CLUSTER = new AqlFieldImp(AbteilungsfallCluster.class, "", "AbteilungsfallCluster", AbteilungsfallCluster.class, this); - - public SelectAqlField ZUGEHORIGE_ABTEILUNGSFALL_KENNUNG_VALUE = new AqlFieldImp(AbteilungsfallCluster.class, "/items[at0001]/value|value", "zugehorigeAbteilungsfallKennungValue", String.class, this); - - private AbteilungsfallClusterContainment() { - super("openEHR-EHR-CLUSTER.case_identification.v0"); - } - - public static AbteilungsfallClusterContainment getInstance() { - return new AbteilungsfallClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java deleted file mode 100644 index 16b35ec32..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datavalues.DvIdentifier; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.device.v1") -public class DetailsZumBettCluster { - @Path("/items[at0001]/value|value") - private String geratenameValue; - - @Path("/items[at0003]/value|value") - private String geratetypValue; - - @Path("/items[at0009]") - private List eigenschaften; - - @Path("/items[at0021]/value") - private DvIdentifier eindeutigeIdentifikationsnummerId; - - @Path("/items[at0019]") - private List gerateverwaltung; - - @Path("/items[at0018]") - private List komponenten; - - @Path("/items[at0026]") - private List erweiterung; - - @Path("/items[at0027]") - private List multimedia; - - public void setGeratenameValue(String geratenameValue) { - this.geratenameValue = geratenameValue; - } - - public String getGeratenameValue() { - return this.geratenameValue ; - } - - public void setGeratetypValue(String geratetypValue) { - this.geratetypValue = geratetypValue; - } - - public String getGeratetypValue() { - return this.geratetypValue ; - } - - public void setEigenschaften(List eigenschaften) { - this.eigenschaften = eigenschaften; - } - - public List getEigenschaften() { - return this.eigenschaften ; - } - - public void setEindeutigeIdentifikationsnummerId(DvIdentifier eindeutigeIdentifikationsnummerId) { - this.eindeutigeIdentifikationsnummerId = eindeutigeIdentifikationsnummerId; - } - - public DvIdentifier getEindeutigeIdentifikationsnummerId() { - return this.eindeutigeIdentifikationsnummerId ; - } - - public void setGerateverwaltung(List gerateverwaltung) { - this.gerateverwaltung = gerateverwaltung; - } - - public List getGerateverwaltung() { - return this.gerateverwaltung ; - } - - public void setKomponenten(List komponenten) { - this.komponenten = komponenten; - } - - public List getKomponenten() { - return this.komponenten ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setMultimedia(List multimedia) { - this.multimedia = multimedia; - } - - public List getMultimedia() { - return this.multimedia ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettClusterContainment.java deleted file mode 100644 index b92011443..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettClusterContainment.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datavalues.DvIdentifier; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class DetailsZumBettClusterContainment extends Containment { - public SelectAqlField DETAILS_ZUM_BETT_CLUSTER = new AqlFieldImp(DetailsZumBettCluster.class, "", "DetailsZumBettCluster", DetailsZumBettCluster.class, this); - - public SelectAqlField GERATENAME_VALUE = new AqlFieldImp(DetailsZumBettCluster.class, "/items[at0001]/value|value", "geratenameValue", String.class, this); - - public SelectAqlField GERATETYP_VALUE = new AqlFieldImp(DetailsZumBettCluster.class, "/items[at0003]/value|value", "geratetypValue", String.class, this); - - public ListSelectAqlField EIGENSCHAFTEN = new ListAqlFieldImp(DetailsZumBettCluster.class, "/items[at0009]", "eigenschaften", Cluster.class, this); - - public SelectAqlField EINDEUTIGE_IDENTIFIKATIONSNUMMER_ID = new AqlFieldImp(DetailsZumBettCluster.class, "/items[at0021]/value", "eindeutigeIdentifikationsnummerId", DvIdentifier.class, this); - - public ListSelectAqlField GERATEVERWALTUNG = new ListAqlFieldImp(DetailsZumBettCluster.class, "/items[at0019]", "gerateverwaltung", Cluster.class, this); - - public ListSelectAqlField KOMPONENTEN = new ListAqlFieldImp(DetailsZumBettCluster.class, "/items[at0018]", "komponenten", Cluster.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(DetailsZumBettCluster.class, "/items[at0026]", "erweiterung", Cluster.class, this); - - public ListSelectAqlField MULTIMEDIA = new ListAqlFieldImp(DetailsZumBettCluster.class, "/items[at0027]", "multimedia", Cluster.class, this); - - private DetailsZumBettClusterContainment() { - super("openEHR-EHR-CLUSTER.device.v1"); - } - - public static DetailsZumBettClusterContainment getInstance() { - return new DetailsZumBettClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java deleted file mode 100644 index 296a0609b..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java +++ /dev/null @@ -1,121 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.location.v1") -public class StandortCluster { - @Path("/items[at0040]/value|value") - private String standorttypValue; - - @Path("/items[at0046]/value|value") - private String standortbeschreibungValue; - - @Path("/items[at0048]/value|defining_code") - private StandortschlusselDefiningCode standortschlusselDefiningCode; - - @Path("/items[at0024]/value|value") - private String campusValue; - - @Path("/items[at0025]/value|value") - private String gebaudegruppeValue; - - @Path("/items[at0028]/value|value") - private String ebeneValue; - - @Path("/items[at0027 and name/value='Stationskennung']/value|value") - private String stationskennungValue; - - @Path("/items[at0029 and name/value='Zimmerkennung']/value|value") - private String zimmerkennungValue; - - @Path("/items[at0034 and name/value='Bettplatzkennung']/value|value") - private String bettplatzkennungValue; - - @Path("/items[openEHR-EHR-CLUSTER.device.v1 and name/value='Details zum Bett']") - private DetailsZumBettCluster detailsZumBett; - - public void setStandorttypValue(String standorttypValue) { - this.standorttypValue = standorttypValue; - } - - public String getStandorttypValue() { - return this.standorttypValue ; - } - - public void setStandortbeschreibungValue(String standortbeschreibungValue) { - this.standortbeschreibungValue = standortbeschreibungValue; - } - - public String getStandortbeschreibungValue() { - return this.standortbeschreibungValue ; - } - - public void setStandortschlusselDefiningCode( - StandortschlusselDefiningCode standortschlusselDefiningCode) { - this.standortschlusselDefiningCode = standortschlusselDefiningCode; - } - - public StandortschlusselDefiningCode getStandortschlusselDefiningCode() { - return this.standortschlusselDefiningCode ; - } - - public void setCampusValue(String campusValue) { - this.campusValue = campusValue; - } - - public String getCampusValue() { - return this.campusValue ; - } - - public void setGebaudegruppeValue(String gebaudegruppeValue) { - this.gebaudegruppeValue = gebaudegruppeValue; - } - - public String getGebaudegruppeValue() { - return this.gebaudegruppeValue ; - } - - public void setEbeneValue(String ebeneValue) { - this.ebeneValue = ebeneValue; - } - - public String getEbeneValue() { - return this.ebeneValue ; - } - - public void setStationskennungValue(String stationskennungValue) { - this.stationskennungValue = stationskennungValue; - } - - public String getStationskennungValue() { - return this.stationskennungValue ; - } - - public void setZimmerkennungValue(String zimmerkennungValue) { - this.zimmerkennungValue = zimmerkennungValue; - } - - public String getZimmerkennungValue() { - return this.zimmerkennungValue ; - } - - public void setBettplatzkennungValue(String bettplatzkennungValue) { - this.bettplatzkennungValue = bettplatzkennungValue; - } - - public String getBettplatzkennungValue() { - return this.bettplatzkennungValue ; - } - - public void setDetailsZumBett(DetailsZumBettCluster detailsZumBett) { - this.detailsZumBett = detailsZumBett; - } - - public DetailsZumBettCluster getDetailsZumBett() { - return this.detailsZumBett ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortClusterContainment.java deleted file mode 100644 index 631cb838d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortClusterContainment.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; - -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class StandortClusterContainment extends Containment { - public SelectAqlField STANDORT_CLUSTER = new AqlFieldImp(StandortCluster.class, "", "StandortCluster", StandortCluster.class, this); - - public SelectAqlField STANDORTTYP_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0040]/value|value", "standorttypValue", String.class, this); - - public SelectAqlField STANDORTBESCHREIBUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0046]/value|value", "standortbeschreibungValue", String.class, this); - - public SelectAqlField STANDORTSCHLUSSEL_DEFINING_CODE = new AqlFieldImp(StandortCluster.class, "/items[at0048]/value|defining_code", "standortschlusselDefiningCode", StandortschlusselDefiningCode.class, this); - - public SelectAqlField CAMPUS_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0024]/value|value", "campusValue", String.class, this); - - public SelectAqlField GEBAUDEGRUPPE_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0025]/value|value", "gebaudegruppeValue", String.class, this); - - public SelectAqlField EBENE_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0028]/value|value", "ebeneValue", String.class, this); - - public SelectAqlField STATIONSKENNUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0027]/value|value", "stationskennungValue", String.class, this); - - public SelectAqlField ZIMMERKENNUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0029]/value|value", "zimmerkennungValue", String.class, this); - - public SelectAqlField BETTPLATZKENNUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0034]/value|value", "bettplatzkennungValue", String.class, this); - - public SelectAqlField DETAILS_ZUM_BETT = new AqlFieldImp(StandortCluster.class, "/items[openEHR-EHR-CLUSTER.device.v1]", "detailsZumBett", DetailsZumBettCluster.class, this); - - private StandortClusterContainment() { - super("openEHR-EHR-CLUSTER.location.v1"); - } - - public static StandortClusterContainment getInstance() { - return new StandortClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortschlusselDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortschlusselDefiningcode.java deleted file mode 100644 index 33a6aa353..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortschlusselDefiningcode.java +++ /dev/null @@ -1,332 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum StandortschlusselDefiningCode implements EnumValueSet { - NEUROCHIRURGIE("Neurochirurgie", "Neurochirurgie", "§301 SGB V", "1700"), - - HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE_SCHWERPUNKT_FRAUENHEILKUNDE("Hämatologie und internistische Onkologie/Schwerpunkt Frauenheilkunde", "Hämatologie und internistische Onkologie/Schwerpunkt Frauenheilkunde", "§301 SGB V", "0524"), - - INTENSIVMEDIZIN_SCHWERPUNKT_KARDIOLOGIE("Intensivmedizin/Schwerpunkt Kardiologie", "Intensivmedizin/Schwerpunkt Kardiologie", "§301 SGB V", "3603"), - - INNERE_MEDIZIN_SCHWERPUNKT_KARDIOLOGIE("Innere Medizin/Schwerpunkt Kardiologie", "Innere Medizin/Schwerpunkt Kardiologie", "§301 SGB V", "0103"), - - NEUROLOGIE_SCHWERPUNKT_GERONTOLOGIE("Neurologie/Schwerpunkt Gerontologie", "Neurologie/Schwerpunkt Gerontologie", "§301 SGB V", "2851"), - - ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_SUCHTBEHANDLUNG_TAGESKLINIK("Allgemeine Psychiatrie/Schwerpunkt Suchtbehandlung, Tagesklinik", "Allgemeine Psychiatrie/Schwerpunkt Suchtbehandlung, Tagesklinik", "§301 SGB V", "2953"), - - WEANINGEINHEIT("Weaningeinheit", "Weaningeinheit", "§301 SGB V", "3758"), - - INNERE_MEDIZIN_SCHWERPUNKT_GASTROENTEROLOGIE("Innere Medizin/Schwerpunkt Gastroenterologie", "Innere Medizin/Schwerpunkt Gastroenterologie", "§301 SGB V", "0107"), - - ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_FORENSISCHE_BEHANDLUNG("Allgemeine Psychiatrie/Schwerpunkt Forensische Behandlung", "Allgemeine Psychiatrie/Schwerpunkt Forensische Behandlung", "§301 SGB V", "2952"), - - INNERE_MEDIZIN_SCHWERPUNKT_HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE("Innere Medizin/Schwerpunkt Hämatologie und internistische Onkologie", "Innere Medizin/Schwerpunkt Hämatologie und internistische Onkologie", "§301 SGB V", "0105"), - - GERIATRIE_TAGESKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Geriatrie/Tagesklinik (für teilstationäre Pflegesätze)", "Geriatrie/Tagesklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "0260"), - - RHEUMATOLOGIE_SCHWERPUNKT_PADIATRIE("Rheumatologie/Schwerpunkt Pädiatrie", "Rheumatologie/Schwerpunkt Pädiatrie", "§301 SGB V", "0910"), - - PADIATRIE_SCHWERPUNKT_KINDERNEUROLOGIE("Pädiatrie/Schwerpunkt Kinderneurologie", "Pädiatrie/Schwerpunkt Kinderneurologie", "§301 SGB V", "1028"), - - ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_GERONTOPSYCHIATRIE_TAGESKLINIK("Allgemeine Psychiatrie/Schwerpunkt Gerontopsychiatrie, Tagesklinik", "Allgemeine Psychiatrie/Schwerpunkt Gerontopsychiatrie, Tagesklinik", "§301 SGB V", "2955"), - - HERZCHIRURGIE_SCHWERPUNKT_THORAXCHIRURGIE_INTENSIVMEDIZIN("Herzchirurgie/Schwerpunkt Thoraxchirurgie Intensivmedizin", "Herzchirurgie/Schwerpunkt Thoraxchirurgie Intensivmedizin", "§301 SGB V", "2150"), - - ENDOKRINOLOGIE_SCHWERPUNKT_GASTROENTEROLOGIE("Endokrinologie/Schwerpunkt Gastroenterologie", "Endokrinologie/Schwerpunkt Gastroenterologie", "§301 SGB V", "0607"), - - NEONATOLOGIE("Neonatologie", "Neonatologie", "§301 SGB V", "1200"), - - SUCHTMEDIZIN("Suchtmedizin", "Suchtmedizin", "§301 SGB V", "3756"), - - GERIATRIE("Geriatrie", "Geriatrie", "§301 SGB V", "0200"), - - ALLGEMEINE_CHIRURGIE_INTENSIVMEDIZIN13_ABS2_SATZ32_HALBS_BPFLV_IN_DER_AM31122003_GELTENDEN_FASSUNG("Allgemeine Chirurgie/Intensivmedizin (§ 13 Abs. 2 Satz 3, 2. Halbs. BPflV in der am 31.12.2003 geltenden Fassung)", "Allgemeine Chirurgie/Intensivmedizin (§ 13 Abs. 2 Satz 3, 2. Halbs. BPflV in der am 31.12.2003 geltenden Fassung)", "§301 SGB V", "1536"), - - PADIATRIE_SCHWERPUNKT_HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE("Pädiatrie/Schwerpunkt Hämatologie und internistische Onkologie", "Pädiatrie/Schwerpunkt Hämatologie und internistische Onkologie", "§301 SGB V", "1005"), - - INTENSIVMEDIZIN_HERZ_THORAXCHIRURGIE("Intensivmedizin/Herz-Thoraxchirurgie", "Intensivmedizin/Herz-Thoraxchirurgie", "§301 SGB V", "3652"), - - ANGIOLOGIE("Angiologie", "Angiologie", "§301 SGB V", "3750"), - - NEPHROLOGIE_INTENSIVMEDIZIN("Nephrologie/Intensivmedizin", "Nephrologie/Intensivmedizin", "§301 SGB V", "0436"), - - FRAUENHEILKUNDE("Frauenheilkunde", "Frauenheilkunde", "§301 SGB V", "2425"), - - KINDERCHIRURGIE("Kinderchirurgie", "Kinderchirurgie", "§301 SGB V", "1300"), - - DERMATOLOGIE_TAGESKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Dermatologie/Tagesklinik (für teilstationäre Pflegesätze)", "Dermatologie/Tagesklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "3460"), - - PSYCHOSOMATIK_PSYCHOTHERAPIE("Psychosomatik/Psychotherapie", "Psychosomatik/Psychotherapie", "§301 SGB V", "3100"), - - PADIATRIE_SCHWERPUNKT_NEONATOLOGIE("Pädiatrie/Schwerpunkt Neonatologie", "Pädiatrie/Schwerpunkt Neonatologie", "§301 SGB V", "1012"), - - UROLOGIE("Urologie", "Urologie", "§301 SGB V", "2200"), - - INNERE_MEDIZIN_SCHWERPUNKT_LUNGEN_UND_BRONCHIALHEILKUNDE("Innere Medizin/Schwerpunkt Lungen- und Bronchialheilkunde", "Innere Medizin/Schwerpunkt Lungen- und Bronchialheilkunde", "§301 SGB V", "0114"), - - THORAXCHIRURGIE("Thoraxchirurgie", "Thoraxchirurgie", "§301 SGB V", "2000"), - - PADIATRIE_SCHWERPUNKT_NEPHROLOGIE("Pädiatrie/Schwerpunkt Nephrologie", "Pädiatrie/Schwerpunkt Nephrologie", "§301 SGB V", "1004"), - - HERZCHIRURGIE_INTENSIVMEDIZIN13_ABS2_SATZ32_HALBSATZ_BPFLV_IN_DER_AM31122003_GELTENDEN_FASSUNG("Herzchirurgie/Intensivmedizin (§ 13 Abs. 2 Satz 3 2. Halbsatz BPflV in der am 31.12.2003 geltenden Fassung)", "Herzchirurgie/Intensivmedizin (§ 13 Abs. 2 Satz 3 2. Halbsatz BPflV in der am 31.12.2003 geltenden Fassung)", "§301 SGB V", "2136"), - - INNERE_MEDIZIN_SCHWERPUNKT_SCHLAGANFALLPATIENTEN("Innere Medizin/Schwerpunkt Schlaganfallpatienten", "Innere Medizin/Schwerpunkt Schlaganfallpatienten", "§301 SGB V", "0156"), - - ENDOKRINOLOGIE_SCHWERPUNKT_PADIATRIE("Endokrinologie/Schwerpunkt Pädiatrie", "Endokrinologie/Schwerpunkt Pädiatrie", "§301 SGB V", "0610"), - - PSYCHOSOMATIK_PSYCHOTHERAPIE_NACHTKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Psychosomatik/Psychotherapie/Nachtklinik (für teilstationäre Pflegesätze)", "Psychosomatik/Psychotherapie/Nachtklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "3161"), - - GASTROENTEROLOGIE("Gastroenterologie", "Gastroenterologie", "§301 SGB V", "0700"), - - NEUROLOGIE("Neurologie", "Neurologie", "§301 SGB V", "2800"), - - GASTROENTEROLOGIE_SCHWERPUNKT_PADIATRIE("Gastroenterologie/Schwerpunkt Pädiatrie", "Gastroenterologie/Schwerpunkt Pädiatrie", "§301 SGB V", "0710"), - - UNFALLCHIRURGIE("Unfallchirurgie", "Unfallchirurgie", "§301 SGB V", "1600"), - - LUNGEN_UND_BRONCHIALHEILKUNDE_SCHWERPUNKT_PADIATRIE("Lungen- und Bronchialheilkunde/Schwerpunkt Pädiatrie", "Lungen- und Bronchialheilkunde/Schwerpunkt Pädiatrie", "§301 SGB V", "1410"), - - INNERE_MEDIZIN_SCHWERPUNKT_NEPHROLOGIE("Innere Medizin/Schwerpunkt Nephrologie", "Innere Medizin/Schwerpunkt Nephrologie", "§301 SGB V", "0104"), - - HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE("Hämatologie und internistische Onkologie", "Hämatologie und internistische Onkologie", "§301 SGB V", "0500"), - - ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_SUCHTBEHANDLUNG_NACHTKLINIK("Allgemeine Psychiatrie/Schwerpunkt Suchtbehandlung, Nachtklinik", "Allgemeine Psychiatrie/Schwerpunkt Suchtbehandlung, Nachtklinik", "§301 SGB V", "2954"), - - PADIATRIE_SCHWERPUNKT_ENDOKRINOLOGIE("Pädiatrie/Schwerpunkt Endokrinologie", "Pädiatrie/Schwerpunkt Endokrinologie", "§301 SGB V", "1006"), - - PADIATRIE_SCHWERPUNKT_LUNGEN_UND_BRONCHIALHEILKUNDE("Pädiatrie/Schwerpunkt Lungen- und Bronchialheilkunde", "Pädiatrie/Schwerpunkt Lungen- und Bronchialheilkunde", "§301 SGB V", "1014"), - - INNERE_MEDIZIN_SCHWERPUNKT_INFEKTIONSKRANKHEITEN("Innere Medizin/Schwerpunkt Infektionskrankheiten", "Innere Medizin/Schwerpunkt Infektionskrankheiten", "§301 SGB V", "0152"), - - PADIATRIE_SCHWERPUNKT_PERINATALMEDIZIN("Pädiatrie/Schwerpunkt Perinatalmedizin", "Pädiatrie/Schwerpunkt Perinatalmedizin", "§301 SGB V", "1050"), - - INTENSIVMEDIZIN("Intensivmedizin", "Intensivmedizin", "§301 SGB V", "3600"), - - ALLGEMEINE_PSYCHIATRIE_NACHTKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Allgemeine Psychiatrie/Nachtklinik (für teilstationäre Pflegesätze)", "Allgemeine Psychiatrie/Nachtklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "2961"), - - ENDOKRINOLOGIE("Endokrinologie", "Endokrinologie", "§301 SGB V", "0600"), - - INTENSIVMEDIZIN_SCHWERPUNKT_INNERE_MEDIZIN("Intensivmedizin/Schwerpunkt Innere Medizin", "Intensivmedizin/Schwerpunkt Innere Medizin", "§301 SGB V", "3601"), - - INTENSIVMEDIZIN_SCHWERPUNKT_CHIRURGIE("Intensivmedizin/Schwerpunkt Chirurgie", "Intensivmedizin/Schwerpunkt Chirurgie", "§301 SGB V", "3618"), - - NEUROLOGIE_SCHWERPUNKT_PADIATRIE("Neurologie/Schwerpunkt Pädiatrie", "Neurologie/Schwerpunkt Pädiatrie", "§301 SGB V", "2810"), - - OPERATIVE_INTENSIVMEDIZIN_SCHWERPUNKT_CHIRURGIE("Operative Intensivmedizin/Schwerpunkt Chirurgie", "Operative Intensivmedizin/Schwerpunkt Chirurgie", "§301 SGB V", "3650"), - - AUGENHEILKUNDE("Augenheilkunde", "Augenheilkunde", "§301 SGB V", "2700"), - - STRAHLENHEILKUNDE("Strahlenheilkunde", "Strahlenheilkunde", "§301 SGB V", "3300"), - - INNERE_MEDIZIN_SCHWERPUNKT_DIABETES("Innere Medizin/Schwerpunkt Diabetes", "Innere Medizin/Schwerpunkt Diabetes", "§301 SGB V", "0153"), - - SCHMERZTHERAPIE("Schmerztherapie", "Schmerztherapie", "§301 SGB V", "3753"), - - KINDER_UND_JUGENDPSYCHIATRIE_NACHTKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Kinder- und Jugendpsychiatrie/Nachtklinik (für teilstationäre Pflegesätze)", "Kinder- und Jugendpsychiatrie/Nachtklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "3061"), - - INTENSIVMEDIZIN_HERZCHIRURGIE("Intensivmedizin/Herzchirurgie", "Intensivmedizin/Herzchirurgie", "§301 SGB V", "3621"), - - ORTHOPADIE_SCHWERPUNKT_CHIRURGIE("Orthopädie/Schwerpunkt Chirurgie", "Orthopädie/Schwerpunkt Chirurgie", "§301 SGB V", "2315"), - - INNERE_MEDIZIN_SCHWERPUNKT_NATURHEILKUNDE("Innere Medizin/Schwerpunkt Naturheilkunde", "Innere Medizin/Schwerpunkt Naturheilkunde", "§301 SGB V", "0154"), - - ORTHOPADIE_SCHWERPUNKT_RHEUMATOLOGIE("Orthopädie/Schwerpunkt Rheumatologie", "Orthopädie/Schwerpunkt Rheumatologie", "§301 SGB V", "2309"), - - FRAUENHEILKUNDE_SCHWERPUNKT_GERIATRIE("Frauenheilkunde/Schwerpunkt Geriatrie", "Frauenheilkunde/Schwerpunkt Geriatrie", "§301 SGB V", "2402"), - - ALLGEMEINE_CHIRURGIE("Allgemeine Chirurgie", "Allgemeine Chirurgie", "§301 SGB V", "1500"), - - ALLGEMEINE_PSYCHIATRIE_TAGESKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Allgemeine Psychiatrie/Tagesklinik (für teilstationäre Pflegesätze)", "Allgemeine Psychiatrie/Tagesklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "2960"), - - ZAHN_UND_KIEFERHEILKUNDE_MUND_UND_KIEFERCHIRURGIE("Zahn- und Kieferheilkunde, Mund- und Kieferchirurgie", "Zahn- und Kieferheilkunde, Mund- und Kieferchirurgie", "§301 SGB V", "3500"), - - PADIATRIE("Pädiatrie", "Pädiatrie", "§301 SGB V", "1000"), - - STRAHLENHEILKUNDE_SCHWERPUNKT_RADIOLOGIE("Strahlenheilkunde/Schwerpunkt Radiologie", "Strahlenheilkunde/Schwerpunkt Radiologie", "§301 SGB V", "3350"), - - LANGZEITBEREICH_KINDER("Langzeitbereich Kinder", "Langzeitbereich Kinder", "§301 SGB V", "1051"), - - ALLGEMEINE_CHIRURGIE_SCHWERPUNKT_THORAXCHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Thoraxchirurgie", "Allgemeine Chirurgie/Schwerpunkt Thoraxchirurgie", "§301 SGB V", "1520"), - - PADIATRIE_SCHWERPUNKT_GASTROENTEROLOGIE("Pädiatrie/Schwerpunkt Gastroenterologie", "Pädiatrie/Schwerpunkt Gastroenterologie", "§301 SGB V", "1007"), - - HERZCHIRURGIE_SCHWERPUNKT_THORAXCHIRURGIE("Herzchirurgie/Schwerpunkt Thoraxchirurgie", "Herzchirurgie/Schwerpunkt Thoraxchirurgie", "§301 SGB V", "2120"), - - ALLGEMEINE_CHIRURGIE_SCHWERPUNKT_GEFASSCHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Gefäßchirurgie", "Allgemeine Chirurgie/Schwerpunkt Gefäßchirurgie", "§301 SGB V", "1518"), - - PADIATRIE_SCHWERPUNKT_RHEUMATOLOGIE("Pädiatrie/Schwerpunkt Rheumatologie", "Pädiatrie/Schwerpunkt Rheumatologie", "§301 SGB V", "1009"), - - INNERE_MEDIZIN_TUMORFORSCHUNG("Innere Medizin/Tumorforschung", "Innere Medizin/Tumorforschung", "§301 SGB V", "0150"), - - INTENSIVMEDIZIN_SCHWERPUNKT_PADIATRIE("Intensivmedizin/Schwerpunkt Pädiatrie", "Intensivmedizin/Schwerpunkt Pädiatrie", "§301 SGB V", "3610"), - - HALS_NASEN_OHRENHEILKUNDE("Hals-, Nasen-, Ohrenheilkunde", "Hals-, Nasen-, Ohrenheilkunde", "§301 SGB V", "2600"), - - HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE_SCHWERPUNKT_STRAHLENHEILKUNDE("Hämatologie und internistische Onkologie/Schwerpunkt Strahlenheilkunde", "Hämatologie und internistische Onkologie/Schwerpunkt Strahlenheilkunde", "§301 SGB V", "0533"), - - ALLGEMEINE_CHIRURGIE_SCHWERPUNKT_PLASTISCHE_CHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Plastische Chirurgie", "Allgemeine Chirurgie/Schwerpunkt Plastische Chirurgie", "§301 SGB V", "1519"), - - THORAXCHIRURGIE_SCHWERPUNKT_HERZCHIRURGIE("Thoraxchirurgie/Schwerpunkt Herzchirurgie", "Thoraxchirurgie/Schwerpunkt Herzchirurgie", "§301 SGB V", "2021"), - - HERZCHIRURGIE_SCHWERPUNKT_GEFASSCHIRURGIE("Herzchirurgie/Schwerpunkt Gefäßchirurgie", "Herzchirurgie/Schwerpunkt Gefäßchirurgie", "§301 SGB V", "2118"), - - GEFASSCHIRURGIE("Gefäßchirurgie", "Gefäßchirurgie", "§301 SGB V", "1800"), - - FRAUENHEILKUNDE_UND_GEBURTSHILFE("Frauenheilkunde und Geburtshilfe", "Frauenheilkunde und Geburtshilfe", "§301 SGB V", "2400"), - - INNERE_MEDIZIN_SCHWERPUNKT_COLOPROKTOLOGIE("Innere Medizin/Schwerpunkt Coloproktologie", "Innere Medizin/Schwerpunkt Coloproktologie", "§301 SGB V", "0151"), - - ALLGEMEINE_CHIRURGIE_SCHWERPUNKT_HANDCHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Handchirurgie", "Allgemeine Chirurgie/Schwerpunkt Handchirurgie", "§301 SGB V", "1551"), - - PLASTISCHE_CHIRURGIE("Plastische Chirurgie", "Plastische Chirurgie", "§301 SGB V", "1900"), - - DERMATOLOGIE("Dermatologie", "Dermatologie", "§301 SGB V", "3400"), - - THORAXCHIRURGIE_SCHWERPUNKT_HERZCHIRURGIE_INTENSIVMEDIZIN("Thoraxchirurgie/Schwerpunkt Herzchirurgie Intensivmedizin", "Thoraxchirurgie/Schwerpunkt Herzchirurgie Intensivmedizin", "§301 SGB V", "2050"), - - INTENSIVMEDIZIN_SCHWERPUNKT_HALS_NASEN_OHRENHEILKUNDE("Intensivmedizin/Schwerpunkt Hals-, Nasen-, Ohrenheilkunde", "Intensivmedizin/Schwerpunkt Hals-, Nasen-, Ohrenheilkunde", "§301 SGB V", "3626"), - - PNEUMOLOGIE("Pneumologie", "Pneumologie", "§301 SGB V", "0800"), - - PSYCHOSOMATIK_PSYCHOTHERAPIE_SCHWERPUNKT_KINDER_UND_JUGENDPSYCHOSOMATIK("Psychosomatik/Psychotherapie/Schwerpunkt Kinder- und Jugendpsychosomatik", "Psychosomatik/Psychotherapie/Schwerpunkt Kinder- und Jugendpsychosomatik", "§301 SGB V", "3110"), - - INTENSIVMEDIZIN_SCHWERPUNKT_UROLOGIE("Intensivmedizin/Schwerpunkt Urologie", "Intensivmedizin/Schwerpunkt Urologie", "§301 SGB V", "3622"), - - HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE_SCHWERPUNKT_PADIATRIE("Hämatologie und internistische Onkologie/Schwerpunkt Pädiatrie", "Hämatologie und internistische Onkologie/Schwerpunkt Pädiatrie", "§301 SGB V", "0510"), - - NUKLEARMEDIZIN("Nuklearmedizin", "Nuklearmedizin", "§301 SGB V", "3200"), - - NUKLEARMEDIZIN_SCHWERPUNKT_STRAHLENHEILKUNDE("Nuklearmedizin/Schwerpunkt Strahlenheilkunde", "Nuklearmedizin/Schwerpunkt Strahlenheilkunde", "§301 SGB V", "3233"), - - ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_SUCHTBEHANDLUNG("Allgemeine Psychiatrie/Schwerpunkt Suchtbehandlung", "Allgemeine Psychiatrie/Schwerpunkt Suchtbehandlung", "§301 SGB V", "2950"), - - GERIATRIE_NACHTKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Geriatrie/Nachtklinik (für teilstationäre Pflegesätze)", "Geriatrie/Nachtklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "0261"), - - HEILTHERAPEUTISCHE_ABTEILUNG("Heiltherapeutische Abteilung", "Heiltherapeutische Abteilung", "§301 SGB V", "3754"), - - GERIATRIE_SCHWERPUNKT_FRAUENHEILKUNDE("Geriatrie/Schwerpunkt Frauenheilkunde", "Geriatrie/Schwerpunkt Frauenheilkunde", "§301 SGB V", "0224"), - - ORTHOPADIE_UND_UNFALLCHIRURGIE("Orthopädie und Unfallchirurgie", "Orthopädie und Unfallchirurgie", "§301 SGB V", "2316"), - - ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_GERONTOPSYCHIATRIE("Allgemeine Psychiatrie/Schwerpunkt Gerontopsychiatrie", "Allgemeine Psychiatrie/Schwerpunkt Gerontopsychiatrie", "§301 SGB V", "2951"), - - HERZCHIRURGIE("Herzchirurgie", "Herzchirurgie", "§301 SGB V", "2100"), - - FRAUENHEILKUNDE_SCHWERPUNKT_HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE("Frauenheilkunde/Schwerpunkt Hämatologie und internistische Onkologie", "Frauenheilkunde/Schwerpunkt Hämatologie und internistische Onkologie", "§301 SGB V", "2405"), - - ALLGEMEINE_CHIRURGIE_SCHWERPUNKT_ABDOMINAL_UND_GEFASSCHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Abdominal- und Gefäßchirurgie", "Allgemeine Chirurgie/Schwerpunkt Abdominal- und Gefäßchirurgie", "§301 SGB V", "1550"), - - SONSTIGE_FACHABTEILUNG("Sonstige Fachabteilung", "Sonstige Fachabteilung", "§301 SGB V", "3700"), - - RHEUMATOLOGIE("Rheumatologie", "Rheumatologie", "§301 SGB V", "0900"), - - THORAXCHIRURGIE_INTENSIVMEDIZIN("Thoraxchirurgie/Intensivmedizin", "Thoraxchirurgie/Intensivmedizin", "§301 SGB V", "2036"), - - LUNGEN_UND_BRONCHIALHEILKUNDE("Lungen- und Bronchialheilkunde", "Lungen- und Bronchialheilkunde", "§301 SGB V", "1400"), - - KINDER_UND_JUGENDPSYCHIATRIE_TAGESKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Kinder- und Jugendpsychiatrie/Tagesklinik (für teilstationäre Pflegesätze)", "Kinder- und Jugendpsychiatrie/Tagesklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "3060"), - - ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_NEUROLOGIE("Allgemeine Psychiatrie/Schwerpunkt Neurologie", "Allgemeine Psychiatrie/Schwerpunkt Neurologie", "§301 SGB V", "2928"), - - INTENSIVMEDIZIN_SCHWERPUNKT_FRAUENHEILKUNDE_UND_GEBURTSHILFE("Intensivmedizin/Schwerpunkt Frauenheilkunde und Geburtshilfe", "Intensivmedizin/Schwerpunkt Frauenheilkunde und Geburtshilfe", "§301 SGB V", "3624"), - - WIRBELSAULENCHIRURGIE("Wirbelsäulenchirurgie", "Wirbelsäulenchirurgie", "§301 SGB V", "3755"), - - PADIATRIE_SCHWERPUNKT_KINDERKARDIOLOGIE("Pädiatrie/Schwerpunkt Kinderkardiologie", "Pädiatrie/Schwerpunkt Kinderkardiologie", "§301 SGB V", "1011"), - - VISCERALCHIRURGIE("Visceralchirurgie", "Visceralchirurgie", "§301 SGB V", "3757"), - - PALLIATIVMEDIZIN("Palliativmedizin", "Palliativmedizin", "§301 SGB V", "3752"), - - CHIRURGIE_SCHWERPUNKT_ORTHOPADIE("Chirurgie/Schwerpunkt Orthopädie", "Chirurgie/Schwerpunkt Orthopädie", "§301 SGB V", "1523"), - - GASTROENTEROLOGIE_SCHWERPUNKT_ENDOKRINOLOGIE("Gastroenterologie/Schwerpunkt Endokrinologie", "Gastroenterologie/Schwerpunkt Endokrinologie", "§301 SGB V", "0706"), - - INNERE_MEDIZIN("Innere Medizin", "Innere Medizin", "§301 SGB V", "0100"), - - DAVON_GEBURTSHILFE("davon Geburtshilfe", "davon Geburtshilfe", "§301 SGB V", "2500"), - - ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_PSYCHOSOMATIK_PSYCHOTHERAPIE("Allgemeine Psychiatrie/Schwerpunkt Psychosomatik/Psychotherapie", "Allgemeine Psychiatrie/Schwerpunkt Psychosomatik/Psychotherapie", "§301 SGB V", "2931"), - - ALLGEMEINE_CHIRURGIE_SCHWERPUNKT_KINDERCHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Kinderchirurgie", "Allgemeine Chirurgie/Schwerpunkt Kinderchirurgie", "§301 SGB V", "1513"), - - KINDERKARDIOLOGIE("Kinderkardiologie", "Kinderkardiologie", "§301 SGB V", "1100"), - - INNERE_MEDIZIN_SCHWERPUNKT_ENDOKRINOLOGIE("Innere Medizin/Schwerpunkt Endokrinologie", "Innere Medizin/Schwerpunkt Endokrinologie", "§301 SGB V", "0106"), - - KINDERKARDIOLOGIE_SCHWERPUNKT_INTENSIVMEDIZIN("Kinderkardiologie/Schwerpunkt Intensivmedizin", "Kinderkardiologie/Schwerpunkt Intensivmedizin", "§301 SGB V", "1136"), - - INTENSIVMEDIZIN_THORAX_HERZCHIRURGIE("Intensivmedizin/Thorax-Herzchirurgie", "Intensivmedizin/Thorax-Herzchirurgie", "§301 SGB V", "3651"), - - ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_GERONTOPSYCHIATRIE_NACHTKLINIK("Allgemeine Psychiatrie/Schwerpunkt Gerontopsychiatrie, Nachtklinik", "Allgemeine Psychiatrie/Schwerpunkt Gerontopsychiatrie, Nachtklinik", "§301 SGB V", "2956"), - - RADIOLOGIE("Radiologie", "Radiologie", "§301 SGB V", "3751"), - - KARDIOLOGIE("Kardiologie", "Kardiologie", "§301 SGB V", "0300"), - - INTENSIVMEDIZIN_SCHWERPUNKT_NEUROLOGIE("Intensivmedizin/Schwerpunkt Neurologie", "Intensivmedizin/Schwerpunkt Neurologie", "§301 SGB V", "3628"), - - FRAUENHEILKUNDE_SCHWERPUNKT_ENDOKRINOLOGIE("Frauenheilkunde/Schwerpunkt Endokrinologie", "Frauenheilkunde/Schwerpunkt Endokrinologie", "§301 SGB V", "2406"), - - NEPHROLOGIE("Nephrologie", "Nephrologie", "§301 SGB V", "0400"), - - NEUROLOGIE_SCHWERPUNKT_SCHLAGANFALLPATIENTEN("Neurologie/Schwerpunkt Schlaganfallpatienten", "Neurologie/Schwerpunkt Schlaganfallpatienten", "§301 SGB V", "2856"), - - ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_KINDER_UND_JUGENDPSYCHIATRIE("Allgemeine Psychiatrie/Schwerpunkt Kinder- und Jugendpsychiatrie", "Allgemeine Psychiatrie/Schwerpunkt Kinder- und Jugendpsychiatrie", "§301 SGB V", "2930"), - - PSYCHOSOMATIK_PSYCHOTHERAPIE_TAGESKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Psychosomatik/Psychotherapie/Tagesklinik (für teilstationäre Pflegesätze)", "Psychosomatik/Psychotherapie/Tagesklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "3160"), - - NEPHROLOGIE_SCHWERPUNKT_PADIATRIE("Nephrologie/Schwerpunkt Pädiatrie", "Nephrologie/Schwerpunkt Pädiatrie", "§301 SGB V", "0410"), - - INNERE_MEDIZIN_SCHWERPUNKT_RHEUMATOLOGIE("Innere Medizin/Schwerpunkt Rheumatologie", "Innere Medizin/Schwerpunkt Rheumatologie", "§301 SGB V", "0109"), - - INNERE_MEDIZIN_SCHWERPUNKT_GERIATRIE("Innere Medizin/Schwerpunkt Geriatrie", "Innere Medizin/Schwerpunkt Geriatrie", "§301 SGB V", "0102"), - - INTENSIVMEDIZIN_SCHWERPUNKT_NEUROCHIRURGIE("Intensivmedizin/Schwerpunkt Neurochirurgie", "Intensivmedizin/Schwerpunkt Neurochirurgie", "§301 SGB V", "3617"), - - ALLGEMEINE_PSYCHIATRIE("Allgemeine Psychiatrie", "Allgemeine Psychiatrie", "§301 SGB V", "2900"), - - KINDER_UND_JUGENDPSYCHIATRIE("Kinder- und Jugendpsychiatrie", "Kinder- und Jugendpsychiatrie", "§301 SGB V", "3000"), - - INNERE_MEDIZIN_SCHWERPUNKT_PNEUMOLOGIE("Innere Medizin/Schwerpunkt Pneumologie", "Innere Medizin/Schwerpunkt Pneumologie", "§301 SGB V", "0108"), - - STRAHLENHEILKUNDE_SCHWERPUNKT_HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE("Strahlenheilkunde/Schwerpunkt Hämatologie und internistische Onkologie", "Strahlenheilkunde/Schwerpunkt Hämatologie und internistische Onkologie", "§301 SGB V", "3305"), - - ORTHOPADIE("Orthopädie", "Orthopädie", "§301 SGB V", "2300"), - - ALLGEMEINE_CHIRURGIE_SCHWERPUNKT_UNFALLCHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Unfallchirurgie", "Allgemeine Chirurgie/Schwerpunkt Unfallchirurgie", "§301 SGB V", "1516"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - StandortschlusselDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java deleted file mode 100644 index b1d7b54e5..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.case_identification.v0") -public class VersorgungsfallCluster { - @Path("/items[at0001 and name/value='Zugehörige Versorgungsfall-Kennung']/value|value") - private String zugehorigeVersorgungsfallKennungValue; - - public void setZugehorigeVersorgungsfallKennungValue( - String zugehorigeVersorgungsfallKennungValue) { - this.zugehorigeVersorgungsfallKennungValue = zugehorigeVersorgungsfallKennungValue; - } - - public String getZugehorigeVersorgungsfallKennungValue() { - return this.zugehorigeVersorgungsfallKennungValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallClusterContainment.java deleted file mode 100644 index d1f5b4a3a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallClusterContainment.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; - -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class VersorgungsfallClusterContainment extends Containment { - public SelectAqlField VERSORGUNGSFALL_CLUSTER = new AqlFieldImp(VersorgungsfallCluster.class, "", "VersorgungsfallCluster", VersorgungsfallCluster.class, this); - - public SelectAqlField ZUGEHORIGE_VERSORGUNGSFALL_KENNUNG_VALUE = new AqlFieldImp(VersorgungsfallCluster.class, "/items[at0001]/value|value", "zugehorigeVersorgungsfallKennungValue", String.class, this); - - private VersorgungsfallClusterContainment() { - super("openEHR-EHR-CLUSTER.case_identification.v0"); - } - - public static VersorgungsfallClusterContainment getInstance() { - return new VersorgungsfallClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java deleted file mode 100644 index ae32fd27b..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java +++ /dev/null @@ -1,90 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; - -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-ADMIN_ENTRY.hospitalization.v0") -public class VersorgungsortAdminEntry { - @Path("/data[at0001]/items[at0004]/value|value") - private TemporalAccessor beginnValue; - - @Path("/data[at0001]/items[at0005]/value|value") - private TemporalAccessor endeValue; - - @Path("/data[at0001]/items[at0006]/value|value") - private String grundDesAufenthaltesValue; - - @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.location.v1]") - private StandortCluster standort; - - @Path("/data[at0001]/items[at0009]/value|value") - private String kommentarValue; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setBeginnValue(TemporalAccessor beginnValue) { - this.beginnValue = beginnValue; - } - - public TemporalAccessor getBeginnValue() { - return this.beginnValue ; - } - - public void setEndeValue(TemporalAccessor endeValue) { - this.endeValue = endeValue; - } - - public TemporalAccessor getEndeValue() { - return this.endeValue ; - } - - public void setGrundDesAufenthaltesValue(String grundDesAufenthaltesValue) { - this.grundDesAufenthaltesValue = grundDesAufenthaltesValue; - } - - public String getGrundDesAufenthaltesValue() { - return this.grundDesAufenthaltesValue ; - } - - public void setStandort(StandortCluster standort) { - this.standort = standort; - } - - public StandortCluster getStandort() { - return this.standort ; - } - - public void setKommentarValue(String kommentarValue) { - this.kommentarValue = kommentarValue; - } - - public String getKommentarValue() { - return this.kommentarValue ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntryContainment.java deleted file mode 100644 index 2b82cce8d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntryContainment.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; - -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class VersorgungsortAdminEntryContainment extends Containment { - public SelectAqlField VERSORGUNGSORT_ADMIN_ENTRY = new AqlFieldImp(VersorgungsortAdminEntry.class, "", "VersorgungsortAdminEntry", VersorgungsortAdminEntry.class, this); - - public SelectAqlField BEGINN_VALUE = new AqlFieldImp(VersorgungsortAdminEntry.class, "/data[at0001]/items[at0004]/value|value", "beginnValue", TemporalAccessor.class, this); - - public SelectAqlField ENDE_VALUE = new AqlFieldImp(VersorgungsortAdminEntry.class, "/data[at0001]/items[at0005]/value|value", "endeValue", TemporalAccessor.class, this); - - public SelectAqlField GRUND_DES_AUFENTHALTES_VALUE = new AqlFieldImp(VersorgungsortAdminEntry.class, "/data[at0001]/items[at0006]/value|value", "grundDesAufenthaltesValue", String.class, this); - - public SelectAqlField STANDORT = new AqlFieldImp(VersorgungsortAdminEntry.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.location.v1]", "standort", StandortCluster.class, this); - - public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(VersorgungsortAdminEntry.class, "/data[at0001]/items[at0009]/value|value", "kommentarValue", String.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(VersorgungsortAdminEntry.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(VersorgungsortAdminEntry.class, "/language", "language", Language.class, this); - - private VersorgungsortAdminEntryContainment() { - super("openEHR-EHR-ADMIN_ENTRY.hospitalization.v0"); - } - - public static VersorgungsortAdminEntryContainment getInstance() { - return new VersorgungsortAdminEntryContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java deleted file mode 100644 index 047b47d88..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java +++ /dev/null @@ -1,203 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -import com.nedap.archie.rm.datastructures.Cluster; -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 org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Id; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition.SchwangerschaftsstatusObservation; -import org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition.StatusDefiningCode; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import org.ehrbase.client.openehrclient.VersionUid; - -@Entity -@Archetype("openEHR-EHR-COMPOSITION.registereintrag.v1") -@Template("Schwangerschaftsstatus") -public class SchwangerschaftsstatusComposition { - @Path("/context/other_context[at0001]/items[at0002]") - private List erweiterung; - - @Path("/context/other_context[at0001]/items[at0004]/value|defining_code") - private StatusDefiningCode statusDefiningCode; - - @Path("/context/other_context[at0001]/items[at0005]/value|value") - private String kategorieValue; - - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; - - @Path("/context/participations") - private List participations; - - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; - - @Path("/context/location") - private String location; - - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; - - @Path("/context/setting|defining_code") - private Setting settingDefiningCode; - - @Path("/content[openEHR-EHR-OBSERVATION.pregnancy_status.v0]") - private SchwangerschaftsstatusObservation schwangerschaftsstatus; - - @Path("/composer") - private PartyProxy composer; - - @Path("/language") - private Language language; - - @Path("/feeder_audit") - private FeederAudit feederAudit; - - @Path("/category|defining_code") - private Category categoryDefiningCode; - - @Path("/territory") - private Territory territory; - - @Id - private VersionUid versionUid; - - 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 setKategorieValue(String kategorieValue) { - this.kategorieValue = kategorieValue; - } - - public String getKategorieValue() { - return this.kategorieValue ; - } - - 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 setSchwangerschaftsstatus(SchwangerschaftsstatusObservation schwangerschaftsstatus) { - this.schwangerschaftsstatus = schwangerschaftsstatus; - } - - public SchwangerschaftsstatusObservation getSchwangerschaftsstatus() { - return this.schwangerschaftsstatus ; - } - - 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 setCategoryDefiningCode(Category categoryDefiningCode) { - this.categoryDefiningCode = categoryDefiningCode; - } - - public Category getCategoryDefiningCode() { - return this.categoryDefiningCode ; - } - - 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusCompositionContainment.java deleted file mode 100644 index 5f853a4ff..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusCompositionContainment.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -import com.nedap.archie.rm.datastructures.Cluster; -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 org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition.SchwangerschaftsstatusObservation; -import org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition.StatusDefiningCode; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; - -public class SchwangerschaftsstatusCompositionContainment extends Containment { - public SelectAqlField SCHWANGERSCHAFTSSTATUS_COMPOSITION = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "", "SchwangerschaftsstatusComposition", SchwangerschaftsstatusComposition.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/other_context[at0001]/items[at0002]", "erweiterung", Cluster.class, this); - - public SelectAqlField STATUS_DEFINING_CODE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/other_context[at0001]/items[at0004]/value|defining_code", "statusDefiningCode", StatusDefiningCode.class, this); - - public SelectAqlField KATEGORIE_VALUE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "kategorieValue", String.class, this); - - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/participations", "participations", Participation.class, this); - - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - - public SelectAqlField LOCATION = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/location", "location", String.class, this); - - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - - public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - - public SelectAqlField SCHWANGERSCHAFTSSTATUS = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/content[openEHR-EHR-OBSERVATION.pregnancy_status.v0]", "schwangerschaftsstatus", SchwangerschaftsstatusObservation.class, this); - - public SelectAqlField COMPOSER = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/composer", "composer", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/language", "language", Language.class, this); - - public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - - public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - - public SelectAqlField TERRITORY = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/territory", "territory", Territory.class, this); - - private SchwangerschaftsstatusCompositionContainment() { - super("openEHR-EHR-COMPOSITION.registereintrag.v1"); - } - - public static SchwangerschaftsstatusCompositionContainment getInstance() { - return new SchwangerschaftsstatusCompositionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java deleted file mode 100644 index 1e84831b4..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java +++ /dev/null @@ -1,80 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.pregnancy_status.v0") -public class SchwangerschaftsstatusObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|defining_code") - private StatusDefiningCode2 statusDefiningCode; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0021]/items[at0022]") - private List erweiterungen; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setStatusDefiningCode(StatusDefiningCode2 statusDefiningCode) { - this.statusDefiningCode = statusDefiningCode; - } - - public StatusDefiningCode2 getStatusDefiningCode() { - return this.statusDefiningCode ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setErweiterungen(List erweiterungen) { - this.erweiterungen = erweiterungen; - } - - public List getErweiterungen() { - return this.erweiterungen ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservationContainment.java deleted file mode 100644 index 24d7573d7..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservationContainment.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class SchwangerschaftsstatusObservationContainment extends Containment { - public SelectAqlField SCHWANGERSCHAFTSSTATUS_OBSERVATION = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "", "SchwangerschaftsstatusObservation", SchwangerschaftsstatusObservation.class, this); - - public SelectAqlField STATUS_DEFINING_CODE = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|defining_code", "statusDefiningCode", StatusDefiningCode2.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public ListSelectAqlField ERWEITERUNGEN = new ListAqlFieldImp(SchwangerschaftsstatusObservation.class, "/protocol[at0021]/items[at0022]", "erweiterungen", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "/language", "language", Language.class, this); - - private SchwangerschaftsstatusObservationContainment() { - super("openEHR-EHR-OBSERVATION.pregnancy_status.v0"); - } - - public static SchwangerschaftsstatusObservationContainment getInstance() { - return new SchwangerschaftsstatusObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode.java deleted file mode 100644 index 12136f133..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum StatusDefiningCode implements EnumValueSet { - VORLAUFIG("vorläufig", "*", "local", "at0011"), - - FINAL("final", "*", "local", "at0012"), - - REGISTRIERT("registriert", "*", "local", "at0010"), - - GEANDERT("geändert", "*", "local", "at0013"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - StatusDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode2.java deleted file mode 100644 index 59f762ecf..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningcode2.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum StatusDefiningCode2 implements EnumValueSet { - SCHWANGER("Schwanger", "Die Person ist schwanger.", "local", "at0012"), - - NICHT_SCHWANGER("Nicht schwanger", "Die Person ist nicht schwanger.", "local", "at0013"), - - UNBEKANNT("Unbekannt", "Es ist nicht bekannt, ob die Person schwanger ist oder nicht.", "local", "at0014"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - StatusDefiningCode2(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java deleted file mode 100644 index 881c2ecc4..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java +++ /dev/null @@ -1,202 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -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 org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Id; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition.EventsummaryCluster; -import org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition.SmicsErgebnisObservation; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import org.ehrbase.client.openehrclient.VersionUid; - -@Entity -@Archetype("openEHR-EHR-COMPOSITION.report.v1") -@Template("SmICS-Befund") -public class SmICSBefundComposition { - @Path("/context/other_context[at0001]/items[at0002]/value|value") - private String berichtIdValue; - - @Path("/context/other_context[at0001]/items[at0005]/value|value") - private String statusValue; - - @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.eventsummary.v0]") - private List eventsummary; - - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; - - @Path("/context/participations") - private List participations; - - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; - - @Path("/context/location") - private String location; - - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; - - @Path("/context/setting|defining_code") - private Setting settingDefiningCode; - - @Path("/content[openEHR-EHR-OBSERVATION.smics_befund.v1]") - private SmicsErgebnisObservation smicsErgebnis; - - @Path("/composer") - private PartyProxy composer; - - @Path("/language") - private Language language; - - @Path("/feeder_audit") - private FeederAudit feederAudit; - - @Path("/category|defining_code") - private Category categoryDefiningCode; - - @Path("/territory") - private Territory territory; - - @Id - private VersionUid versionUid; - - public void setBerichtIdValue(String berichtIdValue) { - this.berichtIdValue = berichtIdValue; - } - - public String getBerichtIdValue() { - return this.berichtIdValue ; - } - - public void setStatusValue(String statusValue) { - this.statusValue = statusValue; - } - - public String getStatusValue() { - return this.statusValue ; - } - - public void setEventsummary(List eventsummary) { - this.eventsummary = eventsummary; - } - - public List getEventsummary() { - return this.eventsummary ; - } - - 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 setSmicsErgebnis(SmicsErgebnisObservation smicsErgebnis) { - this.smicsErgebnis = smicsErgebnis; - } - - public SmicsErgebnisObservation getSmicsErgebnis() { - return this.smicsErgebnis ; - } - - 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 setCategoryDefiningCode(Category categoryDefiningCode) { - this.categoryDefiningCode = categoryDefiningCode; - } - - public Category getCategoryDefiningCode() { - return this.categoryDefiningCode ; - } - - 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundCompositionContainment.java deleted file mode 100644 index 50d07f8ec..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundCompositionContainment.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -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 org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition.EventsummaryCluster; -import org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition.SmicsErgebnisObservation; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; - -public class SmICSBefundCompositionContainment extends Containment { - public SelectAqlField SM_I_C_S_BEFUND_COMPOSITION = new AqlFieldImp(SmICSBefundComposition.class, "", "SmICSBefundComposition", SmICSBefundComposition.class, this); - - public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(SmICSBefundComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); - - public SelectAqlField STATUS_VALUE = new AqlFieldImp(SmICSBefundComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "statusValue", String.class, this); - - public ListSelectAqlField EVENTSUMMARY = new ListAqlFieldImp(SmICSBefundComposition.class, "/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.eventsummary.v0]", "eventsummary", EventsummaryCluster.class, this); - - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(SmICSBefundComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(SmICSBefundComposition.class, "/context/participations", "participations", Participation.class, this); - - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(SmICSBefundComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - - public SelectAqlField LOCATION = new AqlFieldImp(SmICSBefundComposition.class, "/context/location", "location", String.class, this); - - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(SmICSBefundComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - - public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(SmICSBefundComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - - public SelectAqlField SMICS_ERGEBNIS = new AqlFieldImp(SmICSBefundComposition.class, "/content[openEHR-EHR-OBSERVATION.smics_befund.v1]", "smicsErgebnis", SmicsErgebnisObservation.class, this); - - public SelectAqlField COMPOSER = new AqlFieldImp(SmICSBefundComposition.class, "/composer", "composer", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(SmICSBefundComposition.class, "/language", "language", Language.class, this); - - public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(SmICSBefundComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - - public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(SmICSBefundComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - - public SelectAqlField TERRITORY = new AqlFieldImp(SmICSBefundComposition.class, "/territory", "territory", Territory.class, this); - - private SmICSBefundCompositionContainment() { - super("openEHR-EHR-COMPOSITION.report.v1"); - } - - public static SmICSBefundCompositionContainment getInstance() { - return new SmICSBefundCompositionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java deleted file mode 100644 index 97e79b29a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.laboratory_test_panel.v0") -public class AntibiogrammCluster { - @Path("/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]") - private List laboranalytResultat; - - public void setLaboranalytResultat(List laboranalytResultat) { - this.laboranalytResultat = laboranalytResultat; - } - - public List getLaboranalytResultat() { - return this.laboranalytResultat ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammClusterContainment.java deleted file mode 100644 index fa4e766e2..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammClusterContainment.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class AntibiogrammClusterContainment extends Containment { - public SelectAqlField ANTIBIOGRAMM_CLUSTER = new AqlFieldImp(AntibiogrammCluster.class, "", "AntibiogrammCluster", AntibiogrammCluster.class, this); - - public ListSelectAqlField LABORANALYT_RESULTAT = new ListAqlFieldImp(AntibiogrammCluster.class, "/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]", "laboranalytResultat", LaboranalytResultatCluster.class, this); - - private AntibiogrammClusterContainment() { - super("openEHR-EHR-CLUSTER.laboratory_test_panel.v0"); - } - - public static AntibiogrammClusterContainment getInstance() { - return new AntibiogrammClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiotikumDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiotikumDefiningcode.java deleted file mode 100644 index 5249e6c97..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiotikumDefiningcode.java +++ /dev/null @@ -1,397 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum AntibiotikumDefiningCode implements EnumValueSet { - RAMOPLANIN("Ramoplanin", "Ramoplanin", "LOINC", "41737-8"), - - MOXALACTAM_LATAMOXEF("Moxalactam (Latamoxef)", "Moxalactam (Latamoxef)", "LOINC", "18950-6"), - - MUPIROCIN("Mupirocin", "Mupirocin", "LOINC", "20389-3"), - - TRIMETHOPRIM("Trimethoprim", "Trimethoprim", "LOINC", "18997-7"), - - CEFSULODIN("Cefsulodin", "Cefsulodin", "LOINC", "18892-0"), - - SOLITHROMYCIN("Solithromycin", "Solithromycin", "LOINC", "73587-8"), - - CEFONICID("Cefonicid", "Cefonicid", "LOINC", "18883-9"), - - CEFTIZOXIM("Ceftizoxim", "Ceftizoxim", "LOINC", "18894-6"), - - TEMOCILLIN("Temocillin", "Temocillin", "LOINC", "18991-0"), - - STAVUDIN("Stavudin", "Stavudin", "LOINC", "30302-4"), - - CEFTAROLIN("Ceftarolin", "Ceftarolin", "LOINC", "73605-8"), - - NOVOBIOCIN("Novobiocin", "Novobiocin", "LOINC", "18957-1"), - - AMPICILLIN_SULBACTAM("Ampicillin/Sulbactam", "Ampicillin/Sulbactam", "LOINC", "18865-6"), - - GENTAMICIN("Gentamicin", "Gentamicin", "LOINC", "18928-2"), - - FIDAXOMICIN("Fidaxomicin", "Fidaxomicin", "LOINC", "73599-3"), - - ETHAMBUTOL("Ethambutol", "Ethambutol", "LOINC", "18921-7"), - - OMADACYCLIN("Omadacyclin", "Omadacyclin", "LOINC", "73594-4"), - - FOSFOMYCIN("Fosfomycin", "Fosfomycin", "LOINC", "25596-8"), - - CEFAMANDOL("Cefamandol", "Cefamandol", "LOINC", "18876-3"), - - N5_FLUOROCYTOSIN("5-Fluorocytosin", "5-Fluorocytosin", "LOINC", "18855-7"), - - AZITHROMYCIN("Azithromycin", "Azithromycin", "LOINC", "18866-4"), - - NAFCILLIN("Nafcillin", "Nafcillin", "LOINC", "18951-4"), - - ZALCITABIN("Zalcitabin", "Zalcitabin", "LOINC", "30301-6"), - - CEFDITOREN("Cefditoren", "Cefditoren", "LOINC", "35762-4"), - - MEZLOCILLIN("Mezlocillin", "Mezlocillin", "LOINC", "18947-2"), - - POLYMYXIN_B("Polymyxin B", "Polymyxin B", "LOINC", "421-8"), - - TIGECYCLIN("Tigecyclin", "Tigecyclin", "LOINC", "42357-4"), - - CEFPODOXIM("Cefpodoxim", "Cefpodoxim", "LOINC", "18890-4"), - - SPARFLOXACIN("Sparfloxacin", "Sparfloxacin", "LOINC", "23628-1"), - - TEMAFLOXACIN("Temafloxacin", "Temafloxacin", "LOINC", "18990-2"), - - CEFAZOLIN("Cefazolin", "Cefazolin", "LOINC", "18878-9"), - - NETILMICIN("Netilmicin", "Netilmicin", "LOINC", "18954-8"), - - TELITHROMYCIN("Telithromycin", "Telithromycin", "LOINC", "35845-7"), - - CINOXACIN("Cinoxacin", "Cinoxacin", "LOINC", "18905-0"), - - FUSIDINSAURE("Fusidinsäure", "Fusidinsäure", "LOINC", "18927-4"), - - CEFIXIM("Cefixim", "Cefixim", "LOINC", "18880-5"), - - GATIFLOXACIN("Gatifloxacin", "Gatifloxacin", "LOINC", "31038-3"), - - ICLAPRIM("Iclaprim", "Iclaprim", "LOINC", "73597-7"), - - PREMAFLOXACIN("Premafloxacin", "Premafloxacin", "LOINC", "73591-0"), - - SULFISOXAZOL("Sulfisoxazol", "Sulfisoxazol", "LOINC", "18986-0"), - - ITRACONAZOL("Itraconazol", "Itraconazol", "LOINC", "32603-3"), - - CLARITHROMYCIN("Clarithromycin", "Clarithromycin", "LOINC", "18907-6"), - - CEFEPIM("Cefepim", "Cefepim", "LOINC", "18879-7"), - - ENOXACIN("Enoxacin", "Enoxacin", "LOINC", "18918-3"), - - COLISTIN("Colistin", "Colistin", "LOINC", "18912-6"), - - MECILLINAM_AMDINOCILLIN("Mecillinam (Amdinocillin)", "Mecillinam (Amdinocillin)", "LOINC", "8-3"), - - CEFTAROLIN_AVIBACTAM("Ceftarolin/Avibactam", "Ceftarolin/Avibactam", "LOINC", "73604-1"), - - GENTAMICIN_HIGH_LEVEL("Gentamicin High-Level", "Gentamicin High-Level", "LOINC", "18929-0"), - - ISAVUCONAZOL("Isavuconazol", "Isavuconazol", "LOINC", "88887-5"), - - OFLOXACIN("Ofloxacin", "Ofloxacin", "LOINC", "18959-7"), - - TOBRAMYCIN("Tobramycin", "Tobramycin", "LOINC", "18996-9"), - - KANAMYCIN("Kanamycin", "Kanamycin", "LOINC", "18935-7"), - - CEFTAZIDIM_CLAVULANSAURE("Ceftazidim/Clavulansäure", "Ceftazidim/Clavulansäure", "LOINC", "35776-4"), - - PENICILLIN("Penicillin", "Penicillin", "LOINC", "18964-7"), - - DIRITHROMYCIN("Dirithromycin", "Dirithromycin", "LOINC", "35795-4"), - - DALBAVANCIN("Dalbavancin", "Dalbavancin", "LOINC", "41734-5"), - - TOSUFLOXACIN("Tosufloxacin", "Tosufloxacin", "LOINC", "76146-0"), - - VORICONAZOL("Voriconazol", "Voriconazol", "LOINC", "32379-0"), - - CEFTRIAXON("Ceftriaxon", "Ceftriaxon", "LOINC", "18895-3"), - - VANCOMYCIN("Vancomycin", "Vancomycin", "LOINC", "19000-9"), - - CEFCAPEN("Cefcapen", "Cefcapen", "LOINC", "76143-7"), - - STREPTOMYCIN_HIGH("Streptomycin-High", "Streptomycin-High", "LOINC", "18983-7"), - - RAZUPENEM("Razupenem", "Razupenem", "LOINC", "73590-2"), - - OXACILLIN("Oxacillin", "Oxacillin", "LOINC", "18961-3"), - - SULFONAMID("Sulfonamid", "Sulfonamid", "LOINC", "18987-8"), - - PIPERACILLIN_TAZOBACTAM("Piperacillin/Tazobactam", "Piperacillin/Tazobactam", "LOINC", "18970-4"), - - BESIFLOXACIN("Besifloxacin", "Besifloxacin", "LOINC", "73606-6"), - - METHICILLIN("Methicillin", "Methicillin", "LOINC", "18945-6"), - - CEFOPERAZON("Cefoperazon", "Cefoperazon", "LOINC", "18884-7"), - - CLOFAZIMIN("Clofazimin", "Clofazimin", "LOINC", "23627-3"), - - QUINUPRISTIN_DALFOPRISTIN("Quinupristin/Dalfopristin", "Quinupristin/Dalfopristin", "LOINC", "23640-6"), - - CEFOTAXIM("Cefotaxim", "Cefotaxim", "LOINC", "18886-2"), - - CLINAFLOXACIN("Clinafloxacin", "Clinafloxacin", "LOINC", "32376-6"), - - GREPAFLOXACIN("Grepafloxacin", "Grepafloxacin", "LOINC", "23638-0"), - - AMPHOTERICIN_B("Amphotericin B", "Amphotericin B", "LOINC", "18863-1"), - - JOSAMYCIN("Josamycin", "Josamycin", "LOINC", "25597-6"), - - ERYTHROMYCIN("Erythromycin", "Erythromycin", "LOINC", "18919-1"), - - LAMIVUDIN("Lamivudin", "Lamivudin", "LOINC", "30298-4"), - - CEPHALEXIN("Cephalexin", "Cephalexin", "LOINC", "18897-9"), - - DANOFLOXACIN("Danofloxacin", "Danofloxacin", "LOINC", "73601-7"), - - DOXYCYCLIN("Doxycyclin", "Doxycyclin", "LOINC", "18917-5"), - - ERTAPENEM("Ertapenem", "Ertapenem", "LOINC", "35802-8"), - - SULBACTAM("Sulbactam", "Sulbactam", "LOINC", "55614-2"), - - CEFOTIAM("Cefotiam", "Cefotiam", "LOINC", "32374-1"), - - NORFLOXACIN("Norfloxacin", "Norfloxacin", "LOINC", "18956-3"), - - CEFTOBIPROL("Ceftobiprol", "Ceftobiprol", "LOINC", "43272-4"), - - FLORFENICOL("Florfenicol", "Florfenicol", "LOINC", "23740-4"), - - LINCOMYCIN("Lincomycin", "Lincomycin", "LOINC", "18938-1"), - - ROXITHROMYCIN("Roxithromycin", "Roxithromycin", "LOINC", "18978-7"), - - CLINDAMYCIN("Clindamycin", "Clindamycin", "LOINC", "18908-4"), - - MEROPENEM_VABORBACTAM("Meropenem/Vaborbactam", "Meropenem/Vaborbactam", "LOINC", "88892-5"), - - ANIDULAFUNGIN("Anidulafungin", "Anidulafungin", "LOINC", "57095-2"), - - DORIPENEM("Doripenem", "Doripenem", "LOINC", "60535-2"), - - PLAZOMICIN("Plazomicin", "Plazomicin", "LOINC", "73592-8"), - - CEFACLOR("Cefaclor", "Cefaclor", "LOINC", "18874-8"), - - SPECTINOMYCIN("Spectinomycin", "Spectinomycin", "LOINC", "18980-3"), - - MINOCYCLIN("Minocyclin", "Minocyclin", "LOINC", "18948-0"), - - TICARCILLIN_CLAVULANSAURE("Ticarcillin/Clavulansäure", "Ticarcillin/Clavulansäure", "LOINC", "18995-1"), - - CARBENICILLIN("Carbenicillin", "Carbenicillin", "LOINC", "18873-0"), - - CEFTAZIDIM("Ceftazidim", "Ceftazidim", "LOINC", "18893-8"), - - CEFETAMET("Cefetamet", "Cefetamet", "LOINC", "32377-4"), - - FINAFLOXACIN("Finafloxacin", "Finafloxacin", "LOINC", "73598-5"), - - ZIDOVUDIN("Zidovudin", "Zidovudin", "LOINC", "531-4"), - - AZTREONAM("Aztreonam", "Aztreonam", "LOINC", "18868-0"), - - NITROFURANTOIN("Nitrofurantoin", "Nitrofurantoin", "LOINC", "18955-5"), - - AMPICILLIN("Ampicillin", "Ampicillin", "LOINC", "18864-9"), - - DIDANOSIN("Didanosin", "Didanosin", "LOINC", "30300-8"), - - TEICOPLANIN("Teicoplanin", "Teicoplanin", "LOINC", "18989-4"), - - GARENOXACIN("Garenoxacin", "Garenoxacin", "LOINC", "35813-5"), - - PIPERACILLIN_SULBACTAM("Piperacillin/Sulbactam", "Piperacillin/Sulbactam", "LOINC", "54197-9"), - - PENICILLIN_G("Penicillin G", "Penicillin G", "LOINC", "18965-4"), - - LORACARBEF("Loracarbef", "Loracarbef", "LOINC", "18940-7"), - - PARA_AMINO_SALICYLSAURE("para-Amino-Salicylsäure", "para-Amino-Salicylsäure", "LOINC", "23629-9"), - - AMOXYCILLIN_CLAVULANSAURE("Amoxycillin/Clavulansäure", "Amoxycillin/Clavulansäure", "LOINC", "18862-3"), - - FAROPENEM("Faropenem", "Faropenem", "LOINC", "73600-9"), - - NITROCEPHIN("Nitrocephin", "Nitrocephin", "LOINC", "6985-6"), - - LINEZOLID("Linezolid", "Linezolid", "LOINC", "29258-1"), - - LEVOFLOXACIN("Levofloxacin", "Levofloxacin", "LOINC", "20629-2"), - - RIFAMPIN("Rifampin", "Rifampin", "LOINC", "18974-6"), - - CAPREOMYCIN("Capreomycin", "Capreomycin", "LOINC", "18872-2"), - - CASPOFUNGIN_E_TEST("Caspofungin (E-Test)", "Caspofungin (E-Test)", "LOINC", "54185-4"), - - TELAVANCIN("Telavancin", "Telavancin", "LOINC", "88886-7"), - - ESBL_TESTUNG("ESBL - Testung", "ESBL - Testung", "LOINC", "6984-9"), - - BACITRACIN("Bacitracin", "Bacitracin", "LOINC", "18870-6"), - - CEFPIROM("Cefpirom", "Cefpirom", "LOINC", "18889-6"), - - KANAMYCIN_HIGH("Kanamycin-High", "Kanamycin-High", "LOINC", "18936-5"), - - PIPERACILLIN("Piperacillin", "Piperacillin", "LOINC", "18969-6"), - - CEPHALOTHIN("Cephalothin", "Cephalothin", "LOINC", "18900-1"), - - SULFAMETHOXAZOL("Sulfamethoxazol", "Sulfamethoxazol", "LOINC", "18985-2"), - - CIPROFLOXACIN("Ciprofloxacin", "Ciprofloxacin", "LOINC", "18906-8"), - - ISONIAZID("Isoniazid", "Isoniazid", "LOINC", "18934-0"), - - MICAFUNGIN_E_TEST("Micafungin (E-Test)", "Micafungin (E-Test)", "LOINC", "85048-7"), - - PROTIONAMID("Protionamid", "Protionamid", "LOINC", "63565-6"), - - CEFMETAZOL("Cefmetazol", "Cefmetazol", "LOINC", "18881-3"), - - CEFTOLOZAN_TAZOBACTAM("Ceftolozan/Tazobactam", "Ceftolozan/Tazobactam", "LOINC", "73602-5"), - - BEDAQUILINE("Bedaquiline", "Bedaquiline", "LOINC", "88703-4"), - - FLUCONAZOL("Fluconazol", "Fluconazol", "LOINC", "18924-1"), - - CEFOXITIN("Cefoxitin", "Cefoxitin", "LOINC", "18888-8"), - - NEOMYCIN("Neomycin", "Neomycin", "LOINC", "18953-0"), - - PRISTINAMYCIN("Pristinamycin", "Pristinamycin", "LOINC", "32383-2"), - - CEFDINIR("Cefdinir", "Cefdinir", "LOINC", "23636-4"), - - LOMEFLOXACIN("Lomefloxacin", "Lomefloxacin", "LOINC", "18939-9"), - - DAPTOMYCIN("Daptomycin", "Daptomycin", "LOINC", "35789-7"), - - AMIKACIN("Amikacin", "Amikacin", "LOINC", "18860-7"), - - CEFUROXIM("Cefuroxim", "Cefuroxim", "LOINC", "51724-3"), - - RIFABUTIN("Rifabutin", "Rifabutin", "LOINC", "19149-4"), - - TETRACYCLIN("Tetracyclin", "Tetracyclin", "LOINC", "18993-6"), - - CEFOTETAN("Cefotetan", "Cefotetan", "LOINC", "18887-0"), - - CYCLOSERIN("Cycloserin", "Cycloserin", "LOINC", "18914-2"), - - CEFTAZIDIM_AVIBACTAM("Ceftazidim/Avibactam", "Ceftazidim/Avibactam", "LOINC", "73603-3"), - - SULOPENEM("Sulopenem", "Sulopenem", "LOINC", "55289-3"), - - STREPTOMYCIN("Streptomycin", "Streptomycin", "LOINC", "18982-9"), - - CEFTERAM("Cefteram", "Cefteram", "LOINC", "76144-5"), - - PENICILLIN_V("Penicillin V", "Penicillin V", "LOINC", "18966-2"), - - FOSCARNET("Foscarnet", "Foscarnet", "LOINC", "256-8"), - - CEFOTAXIM_CLAVULANSAURE("Cefotaxim/Clavulansäure", "Cefotaxim/Clavulansäure", "LOINC", "35771-5"), - - TICARCILLIN("Ticarcillin", "Ticarcillin", "LOINC", "18994-4"), - - METRONIDAZOL("Metronidazol", "Metronidazol", "LOINC", "18946-4"), - - SULFAMETHOXAZOL_TRIMETHOPRIM_COTRIMOXAZOL("Sulfamethoxazol/Trimethoprim (Cotrimoxazol)", "Sulfamethoxazol/Trimethoprim (Cotrimoxazol)", "LOINC", "18998-5"), - - NALIDIXINSAURE("Nalidixinsäure", "Nalidixinsäure", "LOINC", "18952-2"), - - DIFLOXACIN("Difloxacin", "Difloxacin", "LOINC", "35792-1"), - - CEFADROXIL("Cefadroxil", "Cefadroxil", "LOINC", "18875-5"), - - IMIPENEM("Imipenem", "Imipenem", "LOINC", "18932-4"), - - CEFTIBUTEN("Ceftibuten", "Ceftibuten", "LOINC", "35779-8"), - - NYSTATIN("Nystatin", "Nystatin", "LOINC", "10697-1"), - - CHLORAMPHENICOL("Chloramphenicol", "Chloramphenicol", "LOINC", "18903-5"), - - PYRAZINAMID("Pyrazinamid", "Pyrazinamid", "LOINC", "18973-8"), - - CEFPROZIL("Cefprozil", "Cefprozil", "LOINC", "18891-2"), - - FLEROXACIN("Fleroxacin", "Fleroxacin", "LOINC", "32372-5"), - - FLUCLOXACILLIN("Flucloxacillin", "Flucloxacillin", "LOINC", "18923-3"), - - TROVAFLOXACIN("Trovafloxacin", "Trovafloxacin", "LOINC", "23642-2"), - - ORITAVANCIN("Oritavancin", "Oritavancin", "LOINC", "41736-0"), - - AZLOCILLIN("Azlocillin", "Azlocillin", "LOINC", "18867-2"), - - MEROPENEM("Meropenem", "Meropenem", "LOINC", "18943-1"), - - MOXIFLOXACIN("Moxifloxacin", "Moxifloxacin", "LOINC", "31039-1"), - - POSACONAZOL_E_TEST("Posaconazol (E-Test)", "Posaconazol (E-Test)", "LOINC", "54186-2"), - - AMOXICILLIN("Amoxicillin", "Amoxicillin", "LOINC", "18861-5"), - - CEFOPERAZON_SULBACTAM("Cefoperazon/Sulbactam", "Cefoperazon/Sulbactam", "LOINC", "54166-4"), - - SARAFLOXACIN("Sarafloxacin", "Sarafloxacin", "LOINC", "73588-6"), - - GEMIFLOXACIN("Gemifloxacin", "Gemifloxacin", "LOINC", "35816-8"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - AntibiotikumDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ArtDerTypisierungDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ArtDerTypisierungDefiningCode.java deleted file mode 100644 index e78016790..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ArtDerTypisierungDefiningCode.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum ArtDerTypisierungDefiningCode implements EnumValueSet { - ANDERE("Andere", "*", "local", "at0007"), - - PULSFELDGELELEKTROPHORESE_PFGE("Pulsfeldgelelektrophorese (PFGE)", "*", "local", "at0003"), - - CORE_GENOM_MULTILOCUS_SEQUENCE_TYPING_CGMLST("core genom Multilocus Sequence Typing (cgMLST)", "*", "local", "at0005"), - - MULTILOCUS_SEQUENCE_TYPING_MLST("Multilocus Sequence Typing (MLST)", "*", "local", "at0004"), - - SPA_TYPISIERUNG_STAPHYLOCOCCUS_AUREUS("spa-Typisierung (Staphylococcus aureus)", "*", "local", "at0006"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - ArtDerTypisierungDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java deleted file mode 100644 index 99e030a1c..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java +++ /dev/null @@ -1,125 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; -import java.lang.Double; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.erregerdetails.v1") -public class ErregerdetailsCluster { - @Path("/items[at0047]") - private List keimSubtyp; - - @Path("/items[at0035]/value|magnitude") - private Double keimzahlMagnitude; - - @Path("/items[at0035]/value|units") - private String keimzahlUnits; - - @Path("/items[at0003]/value") - private DvOrdinal haufigkeit; - - @Path("/items[at0016]/value|value") - private String virulenzfaktorValue; - - @Path("/items[openEHR-EHR-CLUSTER.laboratory_test_panel.v0 and name/value='Antibiogramm']") - private AntibiogrammCluster antibiogramm; - - @Path("/items[at0057]") - private List resistenzmechanismus; - - @Path("/items[at0018]/value|defining_code") - private MreKlasseDefiningCode mreKlasseDefiningCode; - - @Path("/items[at0062]/value|value") - private String kommentarValue; - - @Path("/items[at0059]") - private List weitereErganzungen; - - public void setKeimSubtyp(List keimSubtyp) { - this.keimSubtyp = keimSubtyp; - } - - public List getKeimSubtyp() { - return this.keimSubtyp ; - } - - public void setKeimzahlMagnitude(Double keimzahlMagnitude) { - this.keimzahlMagnitude = keimzahlMagnitude; - } - - public Double getKeimzahlMagnitude() { - return this.keimzahlMagnitude ; - } - - public void setKeimzahlUnits(String keimzahlUnits) { - this.keimzahlUnits = keimzahlUnits; - } - - public String getKeimzahlUnits() { - return this.keimzahlUnits ; - } - - public void setHaufigkeit(DvOrdinal haufigkeit) { - this.haufigkeit = haufigkeit; - } - - public DvOrdinal getHaufigkeit() { - return this.haufigkeit ; - } - - public void setVirulenzfaktorValue(String virulenzfaktorValue) { - this.virulenzfaktorValue = virulenzfaktorValue; - } - - public String getVirulenzfaktorValue() { - return this.virulenzfaktorValue ; - } - - public void setAntibiogramm(AntibiogrammCluster antibiogramm) { - this.antibiogramm = antibiogramm; - } - - public AntibiogrammCluster getAntibiogramm() { - return this.antibiogramm ; - } - - public void setResistenzmechanismus( - List resistenzmechanismus) { - this.resistenzmechanismus = resistenzmechanismus; - } - - public List getResistenzmechanismus() { - return this.resistenzmechanismus ; - } - - public void setMreKlasseDefiningCode(MreKlasseDefiningCode mreKlasseDefiningCode) { - this.mreKlasseDefiningCode = mreKlasseDefiningCode; - } - - public MreKlasseDefiningCode getMreKlasseDefiningCode() { - return this.mreKlasseDefiningCode ; - } - - public void setKommentarValue(String kommentarValue) { - this.kommentarValue = kommentarValue; - } - - public String getKommentarValue() { - return this.kommentarValue ; - } - - public void setWeitereErganzungen(List weitereErganzungen) { - this.weitereErganzungen = weitereErganzungen; - } - - public List getWeitereErganzungen() { - return this.weitereErganzungen ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsClusterContainment.java deleted file mode 100644 index 08183a74a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsClusterContainment.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; -import java.lang.Double; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class ErregerdetailsClusterContainment extends Containment { - public SelectAqlField ERREGERDETAILS_CLUSTER = new AqlFieldImp(ErregerdetailsCluster.class, "", "ErregerdetailsCluster", ErregerdetailsCluster.class, this); - - public ListSelectAqlField KEIM_SUBTYP = new ListAqlFieldImp(ErregerdetailsCluster.class, "/items[at0047]", "keimSubtyp", ErregerdetailsKeimSubtypElement.class, this); - - public SelectAqlField KEIMZAHL_MAGNITUDE = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0035]/value|magnitude", "keimzahlMagnitude", Double.class, this); - - public SelectAqlField KEIMZAHL_UNITS = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0035]/value|units", "keimzahlUnits", String.class, this); - - public SelectAqlField HAUFIGKEIT = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0003]/value", "haufigkeit", DvOrdinal.class, this); - - public SelectAqlField VIRULENZFAKTOR_VALUE = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0016]/value|value", "virulenzfaktorValue", String.class, this); - - public SelectAqlField ANTIBIOGRAMM = new AqlFieldImp(ErregerdetailsCluster.class, "/items[openEHR-EHR-CLUSTER.laboratory_test_panel.v0]", "antibiogramm", AntibiogrammCluster.class, this); - - public ListSelectAqlField RESISTENZMECHANISMUS = new ListAqlFieldImp(ErregerdetailsCluster.class, "/items[at0057]", "resistenzmechanismus", ErregerdetailsResistenzmechanismusCluster.class, this); - - public SelectAqlField MRE_KLASSE_DEFINING_CODE = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0018]/value|defining_code", "mreKlasseDefiningCode", MreKlasseDefiningCode.class, this); - - public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0062]/value|value", "kommentarValue", String.class, this); - - public ListSelectAqlField WEITERE_ERGANZUNGEN = new ListAqlFieldImp(ErregerdetailsCluster.class, "/items[at0059]", "weitereErganzungen", Cluster.class, this); - - private ErregerdetailsClusterContainment() { - super("openEHR-EHR-CLUSTER.erregerdetails.v1"); - } - - public static ErregerdetailsClusterContainment getInstance() { - return new ErregerdetailsClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java deleted file mode 100644 index a8d8b678d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class ErregerdetailsKeimSubtypElement { - @Path("/value|value") - private String value; - - public void setValue(String value) { - this.value = value; - } - - public String getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java deleted file mode 100644 index 4ebee1e08..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class ErregerdetailsResistenzmechanismusCluster { - @Path("/items[at0017]/value|value") - private String resistenzmechanismusBezeichnungValue; - - public void setResistenzmechanismusBezeichnungValue(String resistenzmechanismusBezeichnungValue) { - this.resistenzmechanismusBezeichnungValue = resistenzmechanismusBezeichnungValue; - } - - public String getResistenzmechanismusBezeichnungValue() { - return this.resistenzmechanismusBezeichnungValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregernameDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregernameDefiningcode.java deleted file mode 100644 index 776680619..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregernameDefiningcode.java +++ /dev/null @@ -1,1289 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum ErregernameDefiningCode implements EnumValueSet { - PARABURKHOLDERIA_PHENAZINIUM("Paraburkholderia phenazinium", "Paraburkholderia phenazinium", "SNOMED-CT", "431166001"), - - MYCOBACTERIUM_MICROTI_ORGANISM("Mycobacterium microti (organism)", "Mycobacterium microti (organism)", "SNOMED-CT", "70801007"), - - LEGIONELLA_PNEUMOPHILA_SEROGROUP1_ORGANISM("Legionella pneumophila serogroup 1 (organism)", "Legionella pneumophila serogroup 1 (organism)", "SNOMED-CT", "103463005"), - - RHIZOBIUM_RADIOBACTER_ORGANISM("Rhizobium radiobacter (organism)", "Rhizobium radiobacter (organism)", "SNOMED-CT", "438107000"), - - GENUS_CUTIBACTERIUM_ORGANISM("Genus Cutibacterium (organism)", "Genus Cutibacterium (organism)", "SNOMED-CT", "763051006"), - - ENTEROCOCCUS_FAECIUM_ORGANISM("Enterococcus faecium (organism)", "Enterococcus faecium (organism)", "SNOMED-CT", "90272000"), - - LACTOBACILLUS_CASEI_ORGANISM("Lactobacillus casei (organism)", "Lactobacillus casei (organism)", "SNOMED-CT", "1017006"), - - PSEUDOMONAS_AERUGINOSA_ORGANISM("Pseudomonas aeruginosa (organism)", "Pseudomonas aeruginosa (organism)", "SNOMED-CT", "52499004"), - - PROVIDENCIA_HEIMBACHAE_ORGANISM("Providencia heimbachae (organism)", "Providencia heimbachae (organism)", "SNOMED-CT", "47300009"), - - CITROBACTER_BRAAKII_ORGANISM("Citrobacter braakii (organism)", "Citrobacter braakii (organism)", "SNOMED-CT", "114262000"), - - STREPTOCOCCUS_INTERMEDIUS_ORGANISM("Streptococcus intermedius (organism)", "Streptococcus intermedius (organism)", "SNOMED-CT", "62170002"), - - HAEMOPHILUS_PARAHAEMOLYTICUS_ORGANISM("Haemophilus parahaemolyticus (organism)", "Haemophilus parahaemolyticus (organism)", "SNOMED-CT", "89800007"), - - AEROMONAS_JANDEI_ORGANISM("Aeromonas jandei (organism)", "Aeromonas jandei (organism)", "SNOMED-CT", "115034008"), - - KOSAKONIA_COWANII("Kosakonia cowanii", "Kosakonia cowanii", "SNOMED-CT", "416229008"), - - PASTEURELLA_DAGMATIS_ORGANISM("Pasteurella dagmatis (organism)", "Pasteurella dagmatis (organism)", "SNOMED-CT", "80948000"), - - SAPROCHAETE_CAPITATA_ORGANISM("Saprochaete capitata (organism)", "Saprochaete capitata (organism)", "SNOMED-CT", "67999003"), - - AGGREGATIBACTER_ACTINOMYCETEMCOMITANS_ORGANISM("Aggregatibacter actinomycetemcomitans (organism)", "Aggregatibacter actinomycetemcomitans (organism)", "SNOMED-CT", "442680008"), - - BREVUNDIMONAS_DIMINUTA_ORGANISM("Brevundimonas diminuta (organism)", "Brevundimonas diminuta (organism)", "SNOMED-CT", "113689009"), - - SALMONELLA_DERBY("Salmonella Derby", "Salmonella Derby", "SNOMED-CT", "37091006"), - - CORYNEBACTERIUM_GLUCURONOLYTICUM_ORGANISM("Corynebacterium glucuronolyticum (organism)", "Corynebacterium glucuronolyticum (organism)", "SNOMED-CT", "413927008"), - - SALMONELLA_WIEN("Salmonella Wien", "Salmonella Wien", "SNOMED-CT", "21975008"), - - ENTEROBACTER_LUDWIGII("Enterobacter ludwigii", "Enterobacter ludwigii", "SNOMED-CT", "432763001"), - - AEROMONAS_HYDROPHILA_ORGANISM("Aeromonas hydrophila (organism)", "Aeromonas hydrophila (organism)", "SNOMED-CT", "85823000"), - - SALMONELLA_BREDENEY("Salmonella Bredeney", "Salmonella Bredeney", "SNOMED-CT", "82364007"), - - SACCHAROMYCES_CEREVISIAE_ORGANISM("Saccharomyces cerevisiae (organism)", "Saccharomyces cerevisiae (organism)", "SNOMED-CT", "58296003"), - - GENUS_FUSOBACTERIUM_ORGANISM("Genus Fusobacterium (organism)", "Genus Fusobacterium (organism)", "SNOMED-CT", "33562003"), - - GENUS_ACTINOMYCES_ORGANISM("Genus Actinomyces (organism)", "Genus Actinomyces (organism)", "SNOMED-CT", "40560008"), - - KLEBSIELLA_VARIICOLA_ORGANISM("Klebsiella variicola (organism)", "Klebsiella variicola (organism)", "SNOMED-CT", "431976004"), - - SALMONELLA_TENNESSEE("Salmonella Tennessee", "Salmonella Tennessee", "SNOMED-CT", "79153007"), - - SALMONELLA_VIRCHOW("Salmonella Virchow", "Salmonella Virchow", "SNOMED-CT", "5929008"), - - PARABURKHOLDERIA_XENOVORANS("Paraburkholderia xenovorans", "Paraburkholderia xenovorans", "SNOMED-CT", "431176003"), - - STAPHYLOCOCCUS_CAPRAE_ORGANISM("Staphylococcus caprae (organism)", "Staphylococcus caprae (organism)", "SNOMED-CT", "76969000"), - - LEGIONELLA_PNEUMOPHILIA_SEROGROUP12_ORGANISM("Legionella pneumophilia serogroup 12 (organism)", "Legionella pneumophilia serogroup 12 (organism)", "SNOMED-CT", "131324005"), - - LEGIONELLA_BELIARDENSIS_ORGANISM("Legionella beliardensis (organism)", "Legionella beliardensis (organism)", "SNOMED-CT", "432714000"), - - CITROBACTER_FARMERI_ORGANISM("Citrobacter farmeri (organism)", "Citrobacter farmeri (organism)", "SNOMED-CT", "114263005"), - - STAPHYLOCOCCUS_WARNERI_ORGANISM("Staphylococcus warneri (organism)", "Staphylococcus warneri (organism)", "SNOMED-CT", "63550006"), - - CITROBACTER_FREUNDII_COMPLEX_ORGANISM("Citrobacter freundii complex (organism)", "Citrobacter freundii complex (organism)", "SNOMED-CT", "782522004"), - - PANTOEA_DISPERSA_ORGANISM("Pantoea dispersa (organism)", "Pantoea dispersa (organism)", "SNOMED-CT", "115017000"), - - GENUS_LEGIONELLA_ORGANISM("Genus Legionella (organism)", "Genus Legionella (organism)", "SNOMED-CT", "7527002"), - - CANDIDA_ALBICANS_ORGANISM("Candida albicans (organism)", "Candida albicans (organism)", "SNOMED-CT", "53326005"), - - STAPHYLOCOCCUS_PETTENKOFERI_ORGANISM("Staphylococcus pettenkoferi (organism)", "Staphylococcus pettenkoferi (organism)", "SNOMED-CT", "428731005"), - - PANTOEA_ANANATIS_ORGANISM("Pantoea ananatis (organism)", "Pantoea ananatis (organism)", "SNOMED-CT", "115014007"), - - MYCOBACTERIUM_TUBERCULOSIS_ORGANISM("Mycobacterium tuberculosis (organism)", "Mycobacterium tuberculosis (organism)", "SNOMED-CT", "113861009"), - - SALMONELLA_ORANIENBURG("Salmonella Oranienburg", "Salmonella Oranienburg", "SNOMED-CT", "46667007"), - - BURKHOLDERIA_CENOCEPACIA_ORGANISM("Burkholderia cenocepacia (organism)", "Burkholderia cenocepacia (organism)", "SNOMED-CT", "416941006"), - - GENUS_CLOSTRIDIUM_ORGANISM("Genus Clostridium (organism)", "Genus Clostridium (organism)", "SNOMED-CT", "8191000"), - - KLEBSIELLA_PNEUMONIAE_SS_PNEUMONIAE_ORGANISM("Klebsiella pneumoniae ss. pneumoniae (organism)", "Klebsiella pneumoniae ss. pneumoniae (organism)", "SNOMED-CT", "18400002"), - - CRONOBACTER_UNIVERSALIS_ORGANISM("Cronobacter universalis (organism)", "Cronobacter universalis (organism)", "SNOMED-CT", "707335003"), - - LEGIONELLA_GORMANII_ORGANISM("Legionella gormanii (organism)", "Legionella gormanii (organism)", "SNOMED-CT", "113721003"), - - MORAXELLA_OSLOENSIS_ORGANISM("Moraxella osloensis (organism)", "Moraxella osloensis (organism)", "SNOMED-CT", "72401008"), - - SALMONELLA_HAVANA("Salmonella Havana", "Salmonella Havana", "SNOMED-CT", "38788001"), - - SALMONELLA_GOLDCOAST("Salmonella Goldcoast", "Salmonella Goldcoast", "SNOMED-CT", "16820003"), - - SALMONELLA_SANDIEGO("Salmonella Sandiego", "Salmonella Sandiego", "SNOMED-CT", "112287008"), - - ASPERGILLUS_TERREUS_ORGANISM("Aspergillus terreus (organism)", "Aspergillus terreus (organism)", "SNOMED-CT", "26406003"), - - PANTOEA_STEWARTII_ORGANISM("Pantoea stewartii (organism)", "Pantoea stewartii (organism)", "SNOMED-CT", "131300002"), - - SALMONELLA_CHOLERAESUIS_VAR_KUNZENDORF("Salmonella Choleraesuis var. Kunzendorf", "Salmonella Choleraesuis var. Kunzendorf", "SNOMED-CT", "370577001"), - - BREVUNDIMONAS_VESICULARIS_ORGANISM("Brevundimonas vesicularis (organism)", "Brevundimonas vesicularis (organism)", "SNOMED-CT", "113690000"), - - LEGIONELLA_PNEUMOPHILA_SEROGROUP6_ORGANISM("Legionella pneumophila serogroup 6 (organism)", "Legionella pneumophila serogroup 6 (organism)", "SNOMED-CT", "103468001"), - - ENTEROBACTER_KOBEI_ORGANISM("Enterobacter kobei (organism)", "Enterobacter kobei (organism)", "SNOMED-CT", "114456008"), - - BURKHOLDERIA_DOLOSA("Burkholderia dolosa", "Burkholderia dolosa", "SNOMED-CT", "431173006"), - - LEGIONELLA_PNEUMOPHILIA_SEROGROUP11_ORGANISM("Legionella pneumophilia serogroup 11 (organism)", "Legionella pneumophilia serogroup 11 (organism)", "SNOMED-CT", "131323004"), - - BACTEROIDES_FRAGILIS_ORGANISM("Bacteroides fragilis (organism)", "Bacteroides fragilis (organism)", "SNOMED-CT", "55247009"), - - STREPTOCOCCUS_DYSGALACTIAE_SUBSPECIES_EQUISIMILIS_ORGANISM("Streptococcus dysgalactiae subspecies equisimilis (organism)", "Streptococcus dysgalactiae subspecies equisimilis (organism)", "SNOMED-CT", "128338004"), - - CANDIDA_UTILIS_ORGANISM("Candida utilis (organism)", "Candida utilis (organism)", "SNOMED-CT", "243464000"), - - ESCHERICHIA_COLI_ORGANISM("Escherichia coli (organism)", "Escherichia coli (organism)", "SNOMED-CT", "112283007"), - - AEROMONAS_VERONII_ORGANISM("Aeromonas veronii (organism)", "Aeromonas veronii (organism)", "SNOMED-CT", "9281006"), - - SALMONELLA_NEWPORT("Salmonella Newport", "Salmonella Newport", "SNOMED-CT", "56077000"), - - STREPTOCOCCUS_CONSTELLATUS_ORGANISM("Streptococcus constellatus (organism)", "Streptococcus constellatus (organism)", "SNOMED-CT", "76199005"), - - CANDIDA_LUSITANIAE_ORGANISM("Candida lusitaniae (organism)", "Candida lusitaniae (organism)", "SNOMED-CT", "47608006"), - - MORAXELLA_LACUNATA_ORGANISM("Moraxella lacunata (organism)", "Moraxella lacunata (organism)", "SNOMED-CT", "84066001"), - - SALMONELLA_PANAMA("Salmonella Panama", "Salmonella Panama", "SNOMED-CT", "40114001"), - - CORYNEBACTERIUM_PSEUDODIPHTHERITICUM_ORGANISM("Corynebacterium pseudodiphtheriticum (organism)", "Corynebacterium pseudodiphtheriticum (organism)", "SNOMED-CT", "12050008"), - - ACTINOMYCES_NEUII_ORGANISM("Actinomyces neuii (organism)", "Actinomyces neuii (organism)", "SNOMED-CT", "877802991000087109"), - - ASPERGILLUS_FUMIGATUS_SPECIES_COMPLEX_ORGANISM("Aspergillus fumigatus species complex (organism)", "Aspergillus fumigatus species complex (organism)", "SNOMED-CT", "719029007"), - - CRONOBACTER_MALONATICUS("Cronobacter malonaticus", "Cronobacter malonaticus", "SNOMED-CT", "445560007"), - - HAEMOPHILUS_PARAINFLUENZAE_ORGANISM("Haemophilus parainfluenzae (organism)", "Haemophilus parainfluenzae (organism)", "SNOMED-CT", "51593004"), - - LEGIONELLA_TUCSONENSIS_ORGANISM("Legionella tucsonensis (organism)", "Legionella tucsonensis (organism)", "SNOMED-CT", "103461007"), - - GENUS_PICHIA_ORGANISM("Genus Pichia (organism)", "Genus Pichia (organism)", "SNOMED-CT", "4163004"), - - YEAST_ORGANISM("Yeast (organism)", "Yeast (organism)", "SNOMED-CT", "62093005"), - - ENTEROBACTER_AMNIGENUS_BIOGROUP_II_ORGANISM("Enterobacter amnigenus biogroup II (organism)", "Enterobacter amnigenus biogroup II (organism)", "SNOMED-CT", "114453000"), - - CRONOBACTER_DUBLINENSIS_SUBSPECIES_LAUSANNENSIS("Cronobacter dublinensis subspecies lausannensis", "Cronobacter dublinensis subspecies lausannensis", "SNOMED-CT", "5711000087108"), - - ASPERGILLUS_NIDULANS_GROUP_ORGANISM("Aspergillus nidulans Group (organism)", "Aspergillus nidulans Group (organism)", "SNOMED-CT", "415879008"), - - CLOSTRIDIOIDES_DIFFICILE_ORGANISM("Clostridioides difficile (organism)", "Clostridioides difficile (organism)", "SNOMED-CT", "5933001"), - - SALMONELLA_MONSCHAUI("Salmonella Monschaui", "Salmonella Monschaui", "SNOMED-CT", "65132007"), - - GENUS_PSEUDOMONAS_ORGANISM("Genus Pseudomonas (organism)", "Genus Pseudomonas (organism)", "SNOMED-CT", "57032008"), - - PROTEUS_MYXOFACIENS_ORGANISM("Proteus myxofaciens (organism)", "Proteus myxofaciens (organism)", "SNOMED-CT", "86145008"), - - RHODOTORULA_RUBRA_ORGANISM("Rhodotorula rubra (organism)", "Rhodotorula rubra (organism)", "SNOMED-CT", "86724009"), - - STAPHYLOCOCCUS_SACCHAROLYTICUS_ORGANISM("Staphylococcus saccharolyticus (organism)", "Staphylococcus saccharolyticus (organism)", "SNOMED-CT", "41103009"), - - CANDIDA_MAGNOLIAE_ORGANISM("Candida magnoliae (organism)", "Candida magnoliae (organism)", "SNOMED-CT", "446239009"), - - EIKENELLA_CORRODENS_ORGANISM("Eikenella corrodens (organism)", "Eikenella corrodens (organism)", "SNOMED-CT", "52591004"), - - HAFNIA_ALVEI_ORGANISM("Hafnia alvei (organism)", "Hafnia alvei (organism)", "SNOMED-CT", "76694001"), - - SERRATIA_GRIMESII_ORGANISM("Serratia grimesii (organism)", "Serratia grimesii (organism)", "SNOMED-CT", "115005002"), - - SALMONELLA_BRANDENBURG("Salmonella Brandenburg", "Salmonella Brandenburg", "SNOMED-CT", "16888008"), - - SUBGENUS_MORAXELLA_ORGANISM("Subgenus Moraxella (organism)", "Subgenus Moraxella (organism)", "SNOMED-CT", "427057001"), - - YERSINIA_ENTEROCOLITICA_SEROGROUP_O5_ORGANISM("Yersinia enterocolitica serogroup O:5 (organism)", "Yersinia enterocolitica serogroup O:5 (organism)", "SNOMED-CT", "103431004"), - - LEUCONOSTOC_LACTIS_ORGANISM("Leuconostoc lactis (organism)", "Leuconostoc lactis (organism)", "SNOMED-CT", "70285009"), - - SALMONELLA_MANCHESTER("Salmonella Manchester", "Salmonella Manchester", "SNOMED-CT", "70605000"), - - LEGIONELLA_PNEUMOPHILIA_SEROGROUP13_ORGANISM("Legionella pneumophilia serogroup 13 (organism)", "Legionella pneumophilia serogroup 13 (organism)", "SNOMED-CT", "131325006"), - - BIFIDOBACTERIUM_DENTIUM_ORGANISM("Bifidobacterium dentium (organism)", "Bifidobacterium dentium (organism)", "SNOMED-CT", "36623007"), - - CLOSTRIDIUM_PERFRINGENS_ORGANISM("Clostridium perfringens (organism)", "Clostridium perfringens (organism)", "SNOMED-CT", "8331005"), - - CRYPTOCOCCUS_ORGANISM("Cryptococcus (organism)", "Cryptococcus (organism)", "SNOMED-CT", "17579001"), - - MIXTA_CALIDA_ORGANISM("Mixta calida (organism)", "Mixta calida (organism)", "SNOMED-CT", "709310002"), - - SALMONELLA_ALBANY("Salmonella Albany", "Salmonella Albany", "SNOMED-CT", "72033009"), - - STREPTOCOCCUS_VESTIBULARIS_ORGANISM("Streptococcus vestibularis (organism)", "Streptococcus vestibularis (organism)", "SNOMED-CT", "113998009"), - - LEGIONELLA_BIRMINGHAMENSIS_ORGANISM("Legionella birminghamensis (organism)", "Legionella birminghamensis (organism)", "SNOMED-CT", "22592008"), - - STREPTOCOCCUS_VIRIDANS_GROUP_ORGANISM("Streptococcus, viridans group (organism)", "Streptococcus, viridans group (organism)", "SNOMED-CT", "31703004"), - - PANTOEA_AGGLOMERANS_ORGANISM("Pantoea agglomerans (organism)", "Pantoea agglomerans (organism)", "SNOMED-CT", "115015008"), - - SERRATIA_PLYMUTHICA_ORGANISM("Serratia plymuthica (organism)", "Serratia plymuthica (organism)", "SNOMED-CT", "28955009"), - - ANAEROBIC_GRAM_NEGATIVE_BACILLUS_ORGANISM("Anaerobic Gram-negative bacillus (organism)", "Anaerobic Gram-negative bacillus (organism)", "SNOMED-CT", "243386003"), - - BREVUNDIMONAS_AURANTIACA("Brevundimonas aurantiaca", "Brevundimonas aurantiaca", "SNOMED-CT", "423035009"), - - BETA_HEMOLYTIC_STREPTOCOCCUS_GROUP_A_ORGANISM("Beta-hemolytic Streptococcus, group A (organism)", "Beta-hemolytic Streptococcus, group A (organism)", "SNOMED-CT", "413643004"), - - NEISSERIA_GONORRHOEAE_ORGANISM("Neisseria gonorrhoeae (organism)", "Neisseria gonorrhoeae (organism)", "SNOMED-CT", "68704007"), - - BURKHOLDERIA_VIETNAMIENSIS_ORGANISM("Burkholderia vietnamiensis (organism)", "Burkholderia vietnamiensis (organism)", "SNOMED-CT", "113680008"), - - PEPTONIPHILUS_HAREI_ORGANISM("Peptoniphilus harei (organism)", "Peptoniphilus harei (organism)", "SNOMED-CT", "433373007"), - - SALMONELLA_ENTERICA_SUBSP_ENTERICA_ORGANISM("Salmonella enterica subsp. enterica (organism)", "Salmonella enterica subsp. enterica (organism)", "SNOMED-CT", "398508004"), - - DERMABACTER_HOMINIS_ORGANISM("Dermabacter hominis (organism)", "Dermabacter hominis (organism)", "SNOMED-CT", "413977006"), - - MORGANELLA_MORGANII_SUBSP_SIBONII_ORGANISM("Morganella morganii subsp sibonii (organism)", "Morganella morganii subsp sibonii (organism)", "SNOMED-CT", "243303008"), - - STENOTROPHOMONAS_ACIDAMINIPHILA_ORGANISM("Stenotrophomonas acidaminiphila (organism)", "Stenotrophomonas acidaminiphila (organism)", "SNOMED-CT", "415583001"), - - LEGIONELLA_ERYTHRA_ORGANISM("Legionella erythra (organism)", "Legionella erythra (organism)", "SNOMED-CT", "28109006"), - - SALMONELLA_SINSTORF("Salmonella Sinstorf", "Salmonella Sinstorf", "SNOMED-CT", "71443004"), - - PSEUDOMONAS_MENDOCINA_ORGANISM("Pseudomonas mendocina (organism)", "Pseudomonas mendocina (organism)", "SNOMED-CT", "59419001"), - - ANAEROBIC_GRAM_POSITIVE_BACILLUS_ORGANISM("Anaerobic Gram-positive bacillus (organism)", "Anaerobic Gram-positive bacillus (organism)", "SNOMED-CT", "243398008"), - - ENTEROBACTER_HORMAECHEI_ORGANISM("Enterobacter hormaechei (organism)", "Enterobacter hormaechei (organism)", "SNOMED-CT", "114454006"), - - BURKHOLDERIA_MALLEI("Burkholderia mallei", "Burkholderia mallei", "SNOMED-CT", "113674000"), - - BURKHOLDERIA_PYRROCINIA("Burkholderia pyrrocinia", "Burkholderia pyrrocinia", "SNOMED-CT", "113677007"), - - SALMONELLA_CHOLERAESUIS_ORGANISM("Salmonella Choleraesuis (organism)", "Salmonella Choleraesuis (organism)", "SNOMED-CT", "80232006"), - - LEGIONELLA_PNEUMOPHILA_SEROGROUP2_ORGANISM("Legionella pneumophila serogroup 2 (organism)", "Legionella pneumophila serogroup 2 (organism)", "SNOMED-CT", "103464004"), - - STENOTROPHOMONAS_NITRITIREDUCENS_ORGANISM("Stenotrophomonas nitritireducens (organism)", "Stenotrophomonas nitritireducens (organism)", "SNOMED-CT", "416746005"), - - STREPTOCOCCUS_CONSTELLATUS_SUBSPECIES_CONSTELLATUS_ORGANISM("Streptococcus constellatus subspecies constellatus (organism)", "Streptococcus constellatus subspecies constellatus (organism)", "SNOMED-CT", "415601009"), - - BREVUNDIMONAS_NASDAE("Brevundimonas nasdae", "Brevundimonas nasdae", "SNOMED-CT", "424717001"), - - PARABURKHOLDERIA_TERRICOLA("Paraburkholderia terricola", "Paraburkholderia terricola", "SNOMED-CT", "431683009"), - - CHRYSEOBACTERIUM_GLEUM_ORGANISM("Chryseobacterium gleum (organism)", "Chryseobacterium gleum (organism)", "SNOMED-CT", "113548000"), - - ACINETOBACTER_URSINGII_ORGANISM("Acinetobacter ursingii (organism)", "Acinetobacter ursingii (organism)", "SNOMED-CT", "424791004"), - - SALMONELLA_RICHMOND("Salmonella Richmond", "Salmonella Richmond", "SNOMED-CT", "31517006"), - - ASPERGILLUS_NIGER_ORGANISM("Aspergillus niger (organism)", "Aspergillus niger (organism)", "SNOMED-CT", "89354002"), - - MYCOBACTERIUM_BOVIS_ORGANISM("Mycobacterium bovis (organism)", "Mycobacterium bovis (organism)", "SNOMED-CT", "27142009"), - - MYCOBACTERIUM_BOVIS_SUBSPECIES_BOVIS_ORGANISM("Mycobacterium bovis subspecies bovis (organism)", "Mycobacterium bovis subspecies bovis (organism)", "SNOMED-CT", "832924651000087107"), - - LEGIONELLA_ISRAELENSIS_ORGANISM("Legionella israelensis (organism)", "Legionella israelensis (organism)", "SNOMED-CT", "3128001"), - - SALMONELLA_PARATYPHI_B_VAR_JAVA("Salmonella Paratyphi B var. Java", "Salmonella Paratyphi B var. Java", "SNOMED-CT", "128388007"), - - ACINETOBACTER_TANDOII_ORGANISM("Acinetobacter tandoii (organism)", "Acinetobacter tandoii (organism)", "SNOMED-CT", "424021002"), - - PROTEUS_VULGARIS_ORGANISM("Proteus vulgaris (organism)", "Proteus vulgaris (organism)", "SNOMED-CT", "45834001"), - - SALMONELLA_SEROGROUP_C_ORGANISM("Salmonella, serogroup C (organism)", "Salmonella, serogroup C (organism)", "SNOMED-CT", "116048001"), - - LACTOCOCCUS_LACTIS_SUBSPECIES_LACTIS_ORGANISM("Lactococcus lactis subspecies lactis (organism)", "Lactococcus lactis subspecies lactis (organism)", "SNOMED-CT", "38518005"), - - LEGIONELLA_PNEUMOPHILIA_SEROGROUP14_ORGANISM("Legionella pneumophilia serogroup 14 (organism)", "Legionella pneumophilia serogroup 14 (organism)", "SNOMED-CT", "131326007"), - - PEDIOCOCCUS_ACIDILACTICI_ORGANISM("Pediococcus acidilactici (organism)", "Pediococcus acidilactici (organism)", "SNOMED-CT", "243237003"), - - GENUS_ALCALIGENES_ORGANISM("Genus Alcaligenes (organism)", "Genus Alcaligenes (organism)", "SNOMED-CT", "68571003"), - - ASPERGILLUS_USTUS_ORGANISM("Aspergillus ustus (organism)", "Aspergillus ustus (organism)", "SNOMED-CT", "23179008"), - - CLOSTRIDIUM_RAMOSUM_ORGANISM("Clostridium ramosum (organism)", "Clostridium ramosum (organism)", "SNOMED-CT", "42706008"), - - KOCURIA_KRISTINAE_ORGANISM("Kocuria kristinae (organism)", "Kocuria kristinae (organism)", "SNOMED-CT", "113772007"), - - CAMPYLOBACTER_JEJUNI_ORGANISM("Campylobacter jejuni (organism)", "Campylobacter jejuni (organism)", "SNOMED-CT", "66543000"), - - PANTOEA_SEPTICA_ORGANISM("Pantoea septica (organism)", "Pantoea septica (organism)", "SNOMED-CT", "5681000146105"), - - STREPTOCOCCUS_ORALIS_ORGANISM("Streptococcus oralis (organism)", "Streptococcus oralis (organism)", "SNOMED-CT", "19870004"), - - PREVOTELLA_INTERMEDIA_ORGANISM("Prevotella intermedia (organism)", "Prevotella intermedia (organism)", "SNOMED-CT", "114142000"), - - LEGIONELLA_BRUNENSIS_ORGANISM("Legionella brunensis (organism)", "Legionella brunensis (organism)", "SNOMED-CT", "103448007"), - - STREPTOCOCCUS_AGALACTIAE_ORGANISM("Streptococcus agalactiae (organism)", "Streptococcus agalactiae (organism)", "SNOMED-CT", "43492007"), - - STREPTOCOCCUS_MITIS_GROUP_ORGANISM("Streptococcus mitis group (organism)", "Streptococcus mitis group (organism)", "SNOMED-CT", "127539005"), - - ACINETOBACTER_GENOSPECIES11_ORGANISM("Acinetobacter genospecies 11 (organism)", "Acinetobacter genospecies 11 (organism)", "SNOMED-CT", "113380002"), - - PARABURKHOLDERIA_ANDROPOGONIS("Paraburkholderia andropogonis", "Paraburkholderia andropogonis", "SNOMED-CT", "113667005"), - - BREVUNDIMONAS_INTERMEDIA("Brevundimonas intermedia", "Brevundimonas intermedia", "SNOMED-CT", "423923008"), - - CORYNEBACTERIUM_AFERMENTANS_ORGANISM("Corynebacterium afermentans (organism)", "Corynebacterium afermentans (organism)", "SNOMED-CT", "113608003"), - - NEISSERIA_SUBFLAVA_ORGANISM("Neisseria subflava (organism)", "Neisseria subflava (organism)", "SNOMED-CT", "77700001"), - - CORYNEBACTERIUM_TUBERCULOSTEARICUM_ORGANISM("Corynebacterium tuberculostearicum (organism)", "Corynebacterium tuberculostearicum (organism)", "SNOMED-CT", "416356007"), - - BACILLUS_THURINGIENSIS_ORGANISM("Bacillus thuringiensis (organism)", "Bacillus thuringiensis (organism)", "SNOMED-CT", "64840009"), - - STREPTOCOCCUS_ANGINOSUS_GROUP_ORGANISM("Streptococcus anginosus group (organism)", "Streptococcus anginosus group (organism)", "SNOMED-CT", "415597009"), - - PAENIBACILLUS_MACERANS_ORGANISM("Paenibacillus macerans (organism)", "Paenibacillus macerans (organism)", "SNOMED-CT", "114101003"), - - PARABURKHOLDERIA_FUNGORUM_ORGANISM("Paraburkholderia fungorum (organism)", "Paraburkholderia fungorum (organism)", "SNOMED-CT", "417285005"), - - FINEGOLDIA_MAGNA_ORGANISM("Finegoldia magna (organism)", "Finegoldia magna (organism)", "SNOMED-CT", "417469002"), - - ASPERGILLUS_GLAUCUS("Aspergillus glaucus", "Aspergillus glaucus", "SNOMED-CT", "19556009"), - - CANDIDA_DUBLINIENSIS_ORGANISM("Candida dubliniensis (organism)", "Candida dubliniensis (organism)", "SNOMED-CT", "115952006"), - - STREPTOCOCCUS_SANGUINIS_ORGANISM("Streptococcus sanguinis (organism)", "Streptococcus sanguinis (organism)", "SNOMED-CT", "113993000"), - - PROVIDENCIA_RUSTIGIANII_ORGANISM("Providencia rustigianii (organism)", "Providencia rustigianii (organism)", "SNOMED-CT", "19196004"), - - SHIGELLA_FLEXNERI_ORGANISM("Shigella flexneri (organism)", "Shigella flexneri (organism)", "SNOMED-CT", "85729005"), - - BURKHOLDERIA_MULTIVORANS_ORGANISM("Burkholderia multivorans (organism)", "Burkholderia multivorans (organism)", "SNOMED-CT", "113675004"), - - CITROBACTER_MURLINIAE("Citrobacter murliniae", "Citrobacter murliniae", "SNOMED-CT", "417581000"), - - PREVOTELLA_NANCEIENSIS_ORGANISM("Prevotella nanceiensis (organism)", "Prevotella nanceiensis (organism)", "SNOMED-CT", "441625003"), - - GENUS_ACINETOBACTER_ORGANISM("Genus Acinetobacter (organism)", "Genus Acinetobacter (organism)", "SNOMED-CT", "7757008"), - - ASPERGILLUS_SPECIES_NOT_ASPERGILLUS_FUMIGATUS_ORGANISM("Aspergillus species not Aspergillus fumigatus (organism)", "Aspergillus species not Aspergillus fumigatus (organism)", "SNOMED-CT", "413584009"), - - STAPHYLOCOCCUS_PASTEURI_ORGANISM("Staphylococcus pasteuri (organism)", "Staphylococcus pasteuri (organism)", "SNOMED-CT", "103495006"), - - PREVOTELLA_BIVIA_ORGANISM("Prevotella bivia (organism)", "Prevotella bivia (organism)", "SNOMED-CT", "114131009"), - - MORGANELLA_MORGANII_ORGANISM("Morganella morganii (organism)", "Morganella morganii (organism)", "SNOMED-CT", "243301005"), - - PREVOTELLA_BUCCAE_ORGANISM("Prevotella buccae (organism)", "Prevotella buccae (organism)", "SNOMED-CT", "114134001"), - - KLUYVERA_INTERMEDIA("Kluyvera intermedia", "Kluyvera intermedia", "SNOMED-CT", "431977008"), - - PROVIDENCIA_VERMICOLA_ORGANISM("Providencia vermicola (organism)", "Providencia vermicola (organism)", "SNOMED-CT", "6031000146109"), - - CUTIBACTERIUM_ACNES_ORGANISM("Cutibacterium acnes (organism)", "Cutibacterium acnes (organism)", "SNOMED-CT", "39473003"), - - PASTEURELLA_CANIS_ORGANISM("Pasteurella canis (organism)", "Pasteurella canis (organism)", "SNOMED-CT", "7784009"), - - LEGIONELLA_YABUUCHIAE_ORGANISM("Legionella yabuuchiae (organism)", "Legionella yabuuchiae (organism)", "SNOMED-CT", "5131000146101"), - - HAEMOPHILUS_HAEMOLYTICUS_ORGANISM("Haemophilus haemolyticus (organism)", "Haemophilus haemolyticus (organism)", "SNOMED-CT", "54950008"), - - BACILLUS_CIRCULANS_ORGANISM("Bacillus circulans (organism)", "Bacillus circulans (organism)", "SNOMED-CT", "71812004"), - - LEGIONELLA_RUBRILUCENS_ORGANISM("Legionella rubrilucens (organism)", "Legionella rubrilucens (organism)", "SNOMED-CT", "17298000"), - - STREPTOCOCCUS_GORDONII_ORGANISM("Streptococcus gordonii (organism)", "Streptococcus gordonii (organism)", "SNOMED-CT", "113986004"), - - PASTEURELLA_STOMATIS_ORGANISM("Pasteurella stomatis (organism)", "Pasteurella stomatis (organism)", "SNOMED-CT", "46827009"), - - PSEUDOMONAS_PUTIDA_ORGANISM("Pseudomonas putida (organism)", "Pseudomonas putida (organism)", "SNOMED-CT", "68608003"), - - ASPERGILLUS_FLAVUS_ORGANISM("Aspergillus flavus (organism)", "Aspergillus flavus (organism)", "SNOMED-CT", "66821001"), - - MYCOBACTERIUM_CAPRAE_ORGANISM("Mycobacterium caprae (organism)", "Mycobacterium caprae (organism)", "SNOMED-CT", "430579009"), - - SALMONELLA_TYPHI_ORGANISM("Salmonella Typhi (organism)", "Salmonella Typhi (organism)", "SNOMED-CT", "5595000"), - - STREPTOCOCCUS_EQUINUS_ORGANISM("Streptococcus equinus (organism)", "Streptococcus equinus (organism)", "SNOMED-CT", "72646003"), - - GENUS_PREVOTELLA_ORGANISM("Genus Prevotella (organism)", "Genus Prevotella (organism)", "SNOMED-CT", "114129000"), - - ASPERGILLUS_TAMARII_ORGANISM("Aspergillus tamarii (organism)", "Aspergillus tamarii (organism)", "SNOMED-CT", "3111000146107"), - - CANDIDA_SPECIES_NOT_CANDIDA_ALBICANS_ORGANISM("Candida species not Candida albicans (organism)", "Candida species not Candida albicans (organism)", "SNOMED-CT", "714313009"), - - AEROMONAS_ENCHELEIA_ORGANISM("Aeromonas encheleia (organism)", "Aeromonas encheleia (organism)", "SNOMED-CT", "115028001"), - - PARABURKHOLDERIA_TROPICA("Paraburkholderia tropica", "Paraburkholderia tropica", "SNOMED-CT", "431175004"), - - LACTOBACILLUS_GASSERI_ORGANISM("Lactobacillus gasseri (organism)", "Lactobacillus gasseri (organism)", "SNOMED-CT", "71158000"), - - SHIGELLA_BOYDII_ORGANISM("Shigella boydii (organism)", "Shigella boydii (organism)", "SNOMED-CT", "55462008"), - - KLEBSIELLA_OXYTOCA_ORGANISM("Klebsiella oxytoca (organism)", "Klebsiella oxytoca (organism)", "SNOMED-CT", "40886007"), - - GENUS_MYCOBACTERIUM_ORGANISM("Genus Mycobacterium (organism)", "Genus Mycobacterium (organism)", "SNOMED-CT", "243368001"), - - LEGIONELLA_BOZEMANAE_ORGANISM("Legionella bozemanae (organism)", "Legionella bozemanae (organism)", "SNOMED-CT", "450611004"), - - BURKHOLDERIA_GLUMAE("Burkholderia glumae", "Burkholderia glumae", "SNOMED-CT", "113673006"), - - PREVOTELLA_DISIENS_ORGANISM("Prevotella disiens (organism)", "Prevotella disiens (organism)", "SNOMED-CT", "114139006"), - - AEROMONAS_POPOFFII_ORGANISM("Aeromonas popoffii (organism)", "Aeromonas popoffii (organism)", "SNOMED-CT", "115035009"), - - PARABURKHOLDERIA_PHYMATUM("Paraburkholderia phymatum", "Paraburkholderia phymatum", "SNOMED-CT", "431165002"), - - ACINETOBACTER_TOWNERI_ORGANISM("Acinetobacter towneri (organism)", "Acinetobacter towneri (organism)", "SNOMED-CT", "424930007"), - - ACINETOBACTER_BAYLYI_ORGANISM("Acinetobacter baylyi (organism)", "Acinetobacter baylyi (organism)", "SNOMED-CT", "423974000"), - - ANAEROBIC_BACTERIA_ORGANISM("Anaerobic bacteria (organism)", "Anaerobic bacteria (organism)", "SNOMED-CT", "59343002"), - - PSEUDOMONAS_CITRONELLOLIS_ORGANISM("Pseudomonas citronellolis (organism)", "Pseudomonas citronellolis (organism)", "SNOMED-CT", "31277003"), - - SALMONELLA_OHIO("Salmonella Ohio", "Salmonella Ohio", "SNOMED-CT", "67210008"), - - NEOSARTORYA_HIRATSUKAE_ORGANISM("Neosartorya hiratsukae (organism)", "Neosartorya hiratsukae (organism)", "SNOMED-CT", "414835000"), - - ACTINOMYCES_NAESLUNDII_ORGANISM("Actinomyces naeslundii (organism)", "Actinomyces naeslundii (organism)", "SNOMED-CT", "8940004"), - - SALMONELLA_SPECIES("Salmonella species", "Salmonella species", "SNOMED-CT", "27268008"), - - SERRATIA_RUBIDAEA_ORGANISM("Serratia rubidaea (organism)", "Serratia rubidaea (organism)", "SNOMED-CT", "55825002"), - - PREVOTELLA_ORIS_ORGANISM("Prevotella oris (organism)", "Prevotella oris (organism)", "SNOMED-CT", "114147006"), - - CITROBACTER_GILLENII("Citrobacter gillenii", "Citrobacter gillenii", "SNOMED-CT", "416990006"), - - MYCOBACTERIUM_INTRACELLULARE_ORGANISM("Mycobacterium intracellulare (organism)", "Mycobacterium intracellulare (organism)", "SNOMED-CT", "83841006"), - - CUPRIAVIDUS_PAUCULUS_ORGANISM("Cupriavidus pauculus (organism)", "Cupriavidus pauculus (organism)", "SNOMED-CT", "429465001"), - - ELIZABETHKINGIA_MIRICOLA_ORGANISM("Elizabethkingia miricola (organism)", "Elizabethkingia miricola (organism)", "SNOMED-CT", "444815005"), - - GRAM_POSITIVE_COCCUS_ORGANISM("Gram-positive coccus (organism)", "Gram-positive coccus (organism)", "SNOMED-CT", "59206002"), - - ACINETOBACTER_NOSOCOMIALIS_ORGANISM("Acinetobacter nosocomialis (organism)", "Acinetobacter nosocomialis (organism)", "SNOMED-CT", "708859003"), - - CITROBACTER_FREUNDII_ORGANISM("Citrobacter freundii (organism)", "Citrobacter freundii (organism)", "SNOMED-CT", "6265002"), - - BURKHOLDERIA_ANTHINA("Burkholderia anthina", "Burkholderia anthina", "SNOMED-CT", "417565005"), - - SERRATIA_QUINIVORANS_ORGANISM("Serratia quinivorans (organism)", "Serratia quinivorans (organism)", "SNOMED-CT", "438199009"), - - GENUS_AEROCOCCUS_ORGANISM("Genus Aerococcus (organism)", "Genus Aerococcus (organism)", "SNOMED-CT", "9008009"), - - ENTEROCOCCUS_GALLINARUM_ORGANISM("Enterococcus gallinarum (organism)", "Enterococcus gallinarum (organism)", "SNOMED-CT", "53233007"), - - CAMPYLOBACTER_UREOLYTICUS_ORGANISM("Campylobacter ureolyticus (organism)", "Campylobacter ureolyticus (organism)", "SNOMED-CT", "450602004"), - - GRANULICATELLA_ADIACENS_ORGANISM("Granulicatella adiacens (organism)", "Granulicatella adiacens (organism)", "SNOMED-CT", "113713009"), - - ACHROMOBACTER_XYLOSOXIDANS_ORGANISM("Achromobacter xylosoxidans (organism)", "Achromobacter xylosoxidans (organism)", "SNOMED-CT", "413424009"), - - GENUS_PROPIONIBACTERIUM_ORGANISM("Genus Propionibacterium (organism)", "Genus Propionibacterium (organism)", "SNOMED-CT", "34844008"), - - SERRATIA_ENTOMOPHILA_ORGANISM("Serratia entomophila (organism)", "Serratia entomophila (organism)", "SNOMED-CT", "76656001"), - - ASPERGILLUS_NIVEUS_ORGANISM("Aspergillus niveus (organism)", "Aspergillus niveus (organism)", "SNOMED-CT", "18651002"), - - LACTOBACILLUS_PARACASEI_ORGANISM("Lactobacillus paracasei (organism)", "Lactobacillus paracasei (organism)", "SNOMED-CT", "113792000"), - - PASTEURELLA_MULTOCIDA_ORGANISM("Pasteurella multocida (organism)", "Pasteurella multocida (organism)", "SNOMED-CT", "10879005"), - - GENUS_STREPTOCOCCUS_ORGANISM("Genus Streptococcus (organism)", "Genus Streptococcus (organism)", "SNOMED-CT", "58800005"), - - BACTEROIDES_THETAIOTAOMICRON_ORGANISM("Bacteroides thetaiotaomicron (organism)", "Bacteroides thetaiotaomicron (organism)", "SNOMED-CT", "34236001"), - - YERSINIA_ENTEROCOLITICA_SEROGROUP_O3_ORGANISM("Yersinia enterocolitica serogroup O:3 (organism)", "Yersinia enterocolitica serogroup O:3 (organism)", "SNOMED-CT", "103430003"), - - BURKHOLDERIA_CALEDONICA("Burkholderia caledonica", "Burkholderia caledonica", "SNOMED-CT", "423159001"), - - AGGREGATIBACTER_APHROPHILUS_ORGANISM("Aggregatibacter aphrophilus (organism)", "Aggregatibacter aphrophilus (organism)", "SNOMED-CT", "442683005"), - - CRONOBACTER_TURICENSIS("Cronobacter turicensis", "Cronobacter turicensis", "SNOMED-CT", "445639005"), - - EGGERTHELLA_LENTA_ORGANISM("Eggerthella lenta (organism)", "Eggerthella lenta (organism)", "SNOMED-CT", "414077004"), - - INTERFERON_GAMMA_ASSAY_POSITIVE_FINDING("Interferon gamma assay positive (finding)", "Interferon gamma assay positive (finding)", "SNOMED-CT", "440662009"), - - LEGIONELLA_PNEUMOPHILA_SEROGROUP4_ORGANISM("Legionella pneumophila serogroup 4 (organism)", "Legionella pneumophila serogroup 4 (organism)", "SNOMED-CT", "103466002"), - - ASPERGILLUS_NIDULANS_ORGANISM("Aspergillus nidulans (organism)", "Aspergillus nidulans (organism)", "SNOMED-CT", "60264008"), - - ACINETOBACTER_SCHINDLERI_ORGANISM("Acinetobacter schindleri (organism)", "Acinetobacter schindleri (organism)", "SNOMED-CT", "423732001"), - - LEGIONELLA_PNEUMOPHILA_SEROGROUP7_ORGANISM("Legionella pneumophila serogroup 7 (organism)", "Legionella pneumophila serogroup 7 (organism)", "SNOMED-CT", "103469009"), - - LEGIONELLA_DUMOFFII_ORGANISM("Legionella dumoffii (organism)", "Legionella dumoffii (organism)", "SNOMED-CT", "113720002"), - - SHEWANELLA_PUTREFACIENS_ORGANISM("Shewanella putrefaciens (organism)", "Shewanella putrefaciens (organism)", "SNOMED-CT", "113700003"), - - GENUS_PEPTONIPHILUS_ORGANISM("Genus Peptoniphilus (organism)", "Genus Peptoniphilus (organism)", "SNOMED-CT", "430742009"), - - SALMONELLA_POMONA("Salmonella Pomona", "Salmonella Pomona", "SNOMED-CT", "112314009"), - - LEGIONELLA_PNEUMOPHILA_ORGANISM("Legionella pneumophila (organism)", "Legionella pneumophila (organism)", "SNOMED-CT", "80897008"), - - PSEUDOMONAS_FLUORESCENS_ORGANISM("Pseudomonas fluorescens (organism)", "Pseudomonas fluorescens (organism)", "SNOMED-CT", "39289003"), - - ASPERGILLUS_BRASILIENSIS_ORGANISM("Aspergillus brasiliensis (organism)", "Aspergillus brasiliensis (organism)", "SNOMED-CT", "3101000146105"), - - BACILLUS_SIMPLEX_ORGANISM("Bacillus simplex (organism)", "Bacillus simplex (organism)", "SNOMED-CT", "113479004"), - - DERMATOPHYTE_ORGANISM("Dermatophyte (organism)", "Dermatophyte (organism)", "SNOMED-CT", "115651002"), - - ENTEROBACTER_CLOACAE_SUBSPECIES_DISSOLVENS("Enterobacter cloacae subspecies dissolvens", "Enterobacter cloacae subspecies dissolvens", "SNOMED-CT", "56813009"), - - BREVUNDIMONAS_SUBVIBRIOIDES("Brevundimonas subvibrioides", "Brevundimonas subvibrioides", "SNOMED-CT", "423492004"), - - LEGIONELLA_LANSINGENSIS_ORGANISM("Legionella lansingensis (organism)", "Legionella lansingensis (organism)", "SNOMED-CT", "103452007"), - - SALMONELLA_GROUP_O35_ORGANISM("Salmonella group O:35 (organism)", "Salmonella group O:35 (organism)", "SNOMED-CT", "404341009"), - - CANDIDA_KEFYR_ORGANISM("Candida kefyr (organism)", "Candida kefyr (organism)", "SNOMED-CT", "446237006"), - - SALMONELLA_GIVE("Salmonella Give", "Salmonella Give", "SNOMED-CT", "71768003"), - - PSEUDOMONAS_KOREENSIS_ORGANISM("Pseudomonas koreensis (organism)", "Pseudomonas koreensis (organism)", "SNOMED-CT", "438724003"), - - SALMONELLA_TYPHIMURIUM_ORGANISM("Salmonella Typhimurium (organism)", "Salmonella Typhimurium (organism)", "SNOMED-CT", "50136005"), - - CANDIDA_GLABRATA_ORGANISM("Candida glabrata (organism)", "Candida glabrata (organism)", "SNOMED-CT", "444877006"), - - STAPHYLOCOCCUS_CAPITIS_ORGANISM("Staphylococcus capitis (organism)", "Staphylococcus capitis (organism)", "SNOMED-CT", "40347003"), - - SALMONELLA_SEROGROUP_D_ORGANISM("Salmonella, serogroup D (organism)", "Salmonella, serogroup D (organism)", "SNOMED-CT", "115408009"), - - MANNHEIMIA_HAEMOLYTICA_ORGANISM("Mannheimia haemolytica (organism)", "Mannheimia haemolytica (organism)", "SNOMED-CT", "128385005"), - - PREVOTELLA_MELANINOGENICA_ORGANISM("Prevotella melaninogenica (organism)", "Prevotella melaninogenica (organism)", "SNOMED-CT", "114144004"), - - CANDIDA_PARAPSILOSIS_ORGANISM("Candida parapsilosis (organism)", "Candida parapsilosis (organism)", "SNOMED-CT", "61302002"), - - CITROBACTER_YOUNGAE_ORGANISM("Citrobacter youngae (organism)", "Citrobacter youngae (organism)", "SNOMED-CT", "114443001"), - - CORYNEBACTERIUM_AURIMUCOSUM_ORGANISM("Corynebacterium aurimucosum (organism)", "Corynebacterium aurimucosum (organism)", "SNOMED-CT", "385503009"), - - PEDIOCOCCUS_PENTOSACEUS_ORGANISM("Pediococcus pentosaceus (organism)", "Pediococcus pentosaceus (organism)", "SNOMED-CT", "243242006"), - - PNEUMOCYSTIS_JIROVECII_ORGANISM("Pneumocystis jirovecii (organism)", "Pneumocystis jirovecii (organism)", "SNOMED-CT", "79909001"), - - CRYPTOCOCCUS_LAURENTII_ORGANISM("Cryptococcus laurentii (organism)", "Cryptococcus laurentii (organism)", "SNOMED-CT", "7299008"), - - LEGIONELLA_PNEUMOPHILA_SEROGROUP3_ORGANISM("Legionella pneumophila serogroup 3 (organism)", "Legionella pneumophila serogroup 3 (organism)", "SNOMED-CT", "103465003"), - - SALMONELLA_MUENSTER("Salmonella Muenster", "Salmonella Muenster", "SNOMED-CT", "68916009"), - - GENUS_BACILLUS_ORGANISM("Genus Bacillus (organism)", "Genus Bacillus (organism)", "SNOMED-CT", "44762009"), - - STREPTOCOCCUS_CONSTELLATUS_SUBSPECIES_PHARYNGIS_ORGANISM("Streptococcus constellatus subspecies pharyngis (organism)", "Streptococcus constellatus subspecies pharyngis (organism)", "SNOMED-CT", "415602002"), - - KLEBSIELLA_AEROGENES_ORGANISM("Klebsiella aerogenes (organism)", "Klebsiella aerogenes (organism)", "SNOMED-CT", "62592009"), - - PLURALIBACTER_GERGOVIAE("Pluralibacter gergoviae", "Pluralibacter gergoviae", "SNOMED-CT", "716346000"), - - SALMONELLA_AGONA("Salmonella Agona", "Salmonella Agona", "SNOMED-CT", "80627004"), - - SALMONELLA_PARATYPHI_A("Salmonella Paratyphi A", "Salmonella Paratyphi A", "SNOMED-CT", "79128009"), - - GENUS_NEISSERIA_ORGANISM("Genus Neisseria (organism)", "Genus Neisseria (organism)", "SNOMED-CT", "59083001"), - - STREPTOCOCCUS_SALIVARIUS_GROUP_ORGANISM("Streptococcus salivarius group (organism)", "Streptococcus salivarius group (organism)", "SNOMED-CT", "127537007"), - - ACINETOBACTER_SEIFERTII_ORGANISM("Acinetobacter seifertii (organism)", "Acinetobacter seifertii (organism)", "SNOMED-CT", "787184002"), - - ASPERGILLUS_OCHRACEUS_ORGANISM("Aspergillus ochraceus (organism)", "Aspergillus ochraceus (organism)", "SNOMED-CT", "60111002"), - - CRONOBACTER_SAKAZAKII_ORGANISM("Cronobacter sakazakii (organism)", "Cronobacter sakazakii (organism)", "SNOMED-CT", "445562004"), - - ACINETOBACTER_JOHNSONII_ORGANISM("Acinetobacter johnsonii (organism)", "Acinetobacter johnsonii (organism)", "SNOMED-CT", "252000"), - - LEGIONELLA_CHERRII_ORGANISM("Legionella cherrii (organism)", "Legionella cherrii (organism)", "SNOMED-CT", "52462004"), - - WEEKSELLA_VIROSA_ORGANISM("Weeksella virosa (organism)", "Weeksella virosa (organism)", "SNOMED-CT", "83326004"), - - ACTINOMYCES_TURICENSIS_ORGANISM("Actinomyces turicensis (organism)", "Actinomyces turicensis (organism)", "SNOMED-CT", "113422006"), - - CANDIDA_PARAPSILOSIS_COMPLEX_ORGANISM("Candida parapsilosis complex (organism)", "Candida parapsilosis complex (organism)", "SNOMED-CT", "717979000"), - - BACTEROIDES_VULGATUS_ORGANISM("Bacteroides vulgatus (organism)", "Bacteroides vulgatus (organism)", "SNOMED-CT", "52798008"), - - STAPHYLOCOCCUS_LUGDUNENSIS_ORGANISM("Staphylococcus lugdunensis (organism)", "Staphylococcus lugdunensis (organism)", "SNOMED-CT", "103494005"), - - GENUS_BURKHOLDERIA_ORGANISM("Genus Burkholderia (organism)", "Genus Burkholderia (organism)", "SNOMED-CT", "414324002"), - - CITROBACTER_RODENTIUM("Citrobacter rodentium", "Citrobacter rodentium", "SNOMED-CT", "114444007"), - - CRONOBACTER_MUYTJENSII("Cronobacter muytjensii", "Cronobacter muytjensii", "SNOMED-CT", "445561006"), - - PASTEURELLA_BETTYAE_ORGANISM("Pasteurella bettyae (organism)", "Pasteurella bettyae (organism)", "SNOMED-CT", "113902004"), - - ACHROMOBACTER_DENITRIFICANS_ORGANISM("Achromobacter denitrificans (organism)", "Achromobacter denitrificans (organism)", "SNOMED-CT", "413414001"), - - BURKHOLDERIA_CEPACIA_ORGANISM("Burkholderia cepacia (organism)", "Burkholderia cepacia (organism)", "SNOMED-CT", "113669008"), - - ENTEROBACTER_AMNIGENUS("Enterobacter amnigenus", "Enterobacter amnigenus", "SNOMED-CT", "84221003"), - - SALMONELLA_MUENCHEN("Salmonella Muenchen", "Salmonella Muenchen", "SNOMED-CT", "77584005"), - - SALMONELLA_STANLEYVILLE("Salmonella Stanleyville", "Salmonella Stanleyville", "SNOMED-CT", "47441000"), - - RAOULTELLA_TERRIGENA_ORGANISM("Raoultella terrigena (organism)", "Raoultella terrigena (organism)", "SNOMED-CT", "416096003"), - - NEISSERIA_MENINGITIDIS_ORGANISM("Neisseria meningitidis (organism)", "Neisseria meningitidis (organism)", "SNOMED-CT", "17872004"), - - MYCOBACTERIUM_GORDONAE_ORGANISM("Mycobacterium gordonae (organism)", "Mycobacterium gordonae (organism)", "SNOMED-CT", "24871004"), - - CLOSTRIDIUM_PARAPUTRIFICUM_ORGANISM("Clostridium paraputrificum (organism)", "Clostridium paraputrificum (organism)", "SNOMED-CT", "41966004"), - - FAMILY_ENTEROBACTERIACEAE_ORGANISM("Family Enterobacteriaceae (organism)", "Family Enterobacteriaceae (organism)", "SNOMED-CT", "106544002"), - - AEROMONAS_ICHTHIOSMIA_ORGANISM("Aeromonas ichthiosmia (organism)", "Aeromonas ichthiosmia (organism)", "SNOMED-CT", "115033002"), - - STAPHYLOCOCCUS_XYLOSUS_ORGANISM("Staphylococcus xylosus (organism)", "Staphylococcus xylosus (organism)", "SNOMED-CT", "32737005"), - - STREPTOCOCCUS_GALLOLYTICUS_ORGANISM("Streptococcus gallolyticus (organism)", "Streptococcus gallolyticus (organism)", "SNOMED-CT", "113985000"), - - ENTEROBACTER_PYRINUS("Enterobacter pyrinus", "Enterobacter pyrinus", "SNOMED-CT", "114455007"), - - MYCOBACTERIUM_TUBERCULOSIS_COMPLEX_ORGANISM("Mycobacterium tuberculosis complex (organism)", "Mycobacterium tuberculosis complex (organism)", "SNOMED-CT", "113858008"), - - ACINETOBACTER_LWOFFI_ORGANISM("Acinetobacter lwoffi (organism)", "Acinetobacter lwoffi (organism)", "SNOMED-CT", "83088009"), - - SALMONELLA_MANHATTAN("Salmonella Manhattan", "Salmonella Manhattan", "SNOMED-CT", "20073008"), - - AEROMONAS_CAVIAE_ORGANISM("Aeromonas caviae (organism)", "Aeromonas caviae (organism)", "SNOMED-CT", "115036005"), - - STENOTROPHOMONAS_MALTOPHILIA_ORGANISM("Stenotrophomonas maltophilia (organism)", "Stenotrophomonas maltophilia (organism)", "SNOMED-CT", "113697002"), - - KYTOCOCCUS_SCHROETERI_ORGANISM("Kytococcus schroeteri (organism)", "Kytococcus schroeteri (organism)", "SNOMED-CT", "428721003"), - - SALMONELLA_POTSDAM("Salmonella Potsdam", "Salmonella Potsdam", "SNOMED-CT", "8544001"), - - YERSINIA_PSEUDOTUBERCULOSIS_ORGANISM("Yersinia pseudotuberculosis (organism)", "Yersinia pseudotuberculosis (organism)", "SNOMED-CT", "90530002"), - - SHEWANELLA_ALGAE_ORGANISM("Shewanella algae (organism)", "Shewanella algae (organism)", "SNOMED-CT", "113702006"), - - GENUS_PANTOEA_ORGANISM("Genus Pantoea (organism)", "Genus Pantoea (organism)", "SNOMED-CT", "115013001"), - - SALMONELLA_ADELAIDE("Salmonella Adelaide", "Salmonella Adelaide", "SNOMED-CT", "10343005"), - - PROTEUS_PENNERI_ORGANISM("Proteus penneri (organism)", "Proteus penneri (organism)", "SNOMED-CT", "45298005"), - - ACHROMOBACTER_RUHLANDII_ORGANISM("Achromobacter ruhlandii (organism)", "Achromobacter ruhlandii (organism)", "SNOMED-CT", "413421001"), - - SALMONELLA_ENTERITIDIS_ORGANISM("Salmonella Enteritidis (organism)", "Salmonella Enteritidis (organism)", "SNOMED-CT", "73525009"), - - TOXIGENIC_CLOSTRIDIUM_DIFFICILE_ORGANISM("Toxigenic Clostridium difficile (organism)", "Toxigenic Clostridium difficile (organism)", "SNOMED-CT", "736050006"), - - ESCHERICHIA_VULNERIS_ORGANISM("Escherichia vulneris (organism)", "Escherichia vulneris (organism)", "SNOMED-CT", "53013003"), - - ACINETOBACTER_JUNII_ORGANISM("Acinetobacter junii (organism)", "Acinetobacter junii (organism)", "SNOMED-CT", "13879009"), - - OCHROBACTRUM_ANTHROPI_ORGANISM("Ochrobactrum anthropi (organism)", "Ochrobactrum anthropi (organism)", "SNOMED-CT", "116490002"), - - ACINETOBACTER_CALCOACETICUS_ORGANISM("Acinetobacter calcoaceticus (organism)", "Acinetobacter calcoaceticus (organism)", "SNOMED-CT", "82550008"), - - PSEUDOMONAS_FLUORESCENS_GROUP_ORGANISM("Pseudomonas fluorescens group (organism)", "Pseudomonas fluorescens group (organism)", "SNOMED-CT", "415197003"), - - GENUS_CORYNEBACTERIUM_ORGANISM("Genus Corynebacterium (organism)", "Genus Corynebacterium (organism)", "SNOMED-CT", "77086004"), - - LACTOBACILLUS_JENSENII_ORGANISM("Lactobacillus jensenii (organism)", "Lactobacillus jensenii (organism)", "SNOMED-CT", "65904004"), - - SHIGELLA_SONNEI_ORGANISM("Shigella sonnei (organism)", "Shigella sonnei (organism)", "SNOMED-CT", "4298009"), - - CANDIDA_RUGOSA_ORGANISM("Candida rugosa (organism)", "Candida rugosa (organism)", "SNOMED-CT", "23773004"), - - CANDIDA_AURIS_ORGANISM("Candida auris (organism)", "Candida auris (organism)", "SNOMED-CT", "3491000146109"), - - ROTHIA_DENTOCARIOSA_ORGANISM("Rothia dentocariosa (organism)", "Rothia dentocariosa (organism)", "SNOMED-CT", "35379007"), - - SALMONELLA_DUISBURG("Salmonella Duisburg", "Salmonella Duisburg", "SNOMED-CT", "42410007"), - - SERRATIA_LIQUEFACIENS_COMPLEX_ORGANISM("Serratia liquefaciens complex (organism)", "Serratia liquefaciens complex (organism)", "SNOMED-CT", "722258003"), - - ACINETOBACTER_DIJKSHOORNIAE_ORGANISM("Acinetobacter dijkshoorniae (organism)", "Acinetobacter dijkshoorniae (organism)", "SNOMED-CT", "787183008"), - - LEGIONELLA_HACKELIAE_ORGANISM("Legionella hackeliae (organism)", "Legionella hackeliae (organism)", "SNOMED-CT", "58939000"), - - YERSINIA_ENTEROCOLITICA_SEROGROUP_O9_ORGANISM("Yersinia enterocolitica serogroup O:9 (organism)", "Yersinia enterocolitica serogroup O:9 (organism)", "SNOMED-CT", "103433001"), - - PENICILLIUM_ORGANISM("Penicillium (organism)", "Penicillium (organism)", "SNOMED-CT", "42993004"), - - ACINETOBACTER_GUILLOUIAE_ORGANISM("Acinetobacter guillouiae (organism)", "Acinetobacter guillouiae (organism)", "SNOMED-CT", "700397005"), - - LEGIONELLA_OAKRIDGENSIS_ORGANISM("Legionella oakridgensis (organism)", "Legionella oakridgensis (organism)", "SNOMED-CT", "638008"), - - BACILLUS_LICHENIFORMIS_ORGANISM("Bacillus licheniformis (organism)", "Bacillus licheniformis (organism)", "SNOMED-CT", "74867004"), - - PROTEUS_HAUSERI_ORGANISM("Proteus hauseri (organism)", "Proteus hauseri (organism)", "SNOMED-CT", "417592004"), - - ACTINOMYCES_ODONTOLYTICUS_ORGANISM("Actinomyces odontolyticus (organism)", "Actinomyces odontolyticus (organism)", "SNOMED-CT", "12069003"), - - ACINETOBACTER_CALCOACETICUS_ACINETOBACTER_BAUMANNII_COMPLEX_ORGANISM("Acinetobacter calcoaceticus-Acinetobacter baumannii complex (organism)", "Acinetobacter calcoaceticus-Acinetobacter baumannii complex (organism)", "SNOMED-CT", "113376007"), - - SALMONELLA_READING("Salmonella Reading", "Salmonella Reading", "SNOMED-CT", "63396002"), - - BACILLUS_PUMILUS_ORGANISM("Bacillus pumilus (organism)", "Bacillus pumilus (organism)", "SNOMED-CT", "16580009"), - - BURKHOLDERIA_PSEUDOMALLEI_ORGANISM("Burkholderia pseudomallei (organism)", "Burkholderia pseudomallei (organism)", "SNOMED-CT", "116399000"), - - ENTEROCOCCUS_CASSELIFLAVUS_ORGANISM("Enterococcus casseliflavus (organism)", "Enterococcus casseliflavus (organism)", "SNOMED-CT", "30949009"), - - GENUS_PASTEURELLA_ORGANISM("Genus Pasteurella (organism)", "Genus Pasteurella (organism)", "SNOMED-CT", "87579009"), - - LEGIONELLA_PNEUMOPHILA_SEROGROUP5_ORGANISM("Legionella pneumophila serogroup 5 (organism)", "Legionella pneumophila serogroup 5 (organism)", "SNOMED-CT", "103467006"), - - FLAVIMONAS_ORYZIHABITANS_ORGANISM("Flavimonas oryzihabitans (organism)", "Flavimonas oryzihabitans (organism)", "SNOMED-CT", "113931000"), - - SALMONELLA_SEROGROUP_E_ORGANISM("Salmonella, serogroup E (organism)", "Salmonella, serogroup E (organism)", "SNOMED-CT", "115409001"), - - VEILLONELLA_PARVULA_ORGANISM("Veillonella parvula (organism)", "Veillonella parvula (organism)", "SNOMED-CT", "90435009"), - - LEGIONELLA_PNEUMOPHILIA_SEROGROUP10_ORGANISM("Legionella pneumophilia serogroup 10 (organism)", "Legionella pneumophilia serogroup 10 (organism)", "SNOMED-CT", "131322009"), - - LEGIONELLA_SAINTHELENS_ORGANISM("Legionella sainthelens (organism)", "Legionella sainthelens (organism)", "SNOMED-CT", "87271006"), - - SALMONELLA_HEIDELBERG("Salmonella Heidelberg", "Salmonella Heidelberg", "SNOMED-CT", "71865006"), - - ENTEROBACTER_CLOACAE_SUBSP_CLOACAE("Enterobacter cloacae subsp. cloacae", "Enterobacter cloacae subsp. cloacae", "SNOMED-CT", "721950003"), - - SALMONELLA_GALLINARUM("Salmonella Gallinarum", "Salmonella Gallinarum", "SNOMED-CT", "370576005"), - - GENUS_ENTEROBACTER_ORGANISM("Genus Enterobacter (organism)", "Genus Enterobacter (organism)", "SNOMED-CT", "58683007"), - - PROTEUS_MIRABILIS_ORGANISM("Proteus mirabilis (organism)", "Proteus mirabilis (organism)", "SNOMED-CT", "73457008"), - - MYCOBACTERIUM_CHELONAE_ORGANISM("Mycobacterium chelonae (organism)", "Mycobacterium chelonae (organism)", "SNOMED-CT", "243377008"), - - MYCOBACTERIUM_AFRICANUM_ORGANISM("Mycobacterium africanum (organism)", "Mycobacterium africanum (organism)", "SNOMED-CT", "51320008"), - - BURKHOLDERIA_GLADIOLI_ORGANISM("Burkholderia gladioli (organism)", "Burkholderia gladioli (organism)", "SNOMED-CT", "113671008"), - - CLOSTRIDIUM_SEPTICUM_ORGANISM("Clostridium septicum (organism)", "Clostridium septicum (organism)", "SNOMED-CT", "33101000"), - - PASTEURELLA_MAIRII_ORGANISM("Pasteurella mairii (organism)", "Pasteurella mairii (organism)", "SNOMED-CT", "113905002"), - - SALMONELLA_LIVINGSTONE("Salmonella Livingstone", "Salmonella Livingstone", "SNOMED-CT", "66713000"), - - GENUS_STENOTROPHOMONAS_ORGANISM("Genus Stenotrophomonas (organism)", "Genus Stenotrophomonas (organism)", "SNOMED-CT", "115656007"), - - GENUS_PROTEUS_ORGANISM("Genus Proteus (organism)", "Genus Proteus (organism)", "SNOMED-CT", "50517009"), - - AEROMONAS_SOBRIA_ORGANISM("Aeromonas sobria (organism)", "Aeromonas sobria (organism)", "SNOMED-CT", "43731003"), - - PASTEURELLA_PNEUMOTROPICA_ORGANISM("Pasteurella pneumotropica (organism)", "Pasteurella pneumotropica (organism)", "SNOMED-CT", "32562008"), - - RAOULTELLA_PLANTICOLA_ORGANISM("Raoultella planticola (organism)", "Raoultella planticola (organism)", "SNOMED-CT", "416264004"), - - GENUS_ACHROMOBACTER_ORGANISM("Genus Achromobacter (organism)", "Genus Achromobacter (organism)", "SNOMED-CT", "91620006"), - - PROVIDENCIA_RETTGERI_ORGANISM("Providencia rettgeri (organism)", "Providencia rettgeri (organism)", "SNOMED-CT", "14196002"), - - KOSAKONIA_RADICINCITANS("Kosakonia radicincitans", "Kosakonia radicincitans", "SNOMED-CT", "8181000146108"), - - BURKHOLDERIA_AMBIFARIA("Burkholderia ambifaria", "Burkholderia ambifaria", "SNOMED-CT", "416467009"), - - GARDNERELLA_VAGINALIS_ORGANISM("Gardnerella vaginalis (organism)", "Gardnerella vaginalis (organism)", "SNOMED-CT", "64071004"), - - ACINETOBACTER_GENOSPECIES_ORGANISM("Acinetobacter genospecies (organism)", "Acinetobacter genospecies (organism)", "SNOMED-CT", "131203002"), - - GENUS_CITROBACTER_ORGANISM("Genus Citrobacter (organism)", "Genus Citrobacter (organism)", "SNOMED-CT", "75972000"), - - SALMONELLA_BOVISMORBIFICANS("Salmonella Bovismorbificans", "Salmonella Bovismorbificans", "SNOMED-CT", "81938008"), - - SALMONELLA_THOMPSON("Salmonella Thompson", "Salmonella Thompson", "SNOMED-CT", "4361005"), - - ACINETOBACTER_BAUMANNII_ORGANISM("Acinetobacter baumannii (organism)", "Acinetobacter baumannii (organism)", "SNOMED-CT", "91288006"), - - LACTOBACILLUS_CRISPATUS_ORGANISM("Lactobacillus crispatus (organism)", "Lactobacillus crispatus (organism)", "SNOMED-CT", "89237007"), - - LEGIONELLA_CINCINNATIENSIS_ORGANISM("Legionella cincinnatiensis (organism)", "Legionella cincinnatiensis (organism)", "SNOMED-CT", "58923007"), - - PSEUDOGLUTAMICIBACTER_CUMMINSII_ORGANISM("Pseudoglutamicibacter cumminsii (organism)", "Pseudoglutamicibacter cumminsii (organism)", "SNOMED-CT", "113436001"), - - BACILLUS_SUBTILIS_ORGANISM("Bacillus subtilis (organism)", "Bacillus subtilis (organism)", "SNOMED-CT", "83512007"), - - ALCALIGENES_FAECALIS_SUBSPECIES_FAECALIS_ORGANISM("Alcaligenes faecalis subspecies faecalis (organism)", "Alcaligenes faecalis subspecies faecalis (organism)", "SNOMED-CT", "424719003"), - - ALCALIGENES_FAECALIS_ORGANISM("Alcaligenes faecalis (organism)", "Alcaligenes faecalis (organism)", "SNOMED-CT", "25223004"), - - STREPTOCOCCUS_THORALTENSIS_ORGANISM("Streptococcus thoraltensis (organism)", "Streptococcus thoraltensis (organism)", "SNOMED-CT", "113997004"), - - SALMONELLA_GROUP_O4_ORGANISM("Salmonella group O:4 (organism)", "Salmonella group O:4 (organism)", "SNOMED-CT", "398467008"), - - GENUS_VEILLONELLA_ORGANISM("Genus Veillonella (organism)", "Genus Veillonella (organism)", "SNOMED-CT", "29875005"), - - AEROCOCCUS_URINAEHOMINIS_ORGANISM("Aerococcus urinaehominis (organism)", "Aerococcus urinaehominis (organism)", "SNOMED-CT", "409819000"), - - ASPERGILLUS_FLAVUS_GROUP_ORGANISM("Aspergillus flavus group (organism)", "Aspergillus flavus group (organism)", "SNOMED-CT", "243491003"), - - LEGIONELLA_IMPLETISOLI_ORGANISM("Legionella impletisoli (organism)", "Legionella impletisoli (organism)", "SNOMED-CT", "5121000146103"), - - PARABURKHOLDERIA_TUBERUM("Paraburkholderia tuberum", "Paraburkholderia tuberum", "SNOMED-CT", "431167005"), - - BURKHOLDERIA_PLANTARII("Burkholderia plantarii", "Burkholderia plantarii", "SNOMED-CT", "113676003"), - - GENUS_MYCOPLASMA_ORGANISM("Genus Mycoplasma (organism)", "Genus Mycoplasma (organism)", "SNOMED-CT", "78981005"), - - GENUS_PROVIDENCIA_ORGANISM("Genus Providencia (organism)", "Genus Providencia (organism)", "SNOMED-CT", "112284001"), - - KLEBSIELLA_PNEUMONIAE_SS_RHINOSCLEROMATIS_ORGANISM("Klebsiella pneumoniae ss. rhinoscleromatis (organism)", "Klebsiella pneumoniae ss. rhinoscleromatis (organism)", "SNOMED-CT", "17688001"), - - MYCOBACTERIUM_ABSCESSUS_ORGANISM("Mycobacterium abscessus (organism)", "Mycobacterium abscessus (organism)", "SNOMED-CT", "113838007"), - - STREPTOCOCCUS_DYSGALACTIAE_SUBSPECIES_DYSGALACTIAE_ORGANISM("Streptococcus dysgalactiae subspecies dysgalactiae (organism)", "Streptococcus dysgalactiae subspecies dysgalactiae (organism)", "SNOMED-CT", "113982002"), - - SALMONELLA_SCHWARZENGRUND("Salmonella Schwarzengrund", "Salmonella Schwarzengrund", "SNOMED-CT", "45651006"), - - BACILLUS_CEREUS_ORGANISM("Bacillus cereus (organism)", "Bacillus cereus (organism)", "SNOMED-CT", "84408007"), - - SALMONELLA_POONA("Salmonella Poona", "Salmonella Poona", "SNOMED-CT", "57101009"), - - GENUS_ANAEROCOCCUS_ORGANISM("Genus Anaerococcus (organism)", "Genus Anaerococcus (organism)", "SNOMED-CT", "413518000"), - - MICROCOCCUS_LUTEUS_ORGANISM("Micrococcus luteus (organism)", "Micrococcus luteus (organism)", "SNOMED-CT", "48299003"), - - BIFIDOBACTERIUM_BREVE_ORGANISM("Bifidobacterium breve (organism)", "Bifidobacterium breve (organism)", "SNOMED-CT", "35011006"), - - LEGIONELLA_FEELEII_ORGANISM("Legionella feeleii (organism)", "Legionella feeleii (organism)", "SNOMED-CT", "17083009"), - - PARABURKHOLDERIA_SACCHARI("Paraburkholderia sacchari", "Paraburkholderia sacchari", "SNOMED-CT", "431164003"), - - STAPHYLOCOCCUS_HAEMOLYTICUS_ORGANISM("Staphylococcus haemolyticus (organism)", "Staphylococcus haemolyticus (organism)", "SNOMED-CT", "83452006"), - - FUSOBACTERIUM_NUCLEATUM_ORGANISM("Fusobacterium nucleatum (organism)", "Fusobacterium nucleatum (organism)", "SNOMED-CT", "32763000"), - - CORYNEBACTERIUM_ACCOLENS_ORGANISM("Corynebacterium accolens (organism)", "Corynebacterium accolens (organism)", "SNOMED-CT", "243254006"), - - ACINETOBACTER_BEREZINIAE_ORGANISM("Acinetobacter bereziniae (organism)", "Acinetobacter bereziniae (organism)", "SNOMED-CT", "700398000"), - - AEROMONAS_MOLLUSCORUM_ORGANISM("Aeromonas molluscorum (organism)", "Aeromonas molluscorum (organism)", "SNOMED-CT", "425862003"), - - SALMONELLA_INDIANA("Salmonella Indiana", "Salmonella Indiana", "SNOMED-CT", "12278000"), - - GENUS_CANDIDA_ORGANISM("Genus Candida (organism)", "Genus Candida (organism)", "SNOMED-CT", "3265006"), - - STREPTOCOCCUS_DYSGALACTIAE_ORGANISM("Streptococcus dysgalactiae (organism)", "Streptococcus dysgalactiae (organism)", "SNOMED-CT", "40812000"), - - GENUS_MYROIDES_ORGANISM("Genus Myroides (organism)", "Genus Myroides (organism)", "SNOMED-CT", "115127008"), - - SALMONELLA_MONTEVIDEO("Salmonella Montevideo", "Salmonella Montevideo", "SNOMED-CT", "80268001"), - - SALMONELLA_PARATYPHI_C("Salmonella Paratyphi C", "Salmonella Paratyphi C", "SNOMED-CT", "32488009"), - - SALMONELLA_UGANDA("Salmonella Uganda", "Salmonella Uganda", "SNOMED-CT", "2434007"), - - SERRATIA_LIQUEFACIENS_ORGANISM("Serratia liquefaciens (organism)", "Serratia liquefaciens (organism)", "SNOMED-CT", "23787004"), - - ASPERGILLUS_FUMIGATUS_ORGANISM("Aspergillus fumigatus (organism)", "Aspergillus fumigatus (organism)", "SNOMED-CT", "32684000"), - - SALMONELLA_LONDON("Salmonella London", "Salmonella London", "SNOMED-CT", "2291004"), - - LEGIONELLA_PARISIENSIS_ORGANISM("Legionella parisiensis (organism)", "Legionella parisiensis (organism)", "SNOMED-CT", "38322001"), - - BURKHOLDERIA_CARIBENSIS("Burkholderia caribensis", "Burkholderia caribensis", "SNOMED-CT", "431682004"), - - PEPTOSTREPTOCOCCUS_ANAEROBIUS_ORGANISM("Peptostreptococcus anaerobius (organism)", "Peptostreptococcus anaerobius (organism)", "SNOMED-CT", "19217002"), - - MUCOID_PSEUDOMONAS_AERUGINOSA_ORGANISM("Mucoid Pseudomonas aeruginosa (organism)", "Mucoid Pseudomonas aeruginosa (organism)", "SNOMED-CT", "733537009"), - - TRICHOPHYTON_MENTAGROPHYTES_VAR_INTERDIGITALE_ORGANISM("Trichophyton mentagrophytes var. interdigitale (organism)", "Trichophyton mentagrophytes var. interdigitale (organism)", "SNOMED-CT", "76040007"), - - STREPTOCOCCUS_PNEUMONIAE_ORGANISM("Streptococcus pneumoniae (organism)", "Streptococcus pneumoniae (organism)", "SNOMED-CT", "9861002"), - - CITROBACTER_AMALONATICUS_ORGANISM("Citrobacter amalonaticus (organism)", "Citrobacter amalonaticus (organism)", "SNOMED-CT", "55744003"), - - GENUS_GEOTRICHUM_ORGANISM("Genus Geotrichum (organism)", "Genus Geotrichum (organism)", "SNOMED-CT", "34324005"), - - KLEBSIELLA_PNEUMONIAE_SS_OZAENAE_ORGANISM("Klebsiella pneumoniae ss. ozaenae (organism)", "Klebsiella pneumoniae ss. ozaenae (organism)", "SNOMED-CT", "65186004"), - - LECLERCIA_ADECARBOXYLATA_ORGANISM("Leclercia adecarboxylata (organism)", "Leclercia adecarboxylata (organism)", "SNOMED-CT", "57459006"), - - TATUMELLA_TERREA_ORGANISM("Tatumella terrea (organism)", "Tatumella terrea (organism)", "SNOMED-CT", "8301000146102"), - - SALMONELLA_ENTERICA_SUBSPECIES_DIARIZONAE("Salmonella enterica subspecies diarizonae", "Salmonella enterica subspecies diarizonae", "SNOMED-CT", "398428002"), - - GENUS_CAPNOCYTOPHAGA_ORGANISM("Genus Capnocytophaga (organism)", "Genus Capnocytophaga (organism)", "SNOMED-CT", "22294008"), - - SERRATIA_UREILYTICA_ORGANISM("Serratia ureilytica (organism)", "Serratia ureilytica (organism)", "SNOMED-CT", "450416004"), - - BURKHOLDERIA_STABILIS("Burkholderia stabilis", "Burkholderia stabilis", "SNOMED-CT", "416616001"), - - GRAM_NEGATIVE_BACILLUS_ORGANISM("Gram-negative bacillus (organism)", "Gram-negative bacillus (organism)", "SNOMED-CT", "87172008"), - - MICROBACTERIUM_FLAVESCENS_ORGANISM("Microbacterium flavescens (organism)", "Microbacterium flavescens (organism)", "SNOMED-CT", "114061003"), - - ENTEROCOCCUS_MALODORATUS_ORGANISM("Enterococcus malodoratus (organism)", "Enterococcus malodoratus (organism)", "SNOMED-CT", "10262005"), - - PROVIDENCIA_STUARTII_ORGANISM("Providencia stuartii (organism)", "Providencia stuartii (organism)", "SNOMED-CT", "1445008"), - - YERSINIA_ENTEROCOLITICA_ORGANISM("Yersinia enterocolitica (organism)", "Yersinia enterocolitica (organism)", "SNOMED-CT", "65255000"), - - SALMONELLA_BAREILLY("Salmonella Bareilly", "Salmonella Bareilly", "SNOMED-CT", "8044005"), - - BACTEROIDES_CACCAE_ORGANISM("Bacteroides caccae (organism)", "Bacteroides caccae (organism)", "SNOMED-CT", "14342006"), - - STENOTROPHOMONAS_RHIZOPHILA_ORGANISM("Stenotrophomonas rhizophila (organism)", "Stenotrophomonas rhizophila (organism)", "SNOMED-CT", "416084005"), - - GENUS_BREVUNDIMONAS_ORGANISM("Genus Brevundimonas (organism)", "Genus Brevundimonas (organism)", "SNOMED-CT", "115154006"), - - BURKHOLDERIA_CEPACIA_COMPLEX_ORGANISM("Burkholderia cepacia complex (organism)", "Burkholderia cepacia complex (organism)", "SNOMED-CT", "131281002"), - - STREPTOCOCCUS_GALLOLYTICUS_SUBSPECIES_GALLOLYTICUS_ORGANISM("Streptococcus gallolyticus subspecies gallolyticus (organism)", "Streptococcus gallolyticus subspecies gallolyticus (organism)", "SNOMED-CT", "421544007"), - - ASPERGILLUS_VERSICOLOR_ORGANISM("Aspergillus versicolor (organism)", "Aspergillus versicolor (organism)", "SNOMED-CT", "48315007"), - - SPHINGOBACTERIUM_MULTIVORUM_ORGANISM("Sphingobacterium multivorum (organism)", "Sphingobacterium multivorum (organism)", "SNOMED-CT", "51595006"), - - GRAM_POSITIVE_BACILLUS_ORGANISM("Gram-positive bacillus (organism)", "Gram-positive bacillus (organism)", "SNOMED-CT", "83514008"), - - GENUS_SHIGELLA_ORGANISM("Genus Shigella (organism)", "Genus Shigella (organism)", "SNOMED-CT", "77352002"), - - STREPTOCOCCUS_CRISTATUS_ORGANISM("Streptococcus cristatus (organism)", "Streptococcus cristatus (organism)", "SNOMED-CT", "113980005"), - - CANDIDA_GUILLIERMONDII_ORGANISM("Candida guilliermondii (organism)", "Candida guilliermondii (organism)", "SNOMED-CT", "16557001"), - - STREPTOCOCCUS_AGALACTIAE_SEROTYPE_IB_ORGANISM("Streptococcus agalactiae serotype Ib (organism)", "Streptococcus agalactiae serotype Ib (organism)", "SNOMED-CT", "698166003"), - - ACHROMOBACTER_SPANIUS_ORGANISM("Achromobacter spanius (organism)", "Achromobacter spanius (organism)", "SNOMED-CT", "413422008"), - - MYCOBACTERIUM_KANSASII_ORGANISM("Mycobacterium kansasii (organism)", "Mycobacterium kansasii (organism)", "SNOMED-CT", "1507005"), - - GENUS_RAOULTELLA_ORGANISM("Genus Raoultella (organism)", "Genus Raoultella (organism)", "SNOMED-CT", "417468005"), - - ENTEROBACTER_ASBURIAE_ORGANISM("Enterobacter asburiae (organism)", "Enterobacter asburiae (organism)", "SNOMED-CT", "33115003"), - - CORYNEBACTERIUM_AMYCOLATUM_ORGANISM("Corynebacterium amycolatum (organism)", "Corynebacterium amycolatum (organism)", "SNOMED-CT", "113611002"), - - SALMONELLA_KENTUCKY("Salmonella Kentucky", "Salmonella Kentucky", "SNOMED-CT", "8455004"), - - SALMONELLA_HADAR("Salmonella Hadar", "Salmonella Hadar", "SNOMED-CT", "49491006"), - - GEOTRICHUM_CANDIDUM_ORGANISM("Geotrichum candidum (organism)", "Geotrichum candidum (organism)", "SNOMED-CT", "41625002"), - - VAGOCOCCUS_FLUVIALIS_ORGANISM("Vagococcus fluvialis (organism)", "Vagococcus fluvialis (organism)", "SNOMED-CT", "116418005"), - - CAMPYLOBACTER_COLI("Campylobacter coli", "Campylobacter coli", "SNOMED-CT", "40614002"), - - LEGIONELLA_JORDANIS_ORGANISM("Legionella jordanis (organism)", "Legionella jordanis (organism)", "SNOMED-CT", "39739007"), - - PEPTONIPHILUS_ASACCHAROLYTICUS_ORGANISM("Peptoniphilus asaccharolyticus (organism)", "Peptoniphilus asaccharolyticus (organism)", "SNOMED-CT", "433440001"), - - SALMONELLA_TYPHIMURIUM_VAR_COPENHAGEN("Salmonella Typhimurium var. Copenhagen", "Salmonella Typhimurium var. Copenhagen", "SNOMED-CT", "370578006"), - - STAPHYLOCOCCUS_INTERMEDIUS_ORGANISM("Staphylococcus intermedius (organism)", "Staphylococcus intermedius (organism)", "SNOMED-CT", "34605002"), - - CITROBACTER_KOSERI("Citrobacter koseri", "Citrobacter koseri", "SNOMED-CT", "114264004"), - - SALMONELLA_ENTERICA_SUBSP_ARIZONAE_ORGANISM("Salmonella enterica subsp. arizonae (organism)", "Salmonella enterica subsp. arizonae (organism)", "SNOMED-CT", "397502001"), - - SALMONELLA_STANLEY("Salmonella Stanley", "Salmonella Stanley", "SNOMED-CT", "88091007"), - - LEGIONELLA_LONGBEACHAE_ORGANISM("Legionella longbeachae (organism)", "Legionella longbeachae (organism)", "SNOMED-CT", "89605004"), - - ZYGOSACCHAROMYCES_BAILII_ORGANISM("Zygosaccharomyces bailii (organism)", "Zygosaccharomyces bailii (organism)", "SNOMED-CT", "442943004"), - - ACTINOTIGNUM_SCHAALII_ORGANISM("Actinotignum schaalii (organism)", "Actinotignum schaalii (organism)", "SNOMED-CT", "716526006"), - - MOLD_ORGANISM("Mold (organism)", "Mold (organism)", "SNOMED-CT", "84489001"), - - WANGIELLA_DERMATITIDIS_ORGANISM("Wangiella dermatitidis (organism)", "Wangiella dermatitidis (organism)", "SNOMED-CT", "20586007"), - - ACINETOBACTER_GERNERI_ORGANISM("Acinetobacter gerneri (organism)", "Acinetobacter gerneri (organism)", "SNOMED-CT", "424700008"), - - ENTEROBACTER_CLOACAE_ORGANISM("Enterobacter cloacae (organism)", "Enterobacter cloacae (organism)", "SNOMED-CT", "14385002"), - - SERRATIA_PROTEAMACULANS_ORGANISM("Serratia proteamaculans (organism)", "Serratia proteamaculans (organism)", "SNOMED-CT", "116135003"), - - CHRYSEOBACTERIUM_INDOLOGENES_ORGANISM("Chryseobacterium indologenes (organism)", "Chryseobacterium indologenes (organism)", "SNOMED-CT", "113549008"), - - GAMMA_HEMOLYTIC_STREPTOCOCCUS_ORGANISM("Gamma-hemolytic streptococcus (organism)", "Gamma-hemolytic streptococcus (organism)", "SNOMED-CT", "22339002"), - - PARABACTEROIDES_DISTASONIS_ORGANISM("Parabacteroides distasonis (organism)", "Parabacteroides distasonis (organism)", "SNOMED-CT", "447512008"), - - STAPHYLOCOCCUS_HOMINIS_SUBSPECIES_HOMINIS_ORGANISM("Staphylococcus hominis subspecies hominis (organism)", "Staphylococcus hominis subspecies hominis (organism)", "SNOMED-CT", "432505008"), - - LEGIONELLA_SANTICRUCIS_ORGANISM("Legionella santicrucis (organism)", "Legionella santicrucis (organism)", "SNOMED-CT", "72814000"), - - GENUS_BACTEROIDES_ORGANISM("Genus Bacteroides (organism)", "Genus Bacteroides (organism)", "SNOMED-CT", "57522007"), - - BACILLUS_CEREUS_GROUP_ORGANISM("Bacillus cereus group (organism)", "Bacillus cereus group (organism)", "SNOMED-CT", "413618005"), - - ACINETOBACTER_BOUVETII_ORGANISM("Acinetobacter bouvetii (organism)", "Acinetobacter bouvetii (organism)", "SNOMED-CT", "424539001"), - - ACHROMOBACTER_XYLOSOXIDANS_XYLOSOXIDANS_ORGANISM("Achromobacter xylosoxidans xylosoxidans (organism)", "Achromobacter xylosoxidans xylosoxidans (organism)", "SNOMED-CT", "423897003"), - - ASPERGILLUS_SYDOWII_ORGANISM("Aspergillus sydowii (organism)", "Aspergillus sydowii (organism)", "SNOMED-CT", "46388006"), - - INQUILINUS_LIMOSUS_ORGANISM("Inquilinus limosus (organism)", "Inquilinus limosus (organism)", "SNOMED-CT", "427977006"), - - ENTEROBACTER_CANCEROGENUS("Enterobacter cancerogenus", "Enterobacter cancerogenus", "SNOMED-CT", "114451003"), - - PSEUDOMONAS_SPECIES_NOT_AERUGINOSA_ORGANISM("Pseudomonas species not aeruginosa (organism)", "Pseudomonas species not aeruginosa (organism)", "SNOMED-CT", "710336008"), - - STAPHYLOCOCCUS_SIMULANS_ORGANISM("Staphylococcus simulans (organism)", "Staphylococcus simulans (organism)", "SNOMED-CT", "52122005"), - - MORAXELLA_NONLIQUEFACIENS_ORGANISM("Moraxella nonliquefaciens (organism)", "Moraxella nonliquefaciens (organism)", "SNOMED-CT", "46455003"), - - ENTEROBACTER_AMNIGENUS_BIOGROUP_I_ORGANISM("Enterobacter amnigenus biogroup I (organism)", "Enterobacter amnigenus biogroup I (organism)", "SNOMED-CT", "114452005"), - - CLOSTRIDIUM_INNOCUUM_ORGANISM("Clostridium innocuum (organism)", "Clostridium innocuum (organism)", "SNOMED-CT", "19415008"), - - ACINETOBACTER_HAEMOLYTICUS_ORGANISM("Acinetobacter haemolyticus (organism)", "Acinetobacter haemolyticus (organism)", "SNOMED-CT", "77045006"), - - AEROCOCCUS_URINAE_ORGANISM("Aerococcus urinae (organism)", "Aerococcus urinae (organism)", "SNOMED-CT", "243230001"), - - SALMONELLA_ALTONA("Salmonella Altona", "Salmonella Altona", "SNOMED-CT", "47229009"), - - UREAPLASMA_UREALYTICUM_ORGANISM("Ureaplasma urealyticum (organism)", "Ureaplasma urealyticum (organism)", "SNOMED-CT", "12006007"), - - AEROMONAS_SALMONICIDA_SS_SALMONICIDA_ORGANISM("Aeromonas salmonicida ss. salmonicida (organism)", "Aeromonas salmonicida ss. salmonicida (organism)", "SNOMED-CT", "62520007"), - - EUBACTERIUM_LIMOSUM_ORGANISM("Eubacterium limosum (organism)", "Eubacterium limosum (organism)", "SNOMED-CT", "87632000"), - - CANDIDA_TROPICALIS_ORGANISM("Candida tropicalis (organism)", "Candida tropicalis (organism)", "SNOMED-CT", "47885008"), - - STREPTOCOCCUS_PARASANGUINIS_ORGANISM("Streptococcus parasanguinis (organism)", "Streptococcus parasanguinis (organism)", "SNOMED-CT", "113990002"), - - ASPERGILLUS_ORGANISM("Aspergillus (organism)", "Aspergillus (organism)", "SNOMED-CT", "2429008"), - - BORDETELLA_PERTUSSIS_ORGANISM("Bordetella pertussis (organism)", "Bordetella pertussis (organism)", "SNOMED-CT", "5247005"), - - SALMONELLA_PARATYPHI_B("Salmonella Paratyphi B", "Salmonella Paratyphi B", "SNOMED-CT", "85908006"), - - RAOULTELLA_ORNITHINOLYTICA_ORGANISM("Raoultella ornithinolytica (organism)", "Raoultella ornithinolytica (organism)", "SNOMED-CT", "416832000"), - - STREPTOCOCCUS_PYOGENES_ORGANISM("Streptococcus pyogenes (organism)", "Streptococcus pyogenes (organism)", "SNOMED-CT", "80166006"), - - STAPHYLOCOCCUS_AUREUS_ORGANISM("Staphylococcus aureus (organism)", "Staphylococcus aureus (organism)", "SNOMED-CT", "3092008"), - - SERRATIA_FICARIA_ORGANISM("Serratia ficaria (organism)", "Serratia ficaria (organism)", "SNOMED-CT", "802004"), - - STREPTOCOCCUS_MITIS_ORGANISM("Streptococcus mitis (organism)", "Streptococcus mitis (organism)", "SNOMED-CT", "57997003"), - - DELFTIA_ACIDOVORANS_ORGANISM("Delftia acidovorans (organism)", "Delftia acidovorans (organism)", "SNOMED-CT", "20432002"), - - SERRATIA_MARCESCENS_ORGANISM("Serratia marcescens (organism)", "Serratia marcescens (organism)", "SNOMED-CT", "33522002"), - - ENTEROCOCCUS_FAECALIS_ORGANISM("Enterococcus faecalis (organism)", "Enterococcus faecalis (organism)", "SNOMED-CT", "78065002"), - - AEROMONAS_BESTIARUM_ORGANISM("Aeromonas bestiarum (organism)", "Aeromonas bestiarum (organism)", "SNOMED-CT", "115027006"), - - ENTEROHEMORRHAGIC_ESCHERICHIA_COLI_ORGANISM("Enterohemorrhagic Escherichia coli (organism)", "Enterohemorrhagic Escherichia coli (organism)", "SNOMED-CT", "116395006"), - - SALMONELLA_DUBLIN("Salmonella Dublin", "Salmonella Dublin", "SNOMED-CT", "62136003"), - - CORYNEBACTERIUM_PROPINQUUM_ORGANISM("Corynebacterium propinquum (organism)", "Corynebacterium propinquum (organism)", "SNOMED-CT", "113612009"), - - LEGIONELLA_PNEUMOPHILA_SEROGROUP9_ORGANISM("Legionella pneumophila serogroup 9 (organism)", "Legionella pneumophila serogroup 9 (organism)", "SNOMED-CT", "103471009"), - - GENUS_ROTHIA_ORGANISM("Genus Rothia (organism)", "Genus Rothia (organism)", "SNOMED-CT", "90163001"), - - SALMONELLA_GROUP_O18_ORGANISM("Salmonella group O:18 (organism)", "Salmonella group O:18 (organism)", "SNOMED-CT", "404294002"), - - BACTEROIDES_OVATUS_ORGANISM("Bacteroides ovatus (organism)", "Bacteroides ovatus (organism)", "SNOMED-CT", "86936008"), - - STAPHYLOCOCCUS_HOMINIS_ORGANISM("Staphylococcus hominis (organism)", "Staphylococcus hominis (organism)", "SNOMED-CT", "44827007"), - - SERRATIA_FONTICOLA_ORGANISM("Serratia fonticola (organism)", "Serratia fonticola (organism)", "SNOMED-CT", "112329006"), - - NON_TOXIGENIC_CLOSTRIDIUM_DIFFICILE_ORGANISM("Non-Toxigenic Clostridium difficile (organism)", "Non-Toxigenic Clostridium difficile (organism)", "SNOMED-CT", "736051005"), - - LACTOBACILLUS_RHAMNOSUS_ORGANISM("Lactobacillus rhamnosus (organism)", "Lactobacillus rhamnosus (organism)", "SNOMED-CT", "113798001"), - - STAPHYLOCOCCUS_SAPROPHYTICUS("Staphylococcus saprophyticus", "Staphylococcus saprophyticus", "SNOMED-CT", "19743000"), - - STAPHYLOCOCCUS_EPIDERMIDIS_ORGANISM("Staphylococcus epidermidis (organism)", "Staphylococcus epidermidis (organism)", "SNOMED-CT", "60875001"), - - AEROMONAS_EUCRENOPHILIA_ORGANISM("Aeromonas eucrenophilia (organism)", "Aeromonas eucrenophilia (organism)", "SNOMED-CT", "115030004"), - - CITROBACTER_SEDLAKII("Citrobacter sedlakii", "Citrobacter sedlakii", "SNOMED-CT", "114265003"), - - ANAEROBIC_NON_SPORING_GRAM_POSITIVE_BACILLUS_ORGANISM("Anaerobic non-sporing Gram-positive bacillus (organism)", "Anaerobic non-sporing Gram-positive bacillus (organism)", "SNOMED-CT", "243399000"), - - SALMONELLA_SAINTPAUL("Salmonella Saintpaul", "Salmonella Saintpaul", "SNOMED-CT", "2820001"), - - GENUS_LACTOBACILLUS_ORGANISM("Genus Lactobacillus (organism)", "Genus Lactobacillus (organism)", "SNOMED-CT", "43690008"), - - PASTEURELLA_AEROGENES_ORGANISM("Pasteurella aerogenes (organism)", "Pasteurella aerogenes (organism)", "SNOMED-CT", "87075007"), - - ACINETOBACTER_TJERNBERGIAE_ORGANISM("Acinetobacter tjernbergiae (organism)", "Acinetobacter tjernbergiae (organism)", "SNOMED-CT", "425109008"), - - GENUS_AEROMONAS_ORGANISM("Genus Aeromonas (organism)", "Genus Aeromonas (organism)", "SNOMED-CT", "88529008"), - - ACINETOBACTER_GENOSPECIES3_ORGANISM("Acinetobacter genospecies 3 (organism)", "Acinetobacter genospecies 3 (organism)", "SNOMED-CT", "113377003"), - - GENUS_UREAPLASMA_ORGANISM("Genus Ureaplasma (organism)", "Genus Ureaplasma (organism)", "SNOMED-CT", "29680004"), - - CORYNEBACTERIUM_STRIATUM_ORGANISM("Corynebacterium striatum (organism)", "Corynebacterium striatum (organism)", "SNOMED-CT", "63815007"), - - LISTERIA_MONOCYTOGENES_ORGANISM("Listeria monocytogenes (organism)", "Listeria monocytogenes (organism)", "SNOMED-CT", "36094007"), - - CHRYSEOMONAS_LUTEOLA_ORGANISM("Chryseomonas luteola (organism)", "Chryseomonas luteola (organism)", "SNOMED-CT", "33919008"), - - ASPERGILLUS_NIGER_GROUP_ORGANISM("Aspergillus niger group (organism)", "Aspergillus niger group (organism)", "SNOMED-CT", "243494006"), - - ENTEROCOCCUS_AVIUM_ORGANISM("Enterococcus avium (organism)", "Enterococcus avium (organism)", "SNOMED-CT", "87875008"), - - LEGIONELLA_JAMESTOWNIENSIS_ORGANISM("Legionella jamestowniensis (organism)", "Legionella jamestowniensis (organism)", "SNOMED-CT", "89709001"), - - CORYNEBACTERIUM_JEIKEIUM_ORGANISM("Corynebacterium jeikeium (organism)", "Corynebacterium jeikeium (organism)", "SNOMED-CT", "63410006"), - - MORAXELLA_CATARRHALIS_ORGANISM("Moraxella catarrhalis (organism)", "Moraxella catarrhalis (organism)", "SNOMED-CT", "24226003"), - - PSEUDOMONAS_STUTZERI_ORGANISM("Pseudomonas stutzeri (organism)", "Pseudomonas stutzeri (organism)", "SNOMED-CT", "58024003"), - - HAEMOPHILUS_INFLUENZAE_ORGANISM("Haemophilus influenzae (organism)", "Haemophilus influenzae (organism)", "SNOMED-CT", "44470000"), - - BACTEROIDES_UNIFORMIS_ORGANISM("Bacteroides uniformis (organism)", "Bacteroides uniformis (organism)", "SNOMED-CT", "59604009"), - - SALMONELLA_KIAMBU("Salmonella Kiambu", "Salmonella Kiambu", "SNOMED-CT", "11901002"), - - MYCOBACTERIUM_AVIUM_ORGANISM("Mycobacterium avium (organism)", "Mycobacterium avium (organism)", "SNOMED-CT", "83723009"), - - ACINETOBACTER_VARIABILIS_ORGANISM("Acinetobacter variabilis (organism)", "Acinetobacter variabilis (organism)", "SNOMED-CT", "113384006"), - - SALMONELLA_KUMASI("Salmonella Kumasi", "Salmonella Kumasi", "SNOMED-CT", "58946009"), - - SALMONELLA_MIKAWASIMA("Salmonella Mikawasima", "Salmonella Mikawasima", "SNOMED-CT", "42709001"), - - STAPHYLOCOCCUS_ARGENTEUS_ORGANISM("Staphylococcus argenteus (organism)", "Staphylococcus argenteus (organism)", "SNOMED-CT", "782316009"), - - AEROMONAS_TROTA_ORGANISM("Aeromonas trota (organism)", "Aeromonas trota (organism)", "SNOMED-CT", "243316008"), - - ACHROMOBACTER_INSOLITUS_ORGANISM("Achromobacter insolitus (organism)", "Achromobacter insolitus (organism)", "SNOMED-CT", "413417008"), - - PREVOTELLA_DENTICOLA_ORGANISM("Prevotella denticola (organism)", "Prevotella denticola (organism)", "SNOMED-CT", "114138003"), - - KLEBSIELLA_PNEUMONIAE_ORGANISM("Klebsiella pneumoniae (organism)", "Klebsiella pneumoniae (organism)", "SNOMED-CT", "56415008"), - - STAPHYLOCOCCUS_COAGULASE_NEGATIVE_ORGANISM("Staphylococcus, coagulase negative (organism)", "Staphylococcus, coagulase negative (organism)", "SNOMED-CT", "116197008"), - - SALMONELLA_CORVALLIS("Salmonella Corvallis", "Salmonella Corvallis", "SNOMED-CT", "45548005"), - - CANDIDA_NORVEGENSIS_ORGANISM("Candida norvegensis (organism)", "Candida norvegensis (organism)", "SNOMED-CT", "243458007"), - - STREPTOCOCCUS_SALIVARIUS_SUBSPECIES_THERMOPHILUS_ORGANISM("Streptococcus salivarius subspecies thermophilus (organism)", "Streptococcus salivarius subspecies thermophilus (organism)", "SNOMED-CT", "23310006"), - - STREPTOCOCCUS_ANGINOSUS_ORGANISM("Streptococcus anginosus (organism)", "Streptococcus anginosus (organism)", "SNOMED-CT", "44304009"), - - GENUS_SERRATIA_ORGANISM("Genus Serratia (organism)", "Genus Serratia (organism)", "SNOMED-CT", "42025004"), - - BURKHOLDERIA_THAILANDENSIS_ORGANISM("Burkholderia thailandensis (organism)", "Burkholderia thailandensis (organism)", "SNOMED-CT", "113678002"), - - STREPTOCOCCUS_SALIVARIUS_ORGANISM("Streptococcus salivarius (organism)", "Streptococcus salivarius (organism)", "SNOMED-CT", "39888004"), - - BACTEROIDES_STERCORIS_ORGANISM("Bacteroides stercoris (organism)", "Bacteroides stercoris (organism)", "SNOMED-CT", "163009"), - - SALMONELLA_BRAENDERUP("Salmonella Braenderup", "Salmonella Braenderup", "SNOMED-CT", "35225001"), - - ESCHERICHIA_COLI_SEROGROUP_O157_ORGANISM("Escherichia coli serogroup O157 (organism)", "Escherichia coli serogroup O157 (organism)", "SNOMED-CT", "407166006"), - - ANAEROBIC_GRAM_POSITIVE_COCCUS_ORGANISM("Anaerobic Gram-positive coccus (organism)", "Anaerobic Gram-positive coccus (organism)", "SNOMED-CT", "243416009"), - - PROVIDENCIA_ALCALIFACIENS_ORGANISM("Providencia alcalifaciens (organism)", "Providencia alcalifaciens (organism)", "SNOMED-CT", "46349009"), - - SALMONELLA_BLOCKLEY("Salmonella Blockley", "Salmonella Blockley", "SNOMED-CT", "53684004"), - - CANDIDA_KRUSEI_ORGANISM("Candida krusei (organism)", "Candida krusei (organism)", "SNOMED-CT", "76995003"), - - ELIZABETHKINGIA_MENINGOSEPTICA_ORGANISM("Elizabethkingia meningoseptica (organism)", "Elizabethkingia meningoseptica (organism)", "SNOMED-CT", "425774009"), - - ABIOTROPHIA_DEFECTIVA_ORGANISM("Abiotrophia defectiva (organism)", "Abiotrophia defectiva (organism)", "SNOMED-CT", "113714003"), - - MORGANELLA_MORGANII_SUBSP_MORGANII_ORGANISM("Morganella morganii subsp morganii (organism)", "Morganella morganii subsp morganii (organism)", "SNOMED-CT", "243302003"), - - SHIGELLA_DYSENTERIAE_ORGANISM("Shigella dysenteriae (organism)", "Shigella dysenteriae (organism)", "SNOMED-CT", "43612004"), - - LEGIONELLA_WADSWORTHII_ORGANISM("Legionella wadsworthii (organism)", "Legionella wadsworthii (organism)", "SNOMED-CT", "8147000"), - - CANDIDA_INCONSPICUA_ORGANISM("Candida inconspicua (organism)", "Candida inconspicua (organism)", "SNOMED-CT", "283871001"), - - ACINETOBACTER_RADIORESISTENS_ORGANISM("Acinetobacter radioresistens (organism)", "Acinetobacter radioresistens (organism)", "SNOMED-CT", "113381003"), - - CORYNEBACTERIUM_DIPHTHERIAE_ORGANISM("Corynebacterium diphtheriae (organism)", "Corynebacterium diphtheriae (organism)", "SNOMED-CT", "5851001"), - - BACTEROIDES_FRAGILIS_GROUP_ORGANISM("Bacteroides fragilis group (organism)", "Bacteroides fragilis group (organism)", "SNOMED-CT", "417375007"), - - LEGIONELLA_MICDADEI_ORGANISM("Legionella micdadei (organism)", "Legionella micdadei (organism)", "SNOMED-CT", "116380009"), - - GENUS_NOCARDIA_ORGANISM("Genus Nocardia (organism)", "Genus Nocardia (organism)", "SNOMED-CT", "59674005"), - - ENTEROBACTER_CLOACAE_COMPLEX_ORGANISM("Enterobacter cloacae complex (organism)", "Enterobacter cloacae complex (organism)", "SNOMED-CT", "414102007"), - - LEGIONELLA_PNEUMOPHILA_SEROGROUP8_ORGANISM("Legionella pneumophila serogroup 8 (organism)", "Legionella pneumophila serogroup 8 (organism)", "SNOMED-CT", "103470005"), - - FUSOBACTERIUM_NECROPHORUM_ORGANISM("Fusobacterium necrophorum (organism)", "Fusobacterium necrophorum (organism)", "SNOMED-CT", "27274008"), - - HAEMOPHILUS_INFLUENZAE_TYPE_B_ORGANISM("Haemophilus influenzae type b (organism)", "Haemophilus influenzae type b (organism)", "SNOMED-CT", "103442008"), - - AEROMONAS_SCHUBERTII_ORGANISM("Aeromonas schubertii (organism)", "Aeromonas schubertii (organism)", "SNOMED-CT", "115039003"), - - PARVIMONAS_MICRA_ORGANISM("Parvimonas micra (organism)", "Parvimonas micra (organism)", "SNOMED-CT", "434293007"), - - ASPERGILLUS_TERREUS_GROUP_ORGANISM("Aspergillus terreus group (organism)", "Aspergillus terreus group (organism)", "SNOMED-CT", "243500005"), - - LEGIONELLA_MORAVICA_ORGANISM("Legionella moravica (organism)", "Legionella moravica (organism)", "SNOMED-CT", "103454008"), - - AEROMONAS_SIMIAE_ORGANISM("Aeromonas simiae (organism)", "Aeromonas simiae (organism)", "SNOMED-CT", "426333004"), - - AEROMONAS_MEDIA_ORGANISM("Aeromonas media (organism)", "Aeromonas media (organism)", "SNOMED-CT", "65192005"), - - LEGIONELLA_ANISA_ORGANISM("Legionella anisa (organism)", "Legionella anisa (organism)", "SNOMED-CT", "18214000"), - - LACTOBACILLUS_FERMENTUM_ORGANISM("Lactobacillus fermentum (organism)", "Lactobacillus fermentum (organism)", "SNOMED-CT", "65506008"), - - SALMONELLA_SENFTENBERG("Salmonella Senftenberg", "Salmonella Senftenberg", "SNOMED-CT", "18163008"), - - GENUS_ENTEROCOCCUS_ORGANISM("Genus Enterococcus (organism)", "Genus Enterococcus (organism)", "SNOMED-CT", "2785000"), - - ROTHIA_MUCILAGINOSA_ORGANISM("Rothia mucilaginosa (organism)", "Rothia mucilaginosa (organism)", "SNOMED-CT", "416544005"), - - ENTEROCOCCUS_DURANS_ORGANISM("Enterococcus durans (organism)", "Enterococcus durans (organism)", "SNOMED-CT", "46464008"), - - STREPTOCOCCUS_CANIS_ORGANISM("Streptococcus canis (organism)", "Streptococcus canis (organism)", "SNOMED-CT", "88231003"), - - SERRATIA_ODORIFERA_ORGANISM("Serratia odorifera (organism)", "Serratia odorifera (organism)", "SNOMED-CT", "10413007"), - - ENTEROCOCCUS_HIRAE_ORGANISM("Enterococcus hirae (organism)", "Enterococcus hirae (organism)", "SNOMED-CT", "73852008"), - - SALMONELLA_APAPA("Salmonella Apapa", "Salmonella Apapa", "SNOMED-CT", "46399008"), - - SALMONELLA_INFANTIS("Salmonella Infantis", "Salmonella Infantis", "SNOMED-CT", "82071007"), - - GENUS_STAPHYLOCOCCUS_ORGANISM("Genus Staphylococcus (organism)", "Genus Staphylococcus (organism)", "SNOMED-CT", "65119002"), - - GENUS_KLEBSIELLA_ORGANISM("Genus Klebsiella (organism)", "Genus Klebsiella (organism)", "SNOMED-CT", "75032006"), - - ACINETOBACTER_PITTII_ORGANISM("Acinetobacter pittii (organism)", "Acinetobacter pittii (organism)", "SNOMED-CT", "698244000"), - - BACILLUS_MEGATERIUM_ORGANISM("Bacillus megaterium (organism)", "Bacillus megaterium (organism)", "SNOMED-CT", "79109002"), - - ACHROMOBACTER_PIECHAUDII_ORGANISM("Achromobacter piechaudii (organism)", "Achromobacter piechaudii (organism)", "SNOMED-CT", "413420000"), - - PREVOTELLA_BERGENSIS_ORGANISM("Prevotella bergensis (organism)", "Prevotella bergensis (organism)", "SNOMED-CT", "708941000"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - ErregernameDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java deleted file mode 100644 index 6c64a33d7..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class ErregertypisierungArtDerTypisierungElement { - @Path("/value|defining_code") - private ArtDerTypisierungDefiningCode value; - - public void setValue(ArtDerTypisierungDefiningCode value) { - this.value = value; - } - - public ArtDerTypisierungDefiningCode getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java deleted file mode 100644 index c78413728..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.molekulare_typisierung.v0") -public class ErregertypisierungCluster { - @Path("/items[at0001]") - private List artDerTypisierung; - - @Path("/items[at0008]") - private List ergebnis; - - @Path("/items[at0009]/value|value") - private String bewertungValue; - - @Path("/items[at0002]/value|value") - private String kommentarValue; - - public void setArtDerTypisierung( - List artDerTypisierung) { - this.artDerTypisierung = artDerTypisierung; - } - - public List getArtDerTypisierung() { - return this.artDerTypisierung ; - } - - public void setErgebnis(List ergebnis) { - this.ergebnis = ergebnis; - } - - public List getErgebnis() { - return this.ergebnis ; - } - - public void setBewertungValue(String bewertungValue) { - this.bewertungValue = bewertungValue; - } - - public String getBewertungValue() { - return this.bewertungValue ; - } - - public void setKommentarValue(String kommentarValue) { - this.kommentarValue = kommentarValue; - } - - public String getKommentarValue() { - return this.kommentarValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungClusterContainment.java deleted file mode 100644 index 8b62923a3..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungClusterContainment.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class ErregertypisierungClusterContainment extends Containment { - public SelectAqlField ERREGERTYPISIERUNG_CLUSTER = new AqlFieldImp(ErregertypisierungCluster.class, "", "ErregertypisierungCluster", ErregertypisierungCluster.class, this); - - public ListSelectAqlField ART_DER_TYPISIERUNG = new ListAqlFieldImp(ErregertypisierungCluster.class, "/items[at0001]", "artDerTypisierung", ErregertypisierungArtDerTypisierungElement.class, this); - - public ListSelectAqlField ERGEBNIS = new ListAqlFieldImp(ErregertypisierungCluster.class, "/items[at0008]", "ergebnis", ErregertypisierungErgebnisElement.class, this); - - public SelectAqlField BEWERTUNG_VALUE = new AqlFieldImp(ErregertypisierungCluster.class, "/items[at0009]/value|value", "bewertungValue", String.class, this); - - public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ErregertypisierungCluster.class, "/items[at0002]/value|value", "kommentarValue", String.class, this); - - private ErregertypisierungClusterContainment() { - super("openEHR-EHR-CLUSTER.molekulare_typisierung.v0"); - } - - public static ErregertypisierungClusterContainment getInstance() { - return new ErregertypisierungClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java deleted file mode 100644 index 7b8e76802..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import com.nedap.archie.rm.datavalues.encapsulated.DvMultimedia; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class ErregertypisierungErgebnisElement { - @Path("/value") - private DvMultimedia value; - - public void setValue(DvMultimedia value) { - this.value = value; - } - - public DvMultimedia getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java deleted file mode 100644 index 5445e4645..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class EventsummaryBeteiligtePersonenCluster { - @Path("/items[at0011]/value|value") - private String artDerPersonValue; - - @Path("/items[at0010]") - private List idDerPerson; - - public void setArtDerPersonValue(String artDerPersonValue) { - this.artDerPersonValue = artDerPersonValue; - } - - public String getArtDerPersonValue() { - return this.artDerPersonValue ; - } - - public void setIdDerPerson(List idDerPerson) { - this.idDerPerson = idDerPerson; - } - - public List getIdDerPerson() { - return this.idDerPerson ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java deleted file mode 100644 index ca4c70342..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.eventsummary.v0") -public class EventsummaryCluster { - @Path("/items[at0001 and name/value='Fallidentifikation']/value|value") - private String fallidentifikationValue; - - @Path("/items[at0002 and name/value='Fall-Art']/value|value") - private String fallArtValue; - - @Path("/items[at0007]") - private List beteiligtePersonen; - - @Path("/items[at0004 and name/value='Fall-Kategorie']/value|value") - private String fallKategorieValue; - - @Path("/items[at0006]/value|value") - private String kommentarValue; - - public void setFallidentifikationValue(String fallidentifikationValue) { - this.fallidentifikationValue = fallidentifikationValue; - } - - public String getFallidentifikationValue() { - return this.fallidentifikationValue ; - } - - public void setFallArtValue(String fallArtValue) { - this.fallArtValue = fallArtValue; - } - - public String getFallArtValue() { - return this.fallArtValue ; - } - - public void setBeteiligtePersonen( - List beteiligtePersonen) { - this.beteiligtePersonen = beteiligtePersonen; - } - - public List getBeteiligtePersonen() { - return this.beteiligtePersonen ; - } - - public void setFallKategorieValue(String fallKategorieValue) { - this.fallKategorieValue = fallKategorieValue; - } - - public String getFallKategorieValue() { - return this.fallKategorieValue ; - } - - public void setKommentarValue(String kommentarValue) { - this.kommentarValue = kommentarValue; - } - - public String getKommentarValue() { - return this.kommentarValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryClusterContainment.java deleted file mode 100644 index 952e87af9..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryClusterContainment.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class EventsummaryClusterContainment extends Containment { - public SelectAqlField EVENTSUMMARY_CLUSTER = new AqlFieldImp(EventsummaryCluster.class, "", "EventsummaryCluster", EventsummaryCluster.class, this); - - public SelectAqlField FALLIDENTIFIKATION_VALUE = new AqlFieldImp(EventsummaryCluster.class, "/items[at0001]/value|value", "fallidentifikationValue", String.class, this); - - public SelectAqlField FALL_ART_VALUE = new AqlFieldImp(EventsummaryCluster.class, "/items[at0002]/value|value", "fallArtValue", String.class, this); - - public ListSelectAqlField BETEILIGTE_PERSONEN = new ListAqlFieldImp(EventsummaryCluster.class, "/items[at0007]", "beteiligtePersonen", EventsummaryBeteiligtePersonenCluster.class, this); - - public SelectAqlField FALL_KATEGORIE_VALUE = new AqlFieldImp(EventsummaryCluster.class, "/items[at0004]/value|value", "fallKategorieValue", String.class, this); - - public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(EventsummaryCluster.class, "/items[at0006]/value|value", "kommentarValue", String.class, this); - - private EventsummaryClusterContainment() { - super("openEHR-EHR-CLUSTER.eventsummary.v0"); - } - - public static EventsummaryClusterContainment getInstance() { - return new EventsummaryClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java deleted file mode 100644 index 5e5d43887..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import org.ehrbase.client.annotations.Choice; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class EventsummaryIdDerPersonElement { - @Path("/value") - @Choice - private EventsummaryValueChoice value; - - public void setValue(EventsummaryValueChoice value) { - this.value = value; - } - - public EventsummaryValueChoice getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueChoice.java deleted file mode 100644 index e4db29d47..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -public interface EventsummaryValueChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java deleted file mode 100644 index 8caf0e5b8..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import com.nedap.archie.rm.datavalues.DvIdentifier; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_IDENTIFIER") -public class EventsummaryValueDvIdentifier implements EventsummaryValueChoice { - @Path("") - private DvIdentifier value; - - public void setValue(DvIdentifier value) { - this.value = value; - } - - public DvIdentifier getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java deleted file mode 100644 index ae6e20aa2..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import java.net.URI; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_URI") -public class EventsummaryValueDvUri implements EventsummaryValueChoice { - @Path("|value") - private URI valueValue; - - public void setValueValue(URI valueValue) { - this.valueValue = valueValue; - } - - public URI getValueValue() { - return this.valueValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java deleted file mode 100644 index e60df6216..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.Double; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") -public class LaboranalytResultatCluster { - @Path("/items[at0024 and name/value='Antibiotikum']/value|defining_code") - private AntibiotikumDefiningCode antibiotikumDefiningCode; - - @Path("/items[at0001 and name/value='Minimale Hemmkonzentration']/value|magnitude") - private Double minimaleHemmkonzentrationMagnitude; - - @Path("/items[at0001 and name/value='Minimale Hemmkonzentration']/value|units") - private String minimaleHemmkonzentrationUnits; - - @Path("/items[at0014]") - private List analyseergebnisDetails; - - @Path("/items[at0004 and name/value='Resistenz']/value|value") - private String resistenzValue; - - @Path("/items[at0003]/value|value") - private String kommentarValue; - - public void setAntibiotikumDefiningCode(AntibiotikumDefiningCode antibiotikumDefiningCode) { - this.antibiotikumDefiningCode = antibiotikumDefiningCode; - } - - public AntibiotikumDefiningCode getAntibiotikumDefiningCode() { - return this.antibiotikumDefiningCode ; - } - - public void setMinimaleHemmkonzentrationMagnitude(Double minimaleHemmkonzentrationMagnitude) { - this.minimaleHemmkonzentrationMagnitude = minimaleHemmkonzentrationMagnitude; - } - - public Double getMinimaleHemmkonzentrationMagnitude() { - return this.minimaleHemmkonzentrationMagnitude ; - } - - public void setMinimaleHemmkonzentrationUnits(String minimaleHemmkonzentrationUnits) { - this.minimaleHemmkonzentrationUnits = minimaleHemmkonzentrationUnits; - } - - public String getMinimaleHemmkonzentrationUnits() { - return this.minimaleHemmkonzentrationUnits ; - } - - public void setAnalyseergebnisDetails(List analyseergebnisDetails) { - this.analyseergebnisDetails = analyseergebnisDetails; - } - - public List getAnalyseergebnisDetails() { - return this.analyseergebnisDetails ; - } - - public void setResistenzValue(String resistenzValue) { - this.resistenzValue = resistenzValue; - } - - public String getResistenzValue() { - return this.resistenzValue ; - } - - public void setKommentarValue(String kommentarValue) { - this.kommentarValue = kommentarValue; - } - - public String getKommentarValue() { - return this.kommentarValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatClusterContainment.java deleted file mode 100644 index 9321467ee..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatClusterContainment.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.Double; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class LaboranalytResultatClusterContainment extends Containment { - public SelectAqlField LABORANALYT_RESULTAT_CLUSTER = new AqlFieldImp(LaboranalytResultatCluster.class, "", "LaboranalytResultatCluster", LaboranalytResultatCluster.class, this); - - public SelectAqlField ANTIBIOTIKUM_DEFINING_CODE = new AqlFieldImp(LaboranalytResultatCluster.class, "/items[at0024]/value|defining_code", "antibiotikumDefiningCode", AntibiotikumDefiningCode.class, this); - - public SelectAqlField MINIMALE_HEMMKONZENTRATION_MAGNITUDE = new AqlFieldImp(LaboranalytResultatCluster.class, "/items[at0001]/value|magnitude", "minimaleHemmkonzentrationMagnitude", Double.class, this); - - public SelectAqlField MINIMALE_HEMMKONZENTRATION_UNITS = new AqlFieldImp(LaboranalytResultatCluster.class, "/items[at0001]/value|units", "minimaleHemmkonzentrationUnits", String.class, this); - - public ListSelectAqlField ANALYSEERGEBNIS_DETAILS = new ListAqlFieldImp(LaboranalytResultatCluster.class, "/items[at0014]", "analyseergebnisDetails", Cluster.class, this); - - public SelectAqlField RESISTENZ_VALUE = new AqlFieldImp(LaboranalytResultatCluster.class, "/items[at0004]/value|value", "resistenzValue", String.class, this); - - public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(LaboranalytResultatCluster.class, "/items[at0003]/value|value", "kommentarValue", String.class, this); - - private LaboranalytResultatClusterContainment() { - super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); - } - - public static LaboranalytResultatClusterContainment getInstance() { - return new LaboranalytResultatClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/MreKlasseDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/MreKlasseDefiningcode.java deleted file mode 100644 index a4ba03366..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/MreKlasseDefiningcode.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum MreKlasseDefiningCode implements EnumValueSet { - N3MRGN("3MRGN", "Multiresistente Gramnegative Bakterien (Resistenz gegen 3 der 4 Antibiotikagruppen)", "local", "at0065"), - - N2MRGN("2MRGN", "Multiresistente Gramnegative Bakterien (Resistenz gegen 2 der 4 Antibiotikagruppen)", "local", "at0048"), - - VRE("VRE", "Vancomycin-resistente Enterokokken", "local", "at0055"), - - MRSA("MRSA", "Methicillin-resistenter Staphylococcus aureus (und CA- community-acquired, LA – lifestock acquired, HA – hospital acquired)", "local", "at0019"), - - LVRE("LVRE", "Linezolid-Vancomycin-resistenter Enterokokken", "local", "at0056"), - - N4MRGN("4MRGN", "Multiresistente Gramnegative Bakterien (Resistenz gegen 4 der 4 Antibiotikagruppen)", "local", "at0066"), - - LRE("LRE", "Linezolid-resistente Enterokokken", "local", "at0067"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - MreKlasseDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java deleted file mode 100644 index a3a5bb9b4..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import java.lang.Long; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class SmicsErgebnisAnzahlDerErregernachweiseElement { - @Path("/value|magnitude") - private Long value; - - public void setValue(Long value) { - this.value = value; - } - - public Long getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java deleted file mode 100644 index 1f27a1768..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java +++ /dev/null @@ -1,251 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Boolean; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalAmount; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.smics_befund.v1") -public class SmicsErgebnisObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|defining_code") - private SmicsErgebniskategorieDefiningCode smicsErgebniskategorieDefiningCode; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value") - private Boolean multispeziesValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value|value") - private TemporalAccessor beginnValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|value") - private TemporalAccessor beginnDerUntersuchungValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|value") - private TemporalAccessor endeValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0009]/value|value") - private TemporalAmount dauerValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.location.v1]") - private List standort; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|value") - private String baumKommentarValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0014]/value|value") - private String ubertragungswegValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0013]/value|value") - private String transmissionswegValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0038]/value|value") - private String artDerUbertragungKommentarValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0016]/value|defining_code") - private ErregernameDefiningCode erregernameDefiningCode; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0037]") - private List anzahlDerErregernachweise; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[openEHR-EHR-CLUSTER.erregerdetails.v1]") - private ErregerdetailsCluster erregerdetails; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[openEHR-EHR-CLUSTER.molekulare_typisierung.v0 and name/value='Erregertypisierung']") - private ErregertypisierungCluster erregertypisierung; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0021]/value|value") - private TemporalAccessor zeitpunktDesErstenErregernachweisesValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0020]/value|value") - private TemporalAccessor zeitpunktDesLetztenErregernachweisesValue; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setSmicsErgebniskategorieDefiningCode( - SmicsErgebniskategorieDefiningCode smicsErgebniskategorieDefiningCode) { - this.smicsErgebniskategorieDefiningCode = smicsErgebniskategorieDefiningCode; - } - - public SmicsErgebniskategorieDefiningCode getSmicsErgebniskategorieDefiningCode() { - return this.smicsErgebniskategorieDefiningCode ; - } - - public void setMultispeziesValue(Boolean multispeziesValue) { - this.multispeziesValue = multispeziesValue; - } - - public Boolean isMultispeziesValue() { - return this.multispeziesValue ; - } - - public void setBeginnValue(TemporalAccessor beginnValue) { - this.beginnValue = beginnValue; - } - - public TemporalAccessor getBeginnValue() { - return this.beginnValue ; - } - - public void setBeginnDerUntersuchungValue(TemporalAccessor beginnDerUntersuchungValue) { - this.beginnDerUntersuchungValue = beginnDerUntersuchungValue; - } - - public TemporalAccessor getBeginnDerUntersuchungValue() { - return this.beginnDerUntersuchungValue ; - } - - public void setEndeValue(TemporalAccessor endeValue) { - this.endeValue = endeValue; - } - - public TemporalAccessor getEndeValue() { - return this.endeValue ; - } - - public void setDauerValue(TemporalAmount dauerValue) { - this.dauerValue = dauerValue; - } - - public TemporalAmount getDauerValue() { - return this.dauerValue ; - } - - public void setStandort(List standort) { - this.standort = standort; - } - - public List getStandort() { - return this.standort ; - } - - public void setBaumKommentarValue(String baumKommentarValue) { - this.baumKommentarValue = baumKommentarValue; - } - - public String getBaumKommentarValue() { - return this.baumKommentarValue ; - } - - public void setUbertragungswegValue(String ubertragungswegValue) { - this.ubertragungswegValue = ubertragungswegValue; - } - - public String getUbertragungswegValue() { - return this.ubertragungswegValue ; - } - - public void setTransmissionswegValue(String transmissionswegValue) { - this.transmissionswegValue = transmissionswegValue; - } - - public String getTransmissionswegValue() { - return this.transmissionswegValue ; - } - - public void setArtDerUbertragungKommentarValue(String artDerUbertragungKommentarValue) { - this.artDerUbertragungKommentarValue = artDerUbertragungKommentarValue; - } - - public String getArtDerUbertragungKommentarValue() { - return this.artDerUbertragungKommentarValue ; - } - - public void setErregernameDefiningCode(ErregernameDefiningCode erregernameDefiningCode) { - this.erregernameDefiningCode = erregernameDefiningCode; - } - - public ErregernameDefiningCode getErregernameDefiningCode() { - return this.erregernameDefiningCode ; - } - - public void setAnzahlDerErregernachweise( - List anzahlDerErregernachweise) { - this.anzahlDerErregernachweise = anzahlDerErregernachweise; - } - - public List getAnzahlDerErregernachweise() { - return this.anzahlDerErregernachweise ; - } - - public void setErregerdetails(ErregerdetailsCluster erregerdetails) { - this.erregerdetails = erregerdetails; - } - - public ErregerdetailsCluster getErregerdetails() { - return this.erregerdetails ; - } - - public void setErregertypisierung(ErregertypisierungCluster erregertypisierung) { - this.erregertypisierung = erregertypisierung; - } - - public ErregertypisierungCluster getErregertypisierung() { - return this.erregertypisierung ; - } - - public void setZeitpunktDesErstenErregernachweisesValue( - TemporalAccessor zeitpunktDesErstenErregernachweisesValue) { - this.zeitpunktDesErstenErregernachweisesValue = zeitpunktDesErstenErregernachweisesValue; - } - - public TemporalAccessor getZeitpunktDesErstenErregernachweisesValue() { - return this.zeitpunktDesErstenErregernachweisesValue ; - } - - public void setZeitpunktDesLetztenErregernachweisesValue( - TemporalAccessor zeitpunktDesLetztenErregernachweisesValue) { - this.zeitpunktDesLetztenErregernachweisesValue = zeitpunktDesLetztenErregernachweisesValue; - } - - public TemporalAccessor getZeitpunktDesLetztenErregernachweisesValue() { - return this.zeitpunktDesLetztenErregernachweisesValue ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservationContainment.java deleted file mode 100644 index e563259ff..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservationContainment.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Boolean; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalAmount; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class SmicsErgebnisObservationContainment extends Containment { - public SelectAqlField SMICS_ERGEBNIS_OBSERVATION = new AqlFieldImp(SmicsErgebnisObservation.class, "", "SmicsErgebnisObservation", SmicsErgebnisObservation.class, this); - - public SelectAqlField SMICS_ERGEBNISKATEGORIE_DEFINING_CODE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|defining_code", "smicsErgebniskategorieDefiningCode", SmicsErgebniskategorieDefiningCode.class, this); - - public SelectAqlField MULTISPEZIES_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value", "multispeziesValue", Boolean.class, this); - - public SelectAqlField BEGINN_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value|value", "beginnValue", TemporalAccessor.class, this); - - public SelectAqlField BEGINN_DER_UNTERSUCHUNG_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|value", "beginnDerUntersuchungValue", TemporalAccessor.class, this); - - public SelectAqlField ENDE_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|value", "endeValue", TemporalAccessor.class, this); - - public SelectAqlField DAUER_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0009]/value|value", "dauerValue", TemporalAmount.class, this); - - public ListSelectAqlField STANDORT = new ListAqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.location.v1]", "standort", StandortCluster.class, this); - - public SelectAqlField BAUM_KOMMENTAR_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|value", "baumKommentarValue", String.class, this); - - public SelectAqlField UBERTRAGUNGSWEG_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0014]/value|value", "ubertragungswegValue", String.class, this); - - public SelectAqlField TRANSMISSIONSWEG_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0013]/value|value", "transmissionswegValue", String.class, this); - - public SelectAqlField ART_DER_UBERTRAGUNG_KOMMENTAR_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0038]/value|value", "artDerUbertragungKommentarValue", String.class, this); - - public SelectAqlField ERREGERNAME_DEFINING_CODE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0016]/value|defining_code", "erregernameDefiningCode", ErregernameDefiningCode.class, this); - - public ListSelectAqlField ANZAHL_DER_ERREGERNACHWEISE = new ListAqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0037]", "anzahlDerErregernachweise", SmicsErgebnisAnzahlDerErregernachweiseElement.class, this); - - public SelectAqlField ERREGERDETAILS = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[openEHR-EHR-CLUSTER.erregerdetails.v1]", "erregerdetails", ErregerdetailsCluster.class, this); - - public SelectAqlField ERREGERTYPISIERUNG = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[openEHR-EHR-CLUSTER.molekulare_typisierung.v0]", "erregertypisierung", ErregertypisierungCluster.class, this); - - public SelectAqlField ZEITPUNKT_DES_ERSTEN_ERREGERNACHWEISES_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0021]/value|value", "zeitpunktDesErstenErregernachweisesValue", TemporalAccessor.class, this); - - public SelectAqlField ZEITPUNKT_DES_LETZTEN_ERREGERNACHWEISES_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0020]/value|value", "zeitpunktDesLetztenErregernachweisesValue", TemporalAccessor.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(SmicsErgebnisObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(SmicsErgebnisObservation.class, "/language", "language", Language.class, this); - - private SmicsErgebnisObservationContainment() { - super("openEHR-EHR-OBSERVATION.smics_befund.v1"); - } - - public static SmicsErgebnisObservationContainment getInstance() { - return new SmicsErgebnisObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebniskategorieDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebniskategorieDefiningcode.java deleted file mode 100644 index d6754c74c..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebniskategorieDefiningcode.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum SmicsErgebniskategorieDefiningCode implements EnumValueSet { - ANDERE("Andere", "*", "local", "at0028"), - - HAUFUNG("Häufung", "*", "local", "at0026"), - - AUSBRUCH("Ausbruch", "*", "local", "at0027"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - SmicsErgebniskategorieDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java deleted file mode 100644 index 5aaa3e5bb..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.location.v1") -public class StandortCluster { - @Path("/items[at0040]/value|value") - private String standorttypValue; - - @Path("/items[at0046]/value|value") - private String standortbeschreibungValue; - - @Path("/items[at0048]/value|value") - private String standortschlusselValue; - - @Path("/items[at0027]/value|value") - private String stationValue; - - @Path("/items[at0029]/value|value") - private String zimmerValue; - - @Path("/items[at0047]") - private List details; - - public void setStandorttypValue(String standorttypValue) { - this.standorttypValue = standorttypValue; - } - - public String getStandorttypValue() { - return this.standorttypValue ; - } - - public void setStandortbeschreibungValue(String standortbeschreibungValue) { - this.standortbeschreibungValue = standortbeschreibungValue; - } - - public String getStandortbeschreibungValue() { - return this.standortbeschreibungValue ; - } - - public void setStandortschlusselValue(String standortschlusselValue) { - this.standortschlusselValue = standortschlusselValue; - } - - public String getStandortschlusselValue() { - return this.standortschlusselValue ; - } - - public void setStationValue(String stationValue) { - this.stationValue = stationValue; - } - - public String getStationValue() { - return this.stationValue ; - } - - public void setZimmerValue(String zimmerValue) { - this.zimmerValue = zimmerValue; - } - - public String getZimmerValue() { - return this.zimmerValue ; - } - - public void setDetails(List details) { - this.details = details; - } - - public List getDetails() { - return this.details ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortClusterContainment.java deleted file mode 100644 index 8e8f17e87..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortClusterContainment.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class StandortClusterContainment extends Containment { - public SelectAqlField STANDORT_CLUSTER = new AqlFieldImp(StandortCluster.class, "", "StandortCluster", StandortCluster.class, this); - - public SelectAqlField STANDORTTYP_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0040]/value|value", "standorttypValue", String.class, this); - - public SelectAqlField STANDORTBESCHREIBUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0046]/value|value", "standortbeschreibungValue", String.class, this); - - public SelectAqlField STANDORTSCHLUSSEL_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0048]/value|value", "standortschlusselValue", String.class, this); - - public SelectAqlField STATION_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0027]/value|value", "stationValue", String.class, this); - - public SelectAqlField ZIMMER_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0029]/value|value", "zimmerValue", String.class, this); - - public ListSelectAqlField DETAILS = new ListAqlFieldImp(StandortCluster.class, "/items[at0047]", "details", Cluster.class, this); - - private StandortClusterContainment() { - super("openEHR-EHR-CLUSTER.location.v1"); - } - - public static StandortClusterContainment getInstance() { - return new StandortClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java deleted file mode 100644 index 7a478e58e..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java +++ /dev/null @@ -1,226 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -import com.nedap.archie.rm.datastructures.Cluster; -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 org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Id; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.AufnahmedatenAdminEntry; -import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.EntlassungsdatenAdminEntry; -import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.FalltypDefiningCode; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import org.ehrbase.client.openehrclient.VersionUid; - -@Entity -@Archetype("openEHR-EHR-COMPOSITION.fall.v0") -@Template("Stationärer Versorgungsfall") -public class StationarerVersorgungsfallComposition { - @Path("/context/other_context[at0001]/items[at0005]/value|defining_code") - private FalltypDefiningCode falltypDefiningCode; - - @Path("/context/other_context[at0001]/items[at0004]/value|value") - private String fallklasseValue; - - @Path("/context/other_context[at0001]/items[at0003 and name/value='Fall-Kennung']/value|value") - private String fallKennungValue; - - @Path("/context/other_context[at0001]/items[at0002]") - private List erweiterung; - - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; - - @Path("/context/participations") - private List participations; - - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; - - @Path("/context/location") - private String location; - - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; - - @Path("/context/setting|defining_code") - private Setting settingDefiningCode; - - @Path("/content[openEHR-EHR-ADMIN_ENTRY.admission.v0 and name/value='Aufnahmedaten']") - private AufnahmedatenAdminEntry aufnahmedaten; - - @Path("/content[openEHR-EHR-ADMIN_ENTRY.discharge_summary.v0]") - private EntlassungsdatenAdminEntry entlassungsdaten; - - @Path("/composer") - private PartyProxy composer; - - @Path("/language") - private Language language; - - @Path("/feeder_audit") - private FeederAudit feederAudit; - - @Path("/category|defining_code") - private Category categoryDefiningCode; - - @Path("/territory") - private Territory territory; - - @Id - private VersionUid versionUid; - - public void setFalltypDefiningCode(FalltypDefiningCode falltypDefiningCode) { - this.falltypDefiningCode = falltypDefiningCode; - } - - public FalltypDefiningCode getFalltypDefiningCode() { - return this.falltypDefiningCode ; - } - - public void setFallklasseValue(String fallklasseValue) { - this.fallklasseValue = fallklasseValue; - } - - public String getFallklasseValue() { - return this.fallklasseValue ; - } - - public void setFallKennungValue(String fallKennungValue) { - this.fallKennungValue = fallKennungValue; - } - - public String getFallKennungValue() { - return this.fallKennungValue ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - 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 setAufnahmedaten(AufnahmedatenAdminEntry aufnahmedaten) { - this.aufnahmedaten = aufnahmedaten; - } - - public AufnahmedatenAdminEntry getAufnahmedaten() { - return this.aufnahmedaten ; - } - - public void setEntlassungsdaten(EntlassungsdatenAdminEntry entlassungsdaten) { - this.entlassungsdaten = entlassungsdaten; - } - - public EntlassungsdatenAdminEntry getEntlassungsdaten() { - return this.entlassungsdaten ; - } - - 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 setCategoryDefiningCode(Category categoryDefiningCode) { - this.categoryDefiningCode = categoryDefiningCode; - } - - public Category getCategoryDefiningCode() { - return this.categoryDefiningCode ; - } - - 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallCompositionContainment.java deleted file mode 100644 index 91a004845..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallCompositionContainment.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -import com.nedap.archie.rm.datastructures.Cluster; -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 org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.AufnahmedatenAdminEntry; -import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.EntlassungsdatenAdminEntry; -import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.FalltypDefiningCode; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; - -public class StationarerVersorgungsfallCompositionContainment extends Containment { - public SelectAqlField STATIONARER_VERSORGUNGSFALL_COMPOSITION = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "", "StationarerVersorgungsfallComposition", StationarerVersorgungsfallComposition.class, this); - - public SelectAqlField FALLTYP_DEFINING_CODE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/other_context[at0001]/items[at0005]/value|defining_code", "falltypDefiningCode", FalltypDefiningCode.class, this); - - public SelectAqlField FALLKLASSE_VALUE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/other_context[at0001]/items[at0004]/value|value", "fallklasseValue", String.class, this); - - public SelectAqlField FALL_KENNUNG_VALUE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/other_context[at0001]/items[at0003]/value|value", "fallKennungValue", String.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/other_context[at0001]/items[at0002]", "erweiterung", Cluster.class, this); - - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/participations", "participations", Participation.class, this); - - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - - public SelectAqlField LOCATION = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/location", "location", String.class, this); - - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - - public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - - public SelectAqlField AUFNAHMEDATEN = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/content[openEHR-EHR-ADMIN_ENTRY.admission.v0]", "aufnahmedaten", AufnahmedatenAdminEntry.class, this); - - public SelectAqlField ENTLASSUNGSDATEN = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/content[openEHR-EHR-ADMIN_ENTRY.discharge_summary.v0]", "entlassungsdaten", EntlassungsdatenAdminEntry.class, this); - - public SelectAqlField COMPOSER = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/composer", "composer", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/language", "language", Language.class, this); - - public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - - public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - - public SelectAqlField TERRITORY = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/territory", "territory", Territory.class, this); - - private StationarerVersorgungsfallCompositionContainment() { - super("openEHR-EHR-COMPOSITION.fall.v0"); - } - - public static StationarerVersorgungsfallCompositionContainment getInstance() { - return new StationarerVersorgungsfallCompositionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java deleted file mode 100644 index 7b2e44001..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java +++ /dev/null @@ -1,92 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-ADMIN_ENTRY.admission.v0") -public class AufnahmedatenAdminEntry { - @Path("/data[at0001]/items[at0013 and name/value='Versorgungsfallgrund']/value|value") - private String versorgungsfallgrundValue; - - @Path("/data[at0001]/items[at0049]/value|value") - private String artDerAufnahmeValue; - - @Path("/data[at0001]/items[at0071]/value|value") - private TemporalAccessor datumUhrzeitDerAufnahmeValue; - - @Path("/data[at0001]/items[at0131]") - private List zugewiesenerPatientenstandort; - - @Path("/data[at0001]/items[at0132]") - private List vorherigerPatientenstandort; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setVersorgungsfallgrundValue(String versorgungsfallgrundValue) { - this.versorgungsfallgrundValue = versorgungsfallgrundValue; - } - - public String getVersorgungsfallgrundValue() { - return this.versorgungsfallgrundValue ; - } - - public void setArtDerAufnahmeValue(String artDerAufnahmeValue) { - this.artDerAufnahmeValue = artDerAufnahmeValue; - } - - public String getArtDerAufnahmeValue() { - return this.artDerAufnahmeValue ; - } - - public void setDatumUhrzeitDerAufnahmeValue(TemporalAccessor datumUhrzeitDerAufnahmeValue) { - this.datumUhrzeitDerAufnahmeValue = datumUhrzeitDerAufnahmeValue; - } - - public TemporalAccessor getDatumUhrzeitDerAufnahmeValue() { - return this.datumUhrzeitDerAufnahmeValue ; - } - - public void setZugewiesenerPatientenstandort(List zugewiesenerPatientenstandort) { - this.zugewiesenerPatientenstandort = zugewiesenerPatientenstandort; - } - - public List getZugewiesenerPatientenstandort() { - return this.zugewiesenerPatientenstandort ; - } - - public void setVorherigerPatientenstandort(List vorherigerPatientenstandort) { - this.vorherigerPatientenstandort = vorherigerPatientenstandort; - } - - public List getVorherigerPatientenstandort() { - return this.vorherigerPatientenstandort ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntryContainment.java deleted file mode 100644 index 9f9ade2a5..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntryContainment.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class AufnahmedatenAdminEntryContainment extends Containment { - public SelectAqlField AUFNAHMEDATEN_ADMIN_ENTRY = new AqlFieldImp(AufnahmedatenAdminEntry.class, "", "AufnahmedatenAdminEntry", AufnahmedatenAdminEntry.class, this); - - public SelectAqlField VERSORGUNGSFALLGRUND_VALUE = new AqlFieldImp(AufnahmedatenAdminEntry.class, "/data[at0001]/items[at0013]/value|value", "versorgungsfallgrundValue", String.class, this); - - public SelectAqlField ART_DER_AUFNAHME_VALUE = new AqlFieldImp(AufnahmedatenAdminEntry.class, "/data[at0001]/items[at0049]/value|value", "artDerAufnahmeValue", String.class, this); - - public SelectAqlField DATUM_UHRZEIT_DER_AUFNAHME_VALUE = new AqlFieldImp(AufnahmedatenAdminEntry.class, "/data[at0001]/items[at0071]/value|value", "datumUhrzeitDerAufnahmeValue", TemporalAccessor.class, this); - - public ListSelectAqlField ZUGEWIESENER_PATIENTENSTANDORT = new ListAqlFieldImp(AufnahmedatenAdminEntry.class, "/data[at0001]/items[at0131]", "zugewiesenerPatientenstandort", Cluster.class, this); - - public ListSelectAqlField VORHERIGER_PATIENTENSTANDORT = new ListAqlFieldImp(AufnahmedatenAdminEntry.class, "/data[at0001]/items[at0132]", "vorherigerPatientenstandort", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(AufnahmedatenAdminEntry.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(AufnahmedatenAdminEntry.class, "/language", "language", Language.class, this); - - private AufnahmedatenAdminEntryContainment() { - super("openEHR-EHR-ADMIN_ENTRY.admission.v0"); - } - - public static AufnahmedatenAdminEntryContainment getInstance() { - return new AufnahmedatenAdminEntryContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java deleted file mode 100644 index 7e975ea23..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-ADMIN_ENTRY.discharge_summary.v0") -public class EntlassungsdatenAdminEntry { - @Path("/data[at0001]/items[at0040]/value|value") - private String artDerEntlassungValue; - - @Path("/data[at0001]/items[at0002]/value|defining_code") - private KlinischerZustandDesPatientenDefiningCode klinischerZustandDesPatientenDefiningCode; - - @Path("/data[at0001]/items[at0011 and name/value='Datum/Uhrzeit der Entlassung']/value|value") - private TemporalAccessor datumUhrzeitDerEntlassungValue; - - @Path("/data[at0001]/items[at0050]/value|value") - private String zusatzlicheInformationenValue; - - @Path("/data[at0001]/items[at0066]") - private List letzterPatientenstandort; - - @Path("/data[at0001]/items[at0067]") - private List zugewiesenerPatientenstandort; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setArtDerEntlassungValue(String artDerEntlassungValue) { - this.artDerEntlassungValue = artDerEntlassungValue; - } - - public String getArtDerEntlassungValue() { - return this.artDerEntlassungValue ; - } - - public void setKlinischerZustandDesPatientenDefiningCode( - KlinischerZustandDesPatientenDefiningCode klinischerZustandDesPatientenDefiningCode) { - this.klinischerZustandDesPatientenDefiningCode = klinischerZustandDesPatientenDefiningCode; - } - - public KlinischerZustandDesPatientenDefiningCode getKlinischerZustandDesPatientenDefiningCode() { - return this.klinischerZustandDesPatientenDefiningCode ; - } - - public void setDatumUhrzeitDerEntlassungValue(TemporalAccessor datumUhrzeitDerEntlassungValue) { - this.datumUhrzeitDerEntlassungValue = datumUhrzeitDerEntlassungValue; - } - - public TemporalAccessor getDatumUhrzeitDerEntlassungValue() { - return this.datumUhrzeitDerEntlassungValue ; - } - - public void setZusatzlicheInformationenValue(String zusatzlicheInformationenValue) { - this.zusatzlicheInformationenValue = zusatzlicheInformationenValue; - } - - public String getZusatzlicheInformationenValue() { - return this.zusatzlicheInformationenValue ; - } - - public void setLetzterPatientenstandort(List letzterPatientenstandort) { - this.letzterPatientenstandort = letzterPatientenstandort; - } - - public List getLetzterPatientenstandort() { - return this.letzterPatientenstandort ; - } - - public void setZugewiesenerPatientenstandort(List zugewiesenerPatientenstandort) { - this.zugewiesenerPatientenstandort = zugewiesenerPatientenstandort; - } - - public List getZugewiesenerPatientenstandort() { - return this.zugewiesenerPatientenstandort ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntryContainment.java deleted file mode 100644 index dadff48ee..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntryContainment.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class EntlassungsdatenAdminEntryContainment extends Containment { - public SelectAqlField ENTLASSUNGSDATEN_ADMIN_ENTRY = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "", "EntlassungsdatenAdminEntry", EntlassungsdatenAdminEntry.class, this); - - public SelectAqlField ART_DER_ENTLASSUNG_VALUE = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0040]/value|value", "artDerEntlassungValue", String.class, this); - - public SelectAqlField KLINISCHER_ZUSTAND_DES_PATIENTEN_DEFINING_CODE = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0002]/value|defining_code", "klinischerZustandDesPatientenDefiningCode", KlinischerZustandDesPatientenDefiningCode.class, this); - - public SelectAqlField DATUM_UHRZEIT_DER_ENTLASSUNG_VALUE = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0011]/value|value", "datumUhrzeitDerEntlassungValue", TemporalAccessor.class, this); - - public SelectAqlField ZUSATZLICHE_INFORMATIONEN_VALUE = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0050]/value|value", "zusatzlicheInformationenValue", String.class, this); - - public ListSelectAqlField LETZTER_PATIENTENSTANDORT = new ListAqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0066]", "letzterPatientenstandort", Cluster.class, this); - - public ListSelectAqlField ZUGEWIESENER_PATIENTENSTANDORT = new ListAqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0067]", "zugewiesenerPatientenstandort", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/language", "language", Language.class, this); - - private EntlassungsdatenAdminEntryContainment() { - super("openEHR-EHR-ADMIN_ENTRY.discharge_summary.v0"); - } - - public static EntlassungsdatenAdminEntryContainment getInstance() { - return new EntlassungsdatenAdminEntryContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/FalltypDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/FalltypDefiningcode.java deleted file mode 100644 index 33e928d74..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/FalltypDefiningcode.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum FalltypDefiningCode implements EnumValueSet { - VERSORGUNGSFALL("Versorgungsfall", "Versorgungsfall", "local", "at0006"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - FalltypDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/KlinischerZustandDesPatientenDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/KlinischerZustandDesPatientenDefiningcode.java deleted file mode 100644 index 0f4036c1d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/KlinischerZustandDesPatientenDefiningcode.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum KlinischerZustandDesPatientenDefiningCode implements EnumValueSet { - IDENTISCHER_ZUSTAND("Identischer Zustand", "Der Gesundheitszustand des Patienten ist identisch, wie bei der Aufnahme.", "local", "at0005"), - - UNBESTIMMT("Unbestimmt", "Unbestimmt.", "local", "at0008"), - - GEHEILT("Geheilt", "Der Patient ist geheilt.", "local", "at0003"), - - SONSTIGE("Sonstige", "Sonstige", "local", "at0068"), - - SCHLECHTER("Schlechter", "Der Gesundheitszustand des Patienten ist schlechter, als bei der Aufnahme.", "local", "at0006"), - - VERBESSERT("Verbessert", "Der Gesundheitszustand des Patienten hat sich verbessert.", "local", "at0004"), - - VERSTORBEN("Verstorben", "Der Patient verstarb während des Krankenhausaufenthaltes.", "local", "at0007"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - KlinischerZustandDesPatientenDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java deleted file mode 100644 index be6c11123..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java +++ /dev/null @@ -1,205 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -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 org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Id; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.ContextCodedTextDefiningCode; -import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesEvaluation; -import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesObservation; -import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesSection; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import org.ehrbase.client.openehrclient.VersionUid; - -@Entity -@Archetype("openEHR-EHR-COMPOSITION.test_all_types.v1") -@Template("test_all_types.en.v1") -public class TestAllTypesEnV1Composition { - @Path("/context/other_context[at0004]/item[at0005]/value|defining_code") - private ContextCodedTextDefiningCode contextCodedTextDefiningCode; - - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; - - @Path("/context/participations") - private List participations; - - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; - - @Path("/context/location") - private String location; - - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; - - @Path("/context/setting|defining_code") - private Setting settingDefiningCode; - - @Path("/content[openEHR-EHR-OBSERVATION.test_all_types.v1]") - private List testAllTypesTestAllTypes; - - @Path("/content[openEHR-EHR-EVALUATION.test_all_types.v1]") - private List testAllTypesTestAllTypes2; - - @Path("/content[openEHR-EHR-SECTION.test_all_types.v1]") - private List testAllTypesTestAllTypes3; - - @Path("/composer") - private PartyProxy composer; - - @Path("/language") - private Language language; - - @Path("/feeder_audit") - private FeederAudit feederAudit; - - @Path("/category|defining_code") - private Category categoryDefiningCode; - - @Path("/territory") - private Territory territory; - - @Id - private VersionUid versionUid; - - public void setContextCodedTextDefiningCode( - ContextCodedTextDefiningCode contextCodedTextDefiningCode) { - this.contextCodedTextDefiningCode = contextCodedTextDefiningCode; - } - - public ContextCodedTextDefiningCode getContextCodedTextDefiningCode() { - return this.contextCodedTextDefiningCode ; - } - - 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 setTestAllTypesTestAllTypes(List testAllTypesTestAllTypes) { - this.testAllTypesTestAllTypes = testAllTypesTestAllTypes; - } - - public List getTestAllTypesTestAllTypes() { - return this.testAllTypesTestAllTypes ; - } - - public void setTestAllTypesTestAllTypes2(List testAllTypesTestAllTypes2) { - this.testAllTypesTestAllTypes2 = testAllTypesTestAllTypes2; - } - - public List getTestAllTypesTestAllTypes2() { - return this.testAllTypesTestAllTypes2 ; - } - - public void setTestAllTypesTestAllTypes3(List testAllTypesTestAllTypes3) { - this.testAllTypesTestAllTypes3 = testAllTypesTestAllTypes3; - } - - public List getTestAllTypesTestAllTypes3() { - return this.testAllTypesTestAllTypes3 ; - } - - 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 setCategoryDefiningCode(Category categoryDefiningCode) { - this.categoryDefiningCode = categoryDefiningCode; - } - - public Category getCategoryDefiningCode() { - return this.categoryDefiningCode ; - } - - 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java deleted file mode 100644 index ddef03d1a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -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 org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.ContextCodedTextDefiningCode; -import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesEvaluation; -import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesObservation; -import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesSection; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; - -public class TestAllTypesEnV1CompositionContainment extends Containment { - public SelectAqlField TEST_ALL_TYPES_EN_V1_COMPOSITION = new AqlFieldImp(TestAllTypesEnV1Composition.class, "", "TestAllTypesEnV1Composition", TestAllTypesEnV1Composition.class, this); - - public SelectAqlField CONTEXT_CODED_TEXT_DEFINING_CODE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/other_context[at0004]/item[at0005]/value|defining_code", "contextCodedTextDefiningCode", ContextCodedTextDefiningCode.class, this); - - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/context/participations", "participations", Participation.class, this); - - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - - public SelectAqlField LOCATION = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/location", "location", String.class, this); - - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - - public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - - public ListSelectAqlField TEST_ALL_TYPES_TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-OBSERVATION.test_all_types.v1]", "testAllTypesTestAllTypes", TestAllTypesObservation.class, this); - - public ListSelectAqlField TEST_ALL_TYPES_TEST_ALL_TYPES2 = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-EVALUATION.test_all_types.v1]", "testAllTypesTestAllTypes2", TestAllTypesEvaluation.class, this); - - public ListSelectAqlField TEST_ALL_TYPES_TEST_ALL_TYPES3 = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-SECTION.test_all_types.v1]", "testAllTypesTestAllTypes3", TestAllTypesSection.class, this); - - public SelectAqlField COMPOSER = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/composer", "composer", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/language", "language", Language.class, this); - - public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - - public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - - public SelectAqlField TERRITORY = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/territory", "territory", Territory.class, this); - - private TestAllTypesEnV1CompositionContainment() { - super("openEHR-EHR-COMPOSITION.test_all_types.v1"); - } - - public static TestAllTypesEnV1CompositionContainment getInstance() { - return new TestAllTypesEnV1CompositionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CareflowStepDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CareflowStepDefiningCode.java deleted file mode 100644 index 9b86c5b65..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CareflowStepDefiningCode.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum CareflowStepDefiningCode implements EnumValueSet { - PLANNED("Planned", "*", null, "at0003"), - - ACTIVE("Active", "*", null, "at0004"), - - COMPLETED("Completed", "*", null, "at0005"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - CareflowStepDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ContextCodedTextDefiningcode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ContextCodedTextDefiningcode.java deleted file mode 100644 index 82f69efd0..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ContextCodedTextDefiningcode.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum ContextCodedTextDefiningCode implements EnumValueSet { - VALUE1("value1", "*", "local", "at0006"), - - VALUE2("value2", "*", "local", "at0007"), - - VALUE3("value3", "*", "local", "at0008"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - ContextCodedTextDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CurrentStateDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CurrentStateDefiningCode.java deleted file mode 100644 index 2615d9361..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CurrentStateDefiningCode.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum CurrentStateDefiningCode implements EnumValueSet { - COMPLETED("completed", "completed", null, "532"), - - PLANNED("planned", "planned", null, "526"), - - ACTIVE("active", "active", null, "245"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - CurrentStateDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java deleted file mode 100644 index 4c4853e97..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java +++ /dev/null @@ -1,91 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import com.nedap.archie.rm.datatypes.CodePhrase; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-ACTION.test_all_types.v1") -public class TestAllTypesAction { - @Path("/description[at0001]/items[openEHR-EHR-CLUSTER.test_all_types.v1]") - private List testAllTypes; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - @Path("/time|value") - private TemporalAccessor timeValue; - - @Path("/ism_transition/careflow_step|defining_code") - private CareflowStepDefiningCode careflowStepDefiningCode; - - @Path("/ism_transition/current_state|defining_code") - private CurrentStateDefiningCode currentStateDefiningCode; - - @Path("/ism_transition/transition|defining_code") - private CodePhrase transitionDefiningCode; - - public void setTestAllTypes(List testAllTypes) { - this.testAllTypes = testAllTypes; - } - - public List getTestAllTypes() { - return this.testAllTypes ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setCareflowStepDefiningCode(CareflowStepDefiningCode careflowStepDefiningCode) { - this.careflowStepDefiningCode = careflowStepDefiningCode; - } - - public CareflowStepDefiningCode getCareflowStepDefiningCode() { - return this.careflowStepDefiningCode ; - } - - public void setCurrentStateDefiningCode(CurrentStateDefiningCode currentStateDefiningCode) { - this.currentStateDefiningCode = currentStateDefiningCode; - } - - public CurrentStateDefiningCode getCurrentStateDefiningCode() { - return this.currentStateDefiningCode ; - } - - public void setTransitionDefiningCode(CodePhrase transitionDefiningCode) { - this.transitionDefiningCode = transitionDefiningCode; - } - - public CodePhrase getTransitionDefiningCode() { - return this.transitionDefiningCode ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java deleted file mode 100644 index eddcd95e9..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import com.nedap.archie.rm.datatypes.CodePhrase; -import com.nedap.archie.rm.generic.PartyProxy; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class TestAllTypesActionContainment extends Containment { - public SelectAqlField TEST_ALL_TYPES_ACTION = new AqlFieldImp(TestAllTypesAction.class, "", "TestAllTypesAction", TestAllTypesAction.class, this); - - public ListSelectAqlField TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesAction.class, "/description[at0001]/items[openEHR-EHR-CLUSTER.test_all_types.v1]", "testAllTypes", TestAllTypesCluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(TestAllTypesAction.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesAction.class, "/language", "language", Language.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(TestAllTypesAction.class, "/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField CAREFLOW_STEP_DEFINING_CODE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition/careflow_step|defining_code", "careflowStepDefiningCode", CareflowStepDefiningCode.class, this); - - public SelectAqlField CURRENT_STATE_DEFINING_CODE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition/current_state|defining_code", "currentStateDefiningCode", CurrentStateDefiningCode.class, this); - - public SelectAqlField TRANSITION_DEFINING_CODE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition/transition|defining_code", "transitionDefiningCode", CodePhrase.class, this); - - private TestAllTypesActionContainment() { - super("openEHR-EHR-ACTION.test_all_types.v1"); - } - - public static TestAllTypesActionContainment getInstance() { - return new TestAllTypesActionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java deleted file mode 100644 index 79bfc0b9a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Long; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-ADMIN_ENTRY.test_all_types.v1") -public class TestAllTypesAdminEntry { - @Path("/data[at0001]/item[at0002]/value|magnitude") - private Long count3Magnitude; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setCount3Magnitude(Long count3Magnitude) { - this.count3Magnitude = count3Magnitude; - } - - public Long getCount3Magnitude() { - return this.count3Magnitude ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java deleted file mode 100644 index d024d2456..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Long; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class TestAllTypesAdminEntryContainment extends Containment { - public SelectAqlField TEST_ALL_TYPES_ADMIN_ENTRY = new AqlFieldImp(TestAllTypesAdminEntry.class, "", "TestAllTypesAdminEntry", TestAllTypesAdminEntry.class, this); - - public SelectAqlField COUNT3_MAGNITUDE = new AqlFieldImp(TestAllTypesAdminEntry.class, "/data[at0001]/item[at0002]/value|magnitude", "count3Magnitude", Long.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(TestAllTypesAdminEntry.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesAdminEntry.class, "/language", "language", Language.class, this); - - private TestAllTypesAdminEntryContainment() { - super("openEHR-EHR-ADMIN_ENTRY.test_all_types.v1"); - } - - public static TestAllTypesAdminEntryContainment getInstance() { - return new TestAllTypesAdminEntryContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceChoice.java deleted file mode 100644 index f850dac65..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceChoice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -public interface TestAllTypesChoiceChoice { -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java deleted file mode 100644 index b2e1a971b..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import java.lang.Long; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_COUNT") -public class TestAllTypesChoiceDvCount implements TestAllTypesChoiceChoice { - @Path("|magnitude") - private Long choiceMagnitude; - - public void setChoiceMagnitude(Long choiceMagnitude) { - this.choiceMagnitude = choiceMagnitude; - } - - public Long getChoiceMagnitude() { - return this.choiceMagnitude ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java deleted file mode 100644 index 65c47bd21..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import java.lang.Double; -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.OptionFor; -import org.ehrbase.client.annotations.Path; - -@Entity -@OptionFor("DV_QUANTITY") -public class TestAllTypesChoiceDvQuantity implements TestAllTypesChoiceChoice { - @Path("|magnitude") - private Double choiceMagnitude; - - @Path("|units") - private String choiceUnits; - - public void setChoiceMagnitude(Double choiceMagnitude) { - this.choiceMagnitude = choiceMagnitude; - } - - public Double getChoiceMagnitude() { - return this.choiceMagnitude ; - } - - public void setChoiceUnits(String choiceUnits) { - this.choiceUnits = choiceUnits; - } - - public String getChoiceUnits() { - return this.choiceUnits ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java deleted file mode 100644 index 760d6fca3..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import java.lang.Boolean; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.test_all_types.v1") -public class TestAllTypesCluster { - @Path("/items[at0001]/items[at0002]/items[at0003]/value|value") - private Boolean boolean2Value; - - public void setBoolean2Value(Boolean boolean2Value) { - this.boolean2Value = boolean2Value; - } - - public Boolean isBoolean2Value() { - return this.boolean2Value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java deleted file mode 100644 index a2012313d..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import java.lang.Boolean; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class TestAllTypesClusterContainment extends Containment { - public SelectAqlField TEST_ALL_TYPES_CLUSTER = new AqlFieldImp(TestAllTypesCluster.class, "", "TestAllTypesCluster", TestAllTypesCluster.class, this); - - public SelectAqlField BOOLEAN2_VALUE = new AqlFieldImp(TestAllTypesCluster.class, "/items[at0001]/items[at0002]/items[at0003]/value|value", "boolean2Value", Boolean.class, this); - - private TestAllTypesClusterContainment() { - super("openEHR-EHR-CLUSTER.test_all_types.v1"); - } - - public static TestAllTypesClusterContainment getInstance() { - return new TestAllTypesClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java deleted file mode 100644 index 0bd143a90..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java +++ /dev/null @@ -1,228 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Boolean; -import java.lang.Double; -import java.lang.Long; -import java.lang.String; -import java.net.URI; -import java.time.temporal.TemporalAccessor; -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.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-EVALUATION.test_all_types.v1") -public class TestAllTypesEvaluation { - @Path("/data[at0001]/items[at0002]/value|value") - private URI uriValue; - - @Path("/data[at0001]/items[at0003]/value/upper|magnitude") - private Long upperMagnitude; - - @Path("/data[at0001]/items[at0003]/value/lower|magnitude") - private Long lowerMagnitude; - - @Path("/data[at0001]/items[at0003]/value/lower_included") - private Boolean intervalCountLowerIncluded; - - @Path("/data[at0001]/items[at0003]/value/upper_included") - private Boolean intervalCountUpperIncluded; - - @Path("/data[at0001]/items[at0004]/value/upper|magnitude") - private Double upperMagnitude2; - - @Path("/data[at0001]/items[at0004]/value/upper|units") - private String upperUnits; - - @Path("/data[at0001]/items[at0004]/value/lower|magnitude") - private Double lowerMagnitude2; - - @Path("/data[at0001]/items[at0004]/value/lower|units") - private String lowerUnits; - - @Path("/data[at0001]/items[at0004]/value/lower_included") - private Boolean intervalQuantityLowerIncluded; - - @Path("/data[at0001]/items[at0004]/value/upper_included") - private Boolean intervalQuantityUpperIncluded; - - @Path("/data[at0001]/items[at0005]/value/upper|value") - private TemporalAccessor intervalDatetimeUpperValue; - - @Path("/data[at0001]/items[at0005]/value/lower|value") - private TemporalAccessor intervalDatetimeLowerValue; - - @Path("/data[at0001]/items[at0005]/value/lower_included") - private Boolean intervalDatetimeLowerIncluded; - - @Path("/data[at0001]/items[at0005]/value/upper_included") - private Boolean intervalDatetimeUpperIncluded; - - @Path("/data[at0001]/items[at0006]/items[at0007]/items[at0008]/items[at0010]/value|value") - private String text2Value; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - @Path("/data[at0001]/items[at0009]/value") - @Choice - private TestAllTypesChoiceChoice choice; - - public void setUriValue(URI uriValue) { - this.uriValue = uriValue; - } - - public URI getUriValue() { - return this.uriValue ; - } - - public void setUpperMagnitude(Long upperMagnitude) { - this.upperMagnitude = upperMagnitude; - } - - public Long getUpperMagnitude() { - return this.upperMagnitude ; - } - - public void setLowerMagnitude(Long lowerMagnitude) { - this.lowerMagnitude = lowerMagnitude; - } - - public Long getLowerMagnitude() { - return this.lowerMagnitude ; - } - - public void setIntervalCountLowerIncluded(Boolean intervalCountLowerIncluded) { - this.intervalCountLowerIncluded = intervalCountLowerIncluded; - } - - public Boolean isIntervalCountLowerIncluded() { - return this.intervalCountLowerIncluded ; - } - - public void setIntervalCountUpperIncluded(Boolean intervalCountUpperIncluded) { - this.intervalCountUpperIncluded = intervalCountUpperIncluded; - } - - public Boolean isIntervalCountUpperIncluded() { - return this.intervalCountUpperIncluded ; - } - - public void setUpperMagnitude2(Double upperMagnitude2) { - this.upperMagnitude2 = upperMagnitude2; - } - - public Double getUpperMagnitude2() { - return this.upperMagnitude2 ; - } - - public void setUpperUnits(String upperUnits) { - this.upperUnits = upperUnits; - } - - public String getUpperUnits() { - return this.upperUnits ; - } - - public void setLowerMagnitude2(Double lowerMagnitude2) { - this.lowerMagnitude2 = lowerMagnitude2; - } - - public Double getLowerMagnitude2() { - return this.lowerMagnitude2 ; - } - - public void setLowerUnits(String lowerUnits) { - this.lowerUnits = lowerUnits; - } - - public String getLowerUnits() { - return this.lowerUnits ; - } - - public void setIntervalQuantityLowerIncluded(Boolean intervalQuantityLowerIncluded) { - this.intervalQuantityLowerIncluded = intervalQuantityLowerIncluded; - } - - public Boolean isIntervalQuantityLowerIncluded() { - return this.intervalQuantityLowerIncluded ; - } - - public void setIntervalQuantityUpperIncluded(Boolean intervalQuantityUpperIncluded) { - this.intervalQuantityUpperIncluded = intervalQuantityUpperIncluded; - } - - public Boolean isIntervalQuantityUpperIncluded() { - return this.intervalQuantityUpperIncluded ; - } - - public void setIntervalDatetimeUpperValue(TemporalAccessor intervalDatetimeUpperValue) { - this.intervalDatetimeUpperValue = intervalDatetimeUpperValue; - } - - public TemporalAccessor getIntervalDatetimeUpperValue() { - return this.intervalDatetimeUpperValue ; - } - - public void setIntervalDatetimeLowerValue(TemporalAccessor intervalDatetimeLowerValue) { - this.intervalDatetimeLowerValue = intervalDatetimeLowerValue; - } - - public TemporalAccessor getIntervalDatetimeLowerValue() { - return this.intervalDatetimeLowerValue ; - } - - public void setIntervalDatetimeLowerIncluded(Boolean intervalDatetimeLowerIncluded) { - this.intervalDatetimeLowerIncluded = intervalDatetimeLowerIncluded; - } - - public Boolean isIntervalDatetimeLowerIncluded() { - return this.intervalDatetimeLowerIncluded ; - } - - public void setIntervalDatetimeUpperIncluded(Boolean intervalDatetimeUpperIncluded) { - this.intervalDatetimeUpperIncluded = intervalDatetimeUpperIncluded; - } - - public Boolean isIntervalDatetimeUpperIncluded() { - return this.intervalDatetimeUpperIncluded ; - } - - public void setText2Value(String text2Value) { - this.text2Value = text2Value; - } - - public String getText2Value() { - return this.text2Value ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } - - public void setChoice(TestAllTypesChoiceChoice choice) { - this.choice = choice; - } - - public TestAllTypesChoiceChoice getChoice() { - return this.choice ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java deleted file mode 100644 index 2bd2f2deb..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Boolean; -import java.lang.Double; -import java.lang.Long; -import java.lang.String; -import java.net.URI; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class TestAllTypesEvaluationContainment extends Containment { - public SelectAqlField TEST_ALL_TYPES_EVALUATION = new AqlFieldImp(TestAllTypesEvaluation.class, "", "TestAllTypesEvaluation", TestAllTypesEvaluation.class, this); - - public SelectAqlField URI_VALUE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0002]/value|value", "uriValue", URI.class, this); - - public SelectAqlField UPPER_MAGNITUDE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0003]/value/upper|magnitude", "upperMagnitude", Long.class, this); - - public SelectAqlField LOWER_MAGNITUDE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0003]/value/lower|magnitude", "lowerMagnitude", Long.class, this); - - public SelectAqlField INTERVAL_COUNT_LOWER_INCLUDED = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0003]/value/lower_included", "intervalCountLowerIncluded", Boolean.class, this); - - public SelectAqlField INTERVAL_COUNT_UPPER_INCLUDED = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0003]/value/upper_included", "intervalCountUpperIncluded", Boolean.class, this); - - public SelectAqlField UPPER_MAGNITUDE2 = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0004]/value/upper|magnitude", "upperMagnitude2", Double.class, this); - - public SelectAqlField UPPER_UNITS = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0004]/value/upper|units", "upperUnits", String.class, this); - - public SelectAqlField LOWER_MAGNITUDE2 = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0004]/value/lower|magnitude", "lowerMagnitude2", Double.class, this); - - public SelectAqlField LOWER_UNITS = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0004]/value/lower|units", "lowerUnits", String.class, this); - - public SelectAqlField INTERVAL_QUANTITY_LOWER_INCLUDED = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0004]/value/lower_included", "intervalQuantityLowerIncluded", Boolean.class, this); - - public SelectAqlField INTERVAL_QUANTITY_UPPER_INCLUDED = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0004]/value/upper_included", "intervalQuantityUpperIncluded", Boolean.class, this); - - public SelectAqlField INTERVAL_DATETIME_UPPER_VALUE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0005]/value/upper|value", "intervalDatetimeUpperValue", TemporalAccessor.class, this); - - public SelectAqlField INTERVAL_DATETIME_LOWER_VALUE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0005]/value/lower|value", "intervalDatetimeLowerValue", TemporalAccessor.class, this); - - public SelectAqlField INTERVAL_DATETIME_LOWER_INCLUDED = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0005]/value/lower_included", "intervalDatetimeLowerIncluded", Boolean.class, this); - - public SelectAqlField INTERVAL_DATETIME_UPPER_INCLUDED = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0005]/value/upper_included", "intervalDatetimeUpperIncluded", Boolean.class, this); - - public SelectAqlField TEXT2_VALUE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0006]/items[at0007]/items[at0008]/items[at0010]/value|value", "text2Value", String.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(TestAllTypesEvaluation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesEvaluation.class, "/language", "language", Language.class, this); - - public SelectAqlField CHOICE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0009]/value", "choice", TestAllTypesChoiceChoice.class, this); - - private TestAllTypesEvaluationContainment() { - super("openEHR-EHR-EVALUATION.test_all_types.v1"); - } - - public static TestAllTypesEvaluationContainment getInstance() { - return new TestAllTypesEvaluationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java deleted file mode 100644 index 493a5fe03..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java +++ /dev/null @@ -1,92 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.Temporal; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-INSTRUCTION.test_all_types.v1") -public class TestAllTypesInstruction { - @Path("/activities[at0001]/description[at0002]/items[at0003]/value|value") - private Temporal partialDateValue; - - @Path("/activities[at0001]/description[at0002]/items[at0004]/value|value") - private TemporalAccessor partialDatetimeValue; - - @Path("/activities[at0001]/timing") - private DvParsable timing; - - @Path("/subject") - private PartyProxy subject; - - @Path("/narrative|value") - private String narrativeValue; - - @Path("/language") - private Language language; - - @Path("/expiry_time|value") - private TemporalAccessor expiryTimeValue; - - public void setPartialDateValue(Temporal partialDateValue) { - this.partialDateValue = partialDateValue; - } - - public Temporal getPartialDateValue() { - return this.partialDateValue ; - } - - public void setPartialDatetimeValue(TemporalAccessor partialDatetimeValue) { - this.partialDatetimeValue = partialDatetimeValue; - } - - public TemporalAccessor getPartialDatetimeValue() { - return this.partialDatetimeValue ; - } - - public void setTiming(DvParsable timing) { - this.timing = timing; - } - - public DvParsable getTiming() { - return this.timing ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setNarrativeValue(String narrativeValue) { - this.narrativeValue = narrativeValue; - } - - public String getNarrativeValue() { - return this.narrativeValue ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } - - public void setExpiryTimeValue(TemporalAccessor expiryTimeValue) { - this.expiryTimeValue = expiryTimeValue; - } - - public TemporalAccessor getExpiryTimeValue() { - return this.expiryTimeValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java deleted file mode 100644 index 055f8f3b2..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.Temporal; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class TestAllTypesInstructionContainment extends Containment { - public SelectAqlField TEST_ALL_TYPES_INSTRUCTION = new AqlFieldImp(TestAllTypesInstruction.class, "", "TestAllTypesInstruction", TestAllTypesInstruction.class, this); - - public SelectAqlField PARTIAL_DATE_VALUE = new AqlFieldImp(TestAllTypesInstruction.class, "/activities[at0001]/description[at0002]/items[at0003]/value|value", "partialDateValue", Temporal.class, this); - - public SelectAqlField PARTIAL_DATETIME_VALUE = new AqlFieldImp(TestAllTypesInstruction.class, "/activities[at0001]/description[at0002]/items[at0004]/value|value", "partialDatetimeValue", TemporalAccessor.class, this); - - public SelectAqlField TIMING = new AqlFieldImp(TestAllTypesInstruction.class, "/activities[at0001]/timing", "timing", DvParsable.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(TestAllTypesInstruction.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField NARRATIVE_VALUE = new AqlFieldImp(TestAllTypesInstruction.class, "/narrative|value", "narrativeValue", String.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesInstruction.class, "/language", "language", Language.class, this); - - public SelectAqlField EXPIRY_TIME_VALUE = new AqlFieldImp(TestAllTypesInstruction.class, "/expiry_time|value", "expiryTimeValue", TemporalAccessor.class, this); - - private TestAllTypesInstructionContainment() { - super("openEHR-EHR-INSTRUCTION.test_all_types.v1"); - } - - public static TestAllTypesInstructionContainment getInstance() { - return new TestAllTypesInstructionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java deleted file mode 100644 index e4751888a..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java +++ /dev/null @@ -1,255 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import com.nedap.archie.rm.datatypes.CodePhrase; -import com.nedap.archie.rm.datavalues.DvIdentifier; -import com.nedap.archie.rm.datavalues.encapsulated.DvMultimedia; -import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; -import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; -import com.nedap.archie.rm.datavalues.quantity.DvProportion; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Boolean; -import java.lang.Double; -import java.lang.Long; -import java.lang.String; -import java.time.temporal.Temporal; -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalAmount; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.test_all_types.v1") -public class TestAllTypesObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value") - private String textValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|defining_code") - private CodePhrase codedTextDefiningCode; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value|defining_code") - private CodePhrase codedTextTerminologyDefiningCode; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|magnitude") - private Double quantityMagnitude; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|units") - private String quantityUnits; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|magnitude") - private Long countMagnitude; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0009]/value|value") - private Temporal dateValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0010]/value|value") - private TemporalAccessor datetimeValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|value") - private TemporalAccessor datetimeAnyValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0012]/value|value") - private TemporalAccessor arbolTimeValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0013]/value") - private DvOrdinal ordinal; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0017]/value|value") - private Boolean booleanValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0018]/value|value") - private TemporalAmount durationAnyValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0019]/value") - private DvMultimedia multimediaAny; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0020]/value") - private DvParsable parsableAny; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0021]/value") - private DvIdentifier identifier; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/value") - private DvProportion proportionAny; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor cualquierEventoTimeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setTextValue(String textValue) { - this.textValue = textValue; - } - - public String getTextValue() { - return this.textValue ; - } - - public void setCodedTextDefiningCode(CodePhrase codedTextDefiningCode) { - this.codedTextDefiningCode = codedTextDefiningCode; - } - - public CodePhrase getCodedTextDefiningCode() { - return this.codedTextDefiningCode ; - } - - public void setCodedTextTerminologyDefiningCode(CodePhrase codedTextTerminologyDefiningCode) { - this.codedTextTerminologyDefiningCode = codedTextTerminologyDefiningCode; - } - - public CodePhrase getCodedTextTerminologyDefiningCode() { - return this.codedTextTerminologyDefiningCode ; - } - - public void setQuantityMagnitude(Double quantityMagnitude) { - this.quantityMagnitude = quantityMagnitude; - } - - public Double getQuantityMagnitude() { - return this.quantityMagnitude ; - } - - public void setQuantityUnits(String quantityUnits) { - this.quantityUnits = quantityUnits; - } - - public String getQuantityUnits() { - return this.quantityUnits ; - } - - public void setCountMagnitude(Long countMagnitude) { - this.countMagnitude = countMagnitude; - } - - public Long getCountMagnitude() { - return this.countMagnitude ; - } - - public void setDateValue(Temporal dateValue) { - this.dateValue = dateValue; - } - - public Temporal getDateValue() { - return this.dateValue ; - } - - public void setDatetimeValue(TemporalAccessor datetimeValue) { - this.datetimeValue = datetimeValue; - } - - public TemporalAccessor getDatetimeValue() { - return this.datetimeValue ; - } - - public void setDatetimeAnyValue(TemporalAccessor datetimeAnyValue) { - this.datetimeAnyValue = datetimeAnyValue; - } - - public TemporalAccessor getDatetimeAnyValue() { - return this.datetimeAnyValue ; - } - - public void setArbolTimeValue(TemporalAccessor arbolTimeValue) { - this.arbolTimeValue = arbolTimeValue; - } - - public TemporalAccessor getArbolTimeValue() { - return this.arbolTimeValue ; - } - - public void setOrdinal(DvOrdinal ordinal) { - this.ordinal = ordinal; - } - - public DvOrdinal getOrdinal() { - return this.ordinal ; - } - - public void setBooleanValue(Boolean booleanValue) { - this.booleanValue = booleanValue; - } - - public Boolean isBooleanValue() { - return this.booleanValue ; - } - - public void setDurationAnyValue(TemporalAmount durationAnyValue) { - this.durationAnyValue = durationAnyValue; - } - - public TemporalAmount getDurationAnyValue() { - return this.durationAnyValue ; - } - - public void setMultimediaAny(DvMultimedia multimediaAny) { - this.multimediaAny = multimediaAny; - } - - public DvMultimedia getMultimediaAny() { - return this.multimediaAny ; - } - - public void setParsableAny(DvParsable parsableAny) { - this.parsableAny = parsableAny; - } - - public DvParsable getParsableAny() { - return this.parsableAny ; - } - - public void setIdentifier(DvIdentifier identifier) { - this.identifier = identifier; - } - - public DvIdentifier getIdentifier() { - return this.identifier ; - } - - public void setProportionAny(DvProportion proportionAny) { - this.proportionAny = proportionAny; - } - - public DvProportion getProportionAny() { - return this.proportionAny ; - } - - public void setCualquierEventoTimeValue(TemporalAccessor cualquierEventoTimeValue) { - this.cualquierEventoTimeValue = cualquierEventoTimeValue; - } - - public TemporalAccessor getCualquierEventoTimeValue() { - return this.cualquierEventoTimeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java deleted file mode 100644 index 96cf0c114..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import com.nedap.archie.rm.datatypes.CodePhrase; -import com.nedap.archie.rm.datavalues.DvIdentifier; -import com.nedap.archie.rm.datavalues.encapsulated.DvMultimedia; -import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; -import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; -import com.nedap.archie.rm.datavalues.quantity.DvProportion; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.Boolean; -import java.lang.Double; -import java.lang.Long; -import java.lang.String; -import java.time.temporal.Temporal; -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalAmount; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class TestAllTypesObservationContainment extends Containment { - public SelectAqlField TEST_ALL_TYPES_OBSERVATION = new AqlFieldImp(TestAllTypesObservation.class, "", "TestAllTypesObservation", TestAllTypesObservation.class, this); - - public SelectAqlField TEXT_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value", "textValue", String.class, this); - - public SelectAqlField CODED_TEXT_DEFINING_CODE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|defining_code", "codedTextDefiningCode", CodePhrase.class, this); - - public SelectAqlField CODED_TEXT_TERMINOLOGY_DEFINING_CODE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value|defining_code", "codedTextTerminologyDefiningCode", CodePhrase.class, this); - - public SelectAqlField QUANTITY_MAGNITUDE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|magnitude", "quantityMagnitude", Double.class, this); - - public SelectAqlField QUANTITY_UNITS = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|units", "quantityUnits", String.class, this); - - public SelectAqlField COUNT_MAGNITUDE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|magnitude", "countMagnitude", Long.class, this); - - public SelectAqlField DATE_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0009]/value|value", "dateValue", Temporal.class, this); - - public SelectAqlField DATETIME_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0010]/value|value", "datetimeValue", TemporalAccessor.class, this); - - public SelectAqlField DATETIME_ANY_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|value", "datetimeAnyValue", TemporalAccessor.class, this); - - public SelectAqlField ARBOL_TIME_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0012]/value|value", "arbolTimeValue", TemporalAccessor.class, this); - - public SelectAqlField ORDINAL = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0013]/value", "ordinal", DvOrdinal.class, this); - - public SelectAqlField BOOLEAN_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0017]/value|value", "booleanValue", Boolean.class, this); - - public SelectAqlField DURATION_ANY_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0018]/value|value", "durationAnyValue", TemporalAmount.class, this); - - public SelectAqlField MULTIMEDIA_ANY = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0019]/value", "multimediaAny", DvMultimedia.class, this); - - public SelectAqlField PARSABLE_ANY = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0020]/value", "parsableAny", DvParsable.class, this); - - public SelectAqlField IDENTIFIER = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0021]/value", "identifier", DvIdentifier.class, this); - - public SelectAqlField PROPORTION_ANY = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/value", "proportionAny", DvProportion.class, this); - - public SelectAqlField CUALQUIER_EVENTO_TIME_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/time|value", "cualquierEventoTimeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(TestAllTypesObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesObservation.class, "/language", "language", Language.class, this); - - private TestAllTypesObservationContainment() { - super("openEHR-EHR-OBSERVATION.test_all_types.v1"); - } - - public static TestAllTypesObservationContainment getInstance() { - return new TestAllTypesObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java deleted file mode 100644 index abea012f5..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-SECTION.test_all_types.v1") -public class TestAllTypesSection { - @Path("/items[at0001]/items[at0002]/items[openEHR-EHR-INSTRUCTION.test_all_types.v1]") - private List section3TestAllTypes; - - @Path("/items[at0001]/items[at0002]/items[openEHR-EHR-ACTION.test_all_types.v1]") - private List section3TestAllTypes2; - - @Path("/items[at0001]/items[openEHR-EHR-ADMIN_ENTRY.test_all_types.v1]") - private List section2TestAllTypes; - - public void setSection3TestAllTypes(List section3TestAllTypes) { - this.section3TestAllTypes = section3TestAllTypes; - } - - public List getSection3TestAllTypes() { - return this.section3TestAllTypes ; - } - - public void setSection3TestAllTypes2(List section3TestAllTypes2) { - this.section3TestAllTypes2 = section3TestAllTypes2; - } - - public List getSection3TestAllTypes2() { - return this.section3TestAllTypes2 ; - } - - public void setSection2TestAllTypes(List section2TestAllTypes) { - this.section2TestAllTypes = section2TestAllTypes; - } - - public List getSection2TestAllTypes() { - return this.section2TestAllTypes ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSectionContainment.java deleted file mode 100644 index 7bedd1cf3..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSectionContainment.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; - -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class TestAllTypesSectionContainment extends Containment { - public SelectAqlField TEST_ALL_TYPES_SECTION = new AqlFieldImp(TestAllTypesSection.class, "", "TestAllTypesSection", TestAllTypesSection.class, this); - - public ListSelectAqlField SECTION3_TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesSection.class, "/items[at0001]/items[at0002]/items[openEHR-EHR-INSTRUCTION.test_all_types.v1]", "section3TestAllTypes", TestAllTypesInstruction.class, this); - - public ListSelectAqlField SECTION3_TEST_ALL_TYPES2 = new ListAqlFieldImp(TestAllTypesSection.class, "/items[at0001]/items[at0002]/items[openEHR-EHR-ACTION.test_all_types.v1]", "section3TestAllTypes2", TestAllTypesAction.class, this); - - public ListSelectAqlField SECTION2_TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesSection.class, "/items[at0001]/items[openEHR-EHR-ADMIN_ENTRY.test_all_types.v1]", "section2TestAllTypes", TestAllTypesAdminEntry.class, this); - - private TestAllTypesSectionContainment() { - super("openEHR-EHR-SECTION.test_all_types.v1"); - } - - public static TestAllTypesSectionContainment getInstance() { - return new TestAllTypesSectionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java deleted file mode 100644 index 273136c2f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java +++ /dev/null @@ -1,202 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -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 org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Id; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.annotations.Template; -import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.BefundObservation; -import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.FallidentifikationCluster; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; -import org.ehrbase.client.openehrclient.VersionUid; - -@Entity -@Archetype("openEHR-EHR-COMPOSITION.report-result.v1") -@Template("Virologischer Befund") -public class VirologischerBefundComposition { - @Path("/context/other_context[at0001]/items[at0002]/value|value") - private String berichtIdValue; - - @Path("/context/other_context[at0001]/items[at0005]/value|value") - private String statusValue; - - @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]") - private FallidentifikationCluster fallidentifikation; - - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; - - @Path("/context/participations") - private List participations; - - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; - - @Path("/context/location") - private String location; - - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; - - @Path("/context/setting|defining_code") - private Setting settingDefiningCode; - - @Path("/content[openEHR-EHR-OBSERVATION.laboratory_test_result.v1 and name/value='Befund']") - private BefundObservation befund; - - @Path("/composer") - private PartyProxy composer; - - @Path("/language") - private Language language; - - @Path("/feeder_audit") - private FeederAudit feederAudit; - - @Path("/category|defining_code") - private Category categoryDefiningCode; - - @Path("/territory") - private Territory territory; - - @Id - private VersionUid versionUid; - - public void setBerichtIdValue(String berichtIdValue) { - this.berichtIdValue = berichtIdValue; - } - - public String getBerichtIdValue() { - return this.berichtIdValue ; - } - - public void setStatusValue(String statusValue) { - this.statusValue = statusValue; - } - - public String getStatusValue() { - return this.statusValue ; - } - - public void setFallidentifikation(FallidentifikationCluster fallidentifikation) { - this.fallidentifikation = fallidentifikation; - } - - public FallidentifikationCluster getFallidentifikation() { - return this.fallidentifikation ; - } - - 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 setBefund(BefundObservation befund) { - this.befund = befund; - } - - public BefundObservation getBefund() { - return this.befund ; - } - - 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 setCategoryDefiningCode(Category categoryDefiningCode) { - this.categoryDefiningCode = categoryDefiningCode; - } - - public Category getCategoryDefiningCode() { - return this.categoryDefiningCode ; - } - - 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundCompositionContainment.java deleted file mode 100644 index a49ff5a30..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundCompositionContainment.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition; - -import com.nedap.archie.rm.archetyped.FeederAudit; -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 org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.BefundObservation; -import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.FallidentifikationCluster; -import org.ehrbase.client.classgenerator.shareddefinition.Category; -import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; -import org.ehrbase.client.classgenerator.shareddefinition.Territory; - -public class VirologischerBefundCompositionContainment extends Containment { - public SelectAqlField VIROLOGISCHER_BEFUND_COMPOSITION = new AqlFieldImp(VirologischerBefundComposition.class, "", "VirologischerBefundComposition", VirologischerBefundComposition.class, this); - - public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(VirologischerBefundComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); - - public SelectAqlField STATUS_VALUE = new AqlFieldImp(VirologischerBefundComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "statusValue", String.class, this); - - public SelectAqlField FALLIDENTIFIKATION = new AqlFieldImp(VirologischerBefundComposition.class, "/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]", "fallidentifikation", FallidentifikationCluster.class, this); - - public SelectAqlField START_TIME_VALUE = new AqlFieldImp(VirologischerBefundComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); - - public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(VirologischerBefundComposition.class, "/context/participations", "participations", Participation.class, this); - - public SelectAqlField END_TIME_VALUE = new AqlFieldImp(VirologischerBefundComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); - - public SelectAqlField LOCATION = new AqlFieldImp(VirologischerBefundComposition.class, "/context/location", "location", String.class, this); - - public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(VirologischerBefundComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - - public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(VirologischerBefundComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - - public SelectAqlField BEFUND = new AqlFieldImp(VirologischerBefundComposition.class, "/content[openEHR-EHR-OBSERVATION.laboratory_test_result.v1]", "befund", BefundObservation.class, this); - - public SelectAqlField COMPOSER = new AqlFieldImp(VirologischerBefundComposition.class, "/composer", "composer", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(VirologischerBefundComposition.class, "/language", "language", Language.class, this); - - public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(VirologischerBefundComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - - public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(VirologischerBefundComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); - - public SelectAqlField TERRITORY = new AqlFieldImp(VirologischerBefundComposition.class, "/territory", "territory", Territory.class, this); - - private VirologischerBefundCompositionContainment() { - super("openEHR-EHR-COMPOSITION.report-result.v1"); - } - - public static VirologischerBefundCompositionContainment getInstance() { - return new VirologischerBefundCompositionContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java deleted file mode 100644 index de73ea967..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.anatomical_location.v1") -public class AnatomischeLokalisationCluster { - @Path("/items[at0001]/value|value") - private String nameDerKorperstelleValue; - - @Path("/items[at0053]") - private List alternativeStruktur; - - @Path("/items[at0054]") - private List multimedialeDarstellung; - - public void setNameDerKorperstelleValue(String nameDerKorperstelleValue) { - this.nameDerKorperstelleValue = nameDerKorperstelleValue; - } - - public String getNameDerKorperstelleValue() { - return this.nameDerKorperstelleValue ; - } - - public void setAlternativeStruktur(List alternativeStruktur) { - this.alternativeStruktur = alternativeStruktur; - } - - public List getAlternativeStruktur() { - return this.alternativeStruktur ; - } - - public void setMultimedialeDarstellung(List multimedialeDarstellung) { - this.multimedialeDarstellung = multimedialeDarstellung; - } - - public List getMultimedialeDarstellung() { - return this.multimedialeDarstellung ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationClusterContainment.java deleted file mode 100644 index 346c112b8..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationClusterContainment.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class AnatomischeLokalisationClusterContainment extends Containment { - public SelectAqlField ANATOMISCHE_LOKALISATION_CLUSTER = new AqlFieldImp(AnatomischeLokalisationCluster.class, "", "AnatomischeLokalisationCluster", AnatomischeLokalisationCluster.class, this); - - public SelectAqlField NAME_DER_KORPERSTELLE_VALUE = new AqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0001]/value|value", "nameDerKorperstelleValue", String.class, this); - - public ListSelectAqlField ALTERNATIVE_STRUKTUR = new ListAqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0053]", "alternativeStruktur", Cluster.class, this); - - public ListSelectAqlField MULTIMEDIALE_DARSTELLUNG = new ListAqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0054]", "multimedialeDarstellung", Cluster.class, this); - - private AnatomischeLokalisationClusterContainment() { - super("openEHR-EHR-CLUSTER.anatomical_location.v1"); - } - - public static AnatomischeLokalisationClusterContainment getInstance() { - return new AnatomischeLokalisationClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java deleted file mode 100644 index b37f2e586..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -public class BefundAnforderungElement { - @Path("/value|value") - private String value; - - public void setValue(String value) { - this.value = value; - } - - public String getValue() { - return this.value ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java deleted file mode 100644 index 4e0044e03..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java +++ /dev/null @@ -1,216 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datavalues.DvIdentifier; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -@Entity -@Archetype("openEHR-EHR-OBSERVATION.laboratory_test_result.v1") -public class BefundObservation { - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value") - private String labortestBezeichnungValue; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.specimen.v1]") - private List probe; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_panel.v0 and name/value='Kultur']") - private List kultur; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0122]") - private List strukturierteTestdiagnostik; - - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0118]") - private List multimediaDarstellung; - - @Path("/data[at0001]/events[at0002]/state[at0112]/items[at0114]") - private List strukturierteErfassungDerStorfaktoren; - - @Path("/data[at0001]/events[at0002]/time|value") - private TemporalAccessor timeValue; - - @Path("/data[at0001]/origin|value") - private TemporalAccessor originValue; - - @Path("/protocol[at0004]/items[openEHR-EHR-CLUSTER.location.v1 and name/value='Empfängerstandort']") - private EmpfangerstandortCluster empfangerstandort; - - @Path("/protocol[at0004]/items[at0094]/items[at0106 and name/value='Anforderung']") - private List anforderung; - - @Path("/protocol[at0004]/items[at0094]/items[at0062]/value") - private DvIdentifier auftragsIdDesAnforderndenEinsendendenSystems; - - @Path("/protocol[at0004]/items[at0094]/items[at0063]/value") - private DvIdentifier auftragsIdEmpfanger; - - @Path("/protocol[at0004]/items[at0094]/items[openEHR-EHR-CLUSTER.location.v1 and name/value='Einsenderstandort']") - private EinsenderstandortCluster einsenderstandort; - - @Path("/protocol[at0004]/items[at0094]/items[at0035]") - private List verteilerliste; - - @Path("/protocol[at0004]/items[at0110]") - private List testDetails; - - @Path("/protocol[at0004]/items[at0117]") - private List erweiterung; - - @Path("/subject") - private PartyProxy subject; - - @Path("/language") - private Language language; - - public void setLabortestBezeichnungValue(String labortestBezeichnungValue) { - this.labortestBezeichnungValue = labortestBezeichnungValue; - } - - public String getLabortestBezeichnungValue() { - return this.labortestBezeichnungValue ; - } - - public void setProbe(List probe) { - this.probe = probe; - } - - public List getProbe() { - return this.probe ; - } - - public void setKultur(List kultur) { - this.kultur = kultur; - } - - public List getKultur() { - return this.kultur ; - } - - public void setStrukturierteTestdiagnostik(List strukturierteTestdiagnostik) { - this.strukturierteTestdiagnostik = strukturierteTestdiagnostik; - } - - public List getStrukturierteTestdiagnostik() { - return this.strukturierteTestdiagnostik ; - } - - public void setMultimediaDarstellung(List multimediaDarstellung) { - this.multimediaDarstellung = multimediaDarstellung; - } - - public List getMultimediaDarstellung() { - return this.multimediaDarstellung ; - } - - public void setStrukturierteErfassungDerStorfaktoren( - List strukturierteErfassungDerStorfaktoren) { - this.strukturierteErfassungDerStorfaktoren = strukturierteErfassungDerStorfaktoren; - } - - public List getStrukturierteErfassungDerStorfaktoren() { - return this.strukturierteErfassungDerStorfaktoren ; - } - - public void setTimeValue(TemporalAccessor timeValue) { - this.timeValue = timeValue; - } - - public TemporalAccessor getTimeValue() { - return this.timeValue ; - } - - public void setOriginValue(TemporalAccessor originValue) { - this.originValue = originValue; - } - - public TemporalAccessor getOriginValue() { - return this.originValue ; - } - - public void setEmpfangerstandort(EmpfangerstandortCluster empfangerstandort) { - this.empfangerstandort = empfangerstandort; - } - - public EmpfangerstandortCluster getEmpfangerstandort() { - return this.empfangerstandort ; - } - - public void setAnforderung(List anforderung) { - this.anforderung = anforderung; - } - - public List getAnforderung() { - return this.anforderung ; - } - - public void setAuftragsIdDesAnforderndenEinsendendenSystems( - DvIdentifier auftragsIdDesAnforderndenEinsendendenSystems) { - this.auftragsIdDesAnforderndenEinsendendenSystems = auftragsIdDesAnforderndenEinsendendenSystems; - } - - public DvIdentifier getAuftragsIdDesAnforderndenEinsendendenSystems() { - return this.auftragsIdDesAnforderndenEinsendendenSystems ; - } - - public void setAuftragsIdEmpfanger(DvIdentifier auftragsIdEmpfanger) { - this.auftragsIdEmpfanger = auftragsIdEmpfanger; - } - - public DvIdentifier getAuftragsIdEmpfanger() { - return this.auftragsIdEmpfanger ; - } - - public void setEinsenderstandort(EinsenderstandortCluster einsenderstandort) { - this.einsenderstandort = einsenderstandort; - } - - public EinsenderstandortCluster getEinsenderstandort() { - return this.einsenderstandort ; - } - - public void setVerteilerliste(List verteilerliste) { - this.verteilerliste = verteilerliste; - } - - public List getVerteilerliste() { - return this.verteilerliste ; - } - - public void setTestDetails(List testDetails) { - this.testDetails = testDetails; - } - - public List getTestDetails() { - return this.testDetails ; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public List getErweiterung() { - return this.erweiterung ; - } - - public void setSubject(PartyProxy subject) { - this.subject = subject; - } - - public PartyProxy getSubject() { - return this.subject ; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public Language getLanguage() { - return this.language ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservationContainment.java deleted file mode 100644 index 5aa5a3f8f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservationContainment.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datavalues.DvIdentifier; -import com.nedap.archie.rm.generic.PartyProxy; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; -import org.ehrbase.client.classgenerator.shareddefinition.Language; - -public class BefundObservationContainment extends Containment { - public SelectAqlField BEFUND_OBSERVATION = new AqlFieldImp(BefundObservation.class, "", "BefundObservation", BefundObservation.class, this); - - public SelectAqlField LABORTEST_BEZEICHNUNG_VALUE = new AqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value", "labortestBezeichnungValue", String.class, this); - - public ListSelectAqlField PROBE = new ListAqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.specimen.v1]", "probe", ProbeCluster.class, this); - - public ListSelectAqlField KULTUR = new ListAqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_panel.v0]", "kultur", KulturCluster.class, this); - - public ListSelectAqlField STRUKTURIERTE_TESTDIAGNOSTIK = new ListAqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0122]", "strukturierteTestdiagnostik", Cluster.class, this); - - public ListSelectAqlField MULTIMEDIA_DARSTELLUNG = new ListAqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0118]", "multimediaDarstellung", Cluster.class, this); - - public ListSelectAqlField STRUKTURIERTE_ERFASSUNG_DER_STORFAKTOREN = new ListAqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/state[at0112]/items[at0114]", "strukturierteErfassungDerStorfaktoren", Cluster.class, this); - - public SelectAqlField TIME_VALUE = new AqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); - - public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(BefundObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); - - public SelectAqlField EMPFANGERSTANDORT = new AqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[openEHR-EHR-CLUSTER.location.v1]", "empfangerstandort", EmpfangerstandortCluster.class, this); - - public ListSelectAqlField ANFORDERUNG = new ListAqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0094]/items[at0106]", "anforderung", BefundAnforderungElement.class, this); - - public SelectAqlField AUFTRAGS_ID_DES_ANFORDERNDEN_EINSENDENDEN_SYSTEMS = new AqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0094]/items[at0062]/value", "auftragsIdDesAnforderndenEinsendendenSystems", DvIdentifier.class, this); - - public SelectAqlField AUFTRAGS_ID_EMPFANGER = new AqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0094]/items[at0063]/value", "auftragsIdEmpfanger", DvIdentifier.class, this); - - public SelectAqlField EINSENDERSTANDORT = new AqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0094]/items[openEHR-EHR-CLUSTER.location.v1]", "einsenderstandort", EinsenderstandortCluster.class, this); - - public ListSelectAqlField VERTEILERLISTE = new ListAqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0094]/items[at0035]", "verteilerliste", Cluster.class, this); - - public ListSelectAqlField TEST_DETAILS = new ListAqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0110]", "testDetails", Cluster.class, this); - - public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0117]", "erweiterung", Cluster.class, this); - - public SelectAqlField SUBJECT = new AqlFieldImp(BefundObservation.class, "/subject", "subject", PartyProxy.class, this); - - public SelectAqlField LANGUAGE = new AqlFieldImp(BefundObservation.class, "/language", "language", Language.class, this); - - private BefundObservationContainment() { - super("openEHR-EHR-OBSERVATION.laboratory_test_result.v1"); - } - - public static BefundObservationContainment getInstance() { - return new BefundObservationContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java deleted file mode 100644 index 43e628658..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.location.v1") -public class EinsenderstandortCluster { - @Path("/items[at0040]/value|value") - private String standorttypValue; - - @Path("/items[at0046]/value|value") - private String standortbeschreibungValue; - - @Path("/items[at0048]/value|value") - private String standortschlusselValue; - - @Path("/items[at0047]") - private List details; - - public void setStandorttypValue(String standorttypValue) { - this.standorttypValue = standorttypValue; - } - - public String getStandorttypValue() { - return this.standorttypValue ; - } - - public void setStandortbeschreibungValue(String standortbeschreibungValue) { - this.standortbeschreibungValue = standortbeschreibungValue; - } - - public String getStandortbeschreibungValue() { - return this.standortbeschreibungValue ; - } - - public void setStandortschlusselValue(String standortschlusselValue) { - this.standortschlusselValue = standortschlusselValue; - } - - public String getStandortschlusselValue() { - return this.standortschlusselValue ; - } - - public void setDetails(List details) { - this.details = details; - } - - public List getDetails() { - return this.details ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortClusterContainment.java deleted file mode 100644 index febd0e937..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortClusterContainment.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class EinsenderstandortClusterContainment extends Containment { - public SelectAqlField EINSENDERSTANDORT_CLUSTER = new AqlFieldImp(EinsenderstandortCluster.class, "", "EinsenderstandortCluster", EinsenderstandortCluster.class, this); - - public SelectAqlField STANDORTTYP_VALUE = new AqlFieldImp(EinsenderstandortCluster.class, "/items[at0040]/value|value", "standorttypValue", String.class, this); - - public SelectAqlField STANDORTBESCHREIBUNG_VALUE = new AqlFieldImp(EinsenderstandortCluster.class, "/items[at0046]/value|value", "standortbeschreibungValue", String.class, this); - - public SelectAqlField STANDORTSCHLUSSEL_VALUE = new AqlFieldImp(EinsenderstandortCluster.class, "/items[at0048]/value|value", "standortschlusselValue", String.class, this); - - public ListSelectAqlField DETAILS = new ListAqlFieldImp(EinsenderstandortCluster.class, "/items[at0047]", "details", Cluster.class, this); - - private EinsenderstandortClusterContainment() { - super("openEHR-EHR-CLUSTER.location.v1"); - } - - public static EinsenderstandortClusterContainment getInstance() { - return new EinsenderstandortClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java deleted file mode 100644 index 72ebb9d5c..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.location.v1") -public class EmpfangerstandortCluster { - @Path("/items[at0040]/value|value") - private String standorttypValue; - - @Path("/items[at0046]/value|value") - private String standortbeschreibungValue; - - @Path("/items[at0048]/value|value") - private String standortschlusselValue; - - @Path("/items[at0047]") - private List details; - - public void setStandorttypValue(String standorttypValue) { - this.standorttypValue = standorttypValue; - } - - public String getStandorttypValue() { - return this.standorttypValue ; - } - - public void setStandortbeschreibungValue(String standortbeschreibungValue) { - this.standortbeschreibungValue = standortbeschreibungValue; - } - - public String getStandortbeschreibungValue() { - return this.standortbeschreibungValue ; - } - - public void setStandortschlusselValue(String standortschlusselValue) { - this.standortschlusselValue = standortschlusselValue; - } - - public String getStandortschlusselValue() { - return this.standortschlusselValue ; - } - - public void setDetails(List details) { - this.details = details; - } - - public List getDetails() { - return this.details ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortClusterContainment.java deleted file mode 100644 index 112508ffd..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortClusterContainment.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class EmpfangerstandortClusterContainment extends Containment { - public SelectAqlField EMPFANGERSTANDORT_CLUSTER = new AqlFieldImp(EmpfangerstandortCluster.class, "", "EmpfangerstandortCluster", EmpfangerstandortCluster.class, this); - - public SelectAqlField STANDORTTYP_VALUE = new AqlFieldImp(EmpfangerstandortCluster.class, "/items[at0040]/value|value", "standorttypValue", String.class, this); - - public SelectAqlField STANDORTBESCHREIBUNG_VALUE = new AqlFieldImp(EmpfangerstandortCluster.class, "/items[at0046]/value|value", "standortbeschreibungValue", String.class, this); - - public SelectAqlField STANDORTSCHLUSSEL_VALUE = new AqlFieldImp(EmpfangerstandortCluster.class, "/items[at0048]/value|value", "standortschlusselValue", String.class, this); - - public ListSelectAqlField DETAILS = new ListAqlFieldImp(EmpfangerstandortCluster.class, "/items[at0047]", "details", Cluster.class, this); - - private EmpfangerstandortClusterContainment() { - super("openEHR-EHR-CLUSTER.location.v1"); - } - - public static EmpfangerstandortClusterContainment getInstance() { - return new EmpfangerstandortClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java deleted file mode 100644 index 6fefa5270..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; - -import java.lang.String; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.case_identification.v0") -public class FallidentifikationCluster { - @Path("/items[at0001]/value|value") - private String fallKennungValue; - - public void setFallKennungValue(String fallKennungValue) { - this.fallKennungValue = fallKennungValue; - } - - public String getFallKennungValue() { - return this.fallKennungValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationClusterContainment.java deleted file mode 100644 index a34b7a70c..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationClusterContainment.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; - -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class FallidentifikationClusterContainment extends Containment { - public SelectAqlField FALLIDENTIFIKATION_CLUSTER = new AqlFieldImp(FallidentifikationCluster.class, "", "FallidentifikationCluster", FallidentifikationCluster.class, this); - - public SelectAqlField FALL_KENNUNG_VALUE = new AqlFieldImp(FallidentifikationCluster.class, "/items[at0001]/value|value", "fallKennungValue", String.class, this); - - private FallidentifikationClusterContainment() { - super("openEHR-EHR-CLUSTER.case_identification.v0"); - } - - public static FallidentifikationClusterContainment getInstance() { - return new FallidentifikationClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java deleted file mode 100644 index d0d355f8f..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; - -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.laboratory_test_panel.v0") -public class KulturCluster { - @Path("/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Pro Virus']") - private List proVirus; - - public void setProVirus(List proVirus) { - this.proVirus = proVirus; - } - - public List getProVirus() { - return this.proVirus ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturClusterContainment.java deleted file mode 100644 index 54b358bc0..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturClusterContainment.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; - -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class KulturClusterContainment extends Containment { - public SelectAqlField KULTUR_CLUSTER = new AqlFieldImp(KulturCluster.class, "", "KulturCluster", KulturCluster.class, this); - - public ListSelectAqlField PRO_VIRUS = new ListAqlFieldImp(KulturCluster.class, "/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]", "proVirus", ProVirusCluster.class, this); - - private KulturClusterContainment() { - super("openEHR-EHR-CLUSTER.laboratory_test_panel.v0"); - } - - public static KulturClusterContainment getInstance() { - return new KulturClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java deleted file mode 100644 index 1f0903984..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java +++ /dev/null @@ -1,103 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datavalues.DvIdentifier; -import java.lang.Double; -import java.lang.Long; -import java.lang.String; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") -public class ProVirusCluster { - @Path("/items[at0027]/value|magnitude") - private Long analyseergebnisReihenfolgeMagnitude; - - @Path("/items[at0024 and name/value='Virus']/value|value") - private String virusValue; - - @Path("/items[at0001 and name/value='Nachweis']/value|value") - private String nachweisValue; - - @Path("/items[at0001 and name/value='Viruslast (ct-Wert)']/value|magnitude") - private Double viruslastCtWertMagnitude; - - @Path("/items[at0001 and name/value='Viruslast (ct-Wert)']/value|units") - private String viruslastCtWertUnits; - - @Path("/items[at0014]") - private List analyseergebnisDetails; - - @Path("/items[at0026 and name/value='Zugehörige Laborprobe']/value") - private DvIdentifier zugehorigeLaborprobe; - - @Path("/items[at0003]/value|value") - private String kommentarValue; - - public void setAnalyseergebnisReihenfolgeMagnitude(Long analyseergebnisReihenfolgeMagnitude) { - this.analyseergebnisReihenfolgeMagnitude = analyseergebnisReihenfolgeMagnitude; - } - - public Long getAnalyseergebnisReihenfolgeMagnitude() { - return this.analyseergebnisReihenfolgeMagnitude ; - } - - public void setVirusValue(String virusValue) { - this.virusValue = virusValue; - } - - public String getVirusValue() { - return this.virusValue ; - } - - public void setNachweisValue(String nachweisValue) { - this.nachweisValue = nachweisValue; - } - - public String getNachweisValue() { - return this.nachweisValue ; - } - - public void setViruslastCtWertMagnitude(Double viruslastCtWertMagnitude) { - this.viruslastCtWertMagnitude = viruslastCtWertMagnitude; - } - - public Double getViruslastCtWertMagnitude() { - return this.viruslastCtWertMagnitude ; - } - - public void setViruslastCtWertUnits(String viruslastCtWertUnits) { - this.viruslastCtWertUnits = viruslastCtWertUnits; - } - - public String getViruslastCtWertUnits() { - return this.viruslastCtWertUnits ; - } - - public void setAnalyseergebnisDetails(List analyseergebnisDetails) { - this.analyseergebnisDetails = analyseergebnisDetails; - } - - public List getAnalyseergebnisDetails() { - return this.analyseergebnisDetails ; - } - - public void setZugehorigeLaborprobe(DvIdentifier zugehorigeLaborprobe) { - this.zugehorigeLaborprobe = zugehorigeLaborprobe; - } - - public DvIdentifier getZugehorigeLaborprobe() { - return this.zugehorigeLaborprobe ; - } - - public void setKommentarValue(String kommentarValue) { - this.kommentarValue = kommentarValue; - } - - public String getKommentarValue() { - return this.kommentarValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusClusterContainment.java deleted file mode 100644 index d9c4b1f9b..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusClusterContainment.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datavalues.DvIdentifier; -import java.lang.Double; -import java.lang.Long; -import java.lang.String; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class ProVirusClusterContainment extends Containment { - public SelectAqlField PRO_VIRUS_CLUSTER = new AqlFieldImp(ProVirusCluster.class, "", "ProVirusCluster", ProVirusCluster.class, this); - - public SelectAqlField ANALYSEERGEBNIS_REIHENFOLGE_MAGNITUDE = new AqlFieldImp(ProVirusCluster.class, "/items[at0027]/value|magnitude", "analyseergebnisReihenfolgeMagnitude", Long.class, this); - - public SelectAqlField VIRUS_VALUE = new AqlFieldImp(ProVirusCluster.class, "/items[at0024]/value|value", "virusValue", String.class, this); - - public SelectAqlField NACHWEIS_VALUE = new AqlFieldImp(ProVirusCluster.class, "/items[at0001]/value|value", "nachweisValue", String.class, this); - - public SelectAqlField VIRUSLAST_CT_WERT_MAGNITUDE = new AqlFieldImp(ProVirusCluster.class, "/items[at0001]/value|magnitude", "viruslastCtWertMagnitude", Double.class, this); - - public SelectAqlField VIRUSLAST_CT_WERT_UNITS = new AqlFieldImp(ProVirusCluster.class, "/items[at0001]/value|units", "viruslastCtWertUnits", String.class, this); - - public ListSelectAqlField ANALYSEERGEBNIS_DETAILS = new ListAqlFieldImp(ProVirusCluster.class, "/items[at0014]", "analyseergebnisDetails", Cluster.class, this); - - public SelectAqlField ZUGEHORIGE_LABORPROBE = new AqlFieldImp(ProVirusCluster.class, "/items[at0026]/value", "zugehorigeLaborprobe", DvIdentifier.class, this); - - public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ProVirusCluster.class, "/items[at0003]/value|value", "kommentarValue", String.class, this); - - private ProVirusClusterContainment() { - super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); - } - - public static ProVirusClusterContainment getInstance() { - return new ProVirusClusterContainment(); - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java deleted file mode 100644 index 053662c81..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java +++ /dev/null @@ -1,213 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datavalues.DvIdentifier; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import java.util.List; -import org.ehrbase.client.annotations.Archetype; -import org.ehrbase.client.annotations.Entity; -import org.ehrbase.client.annotations.Path; - -@Entity -@Archetype("openEHR-EHR-CLUSTER.specimen.v1") -public class ProbeCluster { - @Path("/items[at0029]/value|value") - private String probenartValue; - - @Path("/items[at0001]/value") - private DvIdentifier laborprobenidentifikator; - - @Path("/items[at0088]/value") - private DvIdentifier externerIdentifikator; - - @Path("/items[at0034]/value|value") - private TemporalAccessor zeitpunktDesProbeneingangsValue; - - @Path("/items[at0027]") - private List physischeEigenschaften; - - @Path("/items[at0079]/value|value") - private String kommentarDesProbennehmersValue; - - @Path("/items[at0087]/value|value") - private String probenentnahmestelleValue; - - @Path("/items[openEHR-EHR-CLUSTER.anatomical_location.v1]") - private AnatomischeLokalisationCluster anatomischeLokalisation; - - @Path("/items[at0015]/value|value") - private TemporalAccessor zeitpunktDerProbenentnahmeValue; - - @Path("/items[at0070]/value") - private DvIdentifier identifikatorDesProbennehmers; - - @Path("/items[at0071]") - private List angabenZumProbennehmer; - - @Path("/items[at0083]") - private List zusatzlicheAngabenZurProbennahme; - - @Path("/items[at0085]") - private List behalterDetails; - - @Path("/items[at0068]") - private List angabenZurVerarbeitung; - - @Path("/items[at0093]") - private List angabenZumTransport; - - @Path("/items[at0096]") - private List digitaleDarstellung; - - @Path("/items[at0003]/value") - private DvIdentifier identifikatorDerUbergeordnetenProbe; - - @Path("/items[at0045]/value|value") - private String kommentarValue; - - public void setProbenartValue(String probenartValue) { - this.probenartValue = probenartValue; - } - - public String getProbenartValue() { - return this.probenartValue ; - } - - public void setLaborprobenidentifikator(DvIdentifier laborprobenidentifikator) { - this.laborprobenidentifikator = laborprobenidentifikator; - } - - public DvIdentifier getLaborprobenidentifikator() { - return this.laborprobenidentifikator ; - } - - public void setExternerIdentifikator(DvIdentifier externerIdentifikator) { - this.externerIdentifikator = externerIdentifikator; - } - - public DvIdentifier getExternerIdentifikator() { - return this.externerIdentifikator ; - } - - public void setZeitpunktDesProbeneingangsValue(TemporalAccessor zeitpunktDesProbeneingangsValue) { - this.zeitpunktDesProbeneingangsValue = zeitpunktDesProbeneingangsValue; - } - - public TemporalAccessor getZeitpunktDesProbeneingangsValue() { - return this.zeitpunktDesProbeneingangsValue ; - } - - public void setPhysischeEigenschaften(List physischeEigenschaften) { - this.physischeEigenschaften = physischeEigenschaften; - } - - public List getPhysischeEigenschaften() { - return this.physischeEigenschaften ; - } - - public void setKommentarDesProbennehmersValue(String kommentarDesProbennehmersValue) { - this.kommentarDesProbennehmersValue = kommentarDesProbennehmersValue; - } - - public String getKommentarDesProbennehmersValue() { - return this.kommentarDesProbennehmersValue ; - } - - public void setProbenentnahmestelleValue(String probenentnahmestelleValue) { - this.probenentnahmestelleValue = probenentnahmestelleValue; - } - - public String getProbenentnahmestelleValue() { - return this.probenentnahmestelleValue ; - } - - public void setAnatomischeLokalisation(AnatomischeLokalisationCluster anatomischeLokalisation) { - this.anatomischeLokalisation = anatomischeLokalisation; - } - - public AnatomischeLokalisationCluster getAnatomischeLokalisation() { - return this.anatomischeLokalisation ; - } - - public void setZeitpunktDerProbenentnahmeValue(TemporalAccessor zeitpunktDerProbenentnahmeValue) { - this.zeitpunktDerProbenentnahmeValue = zeitpunktDerProbenentnahmeValue; - } - - public TemporalAccessor getZeitpunktDerProbenentnahmeValue() { - return this.zeitpunktDerProbenentnahmeValue ; - } - - public void setIdentifikatorDesProbennehmers(DvIdentifier identifikatorDesProbennehmers) { - this.identifikatorDesProbennehmers = identifikatorDesProbennehmers; - } - - public DvIdentifier getIdentifikatorDesProbennehmers() { - return this.identifikatorDesProbennehmers ; - } - - public void setAngabenZumProbennehmer(List angabenZumProbennehmer) { - this.angabenZumProbennehmer = angabenZumProbennehmer; - } - - public List getAngabenZumProbennehmer() { - return this.angabenZumProbennehmer ; - } - - public void setZusatzlicheAngabenZurProbennahme(List zusatzlicheAngabenZurProbennahme) { - this.zusatzlicheAngabenZurProbennahme = zusatzlicheAngabenZurProbennahme; - } - - public List getZusatzlicheAngabenZurProbennahme() { - return this.zusatzlicheAngabenZurProbennahme ; - } - - public void setBehalterDetails(List behalterDetails) { - this.behalterDetails = behalterDetails; - } - - public List getBehalterDetails() { - return this.behalterDetails ; - } - - public void setAngabenZurVerarbeitung(List angabenZurVerarbeitung) { - this.angabenZurVerarbeitung = angabenZurVerarbeitung; - } - - public List getAngabenZurVerarbeitung() { - return this.angabenZurVerarbeitung ; - } - - public void setAngabenZumTransport(List angabenZumTransport) { - this.angabenZumTransport = angabenZumTransport; - } - - public List getAngabenZumTransport() { - return this.angabenZumTransport ; - } - - public void setDigitaleDarstellung(List digitaleDarstellung) { - this.digitaleDarstellung = digitaleDarstellung; - } - - public List getDigitaleDarstellung() { - return this.digitaleDarstellung ; - } - - public void setIdentifikatorDerUbergeordnetenProbe( - DvIdentifier identifikatorDerUbergeordnetenProbe) { - this.identifikatorDerUbergeordnetenProbe = identifikatorDerUbergeordnetenProbe; - } - - public DvIdentifier getIdentifikatorDerUbergeordnetenProbe() { - return this.identifikatorDerUbergeordnetenProbe ; - } - - public void setKommentarValue(String kommentarValue) { - this.kommentarValue = kommentarValue; - } - - public String getKommentarValue() { - return this.kommentarValue ; - } -} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeClusterContainment.java deleted file mode 100644 index c8c87764e..000000000 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeClusterContainment.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; - -import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datavalues.DvIdentifier; -import java.lang.String; -import java.time.temporal.TemporalAccessor; -import org.ehrbase.client.aql.containment.Containment; -import org.ehrbase.client.aql.field.AqlFieldImp; -import org.ehrbase.client.aql.field.ListAqlFieldImp; -import org.ehrbase.client.aql.field.ListSelectAqlField; -import org.ehrbase.client.aql.field.SelectAqlField; - -public class ProbeClusterContainment extends Containment { - public SelectAqlField PROBE_CLUSTER = new AqlFieldImp(ProbeCluster.class, "", "ProbeCluster", ProbeCluster.class, this); - - public SelectAqlField PROBENART_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0029]/value|value", "probenartValue", String.class, this); - - public SelectAqlField LABORPROBENIDENTIFIKATOR = new AqlFieldImp(ProbeCluster.class, "/items[at0001]/value", "laborprobenidentifikator", DvIdentifier.class, this); - - public SelectAqlField EXTERNER_IDENTIFIKATOR = new AqlFieldImp(ProbeCluster.class, "/items[at0088]/value", "externerIdentifikator", DvIdentifier.class, this); - - public SelectAqlField ZEITPUNKT_DES_PROBENEINGANGS_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0034]/value|value", "zeitpunktDesProbeneingangsValue", TemporalAccessor.class, this); - - public ListSelectAqlField PHYSISCHE_EIGENSCHAFTEN = new ListAqlFieldImp(ProbeCluster.class, "/items[at0027]", "physischeEigenschaften", Cluster.class, this); - - public SelectAqlField KOMMENTAR_DES_PROBENNEHMERS_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0079]/value|value", "kommentarDesProbennehmersValue", String.class, this); - - public SelectAqlField PROBENENTNAHMESTELLE_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0087]/value|value", "probenentnahmestelleValue", String.class, this); - - public SelectAqlField ANATOMISCHE_LOKALISATION = new AqlFieldImp(ProbeCluster.class, "/items[openEHR-EHR-CLUSTER.anatomical_location.v1]", "anatomischeLokalisation", AnatomischeLokalisationCluster.class, this); - - public SelectAqlField ZEITPUNKT_DER_PROBENENTNAHME_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0015]/value|value", "zeitpunktDerProbenentnahmeValue", TemporalAccessor.class, this); - - public SelectAqlField IDENTIFIKATOR_DES_PROBENNEHMERS = new AqlFieldImp(ProbeCluster.class, "/items[at0070]/value", "identifikatorDesProbennehmers", DvIdentifier.class, this); - - public ListSelectAqlField ANGABEN_ZUM_PROBENNEHMER = new ListAqlFieldImp(ProbeCluster.class, "/items[at0071]", "angabenZumProbennehmer", Cluster.class, this); - - public ListSelectAqlField ZUSATZLICHE_ANGABEN_ZUR_PROBENNAHME = new ListAqlFieldImp(ProbeCluster.class, "/items[at0083]", "zusatzlicheAngabenZurProbennahme", Cluster.class, this); - - public ListSelectAqlField BEHALTER_DETAILS = new ListAqlFieldImp(ProbeCluster.class, "/items[at0085]", "behalterDetails", Cluster.class, this); - - public ListSelectAqlField ANGABEN_ZUR_VERARBEITUNG = new ListAqlFieldImp(ProbeCluster.class, "/items[at0068]", "angabenZurVerarbeitung", Cluster.class, this); - - public ListSelectAqlField ANGABEN_ZUM_TRANSPORT = new ListAqlFieldImp(ProbeCluster.class, "/items[at0093]", "angabenZumTransport", Cluster.class, this); - - public ListSelectAqlField DIGITALE_DARSTELLUNG = new ListAqlFieldImp(ProbeCluster.class, "/items[at0096]", "digitaleDarstellung", Cluster.class, this); - - public SelectAqlField IDENTIFIKATOR_DER_UBERGEORDNETEN_PROBE = new AqlFieldImp(ProbeCluster.class, "/items[at0003]/value", "identifikatorDerUbergeordnetenProbe", DvIdentifier.class, this); - - public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0045]/value|value", "kommentarValue", String.class, this); - - private ProbeClusterContainment() { - super("openEHR-EHR-CLUSTER.specimen.v1"); - } - - public static ProbeClusterContainment getInstance() { - return new ProbeClusterContainment(); - } -} From 9e24deb045142b732b93789470c9c1ee193f6baa Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Wed, 2 Dec 2020 10:11:35 +0100 Subject: [PATCH 22/54] read examples --- .../AlternativeEventsComposition.java | 202 +++ ...ternativeEventsCompositionContainment.java | 61 + .../KorpergewichtAnyEventEnChoice.java | 4 + .../KorpergewichtAnyEventEnIntervalEvent.java | 104 ++ .../KorpergewichtAnyEventEnPointEvent.java | 80 + .../KorpergewichtBirthEnPointEvent.java | 78 + ...pergewichtConfoundingFactorsEnElement.java | 19 + .../definition/KorpergewichtObservation.java | 93 ++ .../KorpergewichtObservationContainment.java | 37 + .../StateOfDressEnDefiningCode.java | 47 + .../BefundDerBlutgasanalyseComposition.java | 203 +++ ...rBlutgasanalyseCompositionContainment.java | 62 + .../KohlendioxidpartialdruckCluster.java | 69 + ...ndioxidpartialdruckClusterContainment.java | 32 + .../definition/LaborergebnisObservation.java | 194 +++ .../LaborergebnisObservationContainment.java | 55 + .../LabortestBezeichnungDefiningCode.java | 44 + .../definition/PhWertCluster.java | 69 + .../definition/PhWertClusterContainment.java | 32 + .../SauerstoffpartialdruckCluster.java | 69 + ...erstoffpartialdruckClusterContainment.java | 32 + .../SauerstoffsattigungCluster.java | 69 + ...SauerstoffsattigungClusterContainment.java | 32 + .../definition/StatusDefiningCode.java | 45 + .../UntersuchterAnalytDefiningCode.java | 44 + .../UntersuchterAnalytDefiningCode2.java | 44 + .../UntersuchterAnalytDefiningCode3.java | 50 + .../UntersuchterAnalytDefiningCode4.java | 42 + .../CoronaAnamneseComposition.java | 250 ++++ .../CoronaAnamneseCompositionContainment.java | 73 + .../definition/AdresseCluster.java | 32 + .../definition/AdresseClusterContainment.java | 22 + .../definition/AllgemeineAngabenSection.java | 114 ++ .../AllgemeineAngabenSectionContainment.java | 37 + ...AndereAktuelleErkrankungenObservation.java | 105 ++ ...lleErkrankungenObservationContainment.java | 40 + ...ogebieteFurCoronainfektionOderKontak_.java | 42 + ...ltInGesundheitseinrichtungObservation.java | 126 ++ ...eitseinrichtungObservationContainment.java | 44 + .../definition/BeschaftigungCluster.java | 45 + .../BeschaftigungClusterContainment.java | 27 + ...ertungDesGesundheitsrisikosEvaluation.java | 160 ++ ...sundheitsrisikosEvaluationContainment.java | 50 + .../ChronischeErkrankungenObservation.java | 105 ++ ...cheErkrankungenObservationContainment.java | 40 + .../DiagnosestatusDefiningCode.java | 39 + .../DiagnostischeSicherheitDefiningCode.java | 44 + ...enstleistungAktuelleAktivitatActivity.java | 89 ++ ...leistungGrundFurDieAnforderungElement.java | 19 + .../definition/DienstleistungInstruction.java | 115 ++ .../DienstleistungInstructionContainment.java | 42 + .../definition/DurchfallObservation.java | 105 ++ .../DurchfallObservationContainment.java | 40 + ...derErhohteKorpertemperaturObservation.java | 105 ++ ...orpertemperaturObservationContainment.java | 40 + ...genZumMedikationsScreeningObservation.java | 120 ++ ...ationsScreeningObservationContainment.java | 43 + ...creeningSpezifischeMedikamenteCluster.java | 31 + ...ichteHistorieBeliebigesEreignisChoice.java | 4 + ...storieBeliebigesEreignisIntervalEvent.java | 69 + ...eHistorieBeliebigesEreignisPointEvent.java | 45 + .../GeschichteHistorieGeschichteElement.java | 19 + .../GeschichteHistorieObservation.java | 72 + ...chichteHistorieObservationContainment.java | 33 + .../GestorterGeruchssinnObservation.java | 105 ++ ...rterGeruchssinnObservationContainment.java | 40 + .../GestorterGeschmackssinnObservation.java | 105 ++ ...rGeschmackssinnObservationContainment.java | 40 + .../GesundheitsbezogenerBerufEvaluation.java | 80 + ...tsbezogenerBerufEvaluationContainment.java | 35 + .../definition/HeiserkeitObservation.java | 105 ++ .../HeiserkeitObservationContainment.java | 40 + .../HistorieDerReiseObservation.java | 104 ++ ...istorieDerReiseObservationContainment.java | 39 + .../definition/HustenObservation.java | 105 ++ .../HustenObservationContainment.java | 40 + .../definition/InlandAuslandDefiningCode.java | 43 + .../definition/KontaktSection.java | 32 + .../definition/KontaktSectionContainment.java | 21 + .../KorpertemperaturObservation.java | 149 ++ ...orpertemperaturObservationContainment.java | 49 + .../KorpertemperaturStorfaktorenElement.java | 19 + .../definition/LetzteReiseDefiningCode.java | 43 + .../MedikamentInVerwendungDefiningCode.java | 44 + ...amentenklasseInVerwendungDefiningCode.java | 44 + .../definition/OrganisationCluster.java | 78 + .../OrganisationClusterContainment.java | 33 + .../PersonenkontaktObservation.java | 126 ++ ...PersonenkontaktObservationContainment.java | 44 + .../PresenceOfAnyExposureEnDefiningCode.java | 44 + .../definition/ProblemDiagnoseEvaluation.java | 91 ++ .../ProblemDiagnoseEvaluationContainment.java | 37 + ...onovirusDiagnostischeSicherheitChoice.java | 4 + ...rusDiagnostischeSicherheitDvCodedText.java | 21 + ...onovirusDiagnostischeSicherheitDvText.java | 21 + .../ProblemDiganoseCoronovirusEvaluation.java | 128 ++ ...anoseCoronovirusEvaluationContainment.java | 44 + ...iebigesIntervallereignisIntervalEvent.java | 77 + .../ReisefallBestimmteReiseCluster.java | 44 + .../ReisefallBestimmtesReisezielCluster.java | 65 + .../definition/ReisefallObservation.java | 70 + .../ReisefallObservationContainment.java | 33 + .../definition/RisikogebietSection.java | 32 + .../RisikogebietSectionContainment.java | 23 + .../definition/SchnupfenObservation.java | 105 ++ .../SchnupfenObservationContainment.java | 40 + .../definition/StandortCluster.java | 34 + .../StandortClusterContainment.java | 25 + .../definition/StatusCluster.java | 20 + .../definition/StatusClusterContainment.java | 19 + .../definition/SymptomeSection.java | 110 ++ .../SymptomeSectionContainment.java | 35 + .../definition/VorhandenDefiningCode.java | 41 + .../definition/VorhandenDefiningCode2.java | 43 + .../definition/VorhandenseinDefiningCode.java | 41 + .../VorhandenseinDefiningCode2.java | 43 + ...itereSymptomeBeliebigesEreignisChoice.java | 4 + ...mptomeBeliebigesEreignisIntervalEvent.java | 59 + ...eSymptomeBeliebigesEreignisPointEvent.java | 35 + .../WeitereSymptomeObservation.java | 72 + ...WeitereSymptomeObservationContainment.java | 33 + ...meSpezifischesSymptomAnzeichenCluster.java | 56 + .../definition/WohnsituationEvaluation.java | 81 ++ .../WohnsituationEvaluationContainment.java | 36 + .../definition/WohnstatteCluster.java | 34 + .../WohnstatteClusterContainment.java | 25 + .../DiagnoseComposition.java | 191 +++ .../DiagnoseCompositionContainment.java | 59 + .../AnatomischeLokalisationCluster.java | 56 + ...omischeLokalisationClusterContainment.java | 29 + ...thogeneseAtiologieDerKrankheitElement.java | 20 + ...eneseBeschreibungDesEntstehensElement.java | 19 + .../definition/AtiopathogeneseCluster.java | 34 + .../AtiopathogeneseClusterContainment.java | 23 + .../AtiopathogeneseValueChoice.java | 4 + .../AtiopathogeneseValueDvCodedText.java | 20 + .../AtiopathogeneseValueDvText.java | 21 + .../definition/DiagnosedetailsCluster.java | 55 + .../DiagnosedetailsClusterContainment.java | 27 + .../DiagnostischeSicherheitDefiningCode.java | 44 + .../definition/FallidentifikationCluster.java | 21 + .../FallidentifikationClusterContainment.java | 20 + .../definition/LateralitatDefiningCode.java | 43 + ...ameDesProblemsDerDiagnoseDefiningCode.java | 46 + ...DiagnoseDiagnostischeSicherheitChoice.java | 4 + ...oseDiagnostischeSicherheitDvCodedText.java | 21 + ...DiagnoseDiagnostischeSicherheitDvText.java | 21 + .../definition/ProblemDiagnoseEvaluation.java | 209 +++ .../ProblemDiagnoseEvaluationContainment.java | 58 + .../ProblemDiagnoseSchweregradChoice.java | 4 + ...ProblemDiagnoseSchweregradDvCodedText.java | 20 + .../ProblemDiagnoseSchweregradDvText.java | 21 + .../definition/SchweregradDefiningCode.java | 43 + .../definition/ValueDefiningCode.java | 63 + ...aseBloodPressureSimpleDeV0Composition.java | 182 +++ ...ssureSimpleDeV0CompositionContainment.java | 57 + ...loodPressureTrainingSampleObservation.java | 249 ++++ ...eTrainingSampleObservationContainment.java | 67 + .../definition/CuffSizeDefiningCode.java | 53 + .../DeviceDetailsTrainingSampleCluster.java | 111 ++ ...tailsTrainingSampleClusterContainment.java | 38 + .../KorotkoffSoundsDefiningCode.java | 44 + .../LocationOfMeasurementDefiningCode.java | 58 + .../definition/PositionDefiningCode.java | 53 + ...EhrbaseMultiOccurrenceDeV1Composition.java | 180 +++ ...iOccurrenceDeV1CompositionContainment.java | 57 + .../definition/BodyExposureDefiningCode.java | 51 + .../BodyTemperatureAnyEventChoice.java | 4 + .../BodyTemperatureAnyEventIntervalEvent.java | 129 ++ .../BodyTemperatureAnyEventPointEvent.java | 105 ++ .../BodyTemperatureBodyExposureChoice.java | 4 + ...odyTemperatureBodyExposureDvCodedText.java | 20 + .../BodyTemperatureBodyExposureDvText.java | 21 + ...emperatureLocationOfMeasurementChoice.java | 4 + ...atureLocationOfMeasurementDvCodedText.java | 21 + ...emperatureLocationOfMeasurementDvText.java | 21 + .../BodyTemperatureObservation.java | 106 ++ ...BodyTemperatureObservationContainment.java | 39 + .../LocationOfMeasurementDefiningCode.java | 70 + .../EpisodeOfCareComposition.java | 168 +++ .../EpisodeOfCareCompositionContainment.java | 54 + .../definition/EpisodeofcareAdminEntry.java | 159 ++ .../EpisodeofcareAdminEntryContainment.java | 51 + .../EpisodeofcareDiagnosisCluster.java | 43 + .../EpisodeofcareIdentifierElement.java | 19 + .../definition/EpisodeofcareTeamElement.java | 19 + .../definition/StatusDefiningCode.java | 51 + .../OpenEREACTCareComposition.java | 216 +++ .../OpenEREACTCareCompositionContainment.java | 66 + .../definition/AbdomenSymptomCluster.java | 78 + .../AbdomenSymptomClusterContainment.java | 33 + .../definition/AcvpuDefiningCode.java | 47 + .../definition/AcvpuScaleObservation.java | 92 ++ .../AcvpuScaleObservationContainment.java | 38 + .../definition/AllergiesEvaluation.java | 58 + .../AllergiesEvaluationContainment.java | 31 + .../AmberFlagAcuteDefiningCode.java | 53 + .../definition/AssessmentSection.java | 53 + .../AssessmentSectionContainment.java | 25 + .../definition/BackgroundSection.java | 75 + .../BackgroundSectionContainment.java | 29 + .../definition/BloodPressureObservation.java | 148 ++ .../BloodPressureObservationContainment.java | 49 + .../BreathingIndicatorDefiningCode.java | 46 + .../definition/CareflowStepDefiningCode.java | 39 + .../definition/ChestSymptomCluster.java | 78 + .../ChestSymptomClusterContainment.java | 33 + .../CirculationIndicatorDefiningCode.java | 46 + .../ClinicalRiskCategoryDefiningCode.java | 46 + .../definition/Covid19ExposureEvaluation.java | 169 +++ .../Covid19ExposureEvaluationContainment.java | 50 + .../definition/CovidNotesEvaluation.java | 58 + .../CovidNotesEvaluationContainment.java | 31 + .../definition/CovidSection.java | 53 + .../definition/CovidSectionContainment.java | 25 + .../definition/CovidSymptomsObservation.java | 147 ++ .../CovidSymptomsObservationContainment.java | 48 + .../definition/CurrentStateDefiningCode.java | 39 + .../DenwisAgitationIndicatorElement.java | 20 + .../DenwisBreathingIndicatorElement.java | 18 + .../DenwisCirculationIndicatorElement.java | 18 + .../DenwisMentationIndicatorElement.java | 20 + ...DenwisNurseSubjectiveIndicatorElement.java | 20 + .../definition/DenwisObservation.java | 307 ++++ .../DenwisObservationContainment.java | 79 + .../DenwisPainIndicatorElement.java | 20 + .../DenwisPatientIndicatorElement.java | 20 + .../DenwisTemperatureIndicatorElement.java | 20 + .../DenwisTrajectoryIndicatorElement.java | 20 + .../definition/DenwisValueChoice.java | 4 + .../definition/DenwisValueChoice2.java | 4 + .../definition/DenwisValueChoice3.java | 4 + .../definition/DenwisValueChoice4.java | 4 + .../definition/DenwisValueChoice5.java | 4 + .../definition/DenwisValueChoice6.java | 4 + .../definition/DenwisValueDvCodedText.java | 20 + .../definition/DenwisValueDvCodedText2.java | 20 + .../definition/DenwisValueDvCodedText3.java | 20 + .../definition/DenwisValueDvCodedText4.java | 20 + .../definition/DenwisValueDvCodedText5.java | 20 + .../definition/DenwisValueDvCodedText6.java | 20 + .../definition/DenwisValueDvText.java | 21 + .../definition/DenwisValueDvText2.java | 21 + .../definition/DenwisValueDvText3.java | 21 + .../definition/DenwisValueDvText4.java | 21 + .../definition/DenwisValueDvText5.java | 21 + .../definition/DenwisValueDvText6.java | 21 + .../definition/FirstSymptomsCluster.java | 125 ++ .../FirstSymptomsClusterContainment.java | 44 + .../definition/FrailtyObservation.java | 81 ++ .../FrailtyObservationContainment.java | 36 + .../definition/HealthRiskDefiningCode.java | 39 + .../definition/HeightObservation.java | 116 ++ .../HeightObservationContainment.java | 44 + .../definition/KeyCovidSymptomCluster.java | 78 + .../KeyCovidSymptomClusterContainment.java | 33 + .../LatestCovid19TestObservation.java | 194 +++ ...testCovid19TestObservationContainment.java | 56 + ...estCovid19TestOverallTestStatusChoice.java | 4 + ...vid19TestOverallTestStatusDvCodedText.java | 21 + ...estCovid19TestOverallTestStatusDvText.java | 21 + ...tCovid19TestTestRequestDetailsCluster.java | 31 + .../definition/MedicationEvaluation.java | 58 + .../MedicationEvaluationContainment.java | 31 + .../definition/N999FlagDefiningCode.java | 49 + .../definition/NeuroSymptomCluster.java | 78 + .../NeuroSymptomClusterContainment.java | 33 + .../definition/News2ScoreObservation.java | 182 +++ .../News2ScoreObservationContainment.java | 55 + .../definition/News2Section.java | 86 ++ .../definition/News2SectionContainment.java | 31 + .../definition/OtherSymptomCluster.java | 78 + .../OtherSymptomClusterContainment.java | 33 + .../OverallTestStatusDefiningCode.java | 54 + .../definition/PastHistoryEvaluation.java | 58 + .../PastHistoryEvaluationContainment.java | 31 + .../definition/PresenceDefiningCode.java | 43 + .../definition/PresenceDefiningCode2.java | 43 + .../definition/PulseObservation.java | 115 ++ .../PulseObservationContainment.java | 43 + .../definition/PulseOximetryObservation.java | 136 ++ .../PulseOximetryObservationContainment.java | 46 + .../definition/RecommendationEvaluation.java | 57 + .../RecommendationEvaluationContainment.java | 30 + .../RecommendationRecommendationElement.java | 19 + .../definition/RedFlagAcuteDefiningCode.java | 55 + .../definition/RespirationsObservation.java | 115 ++ .../RespirationsObservationContainment.java | 43 + .../definition/ResponseSection.java | 43 + .../ResponseSectionContainment.java | 25 + .../RiskAssessmentDefiningCode.java | 41 + .../definition/RiskFactorDefiningCode.java | 39 + .../definition/RiskFactorDefiningCode2.java | 39 + .../definition/RiskFactorDefiningCode3.java | 39 + .../RiskFactorsForSepsisDefiningCode.java | 46 + .../SepsisScreening999FlagElement.java | 18 + .../SepsisScreeningAmberFlagAcuteElement.java | 18 + ...reeningLikelySourceOfInfectionElement.java | 20 + .../SepsisScreeningObservation.java | 126 ++ ...SepsisScreeningObservationContainment.java | 43 + .../SepsisScreeningRedFlagAcuteElement.java | 18 + ...sScreeningRiskFactorsForSepsisElement.java | 18 + .../SepsisScreeningValueChoice.java | 4 + .../SepsisScreeningValueDvCodedText.java | 20 + .../SepsisScreeningValueDvText.java | 21 + .../definition/SepsisSection.java | 20 + .../definition/SepsisSectionContainment.java | 19 + .../definition/ServiceAction.java | 148 ++ .../definition/ServiceActionContainment.java | 49 + ...ServiceRequestCurrentActivityActivity.java | 123 ++ .../definition/ServiceRequestInstruction.java | 114 ++ .../ServiceRequestInstructionContainment.java | 42 + ...ServiceRequestReasonForRequestElement.java | 19 + .../definition/SituationSection.java | 20 + .../SituationSectionContainment.java | 19 + .../definition/StoryHistoryObservation.java | 103 ++ .../StoryHistoryObservationContainment.java | 40 + .../StoryHistorySoftSignsElement.java | 19 + .../definition/TemperatureObservation.java | 126 ++ .../TemperatureObservationContainment.java | 44 + .../definition/TrendDefiningCode.java | 43 + .../definition/ValueDefiningCode.java | 39 + .../definition/ValueDefiningCode2.java | 41 + .../definition/ValueDefiningCode3.java | 41 + .../definition/ValueDefiningCode4.java | 41 + .../definition/ValueDefiningCode5.java | 41 + .../definition/ValueDefiningCode6.java | 41 + .../definition/ValueDefiningCode7.java | 49 + .../definition/WeightObservation.java | 116 ++ .../WeightObservationContainment.java | 44 + .../PatientenaufenthaltComposition.java | 192 +++ ...entenaufenthaltCompositionContainment.java | 60 + .../definition/AbteilungsfallCluster.java | 21 + .../AbteilungsfallClusterContainment.java | 20 + .../definition/DetailsZumBettCluster.java | 101 ++ .../DetailsZumBettClusterContainment.java | 38 + .../definition/StandortCluster.java | 121 ++ .../StandortClusterContainment.java | 38 + .../StandortschlusselDefiningCode.java | 332 +++++ .../definition/VersorgungsfallCluster.java | 22 + .../VersorgungsfallClusterContainment.java | 20 + .../definition/VersorgungsortAdminEntry.java | 90 ++ .../VersorgungsortAdminEntryContainment.java | 35 + .../SchwangerschaftsstatusComposition.java | 203 +++ ...erschaftsstatusCompositionContainment.java | 62 + .../SchwangerschaftsstatusObservation.java | 80 + ...erschaftsstatusObservationContainment.java | 35 + .../definition/StatusDefiningCode.java | 45 + .../definition/StatusDefiningCode2.java | 43 + .../SmICSBefundComposition.java | 202 +++ .../SmICSBefundCompositionContainment.java | 61 + .../definition/AntibiogrammCluster.java | 21 + .../AntibiogrammClusterContainment.java | 21 + .../definition/AntibiotikumDefiningCode.java | 397 +++++ .../ArtDerTypisierungDefiningCode.java | 48 + .../definition/ErregerdetailsCluster.java | 125 ++ .../ErregerdetailsClusterContainment.java | 43 + .../ErregerdetailsKeimSubtypElement.java | 19 + ...gerdetailsResistenzmechanismusCluster.java | 19 + .../definition/ErregernameDefiningCode.java | 1289 +++++++++++++++++ ...ertypisierungArtDerTypisierungElement.java | 18 + .../definition/ErregertypisierungCluster.java | 56 + .../ErregertypisierungClusterContainment.java | 28 + .../ErregertypisierungErgebnisElement.java | 19 + ...EventsummaryBeteiligtePersonenCluster.java | 31 + .../definition/EventsummaryCluster.java | 67 + .../EventsummaryClusterContainment.java | 30 + .../EventsummaryIdDerPersonElement.java | 20 + .../definition/EventsummaryValueChoice.java | 4 + .../EventsummaryValueDvIdentifier.java | 21 + .../definition/EventsummaryValueDvUri.java | 21 + .../LaboranalytResultatCluster.java | 79 + ...LaboranalytResultatClusterContainment.java | 34 + .../definition/MreKlasseDefiningCode.java | 51 + ...ebnisAnzahlDerErregernachweiseElement.java | 19 + .../definition/SmicsErgebnisObservation.java | 251 ++++ .../SmicsErgebnisObservationContainment.java | 67 + .../SmicsErgebniskategorieDefiningCode.java | 44 + .../definition/StandortCluster.java | 78 + .../StandortClusterContainment.java | 33 + ...StationarerVersorgungsfallComposition.java | 226 +++ ...VersorgungsfallCompositionContainment.java | 67 + .../definition/AufnahmedatenAdminEntry.java | 92 ++ .../AufnahmedatenAdminEntryContainment.java | 38 + .../EntlassungsdatenAdminEntry.java | 104 ++ ...EntlassungsdatenAdminEntryContainment.java | 40 + .../definition/FalltypDefiningCode.java | 39 + ...ischerZustandDesPatientenDefiningCode.java | 52 + .../TestAllTypesEnV1Composition.java | 205 +++ ...estAllTypesEnV1CompositionContainment.java | 63 + .../definition/CareflowStepDefiningCode.java | 43 + .../ContextCodedTextDefiningCode.java | 44 + .../definition/CurrentStateDefiningCode.java | 43 + .../definition/TestAllTypesAction.java | 91 ++ .../TestAllTypesActionContainment.java | 37 + .../definition/TestAllTypesAdminEntry.java | 45 + .../TestAllTypesAdminEntryContainment.java | 26 + .../definition/TestAllTypesChoiceChoice.java | 4 + .../definition/TestAllTypesChoiceDvCount.java | 21 + .../TestAllTypesChoiceDvQuantity.java | 33 + .../definition/TestAllTypesCluster.java | 21 + .../TestAllTypesClusterContainment.java | 20 + .../definition/TestAllTypesEvaluation.java | 228 +++ .../TestAllTypesEvaluationContainment.java | 63 + .../definition/TestAllTypesInstruction.java | 92 ++ .../TestAllTypesInstructionContainment.java | 37 + .../definition/TestAllTypesObservation.java | 255 ++++ .../TestAllTypesObservationContainment.java | 74 + .../definition/TestAllTypesSection.java | 43 + .../TestAllTypesSectionContainment.java | 25 + .../VirologischerBefundComposition.java | 202 +++ ...logischerBefundCompositionContainment.java | 61 + .../AnatomischeLokalisationCluster.java | 45 + ...omischeLokalisationClusterContainment.java | 27 + .../definition/BefundAnforderungElement.java | 19 + .../definition/BefundObservation.java | 216 +++ .../BefundObservationContainment.java | 61 + .../definition/EinsenderstandortCluster.java | 56 + .../EinsenderstandortClusterContainment.java | 29 + .../definition/EmpfangerstandortCluster.java | 56 + .../EmpfangerstandortClusterContainment.java | 29 + .../definition/FallidentifikationCluster.java | 21 + .../FallidentifikationClusterContainment.java | 20 + .../definition/KulturCluster.java | 21 + .../definition/KulturClusterContainment.java | 21 + .../definition/ProVirusCluster.java | 103 ++ .../ProVirusClusterContainment.java | 40 + .../definition/ProbeCluster.java | 213 +++ .../definition/ProbeClusterContainment.java | 59 + 429 files changed, 26669 insertions(+) create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsCompositionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/StateOfDressEnDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseCompositionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LabortestBezeichnungDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/StatusDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningCode2.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningCode3.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningCode4.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSectionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnosestatusDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/InlandAuslandDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSectionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/LetzteReiseDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSectionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSectionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningCode2.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseCompositionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnostischeSicherheitDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/LateralitatDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/NameDesProblemsDerDiagnoseDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/SchweregradDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ValueDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1CompositionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyExposureDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvCodedText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvCodedText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/LocationOfMeasurementDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareCompositionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntryContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/StatusDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareCompositionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AmberFlagAcuteDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSectionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSectionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BreathingIndicatorDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CareflowStepDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CirculationIndicatorDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ClinicalRiskCategoryDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSectionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CurrentStateDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice2.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice3.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice4.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice5.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice6.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HealthRiskDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvCodedText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/N999FlagDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2SectionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OverallTestStatusDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningCode2.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RedFlagAcuteDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSectionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskAssessmentDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode2.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode3.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorsForSepsisDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSectionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstructionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSectionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TrendDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode2.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode3.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode4.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode5.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode6.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode7.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltCompositionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortschlusselDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntryContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusCompositionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningCode2.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundCompositionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiotikumDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ArtDerTypisierungDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregernameDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/MreKlasseDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebniskategorieDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallCompositionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntryContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntryContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/FalltypDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/KlinischerZustandDesPatientenDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CareflowStepDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ContextCodedTextDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CurrentStateDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSectionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundCompositionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeClusterContainment.java diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java new file mode 100644 index 000000000..6dc5ea259 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java @@ -0,0 +1,202 @@ +package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +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 org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Id; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.annotations.Template; +import org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.KorpergewichtObservation; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; +import org.ehrbase.client.openehrclient.VersionUid; + +@Entity +@Archetype("openEHR-EHR-COMPOSITION.report.v1") +@Template("AlternativeEvents") +public class AlternativeEventsComposition { + @Path("/context/other_context[at0001]/items[at0002]/value|value") + private String berichtIdValue; + + @Path("/context/other_context[at0001]/items[at0005]/value|value") + private String statusValue; + + @Path("/context/other_context[at0001]/items[at0006]") + private List erweiterung; + + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; + + @Path("/context/participations") + private List participations; + + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + @Path("/context/location") + private String location; + + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; + + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; + + @Path("/content[openEHR-EHR-OBSERVATION.body_weight.v2]") + private List korpergewicht; + + @Path("/composer") + private PartyProxy composer; + + @Path("/language") + private Language language; + + @Path("/feeder_audit") + private FeederAudit feederAudit; + + @Path("/category|defining_code") + private Category categoryDefiningCode; + + @Path("/territory") + private Territory territory; + + @Id + private VersionUid versionUid; + + public void setBerichtIdValue(String berichtIdValue) { + this.berichtIdValue = berichtIdValue; + } + + public String getBerichtIdValue() { + return this.berichtIdValue ; + } + + public void setStatusValue(String statusValue) { + this.statusValue = statusValue; + } + + public String getStatusValue() { + return this.statusValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + 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 setKorpergewicht(List korpergewicht) { + this.korpergewicht = korpergewicht; + } + + public List getKorpergewicht() { + return this.korpergewicht ; + } + + 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 setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } + + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } + + 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsCompositionContainment.java new file mode 100644 index 000000000..6b9196568 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsCompositionContainment.java @@ -0,0 +1,61 @@ +package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +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 org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.KorpergewichtObservation; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; + +public class AlternativeEventsCompositionContainment extends Containment { + public SelectAqlField ALTERNATIVE_EVENTS_COMPOSITION = new AqlFieldImp(AlternativeEventsComposition.class, "", "AlternativeEventsComposition", AlternativeEventsComposition.class, this); + + public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); + + public SelectAqlField STATUS_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "statusValue", String.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(AlternativeEventsComposition.class, "/context/other_context[at0001]/items[at0006]", "erweiterung", Cluster.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(AlternativeEventsComposition.class, "/context/participations", "participations", Participation.class, this); + + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + + public SelectAqlField LOCATION = new AqlFieldImp(AlternativeEventsComposition.class, "/context/location", "location", String.class, this); + + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(AlternativeEventsComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(AlternativeEventsComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); + + public ListSelectAqlField KORPERGEWICHT = new ListAqlFieldImp(AlternativeEventsComposition.class, "/content[openEHR-EHR-OBSERVATION.body_weight.v2]", "korpergewicht", KorpergewichtObservation.class, this); + + public SelectAqlField COMPOSER = new AqlFieldImp(AlternativeEventsComposition.class, "/composer", "composer", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(AlternativeEventsComposition.class, "/language", "language", Language.class, this); + + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AlternativeEventsComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(AlternativeEventsComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); + + public SelectAqlField TERRITORY = new AqlFieldImp(AlternativeEventsComposition.class, "/territory", "territory", Territory.class, this); + + private AlternativeEventsCompositionContainment() { + super("openEHR-EHR-COMPOSITION.report.v1"); + } + + public static AlternativeEventsCompositionContainment getInstance() { + return new AlternativeEventsCompositionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java new file mode 100644 index 000000000..23aa3b305 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; + +public interface KorpergewichtAnyEventEnChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java new file mode 100644 index 000000000..252ae7f8f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java @@ -0,0 +1,104 @@ +package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; + +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; + +@Entity +@OptionFor("INTERVAL_EVENT") +public class KorpergewichtAnyEventEnIntervalEvent implements KorpergewichtAnyEventEnChoice { + @Path("/data[at0001]/items[at0004]/value|magnitude") + private Double gewichtMagnitude; + + @Path("/data[at0001]/items[at0004]/value|units") + private String gewichtUnits; + + @Path("/data[at0001]/items[at0024]/value|value") + private String commentEnValue; + + @Path("/state[at0008]/items[at0009]/value|defining_code") + private StateOfDressEnDefiningCode stateOfDressEnDefiningCode; + + @Path("/state[at0008]/items[at0025]") + private List confoundingFactorsEn; + + @Path("/time|value") + private TemporalAccessor timeValue; + + @Path("/width|value") + private TemporalAmount widthValue; + + @Path("/math_function|defining_code") + private MathFunction mathFunctionDefiningCode; + + public void setGewichtMagnitude(Double gewichtMagnitude) { + this.gewichtMagnitude = gewichtMagnitude; + } + + public Double getGewichtMagnitude() { + return this.gewichtMagnitude ; + } + + public void setGewichtUnits(String gewichtUnits) { + this.gewichtUnits = gewichtUnits; + } + + public String getGewichtUnits() { + return this.gewichtUnits ; + } + + public void setCommentEnValue(String commentEnValue) { + this.commentEnValue = commentEnValue; + } + + public String getCommentEnValue() { + return this.commentEnValue ; + } + + public void setStateOfDressEnDefiningCode(StateOfDressEnDefiningCode stateOfDressEnDefiningCode) { + this.stateOfDressEnDefiningCode = stateOfDressEnDefiningCode; + } + + public StateOfDressEnDefiningCode getStateOfDressEnDefiningCode() { + return this.stateOfDressEnDefiningCode ; + } + + public void setConfoundingFactorsEn( + List confoundingFactorsEn) { + this.confoundingFactorsEn = confoundingFactorsEn; + } + + public List getConfoundingFactorsEn() { + return this.confoundingFactorsEn ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setWidthValue(TemporalAmount widthValue) { + this.widthValue = widthValue; + } + + public TemporalAmount getWidthValue() { + return this.widthValue ; + } + + public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { + this.mathFunctionDefiningCode = mathFunctionDefiningCode; + } + + public MathFunction getMathFunctionDefiningCode() { + return this.mathFunctionDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java new file mode 100644 index 000000000..9150cef34 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java @@ -0,0 +1,80 @@ +package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; + +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("POINT_EVENT") +public class KorpergewichtAnyEventEnPointEvent implements KorpergewichtAnyEventEnChoice { + @Path("/data[at0001]/items[at0004]/value|magnitude") + private Double gewichtMagnitude; + + @Path("/data[at0001]/items[at0004]/value|units") + private String gewichtUnits; + + @Path("/data[at0001]/items[at0024]/value|value") + private String commentEnValue; + + @Path("/state[at0008]/items[at0009]/value|defining_code") + private StateOfDressEnDefiningCode stateOfDressEnDefiningCode; + + @Path("/state[at0008]/items[at0025]") + private List confoundingFactorsEn; + + @Path("/time|value") + private TemporalAccessor timeValue; + + public void setGewichtMagnitude(Double gewichtMagnitude) { + this.gewichtMagnitude = gewichtMagnitude; + } + + public Double getGewichtMagnitude() { + return this.gewichtMagnitude ; + } + + public void setGewichtUnits(String gewichtUnits) { + this.gewichtUnits = gewichtUnits; + } + + public String getGewichtUnits() { + return this.gewichtUnits ; + } + + public void setCommentEnValue(String commentEnValue) { + this.commentEnValue = commentEnValue; + } + + public String getCommentEnValue() { + return this.commentEnValue ; + } + + public void setStateOfDressEnDefiningCode(StateOfDressEnDefiningCode stateOfDressEnDefiningCode) { + this.stateOfDressEnDefiningCode = stateOfDressEnDefiningCode; + } + + public StateOfDressEnDefiningCode getStateOfDressEnDefiningCode() { + return this.stateOfDressEnDefiningCode ; + } + + public void setConfoundingFactorsEn( + List confoundingFactorsEn) { + this.confoundingFactorsEn = confoundingFactorsEn; + } + + public List getConfoundingFactorsEn() { + return this.confoundingFactorsEn ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java new file mode 100644 index 000000000..01fdb2dbc --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java @@ -0,0 +1,78 @@ +package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; + +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class KorpergewichtBirthEnPointEvent { + @Path("/data[at0001]/items[at0004]/value|magnitude") + private Double gewichtMagnitude; + + @Path("/data[at0001]/items[at0004]/value|units") + private String gewichtUnits; + + @Path("/data[at0001]/items[at0024]/value|value") + private String commentEnValue; + + @Path("/state[at0008]/items[at0009]/value|defining_code") + private StateOfDressEnDefiningCode stateOfDressEnDefiningCode; + + @Path("/state[at0008]/items[at0025]") + private List confoundingFactorsEn; + + @Path("/time|value") + private TemporalAccessor timeValue; + + public void setGewichtMagnitude(Double gewichtMagnitude) { + this.gewichtMagnitude = gewichtMagnitude; + } + + public Double getGewichtMagnitude() { + return this.gewichtMagnitude ; + } + + public void setGewichtUnits(String gewichtUnits) { + this.gewichtUnits = gewichtUnits; + } + + public String getGewichtUnits() { + return this.gewichtUnits ; + } + + public void setCommentEnValue(String commentEnValue) { + this.commentEnValue = commentEnValue; + } + + public String getCommentEnValue() { + return this.commentEnValue ; + } + + public void setStateOfDressEnDefiningCode(StateOfDressEnDefiningCode stateOfDressEnDefiningCode) { + this.stateOfDressEnDefiningCode = stateOfDressEnDefiningCode; + } + + public StateOfDressEnDefiningCode getStateOfDressEnDefiningCode() { + return this.stateOfDressEnDefiningCode ; + } + + public void setConfoundingFactorsEn( + List confoundingFactorsEn) { + this.confoundingFactorsEn = confoundingFactorsEn; + } + + public List getConfoundingFactorsEn() { + return this.confoundingFactorsEn ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java new file mode 100644 index 000000000..91525cbf1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java @@ -0,0 +1,19 @@ +package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class KorpergewichtConfoundingFactorsEnElement { + @Path("/value|value") + private String value; + + public void setValue(String value) { + this.value = value; + } + + public String getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java new file mode 100644 index 000000000..4f644459e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java @@ -0,0 +1,93 @@ +package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; +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.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.body_weight.v2") +public class KorpergewichtObservation { + @Path("/data[at0002]/events[at0026]") + private KorpergewichtBirthEnPointEvent birthEn; + + @Path("/data[at0002]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0015]/items[at0020]") + private Cluster gerat; + + @Path("/protocol[at0015]/items[at0027]") + private List extensionEn; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + @Path("/data[at0002]/events[at0003]") + @Choice + private List anyEventEn; + + public void setBirthEn(KorpergewichtBirthEnPointEvent birthEn) { + this.birthEn = birthEn; + } + + public KorpergewichtBirthEnPointEvent getBirthEn() { + return this.birthEn ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setGerat(Cluster gerat) { + this.gerat = gerat; + } + + public Cluster getGerat() { + return this.gerat ; + } + + public void setExtensionEn(List extensionEn) { + this.extensionEn = extensionEn; + } + + public List getExtensionEn() { + return this.extensionEn ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setAnyEventEn(List anyEventEn) { + this.anyEventEn = anyEventEn; + } + + public List getAnyEventEn() { + return this.anyEventEn ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java new file mode 100644 index 000000000..ce524c13b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java @@ -0,0 +1,37 @@ +package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class KorpergewichtObservationContainment extends Containment { + public SelectAqlField KORPERGEWICHT_OBSERVATION = new AqlFieldImp(KorpergewichtObservation.class, "", "KorpergewichtObservation", KorpergewichtObservation.class, this); + + public SelectAqlField BIRTH_EN = new AqlFieldImp(KorpergewichtObservation.class, "/data[at0002]/events[at0026]", "birthEn", KorpergewichtBirthEnPointEvent.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(KorpergewichtObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); + + public SelectAqlField GERAT = new AqlFieldImp(KorpergewichtObservation.class, "/protocol[at0015]/items[at0020]", "gerat", Cluster.class, this); + + public ListSelectAqlField EXTENSION_EN = new ListAqlFieldImp(KorpergewichtObservation.class, "/protocol[at0015]/items[at0027]", "extensionEn", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(KorpergewichtObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(KorpergewichtObservation.class, "/language", "language", Language.class, this); + + public ListSelectAqlField ANY_EVENT_EN = new ListAqlFieldImp(KorpergewichtObservation.class, "/data[at0002]/events[at0003]", "anyEventEn", KorpergewichtAnyEventEnChoice.class, this); + + private KorpergewichtObservationContainment() { + super("openEHR-EHR-OBSERVATION.body_weight.v2"); + } + + public static KorpergewichtObservationContainment getInstance() { + return new KorpergewichtObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/StateOfDressEnDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/StateOfDressEnDefiningCode.java new file mode 100644 index 000000000..a2a979696 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/StateOfDressEnDefiningCode.java @@ -0,0 +1,47 @@ +package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum StateOfDressEnDefiningCode implements EnumValueSet { + LEICHT_BEKLEIDET_UNTERWASCHE("Leicht bekleidet / Unterwäsche", "Bekleidung, die nicht signifikant zum Gewicht beiträgt.", "local", "at0011"), + + UNBEKLEIDET("Unbekleidet", "Ohne Kleidung.", "local", "at0013"), + + N_FULLY_CLOTHED_WITHOUT_SHOES_EN("*Fully clothed, without shoes (en)", "*Clothing which may add significantly to weight. (en)", "local", "at0028"), + + WINDEL("Windel", "Trägt Windel; kann signifikant zum Gewicht beitragen.", "local", "at0017"), + + VOLL_BEKLEIDET_MIT_SCHUHEN("Voll bekleidet, mit Schuhen", "Bekleidung, die signifikant zum Gewicht beiträgt, mit Schuhen.", "local", "at0010"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + StateOfDressEnDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java new file mode 100644 index 000000000..d431671b1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java @@ -0,0 +1,203 @@ +package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +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 org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Id; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.annotations.Template; +import org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition.LaborergebnisObservation; +import org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition.StatusDefiningCode; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; +import org.ehrbase.client.openehrclient.VersionUid; + +@Entity +@Archetype("openEHR-EHR-COMPOSITION.registereintrag.v1") +@Template("Befund der Blutgasanalyse") +public class BefundDerBlutgasanalyseComposition { + @Path("/context/other_context[at0001]/items[at0002]") + private List erweiterung; + + @Path("/context/other_context[at0001]/items[at0004]/value|defining_code") + private StatusDefiningCode statusDefiningCode; + + @Path("/context/other_context[at0001]/items[at0005]/value|value") + private String kategorieValue; + + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; + + @Path("/context/participations") + private List participations; + + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + @Path("/context/location") + private String location; + + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; + + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; + + @Path("/content[openEHR-EHR-OBSERVATION.laboratory_test_result.v1]") + private LaborergebnisObservation laborergebnis; + + @Path("/composer") + private PartyProxy composer; + + @Path("/language") + private Language language; + + @Path("/feeder_audit") + private FeederAudit feederAudit; + + @Path("/category|defining_code") + private Category categoryDefiningCode; + + @Path("/territory") + private Territory territory; + + @Id + private VersionUid versionUid; + + 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 setKategorieValue(String kategorieValue) { + this.kategorieValue = kategorieValue; + } + + public String getKategorieValue() { + return this.kategorieValue ; + } + + 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 setLaborergebnis(LaborergebnisObservation laborergebnis) { + this.laborergebnis = laborergebnis; + } + + public LaborergebnisObservation getLaborergebnis() { + return this.laborergebnis ; + } + + 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 setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } + + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } + + 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseCompositionContainment.java new file mode 100644 index 000000000..f8d6d7daa --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseCompositionContainment.java @@ -0,0 +1,62 @@ +package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +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 org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition.LaborergebnisObservation; +import org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition.StatusDefiningCode; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; + +public class BefundDerBlutgasanalyseCompositionContainment extends Containment { + public SelectAqlField BEFUND_DER_BLUTGASANALYSE_COMPOSITION = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "", "BefundDerBlutgasanalyseComposition", BefundDerBlutgasanalyseComposition.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/other_context[at0001]/items[at0002]", "erweiterung", Cluster.class, this); + + public SelectAqlField STATUS_DEFINING_CODE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/other_context[at0001]/items[at0004]/value|defining_code", "statusDefiningCode", StatusDefiningCode.class, this); + + public SelectAqlField KATEGORIE_VALUE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "kategorieValue", String.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/participations", "participations", Participation.class, this); + + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + + public SelectAqlField LOCATION = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/location", "location", String.class, this); + + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); + + public SelectAqlField LABORERGEBNIS = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/content[openEHR-EHR-OBSERVATION.laboratory_test_result.v1]", "laborergebnis", LaborergebnisObservation.class, this); + + public SelectAqlField COMPOSER = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/composer", "composer", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/language", "language", Language.class, this); + + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); + + public SelectAqlField TERRITORY = new AqlFieldImp(BefundDerBlutgasanalyseComposition.class, "/territory", "territory", Territory.class, this); + + private BefundDerBlutgasanalyseCompositionContainment() { + super("openEHR-EHR-COMPOSITION.registereintrag.v1"); + } + + public static BefundDerBlutgasanalyseCompositionContainment getInstance() { + return new BefundDerBlutgasanalyseCompositionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java new file mode 100644 index 000000000..c7454a080 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java @@ -0,0 +1,69 @@ +package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") +public class KohlendioxidpartialdruckCluster { + @Path("/items[at0024]/value|defining_code") + private UntersuchterAnalytDefiningCode untersuchterAnalytDefiningCode; + + @Path("/items[at0001]/value|magnitude") + private Double analytResultatMagnitude; + + @Path("/items[at0001]/value|units") + private String analytResultatUnits; + + @Path("/items[at0014]") + private List analyseergebnisDetails; + + @Path("/items[at0005]/value|value") + private String ergebnisStatusValue; + + public void setUntersuchterAnalytDefiningCode( + UntersuchterAnalytDefiningCode untersuchterAnalytDefiningCode) { + this.untersuchterAnalytDefiningCode = untersuchterAnalytDefiningCode; + } + + public UntersuchterAnalytDefiningCode getUntersuchterAnalytDefiningCode() { + return this.untersuchterAnalytDefiningCode ; + } + + public void setAnalytResultatMagnitude(Double analytResultatMagnitude) { + this.analytResultatMagnitude = analytResultatMagnitude; + } + + public Double getAnalytResultatMagnitude() { + return this.analytResultatMagnitude ; + } + + public void setAnalytResultatUnits(String analytResultatUnits) { + this.analytResultatUnits = analytResultatUnits; + } + + public String getAnalytResultatUnits() { + return this.analytResultatUnits ; + } + + public void setAnalyseergebnisDetails(List analyseergebnisDetails) { + this.analyseergebnisDetails = analyseergebnisDetails; + } + + public List getAnalyseergebnisDetails() { + return this.analyseergebnisDetails ; + } + + public void setErgebnisStatusValue(String ergebnisStatusValue) { + this.ergebnisStatusValue = ergebnisStatusValue; + } + + public String getErgebnisStatusValue() { + return this.ergebnisStatusValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckClusterContainment.java new file mode 100644 index 000000000..61bcc6d16 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckClusterContainment.java @@ -0,0 +1,32 @@ +package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class KohlendioxidpartialdruckClusterContainment extends Containment { + public SelectAqlField KOHLENDIOXIDPARTIALDRUCK_CLUSTER = new AqlFieldImp(KohlendioxidpartialdruckCluster.class, "", "KohlendioxidpartialdruckCluster", KohlendioxidpartialdruckCluster.class, this); + + public SelectAqlField UNTERSUCHTER_ANALYT_DEFINING_CODE = new AqlFieldImp(KohlendioxidpartialdruckCluster.class, "/items[at0024]/value|defining_code", "untersuchterAnalytDefiningCode", UntersuchterAnalytDefiningCode.class, this); + + public SelectAqlField ANALYT_RESULTAT_MAGNITUDE = new AqlFieldImp(KohlendioxidpartialdruckCluster.class, "/items[at0001]/value|magnitude", "analytResultatMagnitude", Double.class, this); + + public SelectAqlField ANALYT_RESULTAT_UNITS = new AqlFieldImp(KohlendioxidpartialdruckCluster.class, "/items[at0001]/value|units", "analytResultatUnits", String.class, this); + + public ListSelectAqlField ANALYSEERGEBNIS_DETAILS = new ListAqlFieldImp(KohlendioxidpartialdruckCluster.class, "/items[at0014]", "analyseergebnisDetails", Cluster.class, this); + + public SelectAqlField ERGEBNIS_STATUS_VALUE = new AqlFieldImp(KohlendioxidpartialdruckCluster.class, "/items[at0005]/value|value", "ergebnisStatusValue", String.class, this); + + private KohlendioxidpartialdruckClusterContainment() { + super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); + } + + public static KohlendioxidpartialdruckClusterContainment getInstance() { + return new KohlendioxidpartialdruckClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java new file mode 100644 index 000000000..c7aa42893 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java @@ -0,0 +1,194 @@ +package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.laboratory_test_result.v1") +public class LaborergebnisObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|defining_code") + private LabortestBezeichnungDefiningCode labortestBezeichnungDefiningCode; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0065]") + private List probendetail; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Kohlendioxidpartialdruck']") + private KohlendioxidpartialdruckCluster kohlendioxidpartialdruck; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Sauerstoffpartialdruck']") + private SauerstoffpartialdruckCluster sauerstoffpartialdruck; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='pH-Wert']") + private PhWertCluster phWert; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Sauerstoffsättigung']") + private SauerstoffsattigungCluster sauerstoffsattigung; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0122]") + private List strukturierteTestdiagnostik; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0118]") + private List multimediaDarstellung; + + @Path("/data[at0001]/events[at0002]/state[at0112]/items[at0114]") + private List strukturierteErfassungDerStorfaktoren; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0004]/items[at0017]") + private Cluster laborWelchesDenUntersuchungsauftragAnnimmt; + + @Path("/protocol[at0004]/items[at0110]") + private List testDetails; + + @Path("/protocol[at0004]/items[at0117]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setLabortestBezeichnungDefiningCode( + LabortestBezeichnungDefiningCode labortestBezeichnungDefiningCode) { + this.labortestBezeichnungDefiningCode = labortestBezeichnungDefiningCode; + } + + public LabortestBezeichnungDefiningCode getLabortestBezeichnungDefiningCode() { + return this.labortestBezeichnungDefiningCode ; + } + + public void setProbendetail(List probendetail) { + this.probendetail = probendetail; + } + + public List getProbendetail() { + return this.probendetail ; + } + + public void setKohlendioxidpartialdruck( + KohlendioxidpartialdruckCluster kohlendioxidpartialdruck) { + this.kohlendioxidpartialdruck = kohlendioxidpartialdruck; + } + + public KohlendioxidpartialdruckCluster getKohlendioxidpartialdruck() { + return this.kohlendioxidpartialdruck ; + } + + public void setSauerstoffpartialdruck(SauerstoffpartialdruckCluster sauerstoffpartialdruck) { + this.sauerstoffpartialdruck = sauerstoffpartialdruck; + } + + public SauerstoffpartialdruckCluster getSauerstoffpartialdruck() { + return this.sauerstoffpartialdruck ; + } + + public void setPhWert(PhWertCluster phWert) { + this.phWert = phWert; + } + + public PhWertCluster getPhWert() { + return this.phWert ; + } + + public void setSauerstoffsattigung(SauerstoffsattigungCluster sauerstoffsattigung) { + this.sauerstoffsattigung = sauerstoffsattigung; + } + + public SauerstoffsattigungCluster getSauerstoffsattigung() { + return this.sauerstoffsattigung ; + } + + public void setStrukturierteTestdiagnostik(List strukturierteTestdiagnostik) { + this.strukturierteTestdiagnostik = strukturierteTestdiagnostik; + } + + public List getStrukturierteTestdiagnostik() { + return this.strukturierteTestdiagnostik ; + } + + public void setMultimediaDarstellung(List multimediaDarstellung) { + this.multimediaDarstellung = multimediaDarstellung; + } + + public List getMultimediaDarstellung() { + return this.multimediaDarstellung ; + } + + public void setStrukturierteErfassungDerStorfaktoren( + List strukturierteErfassungDerStorfaktoren) { + this.strukturierteErfassungDerStorfaktoren = strukturierteErfassungDerStorfaktoren; + } + + public List getStrukturierteErfassungDerStorfaktoren() { + return this.strukturierteErfassungDerStorfaktoren ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setLaborWelchesDenUntersuchungsauftragAnnimmt( + Cluster laborWelchesDenUntersuchungsauftragAnnimmt) { + this.laborWelchesDenUntersuchungsauftragAnnimmt = laborWelchesDenUntersuchungsauftragAnnimmt; + } + + public Cluster getLaborWelchesDenUntersuchungsauftragAnnimmt() { + return this.laborWelchesDenUntersuchungsauftragAnnimmt ; + } + + public void setTestDetails(List testDetails) { + this.testDetails = testDetails; + } + + public List getTestDetails() { + return this.testDetails ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservationContainment.java new file mode 100644 index 000000000..75527aaf1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservationContainment.java @@ -0,0 +1,55 @@ +package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class LaborergebnisObservationContainment extends Containment { + public SelectAqlField LABORERGEBNIS_OBSERVATION = new AqlFieldImp(LaborergebnisObservation.class, "", "LaborergebnisObservation", LaborergebnisObservation.class, this); + + public SelectAqlField LABORTEST_BEZEICHNUNG_DEFINING_CODE = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|defining_code", "labortestBezeichnungDefiningCode", LabortestBezeichnungDefiningCode.class, this); + + public ListSelectAqlField PROBENDETAIL = new ListAqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0065]", "probendetail", Cluster.class, this); + + public SelectAqlField KOHLENDIOXIDPARTIALDRUCK = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]", "kohlendioxidpartialdruck", KohlendioxidpartialdruckCluster.class, this); + + public SelectAqlField SAUERSTOFFPARTIALDRUCK = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]", "sauerstoffpartialdruck", SauerstoffpartialdruckCluster.class, this); + + public SelectAqlField PH_WERT = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]", "phWert", PhWertCluster.class, this); + + public SelectAqlField SAUERSTOFFSATTIGUNG = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]", "sauerstoffsattigung", SauerstoffsattigungCluster.class, this); + + public ListSelectAqlField STRUKTURIERTE_TESTDIAGNOSTIK = new ListAqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0122]", "strukturierteTestdiagnostik", Cluster.class, this); + + public ListSelectAqlField MULTIMEDIA_DARSTELLUNG = new ListAqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0118]", "multimediaDarstellung", Cluster.class, this); + + public ListSelectAqlField STRUKTURIERTE_ERFASSUNG_DER_STORFAKTOREN = new ListAqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/state[at0112]/items[at0114]", "strukturierteErfassungDerStorfaktoren", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(LaborergebnisObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public SelectAqlField LABOR_WELCHES_DEN_UNTERSUCHUNGSAUFTRAG_ANNIMMT = new AqlFieldImp(LaborergebnisObservation.class, "/protocol[at0004]/items[at0017]", "laborWelchesDenUntersuchungsauftragAnnimmt", Cluster.class, this); + + public ListSelectAqlField TEST_DETAILS = new ListAqlFieldImp(LaborergebnisObservation.class, "/protocol[at0004]/items[at0110]", "testDetails", Cluster.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(LaborergebnisObservation.class, "/protocol[at0004]/items[at0117]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(LaborergebnisObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(LaborergebnisObservation.class, "/language", "language", Language.class, this); + + private LaborergebnisObservationContainment() { + super("openEHR-EHR-OBSERVATION.laboratory_test_result.v1"); + } + + public static LaborergebnisObservationContainment getInstance() { + return new LaborergebnisObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LabortestBezeichnungDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LabortestBezeichnungDefiningCode.java new file mode 100644 index 000000000..1a165d92c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LabortestBezeichnungDefiningCode.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum LabortestBezeichnungDefiningCode implements EnumValueSet { + GAS_PANEL_CAPILLARY_BLOOD("Gas panel - Capillary blood", "Gas panel - Capillary blood", "LOINC", "24337-8"), + + GAS_PANEL_ARTERIAL_BLOOD("Gas panel - Arterial blood", "Gas panel - Arterial blood", "LOINC", "24336-0"), + + GAS_PANEL_BLOOD("Gas panel - Blood", "Gas panel - Blood", "LOINC", "24338-6"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + LabortestBezeichnungDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java new file mode 100644 index 000000000..30121f0a5 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java @@ -0,0 +1,69 @@ +package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") +public class PhWertCluster { + @Path("/items[at0024]/value|defining_code") + private UntersuchterAnalytDefiningCode3 untersuchterAnalytDefiningCode; + + @Path("/items[at0001]/value|magnitude") + private Double analytResultatMagnitude; + + @Path("/items[at0001]/value|units") + private String analytResultatUnits; + + @Path("/items[at0014]") + private List analyseergebnisDetails; + + @Path("/items[at0005]/value|value") + private String ergebnisStatusValue; + + public void setUntersuchterAnalytDefiningCode( + UntersuchterAnalytDefiningCode3 untersuchterAnalytDefiningCode) { + this.untersuchterAnalytDefiningCode = untersuchterAnalytDefiningCode; + } + + public UntersuchterAnalytDefiningCode3 getUntersuchterAnalytDefiningCode() { + return this.untersuchterAnalytDefiningCode ; + } + + public void setAnalytResultatMagnitude(Double analytResultatMagnitude) { + this.analytResultatMagnitude = analytResultatMagnitude; + } + + public Double getAnalytResultatMagnitude() { + return this.analytResultatMagnitude ; + } + + public void setAnalytResultatUnits(String analytResultatUnits) { + this.analytResultatUnits = analytResultatUnits; + } + + public String getAnalytResultatUnits() { + return this.analytResultatUnits ; + } + + public void setAnalyseergebnisDetails(List analyseergebnisDetails) { + this.analyseergebnisDetails = analyseergebnisDetails; + } + + public List getAnalyseergebnisDetails() { + return this.analyseergebnisDetails ; + } + + public void setErgebnisStatusValue(String ergebnisStatusValue) { + this.ergebnisStatusValue = ergebnisStatusValue; + } + + public String getErgebnisStatusValue() { + return this.ergebnisStatusValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertClusterContainment.java new file mode 100644 index 000000000..0c1d88771 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertClusterContainment.java @@ -0,0 +1,32 @@ +package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class PhWertClusterContainment extends Containment { + public SelectAqlField PH_WERT_CLUSTER = new AqlFieldImp(PhWertCluster.class, "", "PhWertCluster", PhWertCluster.class, this); + + public SelectAqlField UNTERSUCHTER_ANALYT_DEFINING_CODE = new AqlFieldImp(PhWertCluster.class, "/items[at0024]/value|defining_code", "untersuchterAnalytDefiningCode", UntersuchterAnalytDefiningCode3.class, this); + + public SelectAqlField ANALYT_RESULTAT_MAGNITUDE = new AqlFieldImp(PhWertCluster.class, "/items[at0001]/value|magnitude", "analytResultatMagnitude", Double.class, this); + + public SelectAqlField ANALYT_RESULTAT_UNITS = new AqlFieldImp(PhWertCluster.class, "/items[at0001]/value|units", "analytResultatUnits", String.class, this); + + public ListSelectAqlField ANALYSEERGEBNIS_DETAILS = new ListAqlFieldImp(PhWertCluster.class, "/items[at0014]", "analyseergebnisDetails", Cluster.class, this); + + public SelectAqlField ERGEBNIS_STATUS_VALUE = new AqlFieldImp(PhWertCluster.class, "/items[at0005]/value|value", "ergebnisStatusValue", String.class, this); + + private PhWertClusterContainment() { + super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); + } + + public static PhWertClusterContainment getInstance() { + return new PhWertClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java new file mode 100644 index 000000000..02c783230 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java @@ -0,0 +1,69 @@ +package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") +public class SauerstoffpartialdruckCluster { + @Path("/items[at0024]/value|defining_code") + private UntersuchterAnalytDefiningCode2 untersuchterAnalytDefiningCode; + + @Path("/items[at0001]/value|magnitude") + private Double analytResultatMagnitude; + + @Path("/items[at0001]/value|units") + private String analytResultatUnits; + + @Path("/items[at0014]") + private List analyseergebnisDetails; + + @Path("/items[at0005]/value|value") + private String ergebnisStatusValue; + + public void setUntersuchterAnalytDefiningCode( + UntersuchterAnalytDefiningCode2 untersuchterAnalytDefiningCode) { + this.untersuchterAnalytDefiningCode = untersuchterAnalytDefiningCode; + } + + public UntersuchterAnalytDefiningCode2 getUntersuchterAnalytDefiningCode() { + return this.untersuchterAnalytDefiningCode ; + } + + public void setAnalytResultatMagnitude(Double analytResultatMagnitude) { + this.analytResultatMagnitude = analytResultatMagnitude; + } + + public Double getAnalytResultatMagnitude() { + return this.analytResultatMagnitude ; + } + + public void setAnalytResultatUnits(String analytResultatUnits) { + this.analytResultatUnits = analytResultatUnits; + } + + public String getAnalytResultatUnits() { + return this.analytResultatUnits ; + } + + public void setAnalyseergebnisDetails(List analyseergebnisDetails) { + this.analyseergebnisDetails = analyseergebnisDetails; + } + + public List getAnalyseergebnisDetails() { + return this.analyseergebnisDetails ; + } + + public void setErgebnisStatusValue(String ergebnisStatusValue) { + this.ergebnisStatusValue = ergebnisStatusValue; + } + + public String getErgebnisStatusValue() { + return this.ergebnisStatusValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckClusterContainment.java new file mode 100644 index 000000000..d3d3cd454 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckClusterContainment.java @@ -0,0 +1,32 @@ +package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class SauerstoffpartialdruckClusterContainment extends Containment { + public SelectAqlField SAUERSTOFFPARTIALDRUCK_CLUSTER = new AqlFieldImp(SauerstoffpartialdruckCluster.class, "", "SauerstoffpartialdruckCluster", SauerstoffpartialdruckCluster.class, this); + + public SelectAqlField UNTERSUCHTER_ANALYT_DEFINING_CODE = new AqlFieldImp(SauerstoffpartialdruckCluster.class, "/items[at0024]/value|defining_code", "untersuchterAnalytDefiningCode", UntersuchterAnalytDefiningCode2.class, this); + + public SelectAqlField ANALYT_RESULTAT_MAGNITUDE = new AqlFieldImp(SauerstoffpartialdruckCluster.class, "/items[at0001]/value|magnitude", "analytResultatMagnitude", Double.class, this); + + public SelectAqlField ANALYT_RESULTAT_UNITS = new AqlFieldImp(SauerstoffpartialdruckCluster.class, "/items[at0001]/value|units", "analytResultatUnits", String.class, this); + + public ListSelectAqlField ANALYSEERGEBNIS_DETAILS = new ListAqlFieldImp(SauerstoffpartialdruckCluster.class, "/items[at0014]", "analyseergebnisDetails", Cluster.class, this); + + public SelectAqlField ERGEBNIS_STATUS_VALUE = new AqlFieldImp(SauerstoffpartialdruckCluster.class, "/items[at0005]/value|value", "ergebnisStatusValue", String.class, this); + + private SauerstoffpartialdruckClusterContainment() { + super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); + } + + public static SauerstoffpartialdruckClusterContainment getInstance() { + return new SauerstoffpartialdruckClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java new file mode 100644 index 000000000..25eded4cd --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java @@ -0,0 +1,69 @@ +package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") +public class SauerstoffsattigungCluster { + @Path("/items[at0024]/value|defining_code") + private UntersuchterAnalytDefiningCode4 untersuchterAnalytDefiningCode; + + @Path("/items[at0001]/value|magnitude") + private Double analytResultatMagnitude; + + @Path("/items[at0001]/value|units") + private String analytResultatUnits; + + @Path("/items[at0014]") + private List analyseergebnisDetails; + + @Path("/items[at0005]/value|value") + private String ergebnisStatusValue; + + public void setUntersuchterAnalytDefiningCode( + UntersuchterAnalytDefiningCode4 untersuchterAnalytDefiningCode) { + this.untersuchterAnalytDefiningCode = untersuchterAnalytDefiningCode; + } + + public UntersuchterAnalytDefiningCode4 getUntersuchterAnalytDefiningCode() { + return this.untersuchterAnalytDefiningCode ; + } + + public void setAnalytResultatMagnitude(Double analytResultatMagnitude) { + this.analytResultatMagnitude = analytResultatMagnitude; + } + + public Double getAnalytResultatMagnitude() { + return this.analytResultatMagnitude ; + } + + public void setAnalytResultatUnits(String analytResultatUnits) { + this.analytResultatUnits = analytResultatUnits; + } + + public String getAnalytResultatUnits() { + return this.analytResultatUnits ; + } + + public void setAnalyseergebnisDetails(List analyseergebnisDetails) { + this.analyseergebnisDetails = analyseergebnisDetails; + } + + public List getAnalyseergebnisDetails() { + return this.analyseergebnisDetails ; + } + + public void setErgebnisStatusValue(String ergebnisStatusValue) { + this.ergebnisStatusValue = ergebnisStatusValue; + } + + public String getErgebnisStatusValue() { + return this.ergebnisStatusValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungClusterContainment.java new file mode 100644 index 000000000..f97680f20 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungClusterContainment.java @@ -0,0 +1,32 @@ +package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class SauerstoffsattigungClusterContainment extends Containment { + public SelectAqlField SAUERSTOFFSATTIGUNG_CLUSTER = new AqlFieldImp(SauerstoffsattigungCluster.class, "", "SauerstoffsattigungCluster", SauerstoffsattigungCluster.class, this); + + public SelectAqlField UNTERSUCHTER_ANALYT_DEFINING_CODE = new AqlFieldImp(SauerstoffsattigungCluster.class, "/items[at0024]/value|defining_code", "untersuchterAnalytDefiningCode", UntersuchterAnalytDefiningCode4.class, this); + + public SelectAqlField ANALYT_RESULTAT_MAGNITUDE = new AqlFieldImp(SauerstoffsattigungCluster.class, "/items[at0001]/value|magnitude", "analytResultatMagnitude", Double.class, this); + + public SelectAqlField ANALYT_RESULTAT_UNITS = new AqlFieldImp(SauerstoffsattigungCluster.class, "/items[at0001]/value|units", "analytResultatUnits", String.class, this); + + public ListSelectAqlField ANALYSEERGEBNIS_DETAILS = new ListAqlFieldImp(SauerstoffsattigungCluster.class, "/items[at0014]", "analyseergebnisDetails", Cluster.class, this); + + public SelectAqlField ERGEBNIS_STATUS_VALUE = new AqlFieldImp(SauerstoffsattigungCluster.class, "/items[at0005]/value|value", "ergebnisStatusValue", String.class, this); + + private SauerstoffsattigungClusterContainment() { + super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); + } + + public static SauerstoffsattigungClusterContainment getInstance() { + return new SauerstoffsattigungClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/StatusDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/StatusDefiningCode.java new file mode 100644 index 000000000..fe85e0cc1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/StatusDefiningCode.java @@ -0,0 +1,45 @@ +package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum StatusDefiningCode implements EnumValueSet { + VORLAUFIG("vorläufig", "*", "local", "at0011"), + + FINAL("final", "*", "local", "at0012"), + + REGISTRIERT("registriert", "*", "local", "at0010"), + + GEANDERT("geändert", "*", "local", "at0013"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + StatusDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningCode.java new file mode 100644 index 000000000..dc8789a12 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningCode.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum UntersuchterAnalytDefiningCode implements EnumValueSet { + CARBON_DIOXIDE_PARTIAL_PRESSURE_IN_CAPILLARY_BLOOD("Carbon dioxide [Partial pressure] in Capillary blood", "Carbon dioxide [Partial pressure] in Capillary blood", "LOINC", "2020-6"), + + CARBON_DIOXIDE_PARTIAL_PRESSURE_IN_BLOOD("Carbon dioxide [Partial pressure] in Blood", "Carbon dioxide [Partial pressure] in Blood", "LOINC", "11557-6"), + + CARBON_DIOXIDE_PARTIAL_PRESSURE_IN_ARTERIAL_BLOOD("Carbon dioxide [Partial pressure] in Arterial blood", "Carbon dioxide [Partial pressure] in Arterial blood", "LOINC", "2019-8"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + UntersuchterAnalytDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningCode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningCode2.java new file mode 100644 index 000000000..76393c5ea --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningCode2.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum UntersuchterAnalytDefiningCode2 implements EnumValueSet { + OXYGEN_PARTIAL_PRESSURE_IN_BLOOD("Oxygen [Partial pressure] in Blood", "Oxygen [Partial pressure] in Blood", "LOINC", "11556-8"), + + OXYGEN_PARTIAL_PRESSURE_IN_ARTERIAL_BLOOD("Oxygen [Partial pressure] in Arterial blood", "Oxygen [Partial pressure] in Arterial blood", "LOINC", "2703-7"), + + OXYGEN_PARTIAL_PRESSURE_IN_CAPILLARY_BLOOD("Oxygen [Partial pressure] in Capillary blood", "Oxygen [Partial pressure] in Capillary blood", "LOINC", "2704-5"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + UntersuchterAnalytDefiningCode2(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningCode3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningCode3.java new file mode 100644 index 000000000..6b43c1f6a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningCode3.java @@ -0,0 +1,50 @@ +package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum UntersuchterAnalytDefiningCode3 implements EnumValueSet { + PH_OF_VENOUS_BLOOD("pH of Venous blood", "pH of Venous blood", "LOINC", "2746-6"), + + PH_OF_CAPILLARY_BLOOD("pH of Capillary blood", "pH of Capillary blood", "LOINC", "2745-8"), + + PH_OF_ARTERIAL_BLOOD("pH of Arterial blood", "pH of Arterial blood", "LOINC", "2744-1"), + + PH_OF_MIXED_VENOUS_BLOOD("pH of Mixed venous blood", "pH of Mixed venous blood", "LOINC", "19213-8"), + + PH_OF_SERUM_OR_PLASMA("pH of Serum or Plasma", "pH of Serum or Plasma", "LOINC", "2753-2"), + + PH_OF_BLOOD("pH of Blood", "pH of Blood", "LOINC", "11558-4"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + UntersuchterAnalytDefiningCode3(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningCode4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningCode4.java new file mode 100644 index 000000000..743b83b4f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/UntersuchterAnalytDefiningCode4.java @@ -0,0 +1,42 @@ +package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum UntersuchterAnalytDefiningCode4 implements EnumValueSet { + OXYGEN_SATURATION_IN_BLOOD("Oxygen saturation in Blood", "Oxygen saturation in Blood", "LOINC", "20564-1"), + + OXYGEN_SATURATION_IN_ARTERIAL_BLOOD("Oxygen saturation in Arterial blood", "Oxygen saturation in Arterial blood", "LOINC", "2708-6"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + UntersuchterAnalytDefiningCode4(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java new file mode 100644 index 000000000..e11fdfa4b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java @@ -0,0 +1,250 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +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 org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Id; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.annotations.Template; +import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.AllgemeineAngabenSection; +import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.GeschichteHistorieObservation; +import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.KontaktSection; +import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.RisikogebietSection; +import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.SymptomeSection; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; +import org.ehrbase.client.openehrclient.VersionUid; + +@Entity +@Archetype("openEHR-EHR-COMPOSITION.report.v1") +@Template("Corona_Anamnese") +public class CoronaAnamneseComposition { + @Path("/context/other_context[at0001]/items[at0002]/value|value") + private String berichtIdValue; + + @Path("/context/other_context[at0001]/items[at0005]/value|value") + private String statusValue; + + @Path("/context/other_context[at0001]/items[at0006]") + private List erweiterung; + + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; + + @Path("/context/participations") + private List participations; + + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + @Path("/context/location") + private String location; + + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; + + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; + + @Path("/content[openEHR-EHR-OBSERVATION.story.v1]") + private List geschichteHistorie; + + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']") + private SymptomeSection symptome; + + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']") + private KontaktSection kontakt; + + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Risikogebiet']") + private RisikogebietSection risikogebiet; + + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']") + private AllgemeineAngabenSection allgemeineAngaben; + + @Path("/composer") + private PartyProxy composer; + + @Path("/language") + private Language language; + + @Path("/feeder_audit") + private FeederAudit feederAudit; + + @Path("/category|defining_code") + private Category categoryDefiningCode; + + @Path("/territory") + private Territory territory; + + @Id + private VersionUid versionUid; + + public void setBerichtIdValue(String berichtIdValue) { + this.berichtIdValue = berichtIdValue; + } + + public String getBerichtIdValue() { + return this.berichtIdValue ; + } + + public void setStatusValue(String statusValue) { + this.statusValue = statusValue; + } + + public String getStatusValue() { + return this.statusValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + 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 setGeschichteHistorie(List geschichteHistorie) { + this.geschichteHistorie = geschichteHistorie; + } + + public List getGeschichteHistorie() { + return this.geschichteHistorie ; + } + + public void setSymptome(SymptomeSection symptome) { + this.symptome = symptome; + } + + public SymptomeSection getSymptome() { + return this.symptome ; + } + + public void setKontakt(KontaktSection kontakt) { + this.kontakt = kontakt; + } + + public KontaktSection getKontakt() { + return this.kontakt ; + } + + public void setRisikogebiet(RisikogebietSection risikogebiet) { + this.risikogebiet = risikogebiet; + } + + public RisikogebietSection getRisikogebiet() { + return this.risikogebiet ; + } + + public void setAllgemeineAngaben(AllgemeineAngabenSection allgemeineAngaben) { + this.allgemeineAngaben = allgemeineAngaben; + } + + public AllgemeineAngabenSection getAllgemeineAngaben() { + return this.allgemeineAngaben ; + } + + 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 setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } + + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } + + 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java new file mode 100644 index 000000000..7698e86e0 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java @@ -0,0 +1,73 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +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 org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.AllgemeineAngabenSection; +import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.GeschichteHistorieObservation; +import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.KontaktSection; +import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.RisikogebietSection; +import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.SymptomeSection; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; + +public class CoronaAnamneseCompositionContainment extends Containment { + public SelectAqlField CORONA_ANAMNESE_COMPOSITION = new AqlFieldImp(CoronaAnamneseComposition.class, "", "CoronaAnamneseComposition", CoronaAnamneseComposition.class, this); + + public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); + + public SelectAqlField STATUS_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "statusValue", String.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/context/other_context[at0001]/items[at0006]", "erweiterung", Cluster.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/context/participations", "participations", Participation.class, this); + + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + + public SelectAqlField LOCATION = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/location", "location", String.class, this); + + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); + + public ListSelectAqlField GESCHICHTE_HISTORIE = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-OBSERVATION.story.v1]", "geschichteHistorie", GeschichteHistorieObservation.class, this); + + public SelectAqlField SYMPTOME = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "symptome", SymptomeSection.class, this); + + public SelectAqlField KONTAKT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "kontakt", KontaktSection.class, this); + + public SelectAqlField RISIKOGEBIET = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "risikogebiet", RisikogebietSection.class, this); + + public SelectAqlField ALLGEMEINE_ANGABEN = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "allgemeineAngaben", AllgemeineAngabenSection.class, this); + + public SelectAqlField COMPOSER = new AqlFieldImp(CoronaAnamneseComposition.class, "/composer", "composer", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/language", "language", Language.class, this); + + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(CoronaAnamneseComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); + + public SelectAqlField TERRITORY = new AqlFieldImp(CoronaAnamneseComposition.class, "/territory", "territory", Territory.class, this); + + private CoronaAnamneseCompositionContainment() { + super("openEHR-EHR-COMPOSITION.report.v1"); + } + + public static CoronaAnamneseCompositionContainment getInstance() { + return new CoronaAnamneseCompositionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java new file mode 100644 index 000000000..da3ee2756 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java @@ -0,0 +1,32 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.address_cc.v0") +public class AdresseCluster { + @Path("/items[at0012]/value|value") + private String stadtValue; + + @Path("/items[at0015]/value|value") + private String landValue; + + public void setStadtValue(String stadtValue) { + this.stadtValue = stadtValue; + } + + public String getStadtValue() { + return this.stadtValue ; + } + + public void setLandValue(String landValue) { + this.landValue = landValue; + } + + public String getLandValue() { + return this.landValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseClusterContainment.java new file mode 100644 index 000000000..f8f98504b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseClusterContainment.java @@ -0,0 +1,22 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class AdresseClusterContainment extends Containment { + public SelectAqlField ADRESSE_CLUSTER = new AqlFieldImp(AdresseCluster.class, "", "AdresseCluster", AdresseCluster.class, this); + + public SelectAqlField STADT_VALUE = new AqlFieldImp(AdresseCluster.class, "/items[at0012]/value|value", "stadtValue", String.class, this); + + public SelectAqlField LAND_VALUE = new AqlFieldImp(AdresseCluster.class, "/items[at0015]/value|value", "landValue", String.class, this); + + private AdresseClusterContainment() { + super("openEHR-EHR-CLUSTER.address_cc.v0"); + } + + public static AdresseClusterContainment getInstance() { + return new AdresseClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java new file mode 100644 index 000000000..541fc885d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java @@ -0,0 +1,114 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-SECTION.adhoc.v1") +public class AllgemeineAngabenSection { + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Andere aktuelle Erkrankungen']") + private AndereAktuelleErkrankungenObservation andereAktuelleErkrankungen; + + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Chronische Erkrankungen']") + private ChronischeErkrankungenObservation chronischeErkrankungen; + + @Path("/items[openEHR-EHR-EVALUATION.problem_diagnosis.v1]") + private List problemDiagnose; + + @Path("/items[openEHR-EHR-OBSERVATION.medication_use.v0]") + private FragebogenZumMedikationsScreeningObservation fragebogenZumMedikationsScreening; + + @Path("/items[openEHR-EHR-EVALUATION.occupation_summary.v1 and name/value='Gesundheitsbezogener Beruf']") + private GesundheitsbezogenerBerufEvaluation gesundheitsbezogenerBeruf; + + @Path("/items[openEHR-EHR-EVALUATION.living_arrangement.v0]") + private List wohnsituation; + + @Path("/items[openEHR-EHR-EVALUATION.health_risk.v1]") + private List bewertungDesGesundheitsrisikos; + + @Path("/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1 and name/value='Problem/Diganose Coronovirus']") + private ProblemDiganoseCoronovirusEvaluation problemDiganoseCoronovirus; + + @Path("/items[openEHR-EHR-INSTRUCTION.service_request.v1]") + private List dienstleistung; + + public void setAndereAktuelleErkrankungen( + AndereAktuelleErkrankungenObservation andereAktuelleErkrankungen) { + this.andereAktuelleErkrankungen = andereAktuelleErkrankungen; + } + + public AndereAktuelleErkrankungenObservation getAndereAktuelleErkrankungen() { + return this.andereAktuelleErkrankungen ; + } + + public void setChronischeErkrankungen(ChronischeErkrankungenObservation chronischeErkrankungen) { + this.chronischeErkrankungen = chronischeErkrankungen; + } + + public ChronischeErkrankungenObservation getChronischeErkrankungen() { + return this.chronischeErkrankungen ; + } + + public void setProblemDiagnose(List problemDiagnose) { + this.problemDiagnose = problemDiagnose; + } + + public List getProblemDiagnose() { + return this.problemDiagnose ; + } + + public void setFragebogenZumMedikationsScreening( + FragebogenZumMedikationsScreeningObservation fragebogenZumMedikationsScreening) { + this.fragebogenZumMedikationsScreening = fragebogenZumMedikationsScreening; + } + + public FragebogenZumMedikationsScreeningObservation getFragebogenZumMedikationsScreening() { + return this.fragebogenZumMedikationsScreening ; + } + + public void setGesundheitsbezogenerBeruf( + GesundheitsbezogenerBerufEvaluation gesundheitsbezogenerBeruf) { + this.gesundheitsbezogenerBeruf = gesundheitsbezogenerBeruf; + } + + public GesundheitsbezogenerBerufEvaluation getGesundheitsbezogenerBeruf() { + return this.gesundheitsbezogenerBeruf ; + } + + public void setWohnsituation(List wohnsituation) { + this.wohnsituation = wohnsituation; + } + + public List getWohnsituation() { + return this.wohnsituation ; + } + + public void setBewertungDesGesundheitsrisikos( + List bewertungDesGesundheitsrisikos) { + this.bewertungDesGesundheitsrisikos = bewertungDesGesundheitsrisikos; + } + + public List getBewertungDesGesundheitsrisikos() { + return this.bewertungDesGesundheitsrisikos ; + } + + public void setProblemDiganoseCoronovirus( + ProblemDiganoseCoronovirusEvaluation problemDiganoseCoronovirus) { + this.problemDiganoseCoronovirus = problemDiganoseCoronovirus; + } + + public ProblemDiganoseCoronovirusEvaluation getProblemDiganoseCoronovirus() { + return this.problemDiganoseCoronovirus ; + } + + public void setDienstleistung(List dienstleistung) { + this.dienstleistung = dienstleistung; + } + + public List getDienstleistung() { + return this.dienstleistung ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSectionContainment.java new file mode 100644 index 000000000..1606a7207 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSectionContainment.java @@ -0,0 +1,37 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class AllgemeineAngabenSectionContainment extends Containment { + public SelectAqlField ALLGEMEINE_ANGABEN_SECTION = new AqlFieldImp(AllgemeineAngabenSection.class, "", "AllgemeineAngabenSection", AllgemeineAngabenSection.class, this); + + public SelectAqlField ANDERE_AKTUELLE_ERKRANKUNGEN = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "andereAktuelleErkrankungen", AndereAktuelleErkrankungenObservation.class, this); + + public SelectAqlField CHRONISCHE_ERKRANKUNGEN = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "chronischeErkrankungen", ChronischeErkrankungenObservation.class, this); + + public ListSelectAqlField PROBLEM_DIAGNOSE = new ListAqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.problem_diagnosis.v1]", "problemDiagnose", ProblemDiagnoseEvaluation.class, this); + + public SelectAqlField FRAGEBOGEN_ZUM_MEDIKATIONS_SCREENING = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-OBSERVATION.medication_use.v0]", "fragebogenZumMedikationsScreening", FragebogenZumMedikationsScreeningObservation.class, this); + + public SelectAqlField GESUNDHEITSBEZOGENER_BERUF = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.occupation_summary.v1]", "gesundheitsbezogenerBeruf", GesundheitsbezogenerBerufEvaluation.class, this); + + public ListSelectAqlField WOHNSITUATION = new ListAqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.living_arrangement.v0]", "wohnsituation", WohnsituationEvaluation.class, this); + + public ListSelectAqlField BEWERTUNG_DES_GESUNDHEITSRISIKOS = new ListAqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.health_risk.v1]", "bewertungDesGesundheitsrisikos", BewertungDesGesundheitsrisikosEvaluation.class, this); + + public SelectAqlField PROBLEM_DIGANOSE_CORONOVIRUS = new AqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1]", "problemDiganoseCoronovirus", ProblemDiganoseCoronovirusEvaluation.class, this); + + public ListSelectAqlField DIENSTLEISTUNG = new ListAqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-INSTRUCTION.service_request.v1]", "dienstleistung", DienstleistungInstruction.class, this); + + private AllgemeineAngabenSectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } + + public static AllgemeineAngabenSectionContainment getInstance() { + return new AllgemeineAngabenSectionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java new file mode 100644 index 000000000..489ca877a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java @@ -0,0 +1,105 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class AndereAktuelleErkrankungenObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } + + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } + + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } + + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java new file mode 100644 index 000000000..436b28080 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class AndereAktuelleErkrankungenObservationContainment extends Containment { + public SelectAqlField ANDERE_AKTUELLE_ERKRANKUNGEN_OBSERVATION = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "", "AndereAktuelleErkrankungenObservation", AndereAktuelleErkrankungenObservation.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/language", "language", Language.class, this); + + private AndereAktuelleErkrankungenObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static AndereAktuelleErkrankungenObservationContainment getInstance() { + return new AndereAktuelleErkrankungenObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java new file mode 100644 index 000000000..ac6e28558 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java @@ -0,0 +1,42 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ implements EnumValueSet { + JA("Ja", "Der Patient ist vor kurzem gereist.", "local", "at0112"), + + NEIN("Nein", "Der Patient ist in letzter Zeit nicht gereist.", "local", "at0113"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java new file mode 100644 index 000000000..21647db2e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java @@ -0,0 +1,126 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.exposure_assessment.v0") +public class AufenthaltInGesundheitseinrichtungObservation { + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value") + private String agentEnValue; + + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code") + private PresenceOfAnyExposureEnDefiningCode presenceOfAnyExposureEnDefiningCode; + + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value") + private String exposureEnValue; + + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code") + private VorhandenseinDefiningCode vorhandenseinDefiningCode; + + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value") + private String kommentarValue; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0004]/items[at0056]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setAgentEnValue(String agentEnValue) { + this.agentEnValue = agentEnValue; + } + + public String getAgentEnValue() { + return this.agentEnValue ; + } + + public void setPresenceOfAnyExposureEnDefiningCode( + PresenceOfAnyExposureEnDefiningCode presenceOfAnyExposureEnDefiningCode) { + this.presenceOfAnyExposureEnDefiningCode = presenceOfAnyExposureEnDefiningCode; + } + + public PresenceOfAnyExposureEnDefiningCode getPresenceOfAnyExposureEnDefiningCode() { + return this.presenceOfAnyExposureEnDefiningCode ; + } + + public void setExposureEnValue(String exposureEnValue) { + this.exposureEnValue = exposureEnValue; + } + + public String getExposureEnValue() { + return this.exposureEnValue ; + } + + public void setVorhandenseinDefiningCode(VorhandenseinDefiningCode vorhandenseinDefiningCode) { + this.vorhandenseinDefiningCode = vorhandenseinDefiningCode; + } + + public VorhandenseinDefiningCode getVorhandenseinDefiningCode() { + return this.vorhandenseinDefiningCode ; + } + + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } + + public String getKommentarValue() { + return this.kommentarValue ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java new file mode 100644 index 000000000..15fe2e055 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class AufenthaltInGesundheitseinrichtungObservationContainment extends Containment { + public SelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG_OBSERVATION = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "", "AufenthaltInGesundheitseinrichtungObservation", AufenthaltInGesundheitseinrichtungObservation.class, this); + + public SelectAqlField AGENT_EN_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value", "agentEnValue", String.class, this); + + public SelectAqlField PRESENCE_OF_ANY_EXPOSURE_EN_DEFINING_CODE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code", "presenceOfAnyExposureEnDefiningCode", PresenceOfAnyExposureEnDefiningCode.class, this); + + public SelectAqlField EXPOSURE_EN_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value", "exposureEnValue", String.class, this); + + public SelectAqlField VORHANDENSEIN_DEFINING_CODE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code", "vorhandenseinDefiningCode", VorhandenseinDefiningCode.class, this); + + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value", "kommentarValue", String.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/protocol[at0004]/items[at0056]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/language", "language", Language.class, this); + + private AufenthaltInGesundheitseinrichtungObservationContainment() { + super("openEHR-EHR-OBSERVATION.exposure_assessment.v0"); + } + + public static AufenthaltInGesundheitseinrichtungObservationContainment getInstance() { + return new AufenthaltInGesundheitseinrichtungObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java new file mode 100644 index 000000000..f012cc41c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java @@ -0,0 +1,45 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.occupation_record.v1") +public class BeschaftigungCluster { + @Path("/items[at0005]/value|value") + private String berufsbezeichnungRolleValue; + + @Path("/items[openEHR-EHR-CLUSTER.organisation_cc.v0]") + private List organisation; + + @Path("/items[at0018]") + private List zusatzlicheAngaben; + + public void setBerufsbezeichnungRolleValue(String berufsbezeichnungRolleValue) { + this.berufsbezeichnungRolleValue = berufsbezeichnungRolleValue; + } + + public String getBerufsbezeichnungRolleValue() { + return this.berufsbezeichnungRolleValue ; + } + + public void setOrganisation(List organisation) { + this.organisation = organisation; + } + + public List getOrganisation() { + return this.organisation ; + } + + public void setZusatzlicheAngaben(List zusatzlicheAngaben) { + this.zusatzlicheAngaben = zusatzlicheAngaben; + } + + public List getZusatzlicheAngaben() { + return this.zusatzlicheAngaben ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java new file mode 100644 index 000000000..f11fdc160 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java @@ -0,0 +1,27 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class BeschaftigungClusterContainment extends Containment { + public SelectAqlField BESCHAFTIGUNG_CLUSTER = new AqlFieldImp(BeschaftigungCluster.class, "", "BeschaftigungCluster", BeschaftigungCluster.class, this); + + public SelectAqlField BERUFSBEZEICHNUNG_ROLLE_VALUE = new AqlFieldImp(BeschaftigungCluster.class, "/items[at0005]/value|value", "berufsbezeichnungRolleValue", String.class, this); + + public ListSelectAqlField ORGANISATION = new ListAqlFieldImp(BeschaftigungCluster.class, "/items[openEHR-EHR-CLUSTER.organisation_cc.v0]", "organisation", OrganisationCluster.class, this); + + public ListSelectAqlField ZUSATZLICHE_ANGABEN = new ListAqlFieldImp(BeschaftigungCluster.class, "/items[at0018]", "zusatzlicheAngaben", Cluster.class, this); + + private BeschaftigungClusterContainment() { + super("openEHR-EHR-CLUSTER.occupation_record.v1"); + } + + public static BeschaftigungClusterContainment getInstance() { + return new BeschaftigungClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java new file mode 100644 index 000000000..32426fdf3 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java @@ -0,0 +1,160 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.health_risk.v1") +public class BewertungDesGesundheitsrisikosEvaluation { + @Path("/data[at0001]/items[at0002]/value|value") + private String gesundheitsrisikoValue; + + @Path("/data[at0001]/items[at0016 and name/value='Spezifischer Risikofaktor']/items[at0013]/value|value") + private String spezifischerRisikofaktorRisikofaktorValue; + + @Path("/data[at0001]/items[at0016 and name/value='Spezifischer Risikofaktor']/items[at0017]/value|defining_code") + private VorhandenseinDefiningCode2 vorhandenseinDefiningCode; + + @Path("/data[at0001]/items[at0016 and name/value='Spezifischer Risikofaktor']/items[at0027]") + private List spezifischerRisikofaktorDetails; + + @Path("/data[at0001]/items[at0016 and name/value='Andere Risikofaktoren']/items[at0013]/value|value") + private String andereRisikofaktorenRisikofaktorValue; + + @Path("/data[at0001]/items[at0016 and name/value='Andere Risikofaktoren']/items[at0017]/value|defining_code") + private VorhandenseinDefiningCode2 vorhandenseinDefiningCode2; + + @Path("/data[at0001]/items[at0016 and name/value='Andere Risikofaktoren']/items[at0027]") + private List andereRisikofaktorenDetails; + + @Path("/data[at0001]/items[at0003]/value|value") + private String risikobewertungValue; + + @Path("/protocol[at0010]/items[at0024]/value|value") + private TemporalAccessor letzteAktualisierungValue; + + @Path("/protocol[at0010]/items[at0025]/value|value") + private String bewertungsmethodeValue; + + @Path("/protocol[at0010]/items[at0011]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setGesundheitsrisikoValue(String gesundheitsrisikoValue) { + this.gesundheitsrisikoValue = gesundheitsrisikoValue; + } + + public String getGesundheitsrisikoValue() { + return this.gesundheitsrisikoValue ; + } + + public void setSpezifischerRisikofaktorRisikofaktorValue( + String spezifischerRisikofaktorRisikofaktorValue) { + this.spezifischerRisikofaktorRisikofaktorValue = spezifischerRisikofaktorRisikofaktorValue; + } + + public String getSpezifischerRisikofaktorRisikofaktorValue() { + return this.spezifischerRisikofaktorRisikofaktorValue ; + } + + public void setVorhandenseinDefiningCode(VorhandenseinDefiningCode2 vorhandenseinDefiningCode) { + this.vorhandenseinDefiningCode = vorhandenseinDefiningCode; + } + + public VorhandenseinDefiningCode2 getVorhandenseinDefiningCode() { + return this.vorhandenseinDefiningCode ; + } + + public void setSpezifischerRisikofaktorDetails(List spezifischerRisikofaktorDetails) { + this.spezifischerRisikofaktorDetails = spezifischerRisikofaktorDetails; + } + + public List getSpezifischerRisikofaktorDetails() { + return this.spezifischerRisikofaktorDetails ; + } + + public void setAndereRisikofaktorenRisikofaktorValue( + String andereRisikofaktorenRisikofaktorValue) { + this.andereRisikofaktorenRisikofaktorValue = andereRisikofaktorenRisikofaktorValue; + } + + public String getAndereRisikofaktorenRisikofaktorValue() { + return this.andereRisikofaktorenRisikofaktorValue ; + } + + public void setVorhandenseinDefiningCode2(VorhandenseinDefiningCode2 vorhandenseinDefiningCode2) { + this.vorhandenseinDefiningCode2 = vorhandenseinDefiningCode2; + } + + public VorhandenseinDefiningCode2 getVorhandenseinDefiningCode2() { + return this.vorhandenseinDefiningCode2 ; + } + + public void setAndereRisikofaktorenDetails(List andereRisikofaktorenDetails) { + this.andereRisikofaktorenDetails = andereRisikofaktorenDetails; + } + + public List getAndereRisikofaktorenDetails() { + return this.andereRisikofaktorenDetails ; + } + + public void setRisikobewertungValue(String risikobewertungValue) { + this.risikobewertungValue = risikobewertungValue; + } + + public String getRisikobewertungValue() { + return this.risikobewertungValue ; + } + + public void setLetzteAktualisierungValue(TemporalAccessor letzteAktualisierungValue) { + this.letzteAktualisierungValue = letzteAktualisierungValue; + } + + public TemporalAccessor getLetzteAktualisierungValue() { + return this.letzteAktualisierungValue ; + } + + public void setBewertungsmethodeValue(String bewertungsmethodeValue) { + this.bewertungsmethodeValue = bewertungsmethodeValue; + } + + public String getBewertungsmethodeValue() { + return this.bewertungsmethodeValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java new file mode 100644 index 000000000..651c5cee5 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java @@ -0,0 +1,50 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class BewertungDesGesundheitsrisikosEvaluationContainment extends Containment { + public SelectAqlField BEWERTUNG_DES_GESUNDHEITSRISIKOS_EVALUATION = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "", "BewertungDesGesundheitsrisikosEvaluation", BewertungDesGesundheitsrisikosEvaluation.class, this); + + public SelectAqlField GESUNDHEITSRISIKO_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0002]/value|value", "gesundheitsrisikoValue", String.class, this); + + public SelectAqlField SPEZIFISCHER_RISIKOFAKTOR_RISIKOFAKTOR_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0013]/value|value", "spezifischerRisikofaktorRisikofaktorValue", String.class, this); + + public SelectAqlField VORHANDENSEIN_DEFINING_CODE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0017]/value|defining_code", "vorhandenseinDefiningCode", VorhandenseinDefiningCode2.class, this); + + public ListSelectAqlField SPEZIFISCHER_RISIKOFAKTOR_DETAILS = new ListAqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0027]", "spezifischerRisikofaktorDetails", Cluster.class, this); + + public SelectAqlField ANDERE_RISIKOFAKTOREN_RISIKOFAKTOR_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0013]/value|value", "andereRisikofaktorenRisikofaktorValue", String.class, this); + + public SelectAqlField VORHANDENSEIN_DEFINING_CODE2 = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0017]/value|defining_code", "vorhandenseinDefiningCode2", VorhandenseinDefiningCode2.class, this); + + public ListSelectAqlField ANDERE_RISIKOFAKTOREN_DETAILS = new ListAqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0027]", "andereRisikofaktorenDetails", Cluster.class, this); + + public SelectAqlField RISIKOBEWERTUNG_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0003]/value|value", "risikobewertungValue", String.class, this); + + public SelectAqlField LETZTE_AKTUALISIERUNG_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/protocol[at0010]/items[at0024]/value|value", "letzteAktualisierungValue", TemporalAccessor.class, this); + + public SelectAqlField BEWERTUNGSMETHODE_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/protocol[at0010]/items[at0025]/value|value", "bewertungsmethodeValue", String.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/protocol[at0010]/items[at0011]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/language", "language", Language.class, this); + + private BewertungDesGesundheitsrisikosEvaluationContainment() { + super("openEHR-EHR-EVALUATION.health_risk.v1"); + } + + public static BewertungDesGesundheitsrisikosEvaluationContainment getInstance() { + return new BewertungDesGesundheitsrisikosEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java new file mode 100644 index 000000000..c0c1c15cf --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java @@ -0,0 +1,105 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class ChronischeErkrankungenObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } + + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } + + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } + + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java new file mode 100644 index 000000000..43b886c6d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class ChronischeErkrankungenObservationContainment extends Containment { + public SelectAqlField CHRONISCHE_ERKRANKUNGEN_OBSERVATION = new AqlFieldImp(ChronischeErkrankungenObservation.class, "", "ChronischeErkrankungenObservation", ChronischeErkrankungenObservation.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ChronischeErkrankungenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/language", "language", Language.class, this); + + private ChronischeErkrankungenObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static ChronischeErkrankungenObservationContainment getInstance() { + return new ChronischeErkrankungenObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnosestatusDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnosestatusDefiningCode.java new file mode 100644 index 000000000..7ec11067a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnosestatusDefiningCode.java @@ -0,0 +1,39 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum DiagnosestatusDefiningCode implements EnumValueSet { + IN_BEARBEITUNG("In Bearbeitung", "Eine vorübergehende Diagnose, bei welcher Testergebnisse und klinische Hinweise oder Empfehlungen noch ausstehen, welche aber bereits auf einer soliden klinischen Sicherheit beruht. Sobald weitere Testresultate und klinische Hinweise oder Empfehlungen zur Verfügung stehen, kann sich die Diagnose noch ändern.", "local", "at0017"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + DiagnosestatusDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningCode.java new file mode 100644 index 000000000..73f2ae3ad --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningCode.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum DiagnostischeSicherheitDefiningCode implements EnumValueSet { + WAHRSCHEINLICH("Wahrscheinlich", "Die Diagnose wurde mit einem hohen Maß an Sicherheit gestellt.", "local", "at0075"), + + VERMUTET("Vermutet", "Die Diagnose wurde mit einem niedrigen Grad an Sicherheit gestellt.", "local", "at0074"), + + BESTATIGT("Bestätigt", "Die Diagnose wurde anhand anerkannter Kriterien bestätigt.", "local", "at0076"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + DiagnostischeSicherheitDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java new file mode 100644 index 000000000..0b6dccd7f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java @@ -0,0 +1,89 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class DienstleistungAktuelleAktivitatActivity { + @Path("/description[at0009]/items[at0121]/value|value") + private String nameDerDienstleistungValue; + + @Path("/description[at0009]/items[at0062]") + private List grundFurDieAnforderung; + + @Path("/description[at0009]/items[at0151]") + private List komplexeZeitplanung; + + @Path("/description[at0009]/items[at0132]") + private List spezifischeDetails; + + @Path("/description[at0009]/items[at0149]") + private List unterstutzendeInformationen; + + @Path("/description[at0009]/items[at0116]") + private List anforderungenAnPatienten; + + @Path("/timing") + private DvParsable timing; + + public void setNameDerDienstleistungValue(String nameDerDienstleistungValue) { + this.nameDerDienstleistungValue = nameDerDienstleistungValue; + } + + public String getNameDerDienstleistungValue() { + return this.nameDerDienstleistungValue ; + } + + public void setGrundFurDieAnforderung( + List grundFurDieAnforderung) { + this.grundFurDieAnforderung = grundFurDieAnforderung; + } + + public List getGrundFurDieAnforderung() { + return this.grundFurDieAnforderung ; + } + + public void setKomplexeZeitplanung(List komplexeZeitplanung) { + this.komplexeZeitplanung = komplexeZeitplanung; + } + + public List getKomplexeZeitplanung() { + return this.komplexeZeitplanung ; + } + + public void setSpezifischeDetails(List spezifischeDetails) { + this.spezifischeDetails = spezifischeDetails; + } + + public List getSpezifischeDetails() { + return this.spezifischeDetails ; + } + + public void setUnterstutzendeInformationen(List unterstutzendeInformationen) { + this.unterstutzendeInformationen = unterstutzendeInformationen; + } + + public List getUnterstutzendeInformationen() { + return this.unterstutzendeInformationen ; + } + + public void setAnforderungenAnPatienten(List anforderungenAnPatienten) { + this.anforderungenAnPatienten = anforderungenAnPatienten; + } + + public List getAnforderungenAnPatienten() { + return this.anforderungenAnPatienten ; + } + + public void setTiming(DvParsable timing) { + this.timing = timing; + } + + public DvParsable getTiming() { + return this.timing ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java new file mode 100644 index 000000000..ae73ac04b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java @@ -0,0 +1,19 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class DienstleistungGrundFurDieAnforderungElement { + @Path("/value|value") + private String value; + + public void setValue(String value) { + this.value = value; + } + + public String getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java new file mode 100644 index 000000000..a8bea456d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java @@ -0,0 +1,115 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-INSTRUCTION.service_request.v1") +public class DienstleistungInstruction { + @Path("/activities[at0001]") + private List aktuelleAktivitat; + + @Path("/protocol[at0008]/items[at0141]") + private Cluster einsender; + + @Path("/protocol[at0008]/items[at0142]") + private Cluster empfanger; + + @Path("/protocol[at0008]/items[at0128]") + private List verteilerliste; + + @Path("/protocol[at0008]/items[at0112]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/narrative|value") + private String narrativeValue; + + @Path("/language") + private Language language; + + @Path("/expiry_time|value") + private TemporalAccessor expiryTimeValue; + + public void setAktuelleAktivitat( + List aktuelleAktivitat) { + this.aktuelleAktivitat = aktuelleAktivitat; + } + + public List getAktuelleAktivitat() { + return this.aktuelleAktivitat ; + } + + public void setEinsender(Cluster einsender) { + this.einsender = einsender; + } + + public Cluster getEinsender() { + return this.einsender ; + } + + public void setEmpfanger(Cluster empfanger) { + this.empfanger = empfanger; + } + + public Cluster getEmpfanger() { + return this.empfanger ; + } + + public void setVerteilerliste(List verteilerliste) { + this.verteilerliste = verteilerliste; + } + + public List getVerteilerliste() { + return this.verteilerliste ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setNarrativeValue(String narrativeValue) { + this.narrativeValue = narrativeValue; + } + + public String getNarrativeValue() { + return this.narrativeValue ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setExpiryTimeValue(TemporalAccessor expiryTimeValue) { + this.expiryTimeValue = expiryTimeValue; + } + + public TemporalAccessor getExpiryTimeValue() { + return this.expiryTimeValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java new file mode 100644 index 000000000..86f98dad8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java @@ -0,0 +1,42 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class DienstleistungInstructionContainment extends Containment { + public SelectAqlField DIENSTLEISTUNG_INSTRUCTION = new AqlFieldImp(DienstleistungInstruction.class, "", "DienstleistungInstruction", DienstleistungInstruction.class, this); + + public ListSelectAqlField AKTUELLE_AKTIVITAT = new ListAqlFieldImp(DienstleistungInstruction.class, "/activities[at0001]", "aktuelleAktivitat", DienstleistungAktuelleAktivitatActivity.class, this); + + public SelectAqlField EINSENDER = new AqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0141]", "einsender", Cluster.class, this); + + public SelectAqlField EMPFANGER = new AqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0142]", "empfanger", Cluster.class, this); + + public ListSelectAqlField VERTEILERLISTE = new ListAqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0128]", "verteilerliste", Cluster.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0112]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(DienstleistungInstruction.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField NARRATIVE_VALUE = new AqlFieldImp(DienstleistungInstruction.class, "/narrative|value", "narrativeValue", String.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(DienstleistungInstruction.class, "/language", "language", Language.class, this); + + public SelectAqlField EXPIRY_TIME_VALUE = new AqlFieldImp(DienstleistungInstruction.class, "/expiry_time|value", "expiryTimeValue", TemporalAccessor.class, this); + + private DienstleistungInstructionContainment() { + super("openEHR-EHR-INSTRUCTION.service_request.v1"); + } + + public static DienstleistungInstructionContainment getInstance() { + return new DienstleistungInstructionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java new file mode 100644 index 000000000..5f99f53a8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java @@ -0,0 +1,105 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class DurchfallObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } + + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } + + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } + + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java new file mode 100644 index 000000000..7bdb007a1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class DurchfallObservationContainment extends Containment { + public SelectAqlField DURCHFALL_OBSERVATION = new AqlFieldImp(DurchfallObservation.class, "", "DurchfallObservation", DurchfallObservation.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(DurchfallObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(DurchfallObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(DurchfallObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(DurchfallObservation.class, "/language", "language", Language.class, this); + + private DurchfallObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static DurchfallObservationContainment getInstance() { + return new DurchfallObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java new file mode 100644 index 000000000..1d3b2ecd7 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java @@ -0,0 +1,105 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class FieberOderErhohteKorpertemperaturObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } + + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } + + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } + + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java new file mode 100644 index 000000000..833a9d289 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class FieberOderErhohteKorpertemperaturObservationContainment extends Containment { + public SelectAqlField FIEBER_ODER_ERHOHTE_KORPERTEMPERATUR_OBSERVATION = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "", "FieberOderErhohteKorpertemperaturObservation", FieberOderErhohteKorpertemperaturObservation.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/language", "language", Language.class, this); + + private FieberOderErhohteKorpertemperaturObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static FieberOderErhohteKorpertemperaturObservationContainment getInstance() { + return new FieberOderErhohteKorpertemperaturObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java new file mode 100644 index 000000000..cf6442814 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java @@ -0,0 +1,120 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.medication_use.v0") +public class FragebogenZumMedikationsScreeningObservation { + @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0027]/value|defining_code") + private CodePhrase medikamenteInVerwendungDefiningCode; + + @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0002]/value|value") + private String nameDerMedikamentenklasseValue; + + @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0003]/value|defining_code") + private MedikamentenklasseInVerwendungDefiningCode medikamentenklasseInVerwendungDefiningCode; + + @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0008]") + private List spezifischeMedikamente; + + @Path("/data[at0022]/events[at0023]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0022]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0005]/items[at0019]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setMedikamenteInVerwendungDefiningCode( + CodePhrase medikamenteInVerwendungDefiningCode) { + this.medikamenteInVerwendungDefiningCode = medikamenteInVerwendungDefiningCode; + } + + public CodePhrase getMedikamenteInVerwendungDefiningCode() { + return this.medikamenteInVerwendungDefiningCode ; + } + + public void setNameDerMedikamentenklasseValue(String nameDerMedikamentenklasseValue) { + this.nameDerMedikamentenklasseValue = nameDerMedikamentenklasseValue; + } + + public String getNameDerMedikamentenklasseValue() { + return this.nameDerMedikamentenklasseValue ; + } + + public void setMedikamentenklasseInVerwendungDefiningCode( + MedikamentenklasseInVerwendungDefiningCode medikamentenklasseInVerwendungDefiningCode) { + this.medikamentenklasseInVerwendungDefiningCode = medikamentenklasseInVerwendungDefiningCode; + } + + public MedikamentenklasseInVerwendungDefiningCode getMedikamentenklasseInVerwendungDefiningCode( + ) { + return this.medikamentenklasseInVerwendungDefiningCode ; + } + + public void setSpezifischeMedikamente( + List spezifischeMedikamente) { + this.spezifischeMedikamente = spezifischeMedikamente; + } + + public List getSpezifischeMedikamente( + ) { + return this.spezifischeMedikamente ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java new file mode 100644 index 000000000..5a537f20f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class FragebogenZumMedikationsScreeningObservationContainment extends Containment { + public SelectAqlField FRAGEBOGEN_ZUM_MEDIKATIONS_SCREENING_OBSERVATION = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "", "FragebogenZumMedikationsScreeningObservation", FragebogenZumMedikationsScreeningObservation.class, this); + + public SelectAqlField MEDIKAMENTE_IN_VERWENDUNG_DEFINING_CODE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0027]/value|defining_code", "medikamenteInVerwendungDefiningCode", CodePhrase.class, this); + + public SelectAqlField NAME_DER_MEDIKAMENTENKLASSE_VALUE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0002]/value|value", "nameDerMedikamentenklasseValue", String.class, this); + + public SelectAqlField MEDIKAMENTENKLASSE_IN_VERWENDUNG_DEFINING_CODE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0003]/value|defining_code", "medikamentenklasseInVerwendungDefiningCode", MedikamentenklasseInVerwendungDefiningCode.class, this); + + public ListSelectAqlField SPEZIFISCHE_MEDIKAMENTE = new ListAqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0008]", "spezifischeMedikamente", FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/protocol[at0005]/items[at0019]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/language", "language", Language.class, this); + + private FragebogenZumMedikationsScreeningObservationContainment() { + super("openEHR-EHR-OBSERVATION.medication_use.v0"); + } + + public static FragebogenZumMedikationsScreeningObservationContainment getInstance() { + return new FragebogenZumMedikationsScreeningObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java new file mode 100644 index 000000000..583b84a2d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java @@ -0,0 +1,31 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster { + @Path("/items[at0021]/value|value") + private String nameDesMedikamentsValue; + + @Path("/items[at0024]/value|defining_code") + private MedikamentInVerwendungDefiningCode medikamentInVerwendungDefiningCode; + + public void setNameDesMedikamentsValue(String nameDesMedikamentsValue) { + this.nameDesMedikamentsValue = nameDesMedikamentsValue; + } + + public String getNameDesMedikamentsValue() { + return this.nameDesMedikamentsValue ; + } + + public void setMedikamentInVerwendungDefiningCode( + MedikamentInVerwendungDefiningCode medikamentInVerwendungDefiningCode) { + this.medikamentInVerwendungDefiningCode = medikamentInVerwendungDefiningCode; + } + + public MedikamentInVerwendungDefiningCode getMedikamentInVerwendungDefiningCode() { + return this.medikamentInVerwendungDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java new file mode 100644 index 000000000..0e0258ddc --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +public interface GeschichteHistorieBeliebigesEreignisChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java new file mode 100644 index 000000000..d36fb3102 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java @@ -0,0 +1,69 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; + +@Entity +@OptionFor("INTERVAL_EVENT") +public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements GeschichteHistorieBeliebigesEreignisChoice { + @Path("/data[at0003]/items[at0004]") + private List geschichte; + + @Path("/data[at0003]/items[at0006]") + private List strukturierteAngabe; + + @Path("/time|value") + private TemporalAccessor timeValue; + + @Path("/width|value") + private TemporalAmount widthValue; + + @Path("/math_function|defining_code") + private MathFunction mathFunctionDefiningCode; + + public void setGeschichte(List geschichte) { + this.geschichte = geschichte; + } + + public List getGeschichte() { + return this.geschichte ; + } + + public void setStrukturierteAngabe(List strukturierteAngabe) { + this.strukturierteAngabe = strukturierteAngabe; + } + + public List getStrukturierteAngabe() { + return this.strukturierteAngabe ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setWidthValue(TemporalAmount widthValue) { + this.widthValue = widthValue; + } + + public TemporalAmount getWidthValue() { + return this.widthValue ; + } + + public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { + this.mathFunctionDefiningCode = mathFunctionDefiningCode; + } + + public MathFunction getMathFunctionDefiningCode() { + return this.mathFunctionDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java new file mode 100644 index 000000000..5a425fc26 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java @@ -0,0 +1,45 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("POINT_EVENT") +public class GeschichteHistorieBeliebigesEreignisPointEvent implements GeschichteHistorieBeliebigesEreignisChoice { + @Path("/data[at0003]/items[at0004]") + private List geschichte; + + @Path("/data[at0003]/items[at0006]") + private List strukturierteAngabe; + + @Path("/time|value") + private TemporalAccessor timeValue; + + public void setGeschichte(List geschichte) { + this.geschichte = geschichte; + } + + public List getGeschichte() { + return this.geschichte ; + } + + public void setStrukturierteAngabe(List strukturierteAngabe) { + this.strukturierteAngabe = strukturierteAngabe; + } + + public List getStrukturierteAngabe() { + return this.strukturierteAngabe ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java new file mode 100644 index 000000000..68c3c7c45 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java @@ -0,0 +1,19 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class GeschichteHistorieGeschichteElement { + @Path("/value|value") + private String value; + + public void setValue(String value) { + this.value = value; + } + + public String getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java new file mode 100644 index 000000000..caa66e1d6 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java @@ -0,0 +1,72 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; +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.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.story.v1") +public class GeschichteHistorieObservation { + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0007]/items[at0008]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + @Path("/data[at0001]/events[at0002]") + @Choice + private List beliebigesEreignis; + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setBeliebigesEreignis( + List beliebigesEreignis) { + this.beliebigesEreignis = beliebigesEreignis; + } + + public List getBeliebigesEreignis() { + return this.beliebigesEreignis ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java new file mode 100644 index 000000000..5cc4f0c20 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java @@ -0,0 +1,33 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class GeschichteHistorieObservationContainment extends Containment { + public SelectAqlField GESCHICHTE_HISTORIE_OBSERVATION = new AqlFieldImp(GeschichteHistorieObservation.class, "", "GeschichteHistorieObservation", GeschichteHistorieObservation.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(GeschichteHistorieObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GeschichteHistorieObservation.class, "/protocol[at0007]/items[at0008]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(GeschichteHistorieObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(GeschichteHistorieObservation.class, "/language", "language", Language.class, this); + + public ListSelectAqlField BELIEBIGES_EREIGNIS = new ListAqlFieldImp(GeschichteHistorieObservation.class, "/data[at0001]/events[at0002]", "beliebigesEreignis", GeschichteHistorieBeliebigesEreignisChoice.class, this); + + private GeschichteHistorieObservationContainment() { + super("openEHR-EHR-OBSERVATION.story.v1"); + } + + public static GeschichteHistorieObservationContainment getInstance() { + return new GeschichteHistorieObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java new file mode 100644 index 000000000..190420e6d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java @@ -0,0 +1,105 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class GestorterGeruchssinnObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } + + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } + + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } + + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java new file mode 100644 index 000000000..eac3965fa --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class GestorterGeruchssinnObservationContainment extends Containment { + public SelectAqlField GESTORTER_GERUCHSSINN_OBSERVATION = new AqlFieldImp(GestorterGeruchssinnObservation.class, "", "GestorterGeruchssinnObservation", GestorterGeruchssinnObservation.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GestorterGeruchssinnObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/language", "language", Language.class, this); + + private GestorterGeruchssinnObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static GestorterGeruchssinnObservationContainment getInstance() { + return new GestorterGeruchssinnObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java new file mode 100644 index 000000000..58fcd7d49 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java @@ -0,0 +1,105 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class GestorterGeschmackssinnObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } + + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } + + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } + + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java new file mode 100644 index 000000000..b39fc7247 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class GestorterGeschmackssinnObservationContainment extends Containment { + public SelectAqlField GESTORTER_GESCHMACKSSINN_OBSERVATION = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "", "GestorterGeschmackssinnObservation", GestorterGeschmackssinnObservation.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GestorterGeschmackssinnObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/language", "language", Language.class, this); + + private GestorterGeschmackssinnObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static GestorterGeschmackssinnObservationContainment getInstance() { + return new GestorterGeschmackssinnObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java new file mode 100644 index 000000000..82d2577b4 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java @@ -0,0 +1,80 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.occupation_summary.v1") +public class GesundheitsbezogenerBerufEvaluation { + @Path("/data[at0001]/items[at0004]/value|value") + private String beschaftigungsstatusValue; + + @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.occupation_record.v1]") + private List beschaftigung; + + @Path("/data[at0001]/items[at0005]") + private List zusatzlicheAngaben; + + @Path("/protocol[at0007]/items[at0008]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setBeschaftigungsstatusValue(String beschaftigungsstatusValue) { + this.beschaftigungsstatusValue = beschaftigungsstatusValue; + } + + public String getBeschaftigungsstatusValue() { + return this.beschaftigungsstatusValue ; + } + + public void setBeschaftigung(List beschaftigung) { + this.beschaftigung = beschaftigung; + } + + public List getBeschaftigung() { + return this.beschaftigung ; + } + + public void setZusatzlicheAngaben(List zusatzlicheAngaben) { + this.zusatzlicheAngaben = zusatzlicheAngaben; + } + + public List getZusatzlicheAngaben() { + return this.zusatzlicheAngaben ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java new file mode 100644 index 000000000..8383c0a16 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java @@ -0,0 +1,35 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class GesundheitsbezogenerBerufEvaluationContainment extends Containment { + public SelectAqlField GESUNDHEITSBEZOGENER_BERUF_EVALUATION = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "", "GesundheitsbezogenerBerufEvaluation", GesundheitsbezogenerBerufEvaluation.class, this); + + public SelectAqlField BESCHAFTIGUNGSSTATUS_VALUE = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/data[at0001]/items[at0004]/value|value", "beschaftigungsstatusValue", String.class, this); + + public ListSelectAqlField BESCHAFTIGUNG = new ListAqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.occupation_record.v1]", "beschaftigung", BeschaftigungCluster.class, this); + + public ListSelectAqlField ZUSATZLICHE_ANGABEN = new ListAqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/data[at0001]/items[at0005]", "zusatzlicheAngaben", Cluster.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/protocol[at0007]/items[at0008]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/language", "language", Language.class, this); + + private GesundheitsbezogenerBerufEvaluationContainment() { + super("openEHR-EHR-EVALUATION.occupation_summary.v1"); + } + + public static GesundheitsbezogenerBerufEvaluationContainment getInstance() { + return new GesundheitsbezogenerBerufEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java new file mode 100644 index 000000000..d217a6390 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java @@ -0,0 +1,105 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class HeiserkeitObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } + + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } + + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } + + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java new file mode 100644 index 000000000..cbe61fa5f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class HeiserkeitObservationContainment extends Containment { + public SelectAqlField HEISERKEIT_OBSERVATION = new AqlFieldImp(HeiserkeitObservation.class, "", "HeiserkeitObservation", HeiserkeitObservation.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(HeiserkeitObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(HeiserkeitObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(HeiserkeitObservation.class, "/language", "language", Language.class, this); + + private HeiserkeitObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static HeiserkeitObservationContainment getInstance() { + return new HeiserkeitObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java new file mode 100644 index 000000000..d8c6ea951 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java @@ -0,0 +1,104 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.travel_history.v0") +public class HistorieDerReiseObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0111 and name/value='Aufenthalt in den letzten 14 Tage in einem der Risikogebiete für Coronainfektion oder Kontakt zu Menschen, die dort waren']/value|defining_code") + private AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0134]/items[openEHR-EHR-CLUSTER.location.v1]") + private StandortCluster standort; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0109]") + private List detaillierteAngabenZurExposition; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0100]/items[at0101]") + private List extensionEn; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setAufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode( + AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode) { + this.aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode = aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode; + } + + public AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ getAufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode( + ) { + return this.aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode ; + } + + public void setStandort(StandortCluster standort) { + this.standort = standort; + } + + public StandortCluster getStandort() { + return this.standort ; + } + + public void setDetaillierteAngabenZurExposition(List detaillierteAngabenZurExposition) { + this.detaillierteAngabenZurExposition = detaillierteAngabenZurExposition; + } + + public List getDetaillierteAngabenZurExposition() { + return this.detaillierteAngabenZurExposition ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setExtensionEn(List extensionEn) { + this.extensionEn = extensionEn; + } + + public List getExtensionEn() { + return this.extensionEn ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java new file mode 100644 index 000000000..50ae4316c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java @@ -0,0 +1,39 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class HistorieDerReiseObservationContainment extends Containment { + public SelectAqlField HISTORIE_DER_REISE_OBSERVATION = new AqlFieldImp(HistorieDerReiseObservation.class, "", "HistorieDerReiseObservation", HistorieDerReiseObservation.class, this); + + public SelectAqlField AUFENTHALT_IN_DEN_LETZTEN14_TAGE_IN_EINEM_DER_RISIKOGEBIETE_FUR_CORONAINFEKTION_ODER_KONTAKT_ZU_MENSCHEN_DIE_DORT_WAREN_DEFINING_CODE = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0111]/value|defining_code", "aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode", AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.class, this); + + public SelectAqlField STANDORT = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0134]/items[openEHR-EHR-CLUSTER.location.v1]", "standort", StandortCluster.class, this); + + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUR_EXPOSITION = new ListAqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0109]", "detaillierteAngabenZurExposition", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField EXTENSION_EN = new ListAqlFieldImp(HistorieDerReiseObservation.class, "/protocol[at0100]/items[at0101]", "extensionEn", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(HistorieDerReiseObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(HistorieDerReiseObservation.class, "/language", "language", Language.class, this); + + private HistorieDerReiseObservationContainment() { + super("openEHR-EHR-OBSERVATION.travel_history.v0"); + } + + public static HistorieDerReiseObservationContainment getInstance() { + return new HistorieDerReiseObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java new file mode 100644 index 000000000..e6c6e3b03 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java @@ -0,0 +1,105 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class HustenObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } + + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } + + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } + + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservationContainment.java new file mode 100644 index 000000000..a4e03a368 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class HustenObservationContainment extends Containment { + public SelectAqlField HUSTEN_OBSERVATION = new AqlFieldImp(HustenObservation.class, "", "HustenObservation", HustenObservation.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(HustenObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(HustenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(HustenObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(HustenObservation.class, "/language", "language", Language.class, this); + + private HustenObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static HustenObservationContainment getInstance() { + return new HustenObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/InlandAuslandDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/InlandAuslandDefiningCode.java new file mode 100644 index 000000000..483633758 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/InlandAuslandDefiningCode.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum InlandAuslandDefiningCode implements EnumValueSet { + INLANDSREISE("Inlandsreise", "Die Person ist innerhalb des angegebenen Zeitraums im Inland gereist.", "local", "at0028"), + + INLANDS_UND_AUSLANDSREISE("Inlands- und Auslandsreise", "Die Person ist innerhalb des festgelegten Zeitraums sowohl im Inland als auch international gereist.", "local", "at0030"), + + AUSLANDREISE("Auslandreise", "Die Person ist innerhalb des angegebenen Zeitraums international gereist.", "local", "at0029"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + InlandAuslandDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java new file mode 100644 index 000000000..faf97531b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java @@ -0,0 +1,32 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-SECTION.adhoc.v1") +public class KontaktSection { + @Path("/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Personenkontakt']") + private PersonenkontaktObservation personenkontakt; + + @Path("/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Aufenthalt in Gesundheitseinrichtung']") + private AufenthaltInGesundheitseinrichtungObservation aufenthaltInGesundheitseinrichtung; + + public void setPersonenkontakt(PersonenkontaktObservation personenkontakt) { + this.personenkontakt = personenkontakt; + } + + public PersonenkontaktObservation getPersonenkontakt() { + return this.personenkontakt ; + } + + public void setAufenthaltInGesundheitseinrichtung( + AufenthaltInGesundheitseinrichtungObservation aufenthaltInGesundheitseinrichtung) { + this.aufenthaltInGesundheitseinrichtung = aufenthaltInGesundheitseinrichtung; + } + + public AufenthaltInGesundheitseinrichtungObservation getAufenthaltInGesundheitseinrichtung() { + return this.aufenthaltInGesundheitseinrichtung ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSectionContainment.java new file mode 100644 index 000000000..cd530a6dd --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSectionContainment.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class KontaktSectionContainment extends Containment { + public SelectAqlField KONTAKT_SECTION = new AqlFieldImp(KontaktSection.class, "", "KontaktSection", KontaktSection.class, this); + + public SelectAqlField PERSONENKONTAKT = new AqlFieldImp(KontaktSection.class, "/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]", "personenkontakt", PersonenkontaktObservation.class, this); + + public SelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG = new AqlFieldImp(KontaktSection.class, "/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]", "aufenthaltInGesundheitseinrichtung", AufenthaltInGesundheitseinrichtungObservation.class, this); + + private KontaktSectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } + + public static KontaktSectionContainment getInstance() { + return new KontaktSectionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java new file mode 100644 index 000000000..bcad74060 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java @@ -0,0 +1,149 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.body_temperature.v2") +public class KorpertemperaturObservation { + @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude") + private Double temperaturMagnitude; + + @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units") + private String temperaturUnits; + + @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0066]") + private List storfaktoren; + + @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0056]") + private List umgebungsbedingungen; + + @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0057]") + private Cluster betatigung; + + @Path("/data[at0002]/events[at0003]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0002]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0020]/items[at0064]") + private List strukturierteLokalisationDerMessung; + + @Path("/protocol[at0020]/items[at0059]") + private Cluster gerat; + + @Path("/protocol[at0020]/items[at0062]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setTemperaturMagnitude(Double temperaturMagnitude) { + this.temperaturMagnitude = temperaturMagnitude; + } + + public Double getTemperaturMagnitude() { + return this.temperaturMagnitude ; + } + + public void setTemperaturUnits(String temperaturUnits) { + this.temperaturUnits = temperaturUnits; + } + + public String getTemperaturUnits() { + return this.temperaturUnits ; + } + + public void setStorfaktoren(List storfaktoren) { + this.storfaktoren = storfaktoren; + } + + public List getStorfaktoren() { + return this.storfaktoren ; + } + + public void setUmgebungsbedingungen(List umgebungsbedingungen) { + this.umgebungsbedingungen = umgebungsbedingungen; + } + + public List getUmgebungsbedingungen() { + return this.umgebungsbedingungen ; + } + + public void setBetatigung(Cluster betatigung) { + this.betatigung = betatigung; + } + + public Cluster getBetatigung() { + return this.betatigung ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setStrukturierteLokalisationDerMessung( + List strukturierteLokalisationDerMessung) { + this.strukturierteLokalisationDerMessung = strukturierteLokalisationDerMessung; + } + + public List getStrukturierteLokalisationDerMessung() { + return this.strukturierteLokalisationDerMessung ; + } + + public void setGerat(Cluster gerat) { + this.gerat = gerat; + } + + public Cluster getGerat() { + return this.gerat ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java new file mode 100644 index 000000000..4ac95d65f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java @@ -0,0 +1,49 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class KorpertemperaturObservationContainment extends Containment { + public SelectAqlField KORPERTEMPERATUR_OBSERVATION = new AqlFieldImp(KorpertemperaturObservation.class, "", "KorpertemperaturObservation", KorpertemperaturObservation.class, this); + + public SelectAqlField TEMPERATUR_MAGNITUDE = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude", "temperaturMagnitude", Double.class, this); + + public SelectAqlField TEMPERATUR_UNITS = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units", "temperaturUnits", String.class, this); + + public ListSelectAqlField STORFAKTOREN = new ListAqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0066]", "storfaktoren", KorpertemperaturStorfaktorenElement.class, this); + + public ListSelectAqlField UMGEBUNGSBEDINGUNGEN = new ListAqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0056]", "umgebungsbedingungen", Cluster.class, this); + + public SelectAqlField BETATIGUNG = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0057]", "betatigung", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField STRUKTURIERTE_LOKALISATION_DER_MESSUNG = new ListAqlFieldImp(KorpertemperaturObservation.class, "/protocol[at0020]/items[at0064]", "strukturierteLokalisationDerMessung", Cluster.class, this); + + public SelectAqlField GERAT = new AqlFieldImp(KorpertemperaturObservation.class, "/protocol[at0020]/items[at0059]", "gerat", Cluster.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(KorpertemperaturObservation.class, "/protocol[at0020]/items[at0062]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(KorpertemperaturObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(KorpertemperaturObservation.class, "/language", "language", Language.class, this); + + private KorpertemperaturObservationContainment() { + super("openEHR-EHR-OBSERVATION.body_temperature.v2"); + } + + public static KorpertemperaturObservationContainment getInstance() { + return new KorpertemperaturObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java new file mode 100644 index 000000000..b20737943 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java @@ -0,0 +1,19 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class KorpertemperaturStorfaktorenElement { + @Path("/value|value") + private String value; + + public void setValue(String value) { + this.value = value; + } + + public String getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/LetzteReiseDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/LetzteReiseDefiningCode.java new file mode 100644 index 000000000..c8d35a6bb --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/LetzteReiseDefiningCode.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum LetzteReiseDefiningCode implements EnumValueSet { + NEIN("Nein", "Die Person ist nicht innerhalb des angegebenen Zeitraums gereist.", "local", "at0005"), + + UNBEKANNT("Unbekannt", "Es ist nicht bekannt, ob die Person innerhalb des angegebenen Zeitinraumss gereist ist.", "local", "at0027"), + + JA_NATIONAL("Ja - national", "Die Person ist innerhalb des angegebenen Zeitraums national gereist.", "local", "at0006"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + LetzteReiseDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningCode.java new file mode 100644 index 000000000..2d0686e62 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningCode.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum MedikamentInVerwendungDefiningCode implements EnumValueSet { + NICHT_IN_VERWENDUNG("Nicht in Verwendung", "Die Person verwendet das Medikament zum Zeitpunkt des Ergebnis oder währendessen nicht oder hat es nicht verwendet.", "local", "at0032"), + + UNBEKANNT("Unbekannt", "Es ist unbekannt, ob die Person das Medikament zum Zeitpunkt des Ergebnis oder währendessen verwendet oder es verwendet hat.", "local", "at0033"), + + IN_VERWENDUNG("In Verwendung", "Die Person verwendet das Medikament zum Zeitpunkt des Ergebnis oder währendessen oder hat es verwendet.", "local", "at0031"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + MedikamentInVerwendungDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningCode.java new file mode 100644 index 000000000..656a99a11 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningCode.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum MedikamentenklasseInVerwendungDefiningCode implements EnumValueSet { + IN_VERWENDUNG("In Verwendung", "Die Person verwendet die Medikamentenklasse zum Zeitpunkt des Ergebnis oder währendessen oder hat sie verwendet.", "local", "at0028"), + + UNBEKANNT("Unbekannt", "Es ist unbekannt, ob die Person die Medikamentenklasse zum Zeitpunkt des Ergebnis oder währendessen verwendet oder sie verwendet hat.", "local", "at0030"), + + NICHT_IN_VERWENDUNG("Nicht in Verwendung", "Die Person verwendet die Medikamentenklasse zum Zeitpunkt des Ergebnis oder währendessen nicht oder hat sie nicht verwendet.", "local", "at0029"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + MedikamentenklasseInVerwendungDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java new file mode 100644 index 000000000..8b3363d47 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java @@ -0,0 +1,78 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.organisation_cc.v0") +public class OrganisationCluster { + @Path("/items[at0018]") + private List identifier; + + @Path("/items[at0012 and name/value='Name der Einrichtung']/value|value") + private String nameDerEinrichtungValue; + + @Path("/items[at0014]") + private List telefon; + + @Path("/items[openEHR-EHR-CLUSTER.address_cc.v0]") + private List adresse; + + @Path("/items[at0017]") + private List teilVon; + + @Path("/items[at0016]") + private List kontakt; + + public void setIdentifier(List identifier) { + this.identifier = identifier; + } + + public List getIdentifier() { + return this.identifier ; + } + + public void setNameDerEinrichtungValue(String nameDerEinrichtungValue) { + this.nameDerEinrichtungValue = nameDerEinrichtungValue; + } + + public String getNameDerEinrichtungValue() { + return this.nameDerEinrichtungValue ; + } + + public void setTelefon(List telefon) { + this.telefon = telefon; + } + + public List getTelefon() { + return this.telefon ; + } + + public void setAdresse(List adresse) { + this.adresse = adresse; + } + + public List getAdresse() { + return this.adresse ; + } + + public void setTeilVon(List teilVon) { + this.teilVon = teilVon; + } + + public List getTeilVon() { + return this.teilVon ; + } + + public void setKontakt(List kontakt) { + this.kontakt = kontakt; + } + + public List getKontakt() { + return this.kontakt ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java new file mode 100644 index 000000000..995a412fa --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java @@ -0,0 +1,33 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class OrganisationClusterContainment extends Containment { + public SelectAqlField ORGANISATION_CLUSTER = new AqlFieldImp(OrganisationCluster.class, "", "OrganisationCluster", OrganisationCluster.class, this); + + public ListSelectAqlField IDENTIFIER = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0018]", "identifier", Cluster.class, this); + + public SelectAqlField NAME_DER_EINRICHTUNG_VALUE = new AqlFieldImp(OrganisationCluster.class, "/items[at0012]/value|value", "nameDerEinrichtungValue", String.class, this); + + public ListSelectAqlField TELEFON = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0014]", "telefon", Cluster.class, this); + + public ListSelectAqlField ADRESSE = new ListAqlFieldImp(OrganisationCluster.class, "/items[openEHR-EHR-CLUSTER.address_cc.v0]", "adresse", AdresseCluster.class, this); + + public ListSelectAqlField TEIL_VON = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0017]", "teilVon", Cluster.class, this); + + public ListSelectAqlField KONTAKT = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0016]", "kontakt", Cluster.class, this); + + private OrganisationClusterContainment() { + super("openEHR-EHR-CLUSTER.organisation_cc.v0"); + } + + public static OrganisationClusterContainment getInstance() { + return new OrganisationClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java new file mode 100644 index 000000000..b69ccd489 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java @@ -0,0 +1,126 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.exposure_assessment.v0") +public class PersonenkontaktObservation { + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value") + private String agentEnValue; + + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code") + private PresenceOfAnyExposureEnDefiningCode presenceOfAnyExposureEnDefiningCode; + + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value") + private String exposureEnValue; + + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code") + private VorhandenseinDefiningCode vorhandenseinDefiningCode; + + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value") + private String kommentarValue; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0004]/items[at0056]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setAgentEnValue(String agentEnValue) { + this.agentEnValue = agentEnValue; + } + + public String getAgentEnValue() { + return this.agentEnValue ; + } + + public void setPresenceOfAnyExposureEnDefiningCode( + PresenceOfAnyExposureEnDefiningCode presenceOfAnyExposureEnDefiningCode) { + this.presenceOfAnyExposureEnDefiningCode = presenceOfAnyExposureEnDefiningCode; + } + + public PresenceOfAnyExposureEnDefiningCode getPresenceOfAnyExposureEnDefiningCode() { + return this.presenceOfAnyExposureEnDefiningCode ; + } + + public void setExposureEnValue(String exposureEnValue) { + this.exposureEnValue = exposureEnValue; + } + + public String getExposureEnValue() { + return this.exposureEnValue ; + } + + public void setVorhandenseinDefiningCode(VorhandenseinDefiningCode vorhandenseinDefiningCode) { + this.vorhandenseinDefiningCode = vorhandenseinDefiningCode; + } + + public VorhandenseinDefiningCode getVorhandenseinDefiningCode() { + return this.vorhandenseinDefiningCode ; + } + + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } + + public String getKommentarValue() { + return this.kommentarValue ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java new file mode 100644 index 000000000..0945a5d9a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class PersonenkontaktObservationContainment extends Containment { + public SelectAqlField PERSONENKONTAKT_OBSERVATION = new AqlFieldImp(PersonenkontaktObservation.class, "", "PersonenkontaktObservation", PersonenkontaktObservation.class, this); + + public SelectAqlField AGENT_EN_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value", "agentEnValue", String.class, this); + + public SelectAqlField PRESENCE_OF_ANY_EXPOSURE_EN_DEFINING_CODE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code", "presenceOfAnyExposureEnDefiningCode", PresenceOfAnyExposureEnDefiningCode.class, this); + + public SelectAqlField EXPOSURE_EN_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value", "exposureEnValue", String.class, this); + + public SelectAqlField VORHANDENSEIN_DEFINING_CODE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code", "vorhandenseinDefiningCode", VorhandenseinDefiningCode.class, this); + + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value", "kommentarValue", String.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(PersonenkontaktObservation.class, "/protocol[at0004]/items[at0056]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(PersonenkontaktObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(PersonenkontaktObservation.class, "/language", "language", Language.class, this); + + private PersonenkontaktObservationContainment() { + super("openEHR-EHR-OBSERVATION.exposure_assessment.v0"); + } + + public static PersonenkontaktObservationContainment getInstance() { + return new PersonenkontaktObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningCode.java new file mode 100644 index 000000000..8b3743fb8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningCode.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum PresenceOfAnyExposureEnDefiningCode implements EnumValueSet { + N_ABSENT_EN("*Absent (en)", "*Exposure is or has been absent at or during the event. (en)", "local", "at0059"), + + N_UNKNOWN_EN("*Unknown (en)", "*It is not known whether any exposure is or has been present or absent at or during the event. (en)", "local", "at0060"), + + N_PRESENT_EN("*Present (en)", "*Exposure is or has been present at or during the event. (en)", "local", "at0058"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + PresenceOfAnyExposureEnDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java new file mode 100644 index 000000000..395f5dc60 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java @@ -0,0 +1,91 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.problem_diagnosis.v1") +public class ProblemDiagnoseEvaluation { + @Path("/data[at0001]/items[at0002]/value|value") + private String nameDesProblemsDerDiagnoseValue; + + @Path("/data[at0001]/items[at0039]") + private List anatomischeStelleStrukturiert; + + @Path("/data[at0001]/items[at0043]") + private List spezifischeAngaben; + + @Path("/data[at0001]/items[at0046]") + private List status; + + @Path("/protocol[at0032]/items[at0071]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setNameDesProblemsDerDiagnoseValue(String nameDesProblemsDerDiagnoseValue) { + this.nameDesProblemsDerDiagnoseValue = nameDesProblemsDerDiagnoseValue; + } + + public String getNameDesProblemsDerDiagnoseValue() { + return this.nameDesProblemsDerDiagnoseValue ; + } + + public void setAnatomischeStelleStrukturiert(List anatomischeStelleStrukturiert) { + this.anatomischeStelleStrukturiert = anatomischeStelleStrukturiert; + } + + public List getAnatomischeStelleStrukturiert() { + return this.anatomischeStelleStrukturiert ; + } + + public void setSpezifischeAngaben(List spezifischeAngaben) { + this.spezifischeAngaben = spezifischeAngaben; + } + + public List getSpezifischeAngaben() { + return this.spezifischeAngaben ; + } + + public void setStatus(List status) { + this.status = status; + } + + public List getStatus() { + return this.status ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java new file mode 100644 index 000000000..fc547d363 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java @@ -0,0 +1,37 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class ProblemDiagnoseEvaluationContainment extends Containment { + public SelectAqlField PROBLEM_DIAGNOSE_EVALUATION = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "", "ProblemDiagnoseEvaluation", ProblemDiagnoseEvaluation.class, this); + + public SelectAqlField NAME_DES_PROBLEMS_DER_DIAGNOSE_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0002]/value|value", "nameDesProblemsDerDiagnoseValue", String.class, this); + + public ListSelectAqlField ANATOMISCHE_STELLE_STRUKTURIERT = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0039]", "anatomischeStelleStrukturiert", Cluster.class, this); + + public ListSelectAqlField SPEZIFISCHE_ANGABEN = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0043]", "spezifischeAngaben", Cluster.class, this); + + public ListSelectAqlField STATUS = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0046]", "status", Cluster.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/protocol[at0032]/items[at0071]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/language", "language", Language.class, this); + + private ProblemDiagnoseEvaluationContainment() { + super("openEHR-EHR-EVALUATION.problem_diagnosis.v1"); + } + + public static ProblemDiagnoseEvaluationContainment getInstance() { + return new ProblemDiagnoseEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java new file mode 100644 index 000000000..254a3d0c0 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +public interface ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java new file mode 100644 index 000000000..e3cf68796 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText implements ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { + @Path("|defining_code") + private DiagnostischeSicherheitDefiningCode diagnostischeSicherheitDefiningCode; + + public void setDiagnostischeSicherheitDefiningCode( + DiagnostischeSicherheitDefiningCode diagnostischeSicherheitDefiningCode) { + this.diagnostischeSicherheitDefiningCode = diagnostischeSicherheitDefiningCode; + } + + public DiagnostischeSicherheitDefiningCode getDiagnostischeSicherheitDefiningCode() { + return this.diagnostischeSicherheitDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java new file mode 100644 index 000000000..036e0b57a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText implements ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { + @Path("|value") + private String diagnostischeSicherheitValue; + + public void setDiagnostischeSicherheitValue(String diagnostischeSicherheitValue) { + this.diagnostischeSicherheitValue = diagnostischeSicherheitValue; + } + + public String getDiagnostischeSicherheitValue() { + return this.diagnostischeSicherheitValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java new file mode 100644 index 000000000..73f92c3b9 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java @@ -0,0 +1,128 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +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.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1") +public class ProblemDiganoseCoronovirusEvaluation { + @Path("/data[at0001]/items[at0002]/value|value") + private String nameDesProblemsDerDiagnoseValue; + + @Path("/data[at0001]/items[at0039]") + private List anatomischeStelleStrukturiert; + + @Path("/data[at0001]/items[at0043]") + private List spezifischeAngaben; + + @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.problem_qualifier.v1 and name/value='Status']") + private StatusCluster status; + + @Path("/data[at0001]/items[at0069]/value|value") + private String kommentarValue; + + @Path("/protocol[at0032]/items[at0070]/value|value") + private TemporalAccessor zuletztAktualisiertValue; + + @Path("/protocol[at0032]/items[at0071]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + @Path("/data[at0001]/items[at0073]/value") + @Choice + private ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice diagnostischeSicherheit; + + public void setNameDesProblemsDerDiagnoseValue(String nameDesProblemsDerDiagnoseValue) { + this.nameDesProblemsDerDiagnoseValue = nameDesProblemsDerDiagnoseValue; + } + + public String getNameDesProblemsDerDiagnoseValue() { + return this.nameDesProblemsDerDiagnoseValue ; + } + + public void setAnatomischeStelleStrukturiert(List anatomischeStelleStrukturiert) { + this.anatomischeStelleStrukturiert = anatomischeStelleStrukturiert; + } + + public List getAnatomischeStelleStrukturiert() { + return this.anatomischeStelleStrukturiert ; + } + + public void setSpezifischeAngaben(List spezifischeAngaben) { + this.spezifischeAngaben = spezifischeAngaben; + } + + public List getSpezifischeAngaben() { + return this.spezifischeAngaben ; + } + + public void setStatus(StatusCluster status) { + this.status = status; + } + + public StatusCluster getStatus() { + return this.status ; + } + + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } + + public String getKommentarValue() { + return this.kommentarValue ; + } + + public void setZuletztAktualisiertValue(TemporalAccessor zuletztAktualisiertValue) { + this.zuletztAktualisiertValue = zuletztAktualisiertValue; + } + + public TemporalAccessor getZuletztAktualisiertValue() { + return this.zuletztAktualisiertValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setDiagnostischeSicherheit( + ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice diagnostischeSicherheit) { + this.diagnostischeSicherheit = diagnostischeSicherheit; + } + + public ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice getDiagnostischeSicherheit() { + return this.diagnostischeSicherheit ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java new file mode 100644 index 000000000..e34ec2001 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class ProblemDiganoseCoronovirusEvaluationContainment extends Containment { + public SelectAqlField PROBLEM_DIGANOSE_CORONOVIRUS_EVALUATION = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "", "ProblemDiganoseCoronovirusEvaluation", ProblemDiganoseCoronovirusEvaluation.class, this); + + public SelectAqlField NAME_DES_PROBLEMS_DER_DIAGNOSE_VALUE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0002]/value|value", "nameDesProblemsDerDiagnoseValue", String.class, this); + + public ListSelectAqlField ANATOMISCHE_STELLE_STRUKTURIERT = new ListAqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0039]", "anatomischeStelleStrukturiert", Cluster.class, this); + + public ListSelectAqlField SPEZIFISCHE_ANGABEN = new ListAqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0043]", "spezifischeAngaben", Cluster.class, this); + + public SelectAqlField STATUS = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.problem_qualifier.v1]", "status", StatusCluster.class, this); + + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0069]/value|value", "kommentarValue", String.class, this); + + public SelectAqlField ZULETZT_AKTUALISIERT_VALUE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/protocol[at0032]/items[at0070]/value|value", "zuletztAktualisiertValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/protocol[at0032]/items[at0071]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/language", "language", Language.class, this); + + public SelectAqlField DIAGNOSTISCHE_SICHERHEIT = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0073]/value", "diagnostischeSicherheit", ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.class, this); + + private ProblemDiganoseCoronovirusEvaluationContainment() { + super("openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1"); + } + + public static ProblemDiganoseCoronovirusEvaluationContainment getInstance() { + return new ProblemDiganoseCoronovirusEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java new file mode 100644 index 000000000..6801442c8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java @@ -0,0 +1,77 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; + +@Entity +public class ReisefallBeliebigesIntervallereignisIntervalEvent { + @Path("/data[at0003]/items[at0004 and name/value='Letzte Reise?']/value|defining_code") + private LetzteReiseDefiningCode letzteReiseDefiningCode; + + @Path("/data[at0003]/items[at0026]/value|defining_code") + private InlandAuslandDefiningCode inlandAuslandDefiningCode; + + @Path("/data[at0003]/items[at0008]") + private List bestimmteReise; + + @Path("/math_function|defining_code") + private MathFunction mathFunctionDefiningCode; + + @Path("/width|value") + private TemporalAmount widthValue; + + @Path("/time|value") + private TemporalAccessor timeValue; + + public void setLetzteReiseDefiningCode(LetzteReiseDefiningCode letzteReiseDefiningCode) { + this.letzteReiseDefiningCode = letzteReiseDefiningCode; + } + + public LetzteReiseDefiningCode getLetzteReiseDefiningCode() { + return this.letzteReiseDefiningCode ; + } + + public void setInlandAuslandDefiningCode(InlandAuslandDefiningCode inlandAuslandDefiningCode) { + this.inlandAuslandDefiningCode = inlandAuslandDefiningCode; + } + + public InlandAuslandDefiningCode getInlandAuslandDefiningCode() { + return this.inlandAuslandDefiningCode ; + } + + public void setBestimmteReise(List bestimmteReise) { + this.bestimmteReise = bestimmteReise; + } + + public List getBestimmteReise() { + return this.bestimmteReise ; + } + + public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { + this.mathFunctionDefiningCode = mathFunctionDefiningCode; + } + + public MathFunction getMathFunctionDefiningCode() { + return this.mathFunctionDefiningCode ; + } + + public void setWidthValue(TemporalAmount widthValue) { + this.widthValue = widthValue; + } + + public TemporalAmount getWidthValue() { + return this.widthValue ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java new file mode 100644 index 000000000..ac6312008 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class ReisefallBestimmteReiseCluster { + @Path("/items[at0010]") + private List bestimmtesReiseziel; + + @Path("/items[at0025]") + private List zusatzlicheReisedetails; + + @Path("/items[at0019]/value|value") + private TemporalAccessor ruckreisedatumValue; + + public void setBestimmtesReiseziel( + List bestimmtesReiseziel) { + this.bestimmtesReiseziel = bestimmtesReiseziel; + } + + public List getBestimmtesReiseziel() { + return this.bestimmtesReiseziel ; + } + + public void setZusatzlicheReisedetails(List zusatzlicheReisedetails) { + this.zusatzlicheReisedetails = zusatzlicheReisedetails; + } + + public List getZusatzlicheReisedetails() { + return this.zusatzlicheReisedetails ; + } + + public void setRuckreisedatumValue(TemporalAccessor ruckreisedatumValue) { + this.ruckreisedatumValue = ruckreisedatumValue; + } + + public TemporalAccessor getRuckreisedatumValue() { + return this.ruckreisedatumValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java new file mode 100644 index 000000000..28a423b7a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java @@ -0,0 +1,65 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class ReisefallBestimmtesReisezielCluster { + @Path("/items[at0011]/value|value") + private String landValue; + + @Path("/items[at0012]/value|value") + private String bundeslandRegionValue; + + @Path("/items[at0013]/value|value") + private String stadtValue; + + @Path("/items[at0031]/value|value") + private String bestimmteGegendValue; + + @Path("/items[at0024]") + private List zusatzlicheAngabenZumZielort; + + public void setLandValue(String landValue) { + this.landValue = landValue; + } + + public String getLandValue() { + return this.landValue ; + } + + public void setBundeslandRegionValue(String bundeslandRegionValue) { + this.bundeslandRegionValue = bundeslandRegionValue; + } + + public String getBundeslandRegionValue() { + return this.bundeslandRegionValue ; + } + + public void setStadtValue(String stadtValue) { + this.stadtValue = stadtValue; + } + + public String getStadtValue() { + return this.stadtValue ; + } + + public void setBestimmteGegendValue(String bestimmteGegendValue) { + this.bestimmteGegendValue = bestimmteGegendValue; + } + + public String getBestimmteGegendValue() { + return this.bestimmteGegendValue ; + } + + public void setZusatzlicheAngabenZumZielort(List zusatzlicheAngabenZumZielort) { + this.zusatzlicheAngabenZumZielort = zusatzlicheAngabenZumZielort; + } + + public List getZusatzlicheAngabenZumZielort() { + return this.zusatzlicheAngabenZumZielort ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java new file mode 100644 index 000000000..39d049e3f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java @@ -0,0 +1,70 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.travel_event.v0") +public class ReisefallObservation { + @Path("/data[at0001]/events[at0002]") + private List beliebigesIntervallereignis; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setBeliebigesIntervallereignis( + List beliebigesIntervallereignis) { + this.beliebigesIntervallereignis = beliebigesIntervallereignis; + } + + public List getBeliebigesIntervallereignis() { + return this.beliebigesIntervallereignis ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java new file mode 100644 index 000000000..5964ada00 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java @@ -0,0 +1,33 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class ReisefallObservationContainment extends Containment { + public SelectAqlField REISEFALL_OBSERVATION = new AqlFieldImp(ReisefallObservation.class, "", "ReisefallObservation", ReisefallObservation.class, this); + + public ListSelectAqlField BELIEBIGES_INTERVALLEREIGNIS = new ListAqlFieldImp(ReisefallObservation.class, "/data[at0001]/events[at0002]", "beliebigesIntervallereignis", ReisefallBeliebigesIntervallereignisIntervalEvent.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(ReisefallObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ReisefallObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(ReisefallObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(ReisefallObservation.class, "/language", "language", Language.class, this); + + private ReisefallObservationContainment() { + super("openEHR-EHR-OBSERVATION.travel_event.v0"); + } + + public static ReisefallObservationContainment getInstance() { + return new ReisefallObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java new file mode 100644 index 000000000..0498d6306 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java @@ -0,0 +1,32 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-SECTION.adhoc.v1") +public class RisikogebietSection { + @Path("/items[openEHR-EHR-OBSERVATION.travel_history.v0]") + private List historieDerReise; + + @Path("/items[openEHR-EHR-OBSERVATION.travel_event.v0]") + private List reisefall; + + public void setHistorieDerReise(List historieDerReise) { + this.historieDerReise = historieDerReise; + } + + public List getHistorieDerReise() { + return this.historieDerReise ; + } + + public void setReisefall(List reisefall) { + this.reisefall = reisefall; + } + + public List getReisefall() { + return this.reisefall ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSectionContainment.java new file mode 100644 index 000000000..94fd30af1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSectionContainment.java @@ -0,0 +1,23 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class RisikogebietSectionContainment extends Containment { + public SelectAqlField RISIKOGEBIET_SECTION = new AqlFieldImp(RisikogebietSection.class, "", "RisikogebietSection", RisikogebietSection.class, this); + + public ListSelectAqlField HISTORIE_DER_REISE = new ListAqlFieldImp(RisikogebietSection.class, "/items[openEHR-EHR-OBSERVATION.travel_history.v0]", "historieDerReise", HistorieDerReiseObservation.class, this); + + public ListSelectAqlField REISEFALL = new ListAqlFieldImp(RisikogebietSection.class, "/items[openEHR-EHR-OBSERVATION.travel_event.v0]", "reisefall", ReisefallObservation.class, this); + + private RisikogebietSectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } + + public static RisikogebietSectionContainment getInstance() { + return new RisikogebietSectionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java new file mode 100644 index 000000000..ff4c107ca --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java @@ -0,0 +1,105 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class SchnupfenObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } + + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } + + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } + + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java new file mode 100644 index 000000000..05af8ef1b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class SchnupfenObservationContainment extends Containment { + public SelectAqlField SCHNUPFEN_OBSERVATION = new AqlFieldImp(SchnupfenObservation.class, "", "SchnupfenObservation", SchnupfenObservation.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(SchnupfenObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(SchnupfenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(SchnupfenObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(SchnupfenObservation.class, "/language", "language", Language.class, this); + + private SchnupfenObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static SchnupfenObservationContainment getInstance() { + return new SchnupfenObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java new file mode 100644 index 000000000..5a9148200 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java @@ -0,0 +1,34 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.location.v1") +public class StandortCluster { + @Path("/items[at0046]/value|value") + private String standortbeschreibungValue; + + @Path("/items[at0047]") + private List details; + + public void setStandortbeschreibungValue(String standortbeschreibungValue) { + this.standortbeschreibungValue = standortbeschreibungValue; + } + + public String getStandortbeschreibungValue() { + return this.standortbeschreibungValue ; + } + + public void setDetails(List details) { + this.details = details; + } + + public List getDetails() { + return this.details ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortClusterContainment.java new file mode 100644 index 000000000..07b79556f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortClusterContainment.java @@ -0,0 +1,25 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class StandortClusterContainment extends Containment { + public SelectAqlField STANDORT_CLUSTER = new AqlFieldImp(StandortCluster.class, "", "StandortCluster", StandortCluster.class, this); + + public SelectAqlField STANDORTBESCHREIBUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0046]/value|value", "standortbeschreibungValue", String.class, this); + + public ListSelectAqlField DETAILS = new ListAqlFieldImp(StandortCluster.class, "/items[at0047]", "details", Cluster.class, this); + + private StandortClusterContainment() { + super("openEHR-EHR-CLUSTER.location.v1"); + } + + public static StandortClusterContainment getInstance() { + return new StandortClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java new file mode 100644 index 000000000..08efbfbde --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.problem_qualifier.v1") +public class StatusCluster { + @Path("/items[at0004]/value|defining_code") + private DiagnosestatusDefiningCode diagnosestatusDefiningCode; + + public void setDiagnosestatusDefiningCode(DiagnosestatusDefiningCode diagnosestatusDefiningCode) { + this.diagnosestatusDefiningCode = diagnosestatusDefiningCode; + } + + public DiagnosestatusDefiningCode getDiagnosestatusDefiningCode() { + return this.diagnosestatusDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusClusterContainment.java new file mode 100644 index 000000000..0758bd30d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusClusterContainment.java @@ -0,0 +1,19 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class StatusClusterContainment extends Containment { + public SelectAqlField STATUS_CLUSTER = new AqlFieldImp(StatusCluster.class, "", "StatusCluster", StatusCluster.class, this); + + public SelectAqlField DIAGNOSESTATUS_DEFINING_CODE = new AqlFieldImp(StatusCluster.class, "/items[at0004]/value|defining_code", "diagnosestatusDefiningCode", DiagnosestatusDefiningCode.class, this); + + private StatusClusterContainment() { + super("openEHR-EHR-CLUSTER.problem_qualifier.v1"); + } + + public static StatusClusterContainment getInstance() { + return new StatusClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java new file mode 100644 index 000000000..ff5650378 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java @@ -0,0 +1,110 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-SECTION.adhoc.v1") +public class SymptomeSection { + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Husten']") + private HustenObservation husten; + + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Schnupfen']") + private SchnupfenObservation schnupfen; + + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Heiserkeit']") + private HeiserkeitObservation heiserkeit; + + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Fieber oder erhöhte Körpertemperatur']") + private FieberOderErhohteKorpertemperaturObservation fieberOderErhohteKorpertemperatur; + + @Path("/items[openEHR-EHR-OBSERVATION.body_temperature.v2]") + private KorpertemperaturObservation korpertemperatur; + + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geruchssinn']") + private GestorterGeruchssinnObservation gestorterGeruchssinn; + + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geschmackssinn']") + private GestorterGeschmackssinnObservation gestorterGeschmackssinn; + + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Durchfall']") + private DurchfallObservation durchfall; + + @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Weitere Symptome']") + private WeitereSymptomeObservation weitereSymptome; + + public void setHusten(HustenObservation husten) { + this.husten = husten; + } + + public HustenObservation getHusten() { + return this.husten ; + } + + public void setSchnupfen(SchnupfenObservation schnupfen) { + this.schnupfen = schnupfen; + } + + public SchnupfenObservation getSchnupfen() { + return this.schnupfen ; + } + + public void setHeiserkeit(HeiserkeitObservation heiserkeit) { + this.heiserkeit = heiserkeit; + } + + public HeiserkeitObservation getHeiserkeit() { + return this.heiserkeit ; + } + + public void setFieberOderErhohteKorpertemperatur( + FieberOderErhohteKorpertemperaturObservation fieberOderErhohteKorpertemperatur) { + this.fieberOderErhohteKorpertemperatur = fieberOderErhohteKorpertemperatur; + } + + public FieberOderErhohteKorpertemperaturObservation getFieberOderErhohteKorpertemperatur() { + return this.fieberOderErhohteKorpertemperatur ; + } + + public void setKorpertemperatur(KorpertemperaturObservation korpertemperatur) { + this.korpertemperatur = korpertemperatur; + } + + public KorpertemperaturObservation getKorpertemperatur() { + return this.korpertemperatur ; + } + + public void setGestorterGeruchssinn(GestorterGeruchssinnObservation gestorterGeruchssinn) { + this.gestorterGeruchssinn = gestorterGeruchssinn; + } + + public GestorterGeruchssinnObservation getGestorterGeruchssinn() { + return this.gestorterGeruchssinn ; + } + + public void setGestorterGeschmackssinn( + GestorterGeschmackssinnObservation gestorterGeschmackssinn) { + this.gestorterGeschmackssinn = gestorterGeschmackssinn; + } + + public GestorterGeschmackssinnObservation getGestorterGeschmackssinn() { + return this.gestorterGeschmackssinn ; + } + + public void setDurchfall(DurchfallObservation durchfall) { + this.durchfall = durchfall; + } + + public DurchfallObservation getDurchfall() { + return this.durchfall ; + } + + public void setWeitereSymptome(WeitereSymptomeObservation weitereSymptome) { + this.weitereSymptome = weitereSymptome; + } + + public WeitereSymptomeObservation getWeitereSymptome() { + return this.weitereSymptome ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSectionContainment.java new file mode 100644 index 000000000..a15572738 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSectionContainment.java @@ -0,0 +1,35 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class SymptomeSectionContainment extends Containment { + public SelectAqlField SYMPTOME_SECTION = new AqlFieldImp(SymptomeSection.class, "", "SymptomeSection", SymptomeSection.class, this); + + public SelectAqlField HUSTEN = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "husten", HustenObservation.class, this); + + public SelectAqlField SCHNUPFEN = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "schnupfen", SchnupfenObservation.class, this); + + public SelectAqlField HEISERKEIT = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "heiserkeit", HeiserkeitObservation.class, this); + + public SelectAqlField FIEBER_ODER_ERHOHTE_KORPERTEMPERATUR = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "fieberOderErhohteKorpertemperatur", FieberOderErhohteKorpertemperaturObservation.class, this); + + public SelectAqlField KORPERTEMPERATUR = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.body_temperature.v2]", "korpertemperatur", KorpertemperaturObservation.class, this); + + public SelectAqlField GESTORTER_GERUCHSSINN = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "gestorterGeruchssinn", GestorterGeruchssinnObservation.class, this); + + public SelectAqlField GESTORTER_GESCHMACKSSINN = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "gestorterGeschmackssinn", GestorterGeschmackssinnObservation.class, this); + + public SelectAqlField DURCHFALL = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "durchfall", DurchfallObservation.class, this); + + public SelectAqlField WEITERE_SYMPTOME = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "weitereSymptome", WeitereSymptomeObservation.class, this); + + private SymptomeSectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } + + public static SymptomeSectionContainment getInstance() { + return new SymptomeSectionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningCode.java new file mode 100644 index 000000000..548e8a567 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningCode.java @@ -0,0 +1,41 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum VorhandenDefiningCode implements EnumValueSet { + NICHT_VORHANDEN("Nicht vorhanden", "Das spezifische Symptom oder Anzeichen ist nicht vorhanden.", "local", "at0024"), + + VORHANDEN("Vorhanden", "Das spezifische Symptom oder Anzeichen ist vorhanden.", "local", "at0023"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + VorhandenDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningCode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningCode2.java new file mode 100644 index 000000000..e82a30d95 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningCode2.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum VorhandenDefiningCode2 implements EnumValueSet { + NICHT_VORHANDEN("Nicht vorhanden", "Das spezifische Symptom oder Anzeichen ist nicht vorhanden.", "local", "at0024"), + + VORHANDEN("Vorhanden", "Das spezifische Symptom oder Anzeichen ist vorhanden.", "local", "at0023"), + + UNBEKANNT("Unbekannt", "Es ist nicht bekannt, ob das Symptom oder Anzeichen vorhanden ist oder nicht.", "local", "at0027"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + VorhandenDefiningCode2(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningCode.java new file mode 100644 index 000000000..766dd1904 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningCode.java @@ -0,0 +1,41 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum VorhandenseinDefiningCode implements EnumValueSet { + NICHT_VORHANDEN("Nicht vorhanden", "*The specific exposure is or has been absent at or during the event.(en)", "local", "at0049"), + + VORHANDEN("Vorhanden", "*The specific exposure is or has been present at or during the event.(en)", "local", "at0047"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + VorhandenseinDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java new file mode 100644 index 000000000..03cb0b364 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum VorhandenseinDefiningCode2 implements EnumValueSet { + VORHANDEN("Vorhanden", "Der Risikofaktor wurde bei der Person identifiziert.", "local", "at0018"), + + UNBESTIMMT("Unbestimmt", "Es ist nicht möglich festzustellen, ob der Risikofaktor vorhanden oder nicht vorhanden ist.", "local", "at0026"), + + NICHT_VORHANDEN("Nicht vorhanden", "Der Risikofaktor wurde bei der Person nicht festgestellt.", "local", "at0019"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + VorhandenseinDefiningCode2(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java new file mode 100644 index 000000000..adb51777b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +public interface WeitereSymptomeBeliebigesEreignisChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java new file mode 100644 index 000000000..4028f35a0 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java @@ -0,0 +1,59 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; + +@Entity +@OptionFor("INTERVAL_EVENT") +public class WeitereSymptomeBeliebigesEreignisIntervalEvent implements WeitereSymptomeBeliebigesEreignisChoice { + @Path("/data[at0003]/items[at0022]") + private List spezifischesSymptomAnzeichen; + + @Path("/time|value") + private TemporalAccessor timeValue; + + @Path("/width|value") + private TemporalAmount widthValue; + + @Path("/math_function|defining_code") + private MathFunction mathFunctionDefiningCode; + + public void setSpezifischesSymptomAnzeichen( + List spezifischesSymptomAnzeichen) { + this.spezifischesSymptomAnzeichen = spezifischesSymptomAnzeichen; + } + + public List getSpezifischesSymptomAnzeichen( + ) { + return this.spezifischesSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setWidthValue(TemporalAmount widthValue) { + this.widthValue = widthValue; + } + + public TemporalAmount getWidthValue() { + return this.widthValue ; + } + + public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { + this.mathFunctionDefiningCode = mathFunctionDefiningCode; + } + + public MathFunction getMathFunctionDefiningCode() { + return this.mathFunctionDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java new file mode 100644 index 000000000..7ea76b09c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java @@ -0,0 +1,35 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("POINT_EVENT") +public class WeitereSymptomeBeliebigesEreignisPointEvent implements WeitereSymptomeBeliebigesEreignisChoice { + @Path("/data[at0003]/items[at0022]") + private List spezifischesSymptomAnzeichen; + + @Path("/time|value") + private TemporalAccessor timeValue; + + public void setSpezifischesSymptomAnzeichen( + List spezifischesSymptomAnzeichen) { + this.spezifischesSymptomAnzeichen = spezifischesSymptomAnzeichen; + } + + public List getSpezifischesSymptomAnzeichen( + ) { + return this.spezifischesSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java new file mode 100644 index 000000000..4269af5d5 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java @@ -0,0 +1,72 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; +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.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class WeitereSymptomeObservation { + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + @Path("/data[at0001]/events[at0002]") + @Choice + private List beliebigesEreignis; + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setBeliebigesEreignis( + List beliebigesEreignis) { + this.beliebigesEreignis = beliebigesEreignis; + } + + public List getBeliebigesEreignis() { + return this.beliebigesEreignis ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java new file mode 100644 index 000000000..e6f84b771 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java @@ -0,0 +1,33 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class WeitereSymptomeObservationContainment extends Containment { + public SelectAqlField WEITERE_SYMPTOME_OBSERVATION = new AqlFieldImp(WeitereSymptomeObservation.class, "", "WeitereSymptomeObservation", WeitereSymptomeObservation.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(WeitereSymptomeObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(WeitereSymptomeObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(WeitereSymptomeObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(WeitereSymptomeObservation.class, "/language", "language", Language.class, this); + + public ListSelectAqlField BELIEBIGES_EREIGNIS = new ListAqlFieldImp(WeitereSymptomeObservation.class, "/data[at0001]/events[at0002]", "beliebigesEreignis", WeitereSymptomeBeliebigesEreignisChoice.class, this); + + private WeitereSymptomeObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static WeitereSymptomeObservationContainment getInstance() { + return new WeitereSymptomeObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java new file mode 100644 index 000000000..60bcd238b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java @@ -0,0 +1,56 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class WeitereSymptomeSpezifischesSymptomAnzeichenCluster { + @Path("/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + @Path("/items[at0005]/value|defining_code") + private VorhandenDefiningCode2 vorhandenDefiningCode; + + @Path("/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; + + @Path("/items[at0035]/value|value") + private String kommentarValue; + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setVorhandenDefiningCode(VorhandenDefiningCode2 vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } + + public VorhandenDefiningCode2 getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } + + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } + + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } + + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } + + public String getKommentarValue() { + return this.kommentarValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java new file mode 100644 index 000000000..cf669e5af --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java @@ -0,0 +1,81 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Long; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.living_arrangement.v0") +public class WohnsituationEvaluation { + @Path("/data[at0001]/items[at0003]/value|value") + private String beschreibungValue; + + @Path("/data[at0001]/items[at0007]/value|magnitude") + private Long anzahlDerHaushaltsmitgliederMagnitude; + + @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.dwelling.v0]") + private List wohnstatte; + + @Path("/protocol[at0002]/items[at0011]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setBeschreibungValue(String beschreibungValue) { + this.beschreibungValue = beschreibungValue; + } + + public String getBeschreibungValue() { + return this.beschreibungValue ; + } + + public void setAnzahlDerHaushaltsmitgliederMagnitude(Long anzahlDerHaushaltsmitgliederMagnitude) { + this.anzahlDerHaushaltsmitgliederMagnitude = anzahlDerHaushaltsmitgliederMagnitude; + } + + public Long getAnzahlDerHaushaltsmitgliederMagnitude() { + return this.anzahlDerHaushaltsmitgliederMagnitude ; + } + + public void setWohnstatte(List wohnstatte) { + this.wohnstatte = wohnstatte; + } + + public List getWohnstatte() { + return this.wohnstatte ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java new file mode 100644 index 000000000..cbc31e8f4 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java @@ -0,0 +1,36 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Long; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class WohnsituationEvaluationContainment extends Containment { + public SelectAqlField WOHNSITUATION_EVALUATION = new AqlFieldImp(WohnsituationEvaluation.class, "", "WohnsituationEvaluation", WohnsituationEvaluation.class, this); + + public SelectAqlField BESCHREIBUNG_VALUE = new AqlFieldImp(WohnsituationEvaluation.class, "/data[at0001]/items[at0003]/value|value", "beschreibungValue", String.class, this); + + public SelectAqlField ANZAHL_DER_HAUSHALTSMITGLIEDER_MAGNITUDE = new AqlFieldImp(WohnsituationEvaluation.class, "/data[at0001]/items[at0007]/value|magnitude", "anzahlDerHaushaltsmitgliederMagnitude", Long.class, this); + + public ListSelectAqlField WOHNSTATTE = new ListAqlFieldImp(WohnsituationEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.dwelling.v0]", "wohnstatte", WohnstatteCluster.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(WohnsituationEvaluation.class, "/protocol[at0002]/items[at0011]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(WohnsituationEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(WohnsituationEvaluation.class, "/language", "language", Language.class, this); + + private WohnsituationEvaluationContainment() { + super("openEHR-EHR-EVALUATION.living_arrangement.v0"); + } + + public static WohnsituationEvaluationContainment getInstance() { + return new WohnsituationEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java new file mode 100644 index 000000000..fc9502ecc --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java @@ -0,0 +1,34 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Long; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.dwelling.v0") +public class WohnstatteCluster { + @Path("/items[at0028]/value|magnitude") + private Long anzahlDerSchlafzimmerMagnitude; + + @Path("/items[at0003]") + private List erganzendeDetails; + + public void setAnzahlDerSchlafzimmerMagnitude(Long anzahlDerSchlafzimmerMagnitude) { + this.anzahlDerSchlafzimmerMagnitude = anzahlDerSchlafzimmerMagnitude; + } + + public Long getAnzahlDerSchlafzimmerMagnitude() { + return this.anzahlDerSchlafzimmerMagnitude ; + } + + public void setErganzendeDetails(List erganzendeDetails) { + this.erganzendeDetails = erganzendeDetails; + } + + public List getErganzendeDetails() { + return this.erganzendeDetails ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java new file mode 100644 index 000000000..cc1d048f6 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java @@ -0,0 +1,25 @@ +package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Long; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class WohnstatteClusterContainment extends Containment { + public SelectAqlField WOHNSTATTE_CLUSTER = new AqlFieldImp(WohnstatteCluster.class, "", "WohnstatteCluster", WohnstatteCluster.class, this); + + public SelectAqlField ANZAHL_DER_SCHLAFZIMMER_MAGNITUDE = new AqlFieldImp(WohnstatteCluster.class, "/items[at0028]/value|magnitude", "anzahlDerSchlafzimmerMagnitude", Long.class, this); + + public ListSelectAqlField ERGANZENDE_DETAILS = new ListAqlFieldImp(WohnstatteCluster.class, "/items[at0003]", "erganzendeDetails", Cluster.class, this); + + private WohnstatteClusterContainment() { + super("openEHR-EHR-CLUSTER.dwelling.v0"); + } + + public static WohnstatteClusterContainment getInstance() { + return new WohnstatteClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java new file mode 100644 index 000000000..b336bb511 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java @@ -0,0 +1,191 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +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 org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Id; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.annotations.Template; +import org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition.FallidentifikationCluster; +import org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition.ProblemDiagnoseEvaluation; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; +import org.ehrbase.client.openehrclient.VersionUid; + +@Entity +@Archetype("openEHR-EHR-COMPOSITION.report.v1") +@Template("Diagnose") +public class DiagnoseComposition { + @Path("/context/other_context[at0001]/items[at0002]/value|value") + private String berichtIdValue; + + @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]") + private FallidentifikationCluster fallidentifikation; + + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; + + @Path("/context/participations") + private List participations; + + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + @Path("/context/location") + private String location; + + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; + + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; + + @Path("/content[openEHR-EHR-EVALUATION.problem_diagnosis.v1]") + private ProblemDiagnoseEvaluation problemDiagnose; + + @Path("/composer") + private PartyProxy composer; + + @Path("/language") + private Language language; + + @Path("/feeder_audit") + private FeederAudit feederAudit; + + @Path("/category|defining_code") + private Category categoryDefiningCode; + + @Path("/territory") + private Territory territory; + + @Id + private VersionUid versionUid; + + public void setBerichtIdValue(String berichtIdValue) { + this.berichtIdValue = berichtIdValue; + } + + public String getBerichtIdValue() { + return this.berichtIdValue ; + } + + public void setFallidentifikation(FallidentifikationCluster fallidentifikation) { + this.fallidentifikation = fallidentifikation; + } + + public FallidentifikationCluster getFallidentifikation() { + return this.fallidentifikation ; + } + + 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 setProblemDiagnose(ProblemDiagnoseEvaluation problemDiagnose) { + this.problemDiagnose = problemDiagnose; + } + + public ProblemDiagnoseEvaluation getProblemDiagnose() { + return this.problemDiagnose ; + } + + 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 setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } + + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } + + 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseCompositionContainment.java new file mode 100644 index 000000000..38cdaa960 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseCompositionContainment.java @@ -0,0 +1,59 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +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 org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition.FallidentifikationCluster; +import org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition.ProblemDiagnoseEvaluation; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; + +public class DiagnoseCompositionContainment extends Containment { + public SelectAqlField DIAGNOSE_COMPOSITION = new AqlFieldImp(DiagnoseComposition.class, "", "DiagnoseComposition", DiagnoseComposition.class, this); + + public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(DiagnoseComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); + + public SelectAqlField FALLIDENTIFIKATION = new AqlFieldImp(DiagnoseComposition.class, "/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]", "fallidentifikation", FallidentifikationCluster.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(DiagnoseComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(DiagnoseComposition.class, "/context/participations", "participations", Participation.class, this); + + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(DiagnoseComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + + public SelectAqlField LOCATION = new AqlFieldImp(DiagnoseComposition.class, "/context/location", "location", String.class, this); + + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(DiagnoseComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(DiagnoseComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); + + public SelectAqlField PROBLEM_DIAGNOSE = new AqlFieldImp(DiagnoseComposition.class, "/content[openEHR-EHR-EVALUATION.problem_diagnosis.v1]", "problemDiagnose", ProblemDiagnoseEvaluation.class, this); + + public SelectAqlField COMPOSER = new AqlFieldImp(DiagnoseComposition.class, "/composer", "composer", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(DiagnoseComposition.class, "/language", "language", Language.class, this); + + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(DiagnoseComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(DiagnoseComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); + + public SelectAqlField TERRITORY = new AqlFieldImp(DiagnoseComposition.class, "/territory", "territory", Territory.class, this); + + private DiagnoseCompositionContainment() { + super("openEHR-EHR-COMPOSITION.report.v1"); + } + + public static DiagnoseCompositionContainment getInstance() { + return new DiagnoseCompositionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java new file mode 100644 index 000000000..0b1d9dc89 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java @@ -0,0 +1,56 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.anatomical_location.v1") +public class AnatomischeLokalisationCluster { + @Path("/items[at0001]/value|value") + private String nameDerKorperstelleValue; + + @Path("/items[at0002]/value|defining_code") + private LateralitatDefiningCode lateralitatDefiningCode; + + @Path("/items[at0053]") + private List alternativeStruktur; + + @Path("/items[at0054]") + private List multimedialeDarstellung; + + public void setNameDerKorperstelleValue(String nameDerKorperstelleValue) { + this.nameDerKorperstelleValue = nameDerKorperstelleValue; + } + + public String getNameDerKorperstelleValue() { + return this.nameDerKorperstelleValue ; + } + + public void setLateralitatDefiningCode(LateralitatDefiningCode lateralitatDefiningCode) { + this.lateralitatDefiningCode = lateralitatDefiningCode; + } + + public LateralitatDefiningCode getLateralitatDefiningCode() { + return this.lateralitatDefiningCode ; + } + + public void setAlternativeStruktur(List alternativeStruktur) { + this.alternativeStruktur = alternativeStruktur; + } + + public List getAlternativeStruktur() { + return this.alternativeStruktur ; + } + + public void setMultimedialeDarstellung(List multimedialeDarstellung) { + this.multimedialeDarstellung = multimedialeDarstellung; + } + + public List getMultimedialeDarstellung() { + return this.multimedialeDarstellung ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationClusterContainment.java new file mode 100644 index 000000000..2024cf025 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationClusterContainment.java @@ -0,0 +1,29 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class AnatomischeLokalisationClusterContainment extends Containment { + public SelectAqlField ANATOMISCHE_LOKALISATION_CLUSTER = new AqlFieldImp(AnatomischeLokalisationCluster.class, "", "AnatomischeLokalisationCluster", AnatomischeLokalisationCluster.class, this); + + public SelectAqlField NAME_DER_KORPERSTELLE_VALUE = new AqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0001]/value|value", "nameDerKorperstelleValue", String.class, this); + + public SelectAqlField LATERALITAT_DEFINING_CODE = new AqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0002]/value|defining_code", "lateralitatDefiningCode", LateralitatDefiningCode.class, this); + + public ListSelectAqlField ALTERNATIVE_STRUKTUR = new ListAqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0053]", "alternativeStruktur", Cluster.class, this); + + public ListSelectAqlField MULTIMEDIALE_DARSTELLUNG = new ListAqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0054]", "multimedialeDarstellung", Cluster.class, this); + + private AnatomischeLokalisationClusterContainment() { + super("openEHR-EHR-CLUSTER.anatomical_location.v1"); + } + + public static AnatomischeLokalisationClusterContainment getInstance() { + return new AnatomischeLokalisationClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java new file mode 100644 index 000000000..f0ca7cbe2 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import org.ehrbase.client.annotations.Choice; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class AtiopathogeneseAtiologieDerKrankheitElement { + @Path("/value") + @Choice + private AtiopathogeneseValueChoice value; + + public void setValue(AtiopathogeneseValueChoice value) { + this.value = value; + } + + public AtiopathogeneseValueChoice getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java new file mode 100644 index 000000000..f366a1d19 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java @@ -0,0 +1,19 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class AtiopathogeneseBeschreibungDesEntstehensElement { + @Path("/value|value") + private String value; + + public void setValue(String value) { + this.value = value; + } + + public String getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java new file mode 100644 index 000000000..3c6220c13 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java @@ -0,0 +1,34 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.etiology.v1") +public class AtiopathogeneseCluster { + @Path("/items[at0001]") + private List atiologieDerKrankheit; + + @Path("/items[at0017]") + private List beschreibungDesEntstehens; + + public void setAtiologieDerKrankheit( + List atiologieDerKrankheit) { + this.atiologieDerKrankheit = atiologieDerKrankheit; + } + + public List getAtiologieDerKrankheit() { + return this.atiologieDerKrankheit ; + } + + public void setBeschreibungDesEntstehens( + List beschreibungDesEntstehens) { + this.beschreibungDesEntstehens = beschreibungDesEntstehens; + } + + public List getBeschreibungDesEntstehens() { + return this.beschreibungDesEntstehens ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseClusterContainment.java new file mode 100644 index 000000000..1537a1842 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseClusterContainment.java @@ -0,0 +1,23 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class AtiopathogeneseClusterContainment extends Containment { + public SelectAqlField ATIOPATHOGENESE_CLUSTER = new AqlFieldImp(AtiopathogeneseCluster.class, "", "AtiopathogeneseCluster", AtiopathogeneseCluster.class, this); + + public ListSelectAqlField ATIOLOGIE_DER_KRANKHEIT = new ListAqlFieldImp(AtiopathogeneseCluster.class, "/items[at0001]", "atiologieDerKrankheit", AtiopathogeneseAtiologieDerKrankheitElement.class, this); + + public ListSelectAqlField BESCHREIBUNG_DES_ENTSTEHENS = new ListAqlFieldImp(AtiopathogeneseCluster.class, "/items[at0017]", "beschreibungDesEntstehens", AtiopathogeneseBeschreibungDesEntstehensElement.class, this); + + private AtiopathogeneseClusterContainment() { + super("openEHR-EHR-CLUSTER.etiology.v1"); + } + + public static AtiopathogeneseClusterContainment getInstance() { + return new AtiopathogeneseClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueChoice.java new file mode 100644 index 000000000..0d9980666 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +public interface AtiopathogeneseValueChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java new file mode 100644 index 000000000..eae7a5b08 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class AtiopathogeneseValueDvCodedText implements AtiopathogeneseValueChoice { + @Path("|defining_code") + private ValueDefiningCode valueDefiningCode; + + public void setValueDefiningCode(ValueDefiningCode valueDefiningCode) { + this.valueDefiningCode = valueDefiningCode; + } + + public ValueDefiningCode getValueDefiningCode() { + return this.valueDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java new file mode 100644 index 000000000..a949ba251 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class AtiopathogeneseValueDvText implements AtiopathogeneseValueChoice { + @Path("|value") + private String valueValue; + + public void setValueValue(String valueValue) { + this.valueValue = valueValue; + } + + public String getValueValue() { + return this.valueValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java new file mode 100644 index 000000000..f2a27f682 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java @@ -0,0 +1,55 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import java.lang.Boolean; +import java.lang.String; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.diagnose_details.v0") +public class DiagnosedetailsCluster { + @Path("/items[at0001]/value|value") + private String begrundungVonAusnahmenValue; + + @Path("/items[at0002]/value|value") + private String diagnosetypValue; + + @Path("/items[at0016]/value|value") + private Boolean vorhandenBeiAufnahmeValue; + + @Path("/items[at0017]/value|value") + private Boolean vorhandenBeiEntlassungValue; + + public void setBegrundungVonAusnahmenValue(String begrundungVonAusnahmenValue) { + this.begrundungVonAusnahmenValue = begrundungVonAusnahmenValue; + } + + public String getBegrundungVonAusnahmenValue() { + return this.begrundungVonAusnahmenValue ; + } + + public void setDiagnosetypValue(String diagnosetypValue) { + this.diagnosetypValue = diagnosetypValue; + } + + public String getDiagnosetypValue() { + return this.diagnosetypValue ; + } + + public void setVorhandenBeiAufnahmeValue(Boolean vorhandenBeiAufnahmeValue) { + this.vorhandenBeiAufnahmeValue = vorhandenBeiAufnahmeValue; + } + + public Boolean isVorhandenBeiAufnahmeValue() { + return this.vorhandenBeiAufnahmeValue ; + } + + public void setVorhandenBeiEntlassungValue(Boolean vorhandenBeiEntlassungValue) { + this.vorhandenBeiEntlassungValue = vorhandenBeiEntlassungValue; + } + + public Boolean isVorhandenBeiEntlassungValue() { + return this.vorhandenBeiEntlassungValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsClusterContainment.java new file mode 100644 index 000000000..711fc365e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsClusterContainment.java @@ -0,0 +1,27 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import java.lang.Boolean; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class DiagnosedetailsClusterContainment extends Containment { + public SelectAqlField DIAGNOSEDETAILS_CLUSTER = new AqlFieldImp(DiagnosedetailsCluster.class, "", "DiagnosedetailsCluster", DiagnosedetailsCluster.class, this); + + public SelectAqlField BEGRUNDUNG_VON_AUSNAHMEN_VALUE = new AqlFieldImp(DiagnosedetailsCluster.class, "/items[at0001]/value|value", "begrundungVonAusnahmenValue", String.class, this); + + public SelectAqlField DIAGNOSETYP_VALUE = new AqlFieldImp(DiagnosedetailsCluster.class, "/items[at0002]/value|value", "diagnosetypValue", String.class, this); + + public SelectAqlField VORHANDEN_BEI_AUFNAHME_VALUE = new AqlFieldImp(DiagnosedetailsCluster.class, "/items[at0016]/value|value", "vorhandenBeiAufnahmeValue", Boolean.class, this); + + public SelectAqlField VORHANDEN_BEI_ENTLASSUNG_VALUE = new AqlFieldImp(DiagnosedetailsCluster.class, "/items[at0017]/value|value", "vorhandenBeiEntlassungValue", Boolean.class, this); + + private DiagnosedetailsClusterContainment() { + super("openEHR-EHR-CLUSTER.diagnose_details.v0"); + } + + public static DiagnosedetailsClusterContainment getInstance() { + return new DiagnosedetailsClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnostischeSicherheitDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnostischeSicherheitDefiningCode.java new file mode 100644 index 000000000..46bbc223c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnostischeSicherheitDefiningCode.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum DiagnostischeSicherheitDefiningCode implements EnumValueSet { + WAHRSCHEINLICH("Wahrscheinlich", "Die Diagnose wurde mit einem hohen Maß an Sicherheit gestellt.", "local", "at0075"), + + VERMUTET("Vermutet", "Die Diagnose wurde mit einem niedrigen Grad an Sicherheit gestellt.", "local", "at0074"), + + BESTATIGT("Bestätigt", "Die Diagnose wurde anhand anerkannter Kriterien bestätigt.", "local", "at0076"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + DiagnostischeSicherheitDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java new file mode 100644 index 000000000..a4a8fe88f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.case_identification.v0") +public class FallidentifikationCluster { + @Path("/items[at0001]/value|value") + private String fallKennungValue; + + public void setFallKennungValue(String fallKennungValue) { + this.fallKennungValue = fallKennungValue; + } + + public String getFallKennungValue() { + return this.fallKennungValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationClusterContainment.java new file mode 100644 index 000000000..de91985e6 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationClusterContainment.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class FallidentifikationClusterContainment extends Containment { + public SelectAqlField FALLIDENTIFIKATION_CLUSTER = new AqlFieldImp(FallidentifikationCluster.class, "", "FallidentifikationCluster", FallidentifikationCluster.class, this); + + public SelectAqlField FALL_KENNUNG_VALUE = new AqlFieldImp(FallidentifikationCluster.class, "/items[at0001]/value|value", "fallKennungValue", String.class, this); + + private FallidentifikationClusterContainment() { + super("openEHR-EHR-CLUSTER.case_identification.v0"); + } + + public static FallidentifikationClusterContainment getInstance() { + return new FallidentifikationClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/LateralitatDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/LateralitatDefiningCode.java new file mode 100644 index 000000000..7750c3f15 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/LateralitatDefiningCode.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum LateralitatDefiningCode implements EnumValueSet { + LINKS_UND_RECHTS("Links und Rechts", "Beide Körperseiten.", "local", "at0086"), + + LINKS("Links", "Die linke Körperseite.", "local", "at0003"), + + RECHTS("Rechts", "Die rechte Körperseite.", "local", "at0004"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + LateralitatDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/NameDesProblemsDerDiagnoseDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/NameDesProblemsDerDiagnoseDefiningCode.java new file mode 100644 index 000000000..1c1938d9c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/NameDesProblemsDerDiagnoseDefiningCode.java @@ -0,0 +1,46 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum NameDesProblemsDerDiagnoseDefiningCode implements EnumValueSet { + COVID19_VIRUS_NACHGEWIESEN("COVID-19, Virus nachgewiesen", "COVID-19, Virus nachgewiesen", "ICD-10-GM-2020", "U07.1"), + + INFEKTION_DURCH_KORONAVIREN_NICHT_NAHER_BEZEICHNETER_LOKALISATION("Infektion durch Koronaviren nicht näher bezeichneter Lokalisation", "Infektion durch Koronaviren nicht näher bezeichneter Lokalisation", "ICD-10-GM-2020", "B34.2"), + + KORONAVIREN_ALS_URSACHE_VON_KRANKHEITEN_DIE_IN_ANDEREN_KAPITELN_KLASSIFIZIERT_SIND("Koronaviren als Ursache von Krankheiten, die in anderen Kapiteln klassifiziert sind", "Koronaviren als Ursache von Krankheiten, die in anderen Kapiteln klassifiziert sind", "ICD-10-GM-2020", "B97.2"), + + COVID19_VIRUS_NICHT_NACHGEWIESEN("COVID-19, Virus nicht nachgewiesen", "COVID-19, Virus nicht nachgewiesen", "ICD-10-GM-2020", "U07.2"); + + 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitChoice.java new file mode 100644 index 000000000..0315f86e9 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +public interface ProblemDiagnoseDiagnostischeSicherheitChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java new file mode 100644 index 000000000..914e22dd8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class ProblemDiagnoseDiagnostischeSicherheitDvCodedText implements ProblemDiagnoseDiagnostischeSicherheitChoice { + @Path("|defining_code") + private DiagnostischeSicherheitDefiningCode diagnostischeSicherheitDefiningCode; + + public void setDiagnostischeSicherheitDefiningCode( + DiagnostischeSicherheitDefiningCode diagnostischeSicherheitDefiningCode) { + this.diagnostischeSicherheitDefiningCode = diagnostischeSicherheitDefiningCode; + } + + public DiagnostischeSicherheitDefiningCode getDiagnostischeSicherheitDefiningCode() { + return this.diagnostischeSicherheitDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java new file mode 100644 index 000000000..c5c0ef601 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class ProblemDiagnoseDiagnostischeSicherheitDvText implements ProblemDiagnoseDiagnostischeSicherheitChoice { + @Path("|value") + private String diagnostischeSicherheitValue; + + public void setDiagnostischeSicherheitValue(String diagnostischeSicherheitValue) { + this.diagnostischeSicherheitValue = diagnostischeSicherheitValue; + } + + public String getDiagnostischeSicherheitValue() { + return this.diagnostischeSicherheitValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java new file mode 100644 index 000000000..9c34f3cd1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java @@ -0,0 +1,209 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +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.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.problem_diagnosis.v1") +public class ProblemDiagnoseEvaluation { + @Path("/data[at0001]/items[at0002]/value|defining_code") + private NameDesProblemsDerDiagnoseDefiningCode nameDesProblemsDerDiagnoseDefiningCode; + + @Path("/data[at0001]/items[at0009 and name/value='Freitextbeschreibung']/value|value") + private String freitextbeschreibungValue; + + @Path("/data[at0001]/items[at0012 and name/value='Lokalisation']/value|value") + private String lokalisationValue; + + @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.anatomical_location.v1]") + private List anatomischeLokalisation; + + @Path("/data[at0001]/items[at0077 and name/value='Datum des Auftretens/der Erstdiagnose']/value|value") + private TemporalAccessor datumDesAuftretensDerErstdiagnoseValue; + + @Path("/data[at0001]/items[at0003 and name/value='Feststellungsdatum']/value|value") + private TemporalAccessor feststellungsdatumValue; + + @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.diagnose_details.v0]") + private DiagnosedetailsCluster diagnosedetails; + + @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.etiology.v1]") + private AtiopathogeneseCluster atiopathogenese; + + @Path("/data[at0001]/items[at0030]/value|value") + private TemporalAccessor datumZeitpunktDerGenesungValue; + + @Path("/data[at0001]/items[at0046]") + private List status; + + @Path("/data[at0001]/items[at0069 and name/value='Diagnoseerläuterung']/value|value") + private String diagnoseerlauterungValue; + + @Path("/protocol[at0032]/items[at0070 and name/value='Letztes Dokumentationsdatum']/value|value") + private TemporalAccessor letztesDokumentationsdatumValue; + + @Path("/protocol[at0032]/items[at0071]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + @Path("/data[at0001]/items[at0073]/value") + @Choice + private ProblemDiagnoseDiagnostischeSicherheitChoice diagnostischeSicherheit; + + @Path("/data[at0001]/items[at0005]/value") + @Choice + private ProblemDiagnoseSchweregradChoice schweregrad; + + public void setNameDesProblemsDerDiagnoseDefiningCode( + NameDesProblemsDerDiagnoseDefiningCode nameDesProblemsDerDiagnoseDefiningCode) { + this.nameDesProblemsDerDiagnoseDefiningCode = nameDesProblemsDerDiagnoseDefiningCode; + } + + public NameDesProblemsDerDiagnoseDefiningCode getNameDesProblemsDerDiagnoseDefiningCode() { + return this.nameDesProblemsDerDiagnoseDefiningCode ; + } + + public void setFreitextbeschreibungValue(String freitextbeschreibungValue) { + this.freitextbeschreibungValue = freitextbeschreibungValue; + } + + public String getFreitextbeschreibungValue() { + return this.freitextbeschreibungValue ; + } + + public void setLokalisationValue(String lokalisationValue) { + this.lokalisationValue = lokalisationValue; + } + + public String getLokalisationValue() { + return this.lokalisationValue ; + } + + public void setAnatomischeLokalisation( + List anatomischeLokalisation) { + this.anatomischeLokalisation = anatomischeLokalisation; + } + + public List getAnatomischeLokalisation() { + return this.anatomischeLokalisation ; + } + + public void setDatumDesAuftretensDerErstdiagnoseValue( + TemporalAccessor datumDesAuftretensDerErstdiagnoseValue) { + this.datumDesAuftretensDerErstdiagnoseValue = datumDesAuftretensDerErstdiagnoseValue; + } + + public TemporalAccessor getDatumDesAuftretensDerErstdiagnoseValue() { + return this.datumDesAuftretensDerErstdiagnoseValue ; + } + + public void setFeststellungsdatumValue(TemporalAccessor feststellungsdatumValue) { + this.feststellungsdatumValue = feststellungsdatumValue; + } + + public TemporalAccessor getFeststellungsdatumValue() { + return this.feststellungsdatumValue ; + } + + public void setDiagnosedetails(DiagnosedetailsCluster diagnosedetails) { + this.diagnosedetails = diagnosedetails; + } + + public DiagnosedetailsCluster getDiagnosedetails() { + return this.diagnosedetails ; + } + + public void setAtiopathogenese(AtiopathogeneseCluster atiopathogenese) { + this.atiopathogenese = atiopathogenese; + } + + public AtiopathogeneseCluster getAtiopathogenese() { + return this.atiopathogenese ; + } + + public void setDatumZeitpunktDerGenesungValue(TemporalAccessor datumZeitpunktDerGenesungValue) { + this.datumZeitpunktDerGenesungValue = datumZeitpunktDerGenesungValue; + } + + public TemporalAccessor getDatumZeitpunktDerGenesungValue() { + return this.datumZeitpunktDerGenesungValue ; + } + + public void setStatus(List status) { + this.status = status; + } + + public List getStatus() { + return this.status ; + } + + public void setDiagnoseerlauterungValue(String diagnoseerlauterungValue) { + this.diagnoseerlauterungValue = diagnoseerlauterungValue; + } + + public String getDiagnoseerlauterungValue() { + return this.diagnoseerlauterungValue ; + } + + public void setLetztesDokumentationsdatumValue(TemporalAccessor letztesDokumentationsdatumValue) { + this.letztesDokumentationsdatumValue = letztesDokumentationsdatumValue; + } + + public TemporalAccessor getLetztesDokumentationsdatumValue() { + return this.letztesDokumentationsdatumValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setDiagnostischeSicherheit( + ProblemDiagnoseDiagnostischeSicherheitChoice diagnostischeSicherheit) { + this.diagnostischeSicherheit = diagnostischeSicherheit; + } + + public ProblemDiagnoseDiagnostischeSicherheitChoice getDiagnostischeSicherheit() { + return this.diagnostischeSicherheit ; + } + + public void setSchweregrad(ProblemDiagnoseSchweregradChoice schweregrad) { + this.schweregrad = schweregrad; + } + + public ProblemDiagnoseSchweregradChoice getSchweregrad() { + return this.schweregrad ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluationContainment.java new file mode 100644 index 000000000..0f6791fce --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluationContainment.java @@ -0,0 +1,58 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class ProblemDiagnoseEvaluationContainment extends Containment { + public SelectAqlField PROBLEM_DIAGNOSE_EVALUATION = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "", "ProblemDiagnoseEvaluation", ProblemDiagnoseEvaluation.class, this); + + public SelectAqlField NAME_DES_PROBLEMS_DER_DIAGNOSE_DEFINING_CODE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0002]/value|defining_code", "nameDesProblemsDerDiagnoseDefiningCode", NameDesProblemsDerDiagnoseDefiningCode.class, this); + + public SelectAqlField FREITEXTBESCHREIBUNG_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0009]/value|value", "freitextbeschreibungValue", String.class, this); + + public SelectAqlField LOKALISATION_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0012]/value|value", "lokalisationValue", String.class, this); + + public ListSelectAqlField ANATOMISCHE_LOKALISATION = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.anatomical_location.v1]", "anatomischeLokalisation", AnatomischeLokalisationCluster.class, this); + + public SelectAqlField DATUM_DES_AUFTRETENS_DER_ERSTDIAGNOSE_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0077]/value|value", "datumDesAuftretensDerErstdiagnoseValue", TemporalAccessor.class, this); + + public SelectAqlField FESTSTELLUNGSDATUM_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0003]/value|value", "feststellungsdatumValue", TemporalAccessor.class, this); + + public SelectAqlField DIAGNOSEDETAILS = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.diagnose_details.v0]", "diagnosedetails", DiagnosedetailsCluster.class, this); + + public SelectAqlField ATIOPATHOGENESE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.etiology.v1]", "atiopathogenese", AtiopathogeneseCluster.class, this); + + public SelectAqlField DATUM_ZEITPUNKT_DER_GENESUNG_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0030]/value|value", "datumZeitpunktDerGenesungValue", TemporalAccessor.class, this); + + public ListSelectAqlField STATUS = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0046]", "status", Cluster.class, this); + + public SelectAqlField DIAGNOSEERLAUTERUNG_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0069]/value|value", "diagnoseerlauterungValue", String.class, this); + + public SelectAqlField LETZTES_DOKUMENTATIONSDATUM_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/protocol[at0032]/items[at0070]/value|value", "letztesDokumentationsdatumValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/protocol[at0032]/items[at0071]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/language", "language", Language.class, this); + + public SelectAqlField DIAGNOSTISCHE_SICHERHEIT = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0073]/value", "diagnostischeSicherheit", ProblemDiagnoseDiagnostischeSicherheitChoice.class, this); + + public SelectAqlField SCHWEREGRAD = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0005]/value", "schweregrad", ProblemDiagnoseSchweregradChoice.class, this); + + private ProblemDiagnoseEvaluationContainment() { + super("openEHR-EHR-EVALUATION.problem_diagnosis.v1"); + } + + public static ProblemDiagnoseEvaluationContainment getInstance() { + return new ProblemDiagnoseEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradChoice.java new file mode 100644 index 000000000..e7ad2f230 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +public interface ProblemDiagnoseSchweregradChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java new file mode 100644 index 000000000..2cd7ab223 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class ProblemDiagnoseSchweregradDvCodedText implements ProblemDiagnoseSchweregradChoice { + @Path("|defining_code") + private SchweregradDefiningCode schweregradDefiningCode; + + public void setSchweregradDefiningCode(SchweregradDefiningCode schweregradDefiningCode) { + this.schweregradDefiningCode = schweregradDefiningCode; + } + + public SchweregradDefiningCode getSchweregradDefiningCode() { + return this.schweregradDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java new file mode 100644 index 000000000..40ca76c9f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class ProblemDiagnoseSchweregradDvText implements ProblemDiagnoseSchweregradChoice { + @Path("|value") + private String schweregradValue; + + public void setSchweregradValue(String schweregradValue) { + this.schweregradValue = schweregradValue; + } + + public String getSchweregradValue() { + return this.schweregradValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/SchweregradDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/SchweregradDefiningCode.java new file mode 100644 index 000000000..d2c8cd49a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/SchweregradDefiningCode.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum SchweregradDefiningCode implements EnumValueSet { + SCHWER("Schwer", "Das Problem oder die Diagnose verhindert die normale Aktivität oder verursacht schwerwiegende gesundheitliche Schäden, falls es nicht behandelt wird.", "local", "at0049"), + + MASSIG("Mäßig", "Das Problem oder die Diagnose beeinträchtigt die normale Aktivität oder verursacht bleibende gesundheitliche Schäden, falls es nicht behandelt wird.", "local", "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.", "local", "at0047"); + + private String value; + + private String description; + + private String terminologyId; + + private String 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 getDescription() { + return this.description ; + } + + public String getTerminologyId() { + return this.terminologyId ; + } + + public String getCode() { + return this.code ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ValueDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ValueDefiningCode.java new file mode 100644 index 000000000..4cccc7739 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ValueDefiningCode.java @@ -0,0 +1,63 @@ +package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum ValueDefiningCode implements EnumValueSet { + LEBENSWANDEL_BEZOGENE_FAKTOREN("Lebenswandel-bezogene Faktoren", "z. B. Rauchen, Alkoholismus", "local", "at0013"), + + GENETISCHE_HERKUNFT("Genetische Herkunft", "z. B Sichelzellenanämie", "local", "at0009"), + + KORPERLICHE_VERLETZUNG("Körperliche Verletzung", "z.B. Kopftrauma, Hitzeerschöpfung, Verletzung durch Strahlenbelastung", "local", "at0012"), + + ARBEITSRISIKOFAKTOREN("Arbeitsrisikofaktoren", "z.B. Asbestexposition", "local", "at0005"), + + IMMUNOLOGISCHE_HERKUNFT("Immunologische Herkunft", "z.B. systemische Lupus erythematodes, AIDS (als Grundursache für Kaposis Sarkom)", "local", "at0010"), + + BIOLOGISCH("Biologisch", "z.B. Alter, Geschlecht", "local", "at0006"), + + INFEKTION("Infektion", "z.B. Hepatitis C", "local", "at0011"), + + NEUROPSYCHIATRISCHE_HERKUNFT("Neuropsychiatrische Herkunft", "z. B. Alzheimer-Krankheit, Depression", "local", "at0015"), + + METABOLISCH_ENDOKRINER_HERKUNFT("Metabolisch-endokriner Herkunft", "z. B. Akromegalie, Diabetes", "local", "at0014"), + + UMWELTEXPOSITION("Umweltexposition", "z.B. UV-Strahlung aussetzen, Feinstaub Aussetzung", "local", "at0016"), + + SONSTIGES("Sonstiges", "Sonstige Ursachen, die mit vorgegebenen Werten nicht dargestellt werden können", "local", "at0018"), + + CHEMISCHE_VERLETZUNG("Chemische Verletzung", "z. B. Gift, Medikament", "local", "at0007"), + + ERNAHRUNGSRELEVANTE_FAKTOREN("Ernährungsrelevante Faktoren", "z. B. Eisenmangel, kohlenhydratreiche Ernährung", "local", "at0008"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + ValueDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java new file mode 100644 index 000000000..b71f402dc --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java @@ -0,0 +1,182 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +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 org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Id; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.annotations.Template; +import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.BloodPressureTrainingSampleObservation; +import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.DeviceDetailsTrainingSampleCluster; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; +import org.ehrbase.client.openehrclient.VersionUid; + +@Entity +@Archetype("openEHR-EHR-COMPOSITION.sample_encounter.v1") +@Template("ehrbase_blood_pressure_simple.de.v0") +public class EhrbaseBloodPressureSimpleDeV0Composition { + @Path("/context/other_context[at0001]/items[at0006]/items[openEHR-EHR-CLUSTER.sample_device.v1]") + private List deviceDetailsTrainingSample; + + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; + + @Path("/context/participations") + private List participations; + + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + @Path("/context/location") + private String location; + + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; + + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; + + @Path("/content[openEHR-EHR-OBSERVATION.sample_blood_pressure.v1]") + private List bloodPressureTrainingSample; + + @Path("/composer") + private PartyProxy composer; + + @Path("/language") + private Language language; + + @Path("/feeder_audit") + private FeederAudit feederAudit; + + @Path("/category|defining_code") + private Category categoryDefiningCode; + + @Path("/territory") + private Territory territory; + + @Id + private VersionUid versionUid; + + public void setDeviceDetailsTrainingSample( + List deviceDetailsTrainingSample) { + this.deviceDetailsTrainingSample = deviceDetailsTrainingSample; + } + + public List getDeviceDetailsTrainingSample() { + return this.deviceDetailsTrainingSample ; + } + + 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 setBloodPressureTrainingSample( + List bloodPressureTrainingSample) { + this.bloodPressureTrainingSample = bloodPressureTrainingSample; + } + + public List getBloodPressureTrainingSample() { + return this.bloodPressureTrainingSample ; + } + + 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 setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } + + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } + + 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java new file mode 100644 index 000000000..0685ac3c8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0CompositionContainment.java @@ -0,0 +1,57 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +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 org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.BloodPressureTrainingSampleObservation; +import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.DeviceDetailsTrainingSampleCluster; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; + +public class EhrbaseBloodPressureSimpleDeV0CompositionContainment extends Containment { + public SelectAqlField EHRBASE_BLOOD_PRESSURE_SIMPLE_DE_V0_COMPOSITION = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "", "EhrbaseBloodPressureSimpleDeV0Composition", EhrbaseBloodPressureSimpleDeV0Composition.class, this); + + public ListSelectAqlField DEVICE_DETAILS_TRAINING_SAMPLE = new ListAqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/other_context[at0001]/items[at0006]/items[openEHR-EHR-CLUSTER.sample_device.v1]", "deviceDetailsTrainingSample", DeviceDetailsTrainingSampleCluster.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/participations", "participations", Participation.class, this); + + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + + public SelectAqlField LOCATION = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/location", "location", String.class, this); + + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); + + public ListSelectAqlField BLOOD_PRESSURE_TRAINING_SAMPLE = new ListAqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/content[openEHR-EHR-OBSERVATION.sample_blood_pressure.v1]", "bloodPressureTrainingSample", BloodPressureTrainingSampleObservation.class, this); + + public SelectAqlField COMPOSER = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/composer", "composer", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/language", "language", Language.class, this); + + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); + + public SelectAqlField TERRITORY = new AqlFieldImp(EhrbaseBloodPressureSimpleDeV0Composition.class, "/territory", "territory", Territory.class, this); + + private EhrbaseBloodPressureSimpleDeV0CompositionContainment() { + super("openEHR-EHR-COMPOSITION.sample_encounter.v1"); + } + + public static EhrbaseBloodPressureSimpleDeV0CompositionContainment getInstance() { + return new EhrbaseBloodPressureSimpleDeV0CompositionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java new file mode 100644 index 000000000..84af6356c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java @@ -0,0 +1,249 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.sample_blood_pressure.v1") +public class BloodPressureTrainingSampleObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude") + private Double systolicMagnitude; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units") + private String systolicUnits; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|magnitude") + private Double diastolicMagnitude; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|units") + private String diastolicUnits; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|magnitude") + private Double meanArterialPressureMagnitude; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|units") + private String meanArterialPressureUnits; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|magnitude") + private Double pulsePressureMagnitude; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|units") + private String pulsePressureUnits; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0033]/value|value") + private String commentValue; + + @Path("/data[at0001]/events[at0002]/state[at0007]/items[at0008]/value|defining_code") + private PositionDefiningCode positionDefiningCode; + + @Path("/data[at0001]/events[at0002]/state[at0007]/items[at1030]") + private List levelOfExertion; + + @Path("/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|magnitude") + private Double tiltMagnitude; + + @Path("/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|units") + private String tiltUnits; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0011]/items[at0013]/value|defining_code") + private CuffSizeDefiningCode cuffSizeDefiningCode; + + @Path("/protocol[at0011]/items[at0014]/value|defining_code") + private LocationOfMeasurementDefiningCode locationOfMeasurementDefiningCode; + + @Path("/protocol[at0011]/items[at1010]/value|defining_code") + private KorotkoffSoundsDefiningCode korotkoffSoundsDefiningCode; + + @Path("/protocol[at0011]/items[at1025]") + private List device; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setSystolicMagnitude(Double systolicMagnitude) { + this.systolicMagnitude = systolicMagnitude; + } + + public Double getSystolicMagnitude() { + return this.systolicMagnitude ; + } + + public void setSystolicUnits(String systolicUnits) { + this.systolicUnits = systolicUnits; + } + + public String getSystolicUnits() { + return this.systolicUnits ; + } + + public void setDiastolicMagnitude(Double diastolicMagnitude) { + this.diastolicMagnitude = diastolicMagnitude; + } + + public Double getDiastolicMagnitude() { + return this.diastolicMagnitude ; + } + + public void setDiastolicUnits(String diastolicUnits) { + this.diastolicUnits = diastolicUnits; + } + + public String getDiastolicUnits() { + return this.diastolicUnits ; + } + + public void setMeanArterialPressureMagnitude(Double meanArterialPressureMagnitude) { + this.meanArterialPressureMagnitude = meanArterialPressureMagnitude; + } + + public Double getMeanArterialPressureMagnitude() { + return this.meanArterialPressureMagnitude ; + } + + public void setMeanArterialPressureUnits(String meanArterialPressureUnits) { + this.meanArterialPressureUnits = meanArterialPressureUnits; + } + + public String getMeanArterialPressureUnits() { + return this.meanArterialPressureUnits ; + } + + public void setPulsePressureMagnitude(Double pulsePressureMagnitude) { + this.pulsePressureMagnitude = pulsePressureMagnitude; + } + + public Double getPulsePressureMagnitude() { + return this.pulsePressureMagnitude ; + } + + public void setPulsePressureUnits(String pulsePressureUnits) { + this.pulsePressureUnits = pulsePressureUnits; + } + + public String getPulsePressureUnits() { + return this.pulsePressureUnits ; + } + + public void setCommentValue(String commentValue) { + this.commentValue = commentValue; + } + + public String getCommentValue() { + return this.commentValue ; + } + + public void setPositionDefiningCode(PositionDefiningCode positionDefiningCode) { + this.positionDefiningCode = positionDefiningCode; + } + + public PositionDefiningCode getPositionDefiningCode() { + return this.positionDefiningCode ; + } + + public void setLevelOfExertion(List levelOfExertion) { + this.levelOfExertion = levelOfExertion; + } + + public List getLevelOfExertion() { + return this.levelOfExertion ; + } + + public void setTiltMagnitude(Double tiltMagnitude) { + this.tiltMagnitude = tiltMagnitude; + } + + public Double getTiltMagnitude() { + return this.tiltMagnitude ; + } + + public void setTiltUnits(String tiltUnits) { + this.tiltUnits = tiltUnits; + } + + public String getTiltUnits() { + return this.tiltUnits ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setCuffSizeDefiningCode(CuffSizeDefiningCode cuffSizeDefiningCode) { + this.cuffSizeDefiningCode = cuffSizeDefiningCode; + } + + public CuffSizeDefiningCode getCuffSizeDefiningCode() { + return this.cuffSizeDefiningCode ; + } + + public void setLocationOfMeasurementDefiningCode( + LocationOfMeasurementDefiningCode locationOfMeasurementDefiningCode) { + this.locationOfMeasurementDefiningCode = locationOfMeasurementDefiningCode; + } + + public LocationOfMeasurementDefiningCode getLocationOfMeasurementDefiningCode() { + return this.locationOfMeasurementDefiningCode ; + } + + public void setKorotkoffSoundsDefiningCode( + KorotkoffSoundsDefiningCode korotkoffSoundsDefiningCode) { + this.korotkoffSoundsDefiningCode = korotkoffSoundsDefiningCode; + } + + public KorotkoffSoundsDefiningCode getKorotkoffSoundsDefiningCode() { + return this.korotkoffSoundsDefiningCode ; + } + + public void setDevice(List device) { + this.device = device; + } + + public List getDevice() { + return this.device ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java new file mode 100644 index 000000000..3b944c814 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java @@ -0,0 +1,67 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class BloodPressureTrainingSampleObservationContainment extends Containment { + public SelectAqlField BLOOD_PRESSURE_TRAINING_SAMPLE_OBSERVATION = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "", "BloodPressureTrainingSampleObservation", BloodPressureTrainingSampleObservation.class, this); + + public SelectAqlField SYSTOLIC_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude", "systolicMagnitude", Double.class, this); + + public SelectAqlField SYSTOLIC_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units", "systolicUnits", String.class, this); + + public SelectAqlField DIASTOLIC_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|magnitude", "diastolicMagnitude", Double.class, this); + + public SelectAqlField DIASTOLIC_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|units", "diastolicUnits", String.class, this); + + public SelectAqlField MEAN_ARTERIAL_PRESSURE_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|magnitude", "meanArterialPressureMagnitude", Double.class, this); + + public SelectAqlField MEAN_ARTERIAL_PRESSURE_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|units", "meanArterialPressureUnits", String.class, this); + + public SelectAqlField PULSE_PRESSURE_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|magnitude", "pulsePressureMagnitude", Double.class, this); + + public SelectAqlField PULSE_PRESSURE_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|units", "pulsePressureUnits", String.class, this); + + public SelectAqlField COMMENT_VALUE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0033]/value|value", "commentValue", String.class, this); + + public SelectAqlField POSITION_DEFINING_CODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/state[at0007]/items[at0008]/value|defining_code", "positionDefiningCode", PositionDefiningCode.class, this); + + public ListSelectAqlField LEVEL_OF_EXERTION = new ListAqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/state[at0007]/items[at1030]", "levelOfExertion", Cluster.class, this); + + public SelectAqlField TILT_MAGNITUDE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|magnitude", "tiltMagnitude", Double.class, this); + + public SelectAqlField TILT_UNITS = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|units", "tiltUnits", String.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public SelectAqlField CUFF_SIZE_DEFINING_CODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at0013]/value|defining_code", "cuffSizeDefiningCode", CuffSizeDefiningCode.class, this); + + public SelectAqlField LOCATION_OF_MEASUREMENT_DEFINING_CODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at0014]/value|defining_code", "locationOfMeasurementDefiningCode", LocationOfMeasurementDefiningCode.class, this); + + public SelectAqlField KOROTKOFF_SOUNDS_DEFINING_CODE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at1010]/value|defining_code", "korotkoffSoundsDefiningCode", KorotkoffSoundsDefiningCode.class, this); + + public ListSelectAqlField DEVICE = new ListAqlFieldImp(BloodPressureTrainingSampleObservation.class, "/protocol[at0011]/items[at1025]", "device", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/language", "language", Language.class, this); + + private BloodPressureTrainingSampleObservationContainment() { + super("openEHR-EHR-OBSERVATION.sample_blood_pressure.v1"); + } + + public static BloodPressureTrainingSampleObservationContainment getInstance() { + return new BloodPressureTrainingSampleObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningCode.java new file mode 100644 index 000000000..90849c773 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/CuffSizeDefiningCode.java @@ -0,0 +1,53 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum CuffSizeDefiningCode implements EnumValueSet { + PAEDIATRIC_CHILD("Paediatric/Child", "A cuff that is appropriate for a child or thin arm - bladder approx 8cm x 21\n" + + " cm\n" + + " ", "local", "at0017"), + + ADULT_THIGH("Adult Thigh", "A cuff used for an adult thigh - bladder approx 20cm x 42 cm", "local", "at1008"), + + LARGE_ADULT("Large Adult", "A cuff for adults with larger arms - bladder approx 16cm x 38cm", "local", "at0016"), + + ADULT("Adult", "A cuff that is standard for an adult - bladder approx 13cm x 30cm", "local", "at0015"), + + INFANT("Infant", "A cuff used for infants - bladder approx 5cm x 15cm", "local", "at1018"), + + NEONATAL("Neonatal", "A cuff used for a new born - bladder approx 3cm x 6cm", "local", "at1009"), + + SMALL_ADULT("Small Adult", "A cuff used for a small adult - bladder approx 10cm x 24 cm", "local", "at1019"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + CuffSizeDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java new file mode 100644 index 000000000..75d4972c0 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java @@ -0,0 +1,111 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.sample_device.v1") +public class DeviceDetailsTrainingSampleCluster { + @Path("/items[at0001]/value|value") + private String nameValue; + + @Path("/items[at0002]/value|value") + private String descriptionValue; + + @Path("/items[at0004]/items[at0003]/value|value") + private String manufacturerValue; + + @Path("/items[at0004]/items[at0005]/value|value") + private String modelValue; + + @Path("/items[at0004]/items[at0006]/value|value") + private String serialNumberValue; + + @Path("/items[at0007]") + private Cluster components; + + @Path("/items[at0008]/items[at0009]/value|value") + private TemporalAccessor dateLastServicedValue; + + @Path("/items[at0008]/items[at0010]/value|value") + private TemporalAccessor dateLastCalibrationValue; + + @Path("/items[at0008]/items[at0011]/value|value") + private String servicedByValue; + + public void setNameValue(String nameValue) { + this.nameValue = nameValue; + } + + public String getNameValue() { + return this.nameValue ; + } + + public void setDescriptionValue(String descriptionValue) { + this.descriptionValue = descriptionValue; + } + + public String getDescriptionValue() { + return this.descriptionValue ; + } + + public void setManufacturerValue(String manufacturerValue) { + this.manufacturerValue = manufacturerValue; + } + + public String getManufacturerValue() { + return this.manufacturerValue ; + } + + public void setModelValue(String modelValue) { + this.modelValue = modelValue; + } + + public String getModelValue() { + return this.modelValue ; + } + + public void setSerialNumberValue(String serialNumberValue) { + this.serialNumberValue = serialNumberValue; + } + + public String getSerialNumberValue() { + return this.serialNumberValue ; + } + + public void setComponents(Cluster components) { + this.components = components; + } + + public Cluster getComponents() { + return this.components ; + } + + public void setDateLastServicedValue(TemporalAccessor dateLastServicedValue) { + this.dateLastServicedValue = dateLastServicedValue; + } + + public TemporalAccessor getDateLastServicedValue() { + return this.dateLastServicedValue ; + } + + public void setDateLastCalibrationValue(TemporalAccessor dateLastCalibrationValue) { + this.dateLastCalibrationValue = dateLastCalibrationValue; + } + + public TemporalAccessor getDateLastCalibrationValue() { + return this.dateLastCalibrationValue ; + } + + public void setServicedByValue(String servicedByValue) { + this.servicedByValue = servicedByValue; + } + + public String getServicedByValue() { + return this.servicedByValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java new file mode 100644 index 000000000..1f0d8e94f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java @@ -0,0 +1,38 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class DeviceDetailsTrainingSampleClusterContainment extends Containment { + public SelectAqlField DEVICE_DETAILS_TRAINING_SAMPLE_CLUSTER = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "", "DeviceDetailsTrainingSampleCluster", DeviceDetailsTrainingSampleCluster.class, this); + + public SelectAqlField NAME_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0001]/value|value", "nameValue", String.class, this); + + public SelectAqlField DESCRIPTION_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0002]/value|value", "descriptionValue", String.class, this); + + public SelectAqlField MANUFACTURER_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0004]/items[at0003]/value|value", "manufacturerValue", String.class, this); + + public SelectAqlField MODEL_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0004]/items[at0005]/value|value", "modelValue", String.class, this); + + public SelectAqlField SERIAL_NUMBER_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0004]/items[at0006]/value|value", "serialNumberValue", String.class, this); + + public SelectAqlField COMPONENTS = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0007]", "components", Cluster.class, this); + + public SelectAqlField DATE_LAST_SERVICED_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0008]/items[at0009]/value|value", "dateLastServicedValue", TemporalAccessor.class, this); + + public SelectAqlField DATE_LAST_CALIBRATION_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0008]/items[at0010]/value|value", "dateLastCalibrationValue", TemporalAccessor.class, this); + + public SelectAqlField SERVICED_BY_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0008]/items[at0011]/value|value", "servicedByValue", String.class, this); + + private DeviceDetailsTrainingSampleClusterContainment() { + super("openEHR-EHR-CLUSTER.sample_device.v1"); + } + + public static DeviceDetailsTrainingSampleClusterContainment getInstance() { + return new DeviceDetailsTrainingSampleClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningCode.java new file mode 100644 index 000000000..82ff05098 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/KorotkoffSoundsDefiningCode.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum KorotkoffSoundsDefiningCode implements EnumValueSet { + FIFTH_SOUND("Fifth sound", "The fifth Korotkoff sound is identified by absence of sounds as the cuff\n" + + " pressure drops below the diastolic blood pressure\n" + + " ", "local", "at1012"), + + FOURTH_SOUND("Fourth sound", "The fourth Korotkoff sound is identified as an abrupt muffling of sounds\n" + + " ", "local", "at1011"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + KorotkoffSoundsDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningCode.java new file mode 100644 index 000000000..4ee4484ad --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/LocationOfMeasurementDefiningCode.java @@ -0,0 +1,58 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum LocationOfMeasurementDefiningCode implements EnumValueSet { + LEFT_THIGH("Left thigh", "The left thigh of the person", "local", "at0028"), + + INTRA_ARTERIAL("Intra-arterial", "Blood pressure monitored via an intra-arterial line", "local", "at0032"), + + FINGER("Finger", "A finger of the person", "local", "at1026"), + + RIGHT_ANKLE("Right ankle", "The right ankle of the person", "local", "at1031"), + + LEFT_WRIST("Left wrist", "The left wrist of the person", "local", "at1021"), + + RIGHT_WRIST("Right wrist", "The right wrist of the person", "local", "at1020"), + + LEFT_ARM("Left arm", "The left arm of the person", "local", "at0026"), + + LEFT_ANKLE("Left ankle", "The left ankle of the person", "local", "at1032"), + + RIGHT_THIGH("Right thigh", "The right thigh of the person", "local", "at0027"), + + RIGHT_ARM("Right arm", "The right arm of the person", "local", "at0025"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + LocationOfMeasurementDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningCode.java new file mode 100644 index 000000000..bf0068793 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/PositionDefiningCode.java @@ -0,0 +1,53 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum PositionDefiningCode implements EnumValueSet { + STANDING("Standing", "Standing at the time of blood pressure measurement", "local", "at1000"), + + LYING("Lying", "Lying flat at the time of blood pressure measurement", "local", "at1003"), + + RECLINING("Reclining", "Reclining at the time of blood pressure measurement", "local", "at1002"), + + TRENDELENBURG("Trendelenburg", "Lying flat on the back (supine position) with the feet higher than the head\n" + + " at the time of blood pressure measurement\n" + + " ", "local", "at1013"), + + LEFT_LATERAL("Left Lateral", "Lying on the left side at the time of blood pressure measurement", "local", "at1014"), + + SITTING("Sitting", "Sitting (for example on bed or chair) at the time of blood pressure\n" + + " measurement\n" + + " ", "local", "at1001"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + PositionDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java new file mode 100644 index 000000000..b48942342 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java @@ -0,0 +1,180 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +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 org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Id; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.annotations.Template; +import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureObservation; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; +import org.ehrbase.client.openehrclient.VersionUid; + +@Entity +@Archetype("openEHR-EHR-COMPOSITION.encounter.v1") +@Template("ehrbase_multi_occurrence.de.v1") +public class EhrbaseMultiOccurrenceDeV1Composition { + @Path("/context/other_context[at0001]/items[at0002]") + private List extension; + + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; + + @Path("/context/participations") + private List participations; + + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + @Path("/context/location") + private String location; + + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; + + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; + + @Path("/content[openEHR-EHR-OBSERVATION.body_temperature.v2]") + private List bodyTemperature; + + @Path("/composer") + private PartyProxy composer; + + @Path("/language") + private Language language; + + @Path("/feeder_audit") + private FeederAudit feederAudit; + + @Path("/category|defining_code") + private Category categoryDefiningCode; + + @Path("/territory") + private Territory territory; + + @Id + private VersionUid versionUid; + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + 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 setBodyTemperature(List bodyTemperature) { + this.bodyTemperature = bodyTemperature; + } + + public List getBodyTemperature() { + return this.bodyTemperature ; + } + + 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 setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } + + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } + + 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1CompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1CompositionContainment.java new file mode 100644 index 000000000..60cdce008 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1CompositionContainment.java @@ -0,0 +1,57 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +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 org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureObservation; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; + +public class EhrbaseMultiOccurrenceDeV1CompositionContainment extends Containment { + public SelectAqlField EHRBASE_MULTI_OCCURRENCE_DE_V1_COMPOSITION = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "", "EhrbaseMultiOccurrenceDeV1Composition", EhrbaseMultiOccurrenceDeV1Composition.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/other_context[at0001]/items[at0002]", "extension", Cluster.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/participations", "participations", Participation.class, this); + + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + + public SelectAqlField LOCATION = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/location", "location", String.class, this); + + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); + + public ListSelectAqlField BODY_TEMPERATURE = new ListAqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/content[openEHR-EHR-OBSERVATION.body_temperature.v2]", "bodyTemperature", BodyTemperatureObservation.class, this); + + public SelectAqlField COMPOSER = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/composer", "composer", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/language", "language", Language.class, this); + + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); + + public SelectAqlField TERRITORY = new AqlFieldImp(EhrbaseMultiOccurrenceDeV1Composition.class, "/territory", "territory", Territory.class, this); + + private EhrbaseMultiOccurrenceDeV1CompositionContainment() { + super("openEHR-EHR-COMPOSITION.encounter.v1"); + } + + public static EhrbaseMultiOccurrenceDeV1CompositionContainment getInstance() { + return new EhrbaseMultiOccurrenceDeV1CompositionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyExposureDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyExposureDefiningCode.java new file mode 100644 index 000000000..581f9d6d9 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyExposureDefiningCode.java @@ -0,0 +1,51 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum BodyExposureDefiningCode implements EnumValueSet { + INCREASED_CLOTHING_BEDDING("Increased clothing/bedding", "The person is covered by an increased amount of clothing or bedding than\n" + + " deemed appropriate for the environmental circumstances.\n" + + " ", "local", "at0034"), + + REDUCED_CLOTHING_BEDDING("Reduced clothing/bedding", "The person is covered by a lesser amount of clothing or bedding than deemed\n" + + " appropriate for the environmental circumstances.\n" + + " ", "local", "at0032"), + + APPROPRIATE_CLOTHING_BEDDING("Appropriate clothing/bedding", "The person is covered by an amount of clothing or bedding deemed appropriate\n" + + " for the environmental circumstances.\n" + + " ", "local", "at0033"), + + NAKED("Naked", "No clothing, bedding or covering.", "local", "at0031"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + BodyExposureDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventChoice.java new file mode 100644 index 000000000..2f2c73fba --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; + +public interface BodyTemperatureAnyEventChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java new file mode 100644 index 000000000..a1b9c83a7 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java @@ -0,0 +1,129 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.Long; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.util.List; +import org.ehrbase.client.annotations.Choice; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; + +@Entity +@OptionFor("INTERVAL_EVENT") +public class BodyTemperatureAnyEventIntervalEvent implements BodyTemperatureAnyEventChoice { + @Path("/data[at0001]/items[at0004]/value|magnitude") + private Double temperatureMagnitude; + + @Path("/data[at0001]/items[at0004]/value|units") + private String temperatureUnits; + + @Path("/state[at0029]/items[at0041]/value|value") + private String descriptionOfThermalStressValue; + + @Path("/state[at0029]/items[at0065]/value|magnitude") + private Long currentDayOfMenstrualCycleMagnitude; + + @Path("/state[at0029]/items[at0056]") + private List environmentalConditions; + + @Path("/state[at0029]/items[at0057]") + private Cluster exertion; + + @Path("/time|value") + private TemporalAccessor timeValue; + + @Path("/width|value") + private TemporalAmount widthValue; + + @Path("/math_function|defining_code") + private MathFunction mathFunctionDefiningCode; + + @Path("/state[at0029]/items[at0030]/value") + @Choice + private BodyTemperatureBodyExposureChoice bodyExposure; + + public void setTemperatureMagnitude(Double temperatureMagnitude) { + this.temperatureMagnitude = temperatureMagnitude; + } + + public Double getTemperatureMagnitude() { + return this.temperatureMagnitude ; + } + + public void setTemperatureUnits(String temperatureUnits) { + this.temperatureUnits = temperatureUnits; + } + + public String getTemperatureUnits() { + return this.temperatureUnits ; + } + + public void setDescriptionOfThermalStressValue(String descriptionOfThermalStressValue) { + this.descriptionOfThermalStressValue = descriptionOfThermalStressValue; + } + + public String getDescriptionOfThermalStressValue() { + return this.descriptionOfThermalStressValue ; + } + + public void setCurrentDayOfMenstrualCycleMagnitude(Long currentDayOfMenstrualCycleMagnitude) { + this.currentDayOfMenstrualCycleMagnitude = currentDayOfMenstrualCycleMagnitude; + } + + public Long getCurrentDayOfMenstrualCycleMagnitude() { + return this.currentDayOfMenstrualCycleMagnitude ; + } + + public void setEnvironmentalConditions(List environmentalConditions) { + this.environmentalConditions = environmentalConditions; + } + + public List getEnvironmentalConditions() { + return this.environmentalConditions ; + } + + public void setExertion(Cluster exertion) { + this.exertion = exertion; + } + + public Cluster getExertion() { + return this.exertion ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setWidthValue(TemporalAmount widthValue) { + this.widthValue = widthValue; + } + + public TemporalAmount getWidthValue() { + return this.widthValue ; + } + + public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { + this.mathFunctionDefiningCode = mathFunctionDefiningCode; + } + + public MathFunction getMathFunctionDefiningCode() { + return this.mathFunctionDefiningCode ; + } + + public void setBodyExposure(BodyTemperatureBodyExposureChoice bodyExposure) { + this.bodyExposure = bodyExposure; + } + + public BodyTemperatureBodyExposureChoice getBodyExposure() { + return this.bodyExposure ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java new file mode 100644 index 000000000..505a566e2 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java @@ -0,0 +1,105 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.Long; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Choice; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("POINT_EVENT") +public class BodyTemperatureAnyEventPointEvent implements BodyTemperatureAnyEventChoice { + @Path("/data[at0001]/items[at0004]/value|magnitude") + private Double temperatureMagnitude; + + @Path("/data[at0001]/items[at0004]/value|units") + private String temperatureUnits; + + @Path("/state[at0029]/items[at0041]/value|value") + private String descriptionOfThermalStressValue; + + @Path("/state[at0029]/items[at0065]/value|magnitude") + private Long currentDayOfMenstrualCycleMagnitude; + + @Path("/state[at0029]/items[at0056]") + private List environmentalConditions; + + @Path("/state[at0029]/items[at0057]") + private Cluster exertion; + + @Path("/time|value") + private TemporalAccessor timeValue; + + @Path("/state[at0029]/items[at0030]/value") + @Choice + private BodyTemperatureBodyExposureChoice bodyExposure; + + public void setTemperatureMagnitude(Double temperatureMagnitude) { + this.temperatureMagnitude = temperatureMagnitude; + } + + public Double getTemperatureMagnitude() { + return this.temperatureMagnitude ; + } + + public void setTemperatureUnits(String temperatureUnits) { + this.temperatureUnits = temperatureUnits; + } + + public String getTemperatureUnits() { + return this.temperatureUnits ; + } + + public void setDescriptionOfThermalStressValue(String descriptionOfThermalStressValue) { + this.descriptionOfThermalStressValue = descriptionOfThermalStressValue; + } + + public String getDescriptionOfThermalStressValue() { + return this.descriptionOfThermalStressValue ; + } + + public void setCurrentDayOfMenstrualCycleMagnitude(Long currentDayOfMenstrualCycleMagnitude) { + this.currentDayOfMenstrualCycleMagnitude = currentDayOfMenstrualCycleMagnitude; + } + + public Long getCurrentDayOfMenstrualCycleMagnitude() { + return this.currentDayOfMenstrualCycleMagnitude ; + } + + public void setEnvironmentalConditions(List environmentalConditions) { + this.environmentalConditions = environmentalConditions; + } + + public List getEnvironmentalConditions() { + return this.environmentalConditions ; + } + + public void setExertion(Cluster exertion) { + this.exertion = exertion; + } + + public Cluster getExertion() { + return this.exertion ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setBodyExposure(BodyTemperatureBodyExposureChoice bodyExposure) { + this.bodyExposure = bodyExposure; + } + + public BodyTemperatureBodyExposureChoice getBodyExposure() { + return this.bodyExposure ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureChoice.java new file mode 100644 index 000000000..0eba59b01 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; + +public interface BodyTemperatureBodyExposureChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvCodedText.java new file mode 100644 index 000000000..cd68266c2 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvCodedText.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class BodyTemperatureBodyExposureDvCodedText implements BodyTemperatureBodyExposureChoice { + @Path("|defining_code") + private BodyExposureDefiningCode bodyExposureDefiningCode; + + public void setBodyExposureDefiningCode(BodyExposureDefiningCode bodyExposureDefiningCode) { + this.bodyExposureDefiningCode = bodyExposureDefiningCode; + } + + public BodyExposureDefiningCode getBodyExposureDefiningCode() { + return this.bodyExposureDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java new file mode 100644 index 000000000..9a914dd21 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class BodyTemperatureBodyExposureDvText implements BodyTemperatureBodyExposureChoice { + @Path("|value") + private String bodyExposureValue; + + public void setBodyExposureValue(String bodyExposureValue) { + this.bodyExposureValue = bodyExposureValue; + } + + public String getBodyExposureValue() { + return this.bodyExposureValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementChoice.java new file mode 100644 index 000000000..9ad06b1cc --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; + +public interface BodyTemperatureLocationOfMeasurementChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvCodedText.java new file mode 100644 index 000000000..dace78986 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvCodedText.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class BodyTemperatureLocationOfMeasurementDvCodedText implements BodyTemperatureLocationOfMeasurementChoice { + @Path("|defining_code") + private LocationOfMeasurementDefiningCode locationOfMeasurementDefiningCode; + + public void setLocationOfMeasurementDefiningCode( + LocationOfMeasurementDefiningCode locationOfMeasurementDefiningCode) { + this.locationOfMeasurementDefiningCode = locationOfMeasurementDefiningCode; + } + + public LocationOfMeasurementDefiningCode getLocationOfMeasurementDefiningCode() { + return this.locationOfMeasurementDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java new file mode 100644 index 000000000..2ec7ca97a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class BodyTemperatureLocationOfMeasurementDvText implements BodyTemperatureLocationOfMeasurementChoice { + @Path("|value") + private String locationOfMeasurementValue; + + public void setLocationOfMeasurementValue(String locationOfMeasurementValue) { + this.locationOfMeasurementValue = locationOfMeasurementValue; + } + + public String getLocationOfMeasurementValue() { + return this.locationOfMeasurementValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java new file mode 100644 index 000000000..11a8519c4 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java @@ -0,0 +1,106 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; +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.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.body_temperature.v2") +public class BodyTemperatureObservation { + @Path("/data[at0002]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0020]/items[at0064]") + private List structuredMeasurementLocation; + + @Path("/protocol[at0020]/items[at0059]") + private Cluster device; + + @Path("/protocol[at0020]/items[at0062]") + private List extension; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + @Path("/protocol[at0020]/items[at0021]/value") + @Choice + private BodyTemperatureLocationOfMeasurementChoice locationOfMeasurement; + + @Path("/data[at0002]/events[at0003]") + @Choice + private List anyEvent; + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setStructuredMeasurementLocation(List structuredMeasurementLocation) { + this.structuredMeasurementLocation = structuredMeasurementLocation; + } + + public List getStructuredMeasurementLocation() { + return this.structuredMeasurementLocation ; + } + + public void setDevice(Cluster device) { + this.device = device; + } + + public Cluster getDevice() { + return this.device ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setLocationOfMeasurement( + BodyTemperatureLocationOfMeasurementChoice locationOfMeasurement) { + this.locationOfMeasurement = locationOfMeasurement; + } + + public BodyTemperatureLocationOfMeasurementChoice getLocationOfMeasurement() { + return this.locationOfMeasurement ; + } + + public void setAnyEvent(List anyEvent) { + this.anyEvent = anyEvent; + } + + public List getAnyEvent() { + return this.anyEvent ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservationContainment.java new file mode 100644 index 000000000..e44fbd1f6 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservationContainment.java @@ -0,0 +1,39 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class BodyTemperatureObservationContainment extends Containment { + public SelectAqlField BODY_TEMPERATURE_OBSERVATION = new AqlFieldImp(BodyTemperatureObservation.class, "", "BodyTemperatureObservation", BodyTemperatureObservation.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(BodyTemperatureObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField STRUCTURED_MEASUREMENT_LOCATION = new ListAqlFieldImp(BodyTemperatureObservation.class, "/protocol[at0020]/items[at0064]", "structuredMeasurementLocation", Cluster.class, this); + + public SelectAqlField DEVICE = new AqlFieldImp(BodyTemperatureObservation.class, "/protocol[at0020]/items[at0059]", "device", Cluster.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(BodyTemperatureObservation.class, "/protocol[at0020]/items[at0062]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(BodyTemperatureObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(BodyTemperatureObservation.class, "/language", "language", Language.class, this); + + public SelectAqlField LOCATION_OF_MEASUREMENT = new AqlFieldImp(BodyTemperatureObservation.class, "/protocol[at0020]/items[at0021]/value", "locationOfMeasurement", BodyTemperatureLocationOfMeasurementChoice.class, this); + + public ListSelectAqlField ANY_EVENT = new ListAqlFieldImp(BodyTemperatureObservation.class, "/data[at0002]/events[at0003]", "anyEvent", BodyTemperatureAnyEventChoice.class, this); + + private BodyTemperatureObservationContainment() { + super("openEHR-EHR-OBSERVATION.body_temperature.v2"); + } + + public static BodyTemperatureObservationContainment getInstance() { + return new BodyTemperatureObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/LocationOfMeasurementDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/LocationOfMeasurementDefiningCode.java new file mode 100644 index 000000000..1d2a1e76c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/LocationOfMeasurementDefiningCode.java @@ -0,0 +1,70 @@ +package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum LocationOfMeasurementDefiningCode implements EnumValueSet { + TEMPLE("Temple", "Temperature is measured at the temple, over the superficial temporal\n" + + " artery.\n" + + " ", "local", "at0060"), + + INTRAVASCULAR("Intravascular", "Temperature is measured within the vascular system.", "local", "at0028"), + + URINARY_BLADDER("Urinary bladder", "Temperature is measured in the urinary bladder.", "local", "at0027"), + + NASOPHARYNX("Nasopharynx", "Temperature is measured within the nasopharynx.", "local", "at0026"), + + VAGINA("Vagina", "Temperature is measured within the vagina.", "local", "at0051"), + + RECTUM("Rectum", "Temperature measured within the rectum.", "local", "at0025"), + + SKIN("Skin", "Temperature is measured from exposed skin.", "local", "at0043"), + + MOUTH("Mouth", "Temperature is measured within the mouth.", "local", "at0022"), + + AXILLA("Axilla", "Temperature is measured from the skin of the axilla with the arm positioned\n" + + " down by the side.\n" + + " ", "local", "at0024"), + + OESOPHAGUS("Oesophagus", "Temperatue is measured within the oesophagus.", "local", "at0054"), + + INGUINAL_SKIN_CREASE("Inguinal skin crease", "Temperature is measured in the inguinal skin crease between the leg and\n" + + " abdominal wall.\n" + + " ", "local", "at0055"), + + FOREHEAD("Forehead", "Temperature is measured on the forehead.", "local", "at0061"), + + EAR_CANAL("Ear canal", "Temperature is measured from within the external auditory canal.", "local", "at0023"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + LocationOfMeasurementDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java new file mode 100644 index 000000000..abd114203 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java @@ -0,0 +1,168 @@ +package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +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 org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Id; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.annotations.Template; +import org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition.EpisodeofcareAdminEntry; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; +import org.ehrbase.client.openehrclient.VersionUid; + +@Entity +@Archetype("openEHR-EHR-COMPOSITION.versorgungsfall.v0") +@Template("EpisodeOfCare") +public class EpisodeOfCareComposition { + @Path("/content[openEHR-EHR-ADMIN_ENTRY.episodeofcare.v0]") + private List episodeofcare; + + @Path("/composer") + private PartyProxy composer; + + @Path("/language") + private Language language; + + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; + + @Path("/context/participations") + private List participations; + + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + @Path("/context/location") + private String location; + + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; + + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; + + @Path("/feeder_audit") + private FeederAudit feederAudit; + + @Path("/category|defining_code") + private Category categoryDefiningCode; + + @Path("/territory") + private Territory territory; + + @Id + private VersionUid versionUid; + + public void setEpisodeofcare(List episodeofcare) { + this.episodeofcare = episodeofcare; + } + + public List getEpisodeofcare() { + return this.episodeofcare ; + } + + 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 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 setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + + public void setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } + + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } + + 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareCompositionContainment.java new file mode 100644 index 000000000..eb6781267 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareCompositionContainment.java @@ -0,0 +1,54 @@ +package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +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 org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition.EpisodeofcareAdminEntry; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; + +public class EpisodeOfCareCompositionContainment extends Containment { + public SelectAqlField EPISODE_OF_CARE_COMPOSITION = new AqlFieldImp(EpisodeOfCareComposition.class, "", "EpisodeOfCareComposition", EpisodeOfCareComposition.class, this); + + public ListSelectAqlField EPISODEOFCARE = new ListAqlFieldImp(EpisodeOfCareComposition.class, "/content[openEHR-EHR-ADMIN_ENTRY.episodeofcare.v0]", "episodeofcare", EpisodeofcareAdminEntry.class, this); + + public SelectAqlField COMPOSER = new AqlFieldImp(EpisodeOfCareComposition.class, "/composer", "composer", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(EpisodeOfCareComposition.class, "/language", "language", Language.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(EpisodeOfCareComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(EpisodeOfCareComposition.class, "/context/participations", "participations", Participation.class, this); + + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(EpisodeOfCareComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + + public SelectAqlField LOCATION = new AqlFieldImp(EpisodeOfCareComposition.class, "/context/location", "location", String.class, this); + + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(EpisodeOfCareComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(EpisodeOfCareComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); + + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(EpisodeOfCareComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(EpisodeOfCareComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); + + public SelectAqlField TERRITORY = new AqlFieldImp(EpisodeOfCareComposition.class, "/territory", "territory", Territory.class, this); + + private EpisodeOfCareCompositionContainment() { + super("openEHR-EHR-COMPOSITION.versorgungsfall.v0"); + } + + public static EpisodeOfCareCompositionContainment getInstance() { + return new EpisodeOfCareCompositionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java new file mode 100644 index 000000000..d8ec76761 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java @@ -0,0 +1,159 @@ +package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; + +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Boolean; +import java.lang.String; +import java.net.URI; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-ADMIN_ENTRY.episodeofcare.v0") +public class EpisodeofcareAdminEntry { + @Path("/data[at0001]/items[at0002]") + private List identifier; + + @Path("/data[at0001]/items[at0003]/value|defining_code") + private StatusDefiningCode statusDefiningCode; + + @Path("/data[at0001]/items[at0011]/value|value") + private String typeValue; + + @Path("/data[at0001]/items[at0014]/value/upper|value") + private TemporalAccessor upperValue; + + @Path("/data[at0001]/items[at0014]/value/lower|value") + private TemporalAccessor lowerValue; + + @Path("/data[at0001]/items[at0014]/value/lower_included") + private Boolean lowerIncluded; + + @Path("/data[at0001]/items[at0014]/value/upper_included") + private Boolean upperIncluded; + + @Path("/data[at0001]/items[at0018]") + private List diagnosis; + + @Path("/data[at0001]/items[at0012]/value|value") + private URI careManagerValue; + + @Path("/data[at0001]/items[at0017]/value|value") + private URI managingOrganizationValue; + + @Path("/data[at0001]/items[at0013]") + private List team; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setIdentifier(List identifier) { + this.identifier = identifier; + } + + public List getIdentifier() { + return this.identifier ; + } + + public void setStatusDefiningCode(StatusDefiningCode statusDefiningCode) { + this.statusDefiningCode = statusDefiningCode; + } + + public StatusDefiningCode getStatusDefiningCode() { + return this.statusDefiningCode ; + } + + public void setTypeValue(String typeValue) { + this.typeValue = typeValue; + } + + public String getTypeValue() { + return this.typeValue ; + } + + public void setUpperValue(TemporalAccessor upperValue) { + this.upperValue = upperValue; + } + + public TemporalAccessor getUpperValue() { + return this.upperValue ; + } + + public void setLowerValue(TemporalAccessor lowerValue) { + this.lowerValue = lowerValue; + } + + public TemporalAccessor getLowerValue() { + return this.lowerValue ; + } + + public void setLowerIncluded(Boolean lowerIncluded) { + this.lowerIncluded = lowerIncluded; + } + + public Boolean isLowerIncluded() { + return this.lowerIncluded ; + } + + public void setUpperIncluded(Boolean upperIncluded) { + this.upperIncluded = upperIncluded; + } + + public Boolean isUpperIncluded() { + return this.upperIncluded ; + } + + public void setDiagnosis(List diagnosis) { + this.diagnosis = diagnosis; + } + + public List getDiagnosis() { + return this.diagnosis ; + } + + public void setCareManagerValue(URI careManagerValue) { + this.careManagerValue = careManagerValue; + } + + public URI getCareManagerValue() { + return this.careManagerValue ; + } + + public void setManagingOrganizationValue(URI managingOrganizationValue) { + this.managingOrganizationValue = managingOrganizationValue; + } + + public URI getManagingOrganizationValue() { + return this.managingOrganizationValue ; + } + + public void setTeam(List team) { + this.team = team; + } + + public List getTeam() { + return this.team ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntryContainment.java new file mode 100644 index 000000000..5eb5cabde --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntryContainment.java @@ -0,0 +1,51 @@ +package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; + +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Boolean; +import java.lang.String; +import java.net.URI; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class EpisodeofcareAdminEntryContainment extends Containment { + public SelectAqlField EPISODEOFCARE_ADMIN_ENTRY = new AqlFieldImp(EpisodeofcareAdminEntry.class, "", "EpisodeofcareAdminEntry", EpisodeofcareAdminEntry.class, this); + + public ListSelectAqlField IDENTIFIER = new ListAqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0002]", "identifier", EpisodeofcareIdentifierElement.class, this); + + public SelectAqlField STATUS_DEFINING_CODE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0003]/value|defining_code", "statusDefiningCode", StatusDefiningCode.class, this); + + public SelectAqlField TYPE_VALUE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0011]/value|value", "typeValue", String.class, this); + + public SelectAqlField UPPER_VALUE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0014]/value/upper|value", "upperValue", TemporalAccessor.class, this); + + public SelectAqlField LOWER_VALUE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0014]/value/lower|value", "lowerValue", TemporalAccessor.class, this); + + public SelectAqlField LOWER_INCLUDED = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0014]/value/lower_included", "lowerIncluded", Boolean.class, this); + + public SelectAqlField UPPER_INCLUDED = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0014]/value/upper_included", "upperIncluded", Boolean.class, this); + + public ListSelectAqlField DIAGNOSIS = new ListAqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0018]", "diagnosis", EpisodeofcareDiagnosisCluster.class, this); + + public SelectAqlField CARE_MANAGER_VALUE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0012]/value|value", "careManagerValue", URI.class, this); + + public SelectAqlField MANAGING_ORGANIZATION_VALUE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0017]/value|value", "managingOrganizationValue", URI.class, this); + + public ListSelectAqlField TEAM = new ListAqlFieldImp(EpisodeofcareAdminEntry.class, "/data[at0001]/items[at0013]", "team", EpisodeofcareTeamElement.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/language", "language", Language.class, this); + + private EpisodeofcareAdminEntryContainment() { + super("openEHR-EHR-ADMIN_ENTRY.episodeofcare.v0"); + } + + public static EpisodeofcareAdminEntryContainment getInstance() { + return new EpisodeofcareAdminEntryContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java new file mode 100644 index 000000000..169f6025b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; + +import com.nedap.archie.rm.datavalues.DvEHRURI; +import java.lang.Long; +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class EpisodeofcareDiagnosisCluster { + @Path("/items[at0019]/value") + private DvEHRURI diagnosisEntry; + + @Path("/items[at0020]/value|value") + private String roleValue; + + @Path("/items[at0021]/value|magnitude") + private Long rankMagnitude; + + public void setDiagnosisEntry(DvEHRURI diagnosisEntry) { + this.diagnosisEntry = diagnosisEntry; + } + + public DvEHRURI getDiagnosisEntry() { + return this.diagnosisEntry ; + } + + public void setRoleValue(String roleValue) { + this.roleValue = roleValue; + } + + public String getRoleValue() { + return this.roleValue ; + } + + public void setRankMagnitude(Long rankMagnitude) { + this.rankMagnitude = rankMagnitude; + } + + public Long getRankMagnitude() { + return this.rankMagnitude ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java new file mode 100644 index 000000000..ec1c16347 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java @@ -0,0 +1,19 @@ +package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; + +import com.nedap.archie.rm.datavalues.DvIdentifier; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class EpisodeofcareIdentifierElement { + @Path("/value") + private DvIdentifier value; + + public void setValue(DvIdentifier value) { + this.value = value; + } + + public DvIdentifier getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java new file mode 100644 index 000000000..3fe2d4a99 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java @@ -0,0 +1,19 @@ +package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; + +import java.net.URI; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class EpisodeofcareTeamElement { + @Path("/value|value") + private URI value; + + public void setValue(URI value) { + this.value = value; + } + + public URI getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/StatusDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/StatusDefiningCode.java new file mode 100644 index 000000000..f77dab15f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/StatusDefiningCode.java @@ -0,0 +1,51 @@ +package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum StatusDefiningCode implements EnumValueSet { + WAITLIST("waitlist", "*", "local", "at0005"), + + CANCELLED("cancelled", "*", "local", "at0009"), + + ENTERED_IN_ERROR("entered-in-error", "*", "local", "at0010"), + + ACTIVE("active", "*", "local", "at0006"), + + PLANNED("planned", "*", "local", "at0004"), + + ONHOLD("onhold", "*", "local", "at0007"), + + FINISHED("finished", "*", "local", "at0008"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + StatusDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java new file mode 100644 index 000000000..53e115edc --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java @@ -0,0 +1,216 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +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 org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Id; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.annotations.Template; +import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.AssessmentSection; +import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.BackgroundSection; +import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.ResponseSection; +import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.SituationSection; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; +import org.ehrbase.client.openehrclient.VersionUid; + +@Entity +@Archetype("openEHR-EHR-COMPOSITION.encounter.v1") +@Template("open_eREACT-Care") +public class OpenEREACTCareComposition { + @Path("/context/other_context[at0001]/items[at0002]") + private List extension; + + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; + + @Path("/context/participations") + private List participations; + + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + @Path("/context/location") + private String location; + + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; + + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; + + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Situation']") + private SituationSection situation; + + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Background']") + private BackgroundSection background; + + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Assessment']") + private AssessmentSection assessment; + + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Response']") + private ResponseSection response; + + @Path("/composer") + private PartyProxy composer; + + @Path("/language") + private Language language; + + @Path("/feeder_audit") + private FeederAudit feederAudit; + + @Path("/category|defining_code") + private Category categoryDefiningCode; + + @Path("/territory") + private Territory territory; + + @Id + private VersionUid versionUid; + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + 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 setSituation(SituationSection situation) { + this.situation = situation; + } + + public SituationSection getSituation() { + return this.situation ; + } + + public void setBackground(BackgroundSection background) { + this.background = background; + } + + public BackgroundSection getBackground() { + return this.background ; + } + + public void setAssessment(AssessmentSection assessment) { + this.assessment = assessment; + } + + public AssessmentSection getAssessment() { + return this.assessment ; + } + + public void setResponse(ResponseSection response) { + this.response = response; + } + + public ResponseSection getResponse() { + return this.response ; + } + + 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 setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } + + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } + + 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareCompositionContainment.java new file mode 100644 index 000000000..a8ccef628 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareCompositionContainment.java @@ -0,0 +1,66 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +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 org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.AssessmentSection; +import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.BackgroundSection; +import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.ResponseSection; +import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.SituationSection; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; + +public class OpenEREACTCareCompositionContainment extends Containment { + public SelectAqlField OPEN_E_R_E_A_C_T_CARE_COMPOSITION = new AqlFieldImp(OpenEREACTCareComposition.class, "", "OpenEREACTCareComposition", OpenEREACTCareComposition.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(OpenEREACTCareComposition.class, "/context/other_context[at0001]/items[at0002]", "extension", Cluster.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(OpenEREACTCareComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(OpenEREACTCareComposition.class, "/context/participations", "participations", Participation.class, this); + + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(OpenEREACTCareComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + + public SelectAqlField LOCATION = new AqlFieldImp(OpenEREACTCareComposition.class, "/context/location", "location", String.class, this); + + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(OpenEREACTCareComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(OpenEREACTCareComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); + + public SelectAqlField SITUATION = new AqlFieldImp(OpenEREACTCareComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "situation", SituationSection.class, this); + + public SelectAqlField BACKGROUND = new AqlFieldImp(OpenEREACTCareComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "background", BackgroundSection.class, this); + + public SelectAqlField ASSESSMENT = new AqlFieldImp(OpenEREACTCareComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "assessment", AssessmentSection.class, this); + + public SelectAqlField RESPONSE = new AqlFieldImp(OpenEREACTCareComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]", "response", ResponseSection.class, this); + + public SelectAqlField COMPOSER = new AqlFieldImp(OpenEREACTCareComposition.class, "/composer", "composer", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(OpenEREACTCareComposition.class, "/language", "language", Language.class, this); + + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(OpenEREACTCareComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(OpenEREACTCareComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); + + public SelectAqlField TERRITORY = new AqlFieldImp(OpenEREACTCareComposition.class, "/territory", "territory", Territory.class, this); + + private OpenEREACTCareCompositionContainment() { + super("openEHR-EHR-COMPOSITION.encounter.v1"); + } + + public static OpenEREACTCareCompositionContainment getInstance() { + return new OpenEREACTCareCompositionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java new file mode 100644 index 000000000..fa8789045 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java @@ -0,0 +1,78 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") +public class AbdomenSymptomCluster { + @Path("/items[at0001.1]/value|defining_code") + private CodePhrase symptomSignNameDefiningCode; + + @Path("/items[at0147]") + private List structuredBodySite; + + @Path("/items[at0153]") + private List specificDetails; + + @Path("/items[at0146]") + private List previousEpisodes; + + @Path("/items[at0063]") + private List associatedSymptomSign; + + @Path("/items[at0.1 and name/value='Presence']/value|defining_code") + private PresenceDefiningCode presenceDefiningCode; + + public void setSymptomSignNameDefiningCode(CodePhrase symptomSignNameDefiningCode) { + this.symptomSignNameDefiningCode = symptomSignNameDefiningCode; + } + + public CodePhrase getSymptomSignNameDefiningCode() { + return this.symptomSignNameDefiningCode ; + } + + public void setStructuredBodySite(List structuredBodySite) { + this.structuredBodySite = structuredBodySite; + } + + public List getStructuredBodySite() { + return this.structuredBodySite ; + } + + public void setSpecificDetails(List specificDetails) { + this.specificDetails = specificDetails; + } + + public List getSpecificDetails() { + return this.specificDetails ; + } + + public void setPreviousEpisodes(List previousEpisodes) { + this.previousEpisodes = previousEpisodes; + } + + public List getPreviousEpisodes() { + return this.previousEpisodes ; + } + + public void setAssociatedSymptomSign(List associatedSymptomSign) { + this.associatedSymptomSign = associatedSymptomSign; + } + + public List getAssociatedSymptomSign() { + return this.associatedSymptomSign ; + } + + public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { + this.presenceDefiningCode = presenceDefiningCode; + } + + public PresenceDefiningCode getPresenceDefiningCode() { + return this.presenceDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomClusterContainment.java new file mode 100644 index 000000000..2b0da992d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomClusterContainment.java @@ -0,0 +1,33 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class AbdomenSymptomClusterContainment extends Containment { + public SelectAqlField ABDOMEN_SYMPTOM_CLUSTER = new AqlFieldImp(AbdomenSymptomCluster.class, "", "AbdomenSymptomCluster", AbdomenSymptomCluster.class, this); + + public SelectAqlField SYMPTOM_SIGN_NAME_DEFINING_CODE = new AqlFieldImp(AbdomenSymptomCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningCode", CodePhrase.class, this); + + public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(AbdomenSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); + + public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(AbdomenSymptomCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); + + public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(AbdomenSymptomCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); + + public ListSelectAqlField ASSOCIATED_SYMPTOM_SIGN = new ListAqlFieldImp(AbdomenSymptomCluster.class, "/items[at0063]", "associatedSymptomSign", Cluster.class, this); + + public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(AbdomenSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); + + private AbdomenSymptomClusterContainment() { + super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); + } + + public static AbdomenSymptomClusterContainment getInstance() { + return new AbdomenSymptomClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuDefiningCode.java new file mode 100644 index 000000000..faffef258 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuDefiningCode.java @@ -0,0 +1,47 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum AcvpuDefiningCode implements EnumValueSet { + CONFUSION("Confusion", "A new onset or worsening confusion, delirium or any other altered mentation.", "local", "at0015"), + + UNRESPONSIVE("Unresponsive", "No response to voice or pain stimuli.", "local", "at0008"), + + VOICE("Voice", "Any verbal, motor or eye response to a voice stimulus.", "local", "at0006"), + + PAIN("Pain", "Any verbal, motor or eye response to a pain stimulus.", "local", "at0007"), + + ALERT("Alert", "Fully awake. Spontaneous opening of the eyes, responds to voice and have motor function.", "local", "at0005"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + AcvpuDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java new file mode 100644 index 000000000..53b2f3fd9 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java @@ -0,0 +1,92 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datastructures.ItemTree; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.acvpu.v0") +public class AcvpuScaleObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|defining_code") + private AcvpuDefiningCode acvpuDefiningCode; + + @Path("/data[at0001]/events[at0002]/state[at0013]") + private ItemTree tree; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0009]/items[at0011]") + private List extension; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setAcvpuDefiningCode(AcvpuDefiningCode acvpuDefiningCode) { + this.acvpuDefiningCode = acvpuDefiningCode; + } + + public AcvpuDefiningCode getAcvpuDefiningCode() { + return this.acvpuDefiningCode ; + } + + public void setTree(ItemTree tree) { + this.tree = tree; + } + + public ItemTree getTree() { + return this.tree ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservationContainment.java new file mode 100644 index 000000000..5a2da7e1f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservationContainment.java @@ -0,0 +1,38 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datastructures.ItemTree; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class AcvpuScaleObservationContainment extends Containment { + public SelectAqlField ACVPU_SCALE_OBSERVATION = new AqlFieldImp(AcvpuScaleObservation.class, "", "AcvpuScaleObservation", AcvpuScaleObservation.class, this); + + public SelectAqlField ACVPU_DEFINING_CODE = new AqlFieldImp(AcvpuScaleObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|defining_code", "acvpuDefiningCode", AcvpuDefiningCode.class, this); + + public SelectAqlField TREE = new AqlFieldImp(AcvpuScaleObservation.class, "/data[at0001]/events[at0002]/state[at0013]", "tree", ItemTree.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(AcvpuScaleObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(AcvpuScaleObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(AcvpuScaleObservation.class, "/protocol[at0009]/items[at0011]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(AcvpuScaleObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(AcvpuScaleObservation.class, "/language", "language", Language.class, this); + + private AcvpuScaleObservationContainment() { + super("openEHR-EHR-OBSERVATION.acvpu.v0"); + } + + public static AcvpuScaleObservationContainment getInstance() { + return new AcvpuScaleObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java new file mode 100644 index 000000000..d5c906fa7 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java @@ -0,0 +1,58 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") +public class AllergiesEvaluation { + @Path("/data[at0001]/items[at0002]/value|value") + private String synopsisValue; + + @Path("/protocol[at0003]/items[at0004]") + private List extension; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setSynopsisValue(String synopsisValue) { + this.synopsisValue = synopsisValue; + } + + public String getSynopsisValue() { + return this.synopsisValue ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluationContainment.java new file mode 100644 index 000000000..eb96cf87f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluationContainment.java @@ -0,0 +1,31 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class AllergiesEvaluationContainment extends Containment { + public SelectAqlField ALLERGIES_EVALUATION = new AqlFieldImp(AllergiesEvaluation.class, "", "AllergiesEvaluation", AllergiesEvaluation.class, this); + + public SelectAqlField SYNOPSIS_VALUE = new AqlFieldImp(AllergiesEvaluation.class, "/data[at0001]/items[at0002]/value|value", "synopsisValue", String.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(AllergiesEvaluation.class, "/protocol[at0003]/items[at0004]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(AllergiesEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(AllergiesEvaluation.class, "/language", "language", Language.class, this); + + private AllergiesEvaluationContainment() { + super("openEHR-EHR-EVALUATION.clinical_synopsis.v1"); + } + + public static AllergiesEvaluationContainment getInstance() { + return new AllergiesEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AmberFlagAcuteDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AmberFlagAcuteDefiningCode.java new file mode 100644 index 000000000..3cfbeab52 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AmberFlagAcuteDefiningCode.java @@ -0,0 +1,53 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum AmberFlagAcuteDefiningCode implements EnumValueSet { + ACUTE_DETERIORATION_IN_FUNCTIONAL_ABILITY("Acute deterioration in functional ability", "Acute deterioration in functional ability", "local", "at0091"), + + HEART_RATE91130_OR_NEW_DYSRHYTHMIA("Heart rate 91-130 or new dysrhythmia", "Heart rate 91-130 or new dysrhythmia", "local", "at0095"), + + CLINICAL_SIGNS_OF_WOUND_INFECTION("Clinical signs of wound infection", "Clinical signs of wound infection", "local", "at0097"), + + SYSTOLIC_BP91100_MMHG("Systolic BP 91-100 mmHg", "Systolic BP 91-100 mmHg", "local", "at0094"), + + TEMPERATURE36_C("Temperature <36°C", "Temperature <36°C", "local", "at0096"), + + RELATIVES_CONCERNED_ABOUT_MENTAL_STATUS_REQUIRED("Relatives concerned about mental status REQUIRED:", "Relatives concerned about mental status REQUIRED:", "local", "at0090"), + + RESPIRATORY_RATE2124("Respiratory rate 21-24", "Respiratory rate 21-24", "local", "at0093"), + + TRAUMA_SURGERY_PROCEDURE_IN_LAST8_WEEKS("Trauma / surgery / procedure in last 8 weeks", "Trauma / surgery / procedure in last 8 weeks", "local", "at0092"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + AmberFlagAcuteDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java new file mode 100644 index 000000000..2a36077f6 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java @@ -0,0 +1,53 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-SECTION.adhoc.v1") +public class AssessmentSection { + @Path("/items[openEHR-EHR-OBSERVATION.denwis.v0]") + private DenwisObservation denwis; + + @Path("/items[openEHR-EHR-SECTION.adhoc.v1 and name/value='Sepsis']") + private SepsisSection sepsis; + + @Path("/items[openEHR-EHR-SECTION.adhoc.v1 and name/value='Covid']") + private CovidSection covid; + + @Path("/items[openEHR-EHR-SECTION.adhoc.v1 and name/value='NEWS2']") + private News2Section news2; + + public void setDenwis(DenwisObservation denwis) { + this.denwis = denwis; + } + + public DenwisObservation getDenwis() { + return this.denwis ; + } + + public void setSepsis(SepsisSection sepsis) { + this.sepsis = sepsis; + } + + public SepsisSection getSepsis() { + return this.sepsis ; + } + + public void setCovid(CovidSection covid) { + this.covid = covid; + } + + public CovidSection getCovid() { + return this.covid ; + } + + public void setNews2(News2Section news2) { + this.news2 = news2; + } + + public News2Section getNews2() { + return this.news2 ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSectionContainment.java new file mode 100644 index 000000000..6ec7c205e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSectionContainment.java @@ -0,0 +1,25 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class AssessmentSectionContainment extends Containment { + public SelectAqlField ASSESSMENT_SECTION = new AqlFieldImp(AssessmentSection.class, "", "AssessmentSection", AssessmentSection.class, this); + + public SelectAqlField DENWIS = new AqlFieldImp(AssessmentSection.class, "/items[openEHR-EHR-OBSERVATION.denwis.v0]", "denwis", DenwisObservation.class, this); + + public SelectAqlField SEPSIS = new AqlFieldImp(AssessmentSection.class, "/items[openEHR-EHR-SECTION.adhoc.v1]", "sepsis", SepsisSection.class, this); + + public SelectAqlField COVID = new AqlFieldImp(AssessmentSection.class, "/items[openEHR-EHR-SECTION.adhoc.v1]", "covid", CovidSection.class, this); + + public SelectAqlField NEWS2 = new AqlFieldImp(AssessmentSection.class, "/items[openEHR-EHR-SECTION.adhoc.v1]", "news2", News2Section.class, this); + + private AssessmentSectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } + + public static AssessmentSectionContainment getInstance() { + return new AssessmentSectionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java new file mode 100644 index 000000000..7799a5574 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java @@ -0,0 +1,75 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-SECTION.adhoc.v1") +public class BackgroundSection { + @Path("/items[openEHR-EHR-OBSERVATION.height.v2 and name/value='Height']") + private HeightObservation height; + + @Path("/items[openEHR-EHR-OBSERVATION.body_weight.v2 and name/value='Weight']") + private WeightObservation weight; + + @Path("/items[openEHR-EHR-OBSERVATION.clinical_frailty_scale.v1 and name/value='Frailty']") + private FrailtyObservation frailty; + + @Path("/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Past history']") + private PastHistoryEvaluation pastHistory; + + @Path("/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Medication']") + private MedicationEvaluation medication; + + @Path("/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Allergies']") + private AllergiesEvaluation allergies; + + public void setHeight(HeightObservation height) { + this.height = height; + } + + public HeightObservation getHeight() { + return this.height ; + } + + public void setWeight(WeightObservation weight) { + this.weight = weight; + } + + public WeightObservation getWeight() { + return this.weight ; + } + + public void setFrailty(FrailtyObservation frailty) { + this.frailty = frailty; + } + + public FrailtyObservation getFrailty() { + return this.frailty ; + } + + public void setPastHistory(PastHistoryEvaluation pastHistory) { + this.pastHistory = pastHistory; + } + + public PastHistoryEvaluation getPastHistory() { + return this.pastHistory ; + } + + public void setMedication(MedicationEvaluation medication) { + this.medication = medication; + } + + public MedicationEvaluation getMedication() { + return this.medication ; + } + + public void setAllergies(AllergiesEvaluation allergies) { + this.allergies = allergies; + } + + public AllergiesEvaluation getAllergies() { + return this.allergies ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSectionContainment.java new file mode 100644 index 000000000..30369facf --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSectionContainment.java @@ -0,0 +1,29 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class BackgroundSectionContainment extends Containment { + public SelectAqlField BACKGROUND_SECTION = new AqlFieldImp(BackgroundSection.class, "", "BackgroundSection", BackgroundSection.class, this); + + public SelectAqlField HEIGHT = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-OBSERVATION.height.v2]", "height", HeightObservation.class, this); + + public SelectAqlField WEIGHT = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-OBSERVATION.body_weight.v2]", "weight", WeightObservation.class, this); + + public SelectAqlField FRAILTY = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-OBSERVATION.clinical_frailty_scale.v1]", "frailty", FrailtyObservation.class, this); + + public SelectAqlField PAST_HISTORY = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1]", "pastHistory", PastHistoryEvaluation.class, this); + + public SelectAqlField MEDICATION = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1]", "medication", MedicationEvaluation.class, this); + + public SelectAqlField ALLERGIES = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1]", "allergies", AllergiesEvaluation.class, this); + + private BackgroundSectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } + + public static BackgroundSectionContainment getInstance() { + return new BackgroundSectionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java new file mode 100644 index 000000000..621f13f4e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java @@ -0,0 +1,148 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.blood_pressure.v2") +public class BloodPressureObservation { + @Path("/data[at0001]/events[at0006]/data[at0003]/items[at0004]/value|magnitude") + private Double systolicMagnitude; + + @Path("/data[at0001]/events[at0006]/data[at0003]/items[at0004]/value|units") + private String systolicUnits; + + @Path("/data[at0001]/events[at0006]/data[at0003]/items[at0005]/value|magnitude") + private Double diastolicMagnitude; + + @Path("/data[at0001]/events[at0006]/data[at0003]/items[at0005]/value|units") + private String diastolicUnits; + + @Path("/data[at0001]/events[at0006]/state[at0007]/items[at1030]") + private Cluster exertion; + + @Path("/data[at0001]/events[at0006]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0011]/items[at1057]") + private List structuredMeasurementLocation; + + @Path("/protocol[at0011]/items[at1025]") + private Cluster device; + + @Path("/protocol[at0011]/items[at1058]") + private List extension; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setSystolicMagnitude(Double systolicMagnitude) { + this.systolicMagnitude = systolicMagnitude; + } + + public Double getSystolicMagnitude() { + return this.systolicMagnitude ; + } + + public void setSystolicUnits(String systolicUnits) { + this.systolicUnits = systolicUnits; + } + + public String getSystolicUnits() { + return this.systolicUnits ; + } + + public void setDiastolicMagnitude(Double diastolicMagnitude) { + this.diastolicMagnitude = diastolicMagnitude; + } + + public Double getDiastolicMagnitude() { + return this.diastolicMagnitude ; + } + + public void setDiastolicUnits(String diastolicUnits) { + this.diastolicUnits = diastolicUnits; + } + + public String getDiastolicUnits() { + return this.diastolicUnits ; + } + + public void setExertion(Cluster exertion) { + this.exertion = exertion; + } + + public Cluster getExertion() { + return this.exertion ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setStructuredMeasurementLocation(List structuredMeasurementLocation) { + this.structuredMeasurementLocation = structuredMeasurementLocation; + } + + public List getStructuredMeasurementLocation() { + return this.structuredMeasurementLocation ; + } + + public void setDevice(Cluster device) { + this.device = device; + } + + public Cluster getDevice() { + return this.device ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservationContainment.java new file mode 100644 index 000000000..e983654f9 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservationContainment.java @@ -0,0 +1,49 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class BloodPressureObservationContainment extends Containment { + public SelectAqlField BLOOD_PRESSURE_OBSERVATION = new AqlFieldImp(BloodPressureObservation.class, "", "BloodPressureObservation", BloodPressureObservation.class, this); + + public SelectAqlField SYSTOLIC_MAGNITUDE = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/events[at0006]/data[at0003]/items[at0004]/value|magnitude", "systolicMagnitude", Double.class, this); + + public SelectAqlField SYSTOLIC_UNITS = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/events[at0006]/data[at0003]/items[at0004]/value|units", "systolicUnits", String.class, this); + + public SelectAqlField DIASTOLIC_MAGNITUDE = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/events[at0006]/data[at0003]/items[at0005]/value|magnitude", "diastolicMagnitude", Double.class, this); + + public SelectAqlField DIASTOLIC_UNITS = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/events[at0006]/data[at0003]/items[at0005]/value|units", "diastolicUnits", String.class, this); + + public SelectAqlField EXERTION = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/events[at0006]/state[at0007]/items[at1030]", "exertion", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/events[at0006]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(BloodPressureObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField STRUCTURED_MEASUREMENT_LOCATION = new ListAqlFieldImp(BloodPressureObservation.class, "/protocol[at0011]/items[at1057]", "structuredMeasurementLocation", Cluster.class, this); + + public SelectAqlField DEVICE = new AqlFieldImp(BloodPressureObservation.class, "/protocol[at0011]/items[at1025]", "device", Cluster.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(BloodPressureObservation.class, "/protocol[at0011]/items[at1058]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(BloodPressureObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(BloodPressureObservation.class, "/language", "language", Language.class, this); + + private BloodPressureObservationContainment() { + super("openEHR-EHR-OBSERVATION.blood_pressure.v2"); + } + + public static BloodPressureObservationContainment getInstance() { + return new BloodPressureObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BreathingIndicatorDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BreathingIndicatorDefiningCode.java new file mode 100644 index 000000000..8bd16182d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BreathingIndicatorDefiningCode.java @@ -0,0 +1,46 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum BreathingIndicatorDefiningCode implements EnumValueSet { + UNABLE_TO_SPEAK_FULL_SENTENCES("Unable to speak full sentences", "Unable to speak in full sentences.", "local", "at0069"), + + NOISY_BREATHING("Noisy breathing", "Noisy breathing.", "local", "at0067"), + + SHORT_OF_BREATH("Short of breath", "Short of breath.", "local", "at0068"), + + USE_ACCESSORY_MUSCLES("Use accessory muscles", "Use accessory muscles.", "local", "at0070"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + BreathingIndicatorDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CareflowStepDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CareflowStepDefiningCode.java new file mode 100644 index 000000000..dc2e12890 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CareflowStepDefiningCode.java @@ -0,0 +1,39 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum CareflowStepDefiningCode implements EnumValueSet { + SERVICE_PLANNED("Service planned", "Service request to healthcare provider is planned.", null, "at0002"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + CareflowStepDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java new file mode 100644 index 000000000..6a6405886 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java @@ -0,0 +1,78 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") +public class ChestSymptomCluster { + @Path("/items[at0001.1]/value|defining_code") + private CodePhrase symptomSignNameDefiningCode; + + @Path("/items[at0147]") + private List structuredBodySite; + + @Path("/items[at0153]") + private List specificDetails; + + @Path("/items[at0146]") + private List previousEpisodes; + + @Path("/items[at0063]") + private List associatedSymptomSign; + + @Path("/items[at0.1 and name/value='Presence']/value|defining_code") + private PresenceDefiningCode presenceDefiningCode; + + public void setSymptomSignNameDefiningCode(CodePhrase symptomSignNameDefiningCode) { + this.symptomSignNameDefiningCode = symptomSignNameDefiningCode; + } + + public CodePhrase getSymptomSignNameDefiningCode() { + return this.symptomSignNameDefiningCode ; + } + + public void setStructuredBodySite(List structuredBodySite) { + this.structuredBodySite = structuredBodySite; + } + + public List getStructuredBodySite() { + return this.structuredBodySite ; + } + + public void setSpecificDetails(List specificDetails) { + this.specificDetails = specificDetails; + } + + public List getSpecificDetails() { + return this.specificDetails ; + } + + public void setPreviousEpisodes(List previousEpisodes) { + this.previousEpisodes = previousEpisodes; + } + + public List getPreviousEpisodes() { + return this.previousEpisodes ; + } + + public void setAssociatedSymptomSign(List associatedSymptomSign) { + this.associatedSymptomSign = associatedSymptomSign; + } + + public List getAssociatedSymptomSign() { + return this.associatedSymptomSign ; + } + + public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { + this.presenceDefiningCode = presenceDefiningCode; + } + + public PresenceDefiningCode getPresenceDefiningCode() { + return this.presenceDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomClusterContainment.java new file mode 100644 index 000000000..c899af271 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomClusterContainment.java @@ -0,0 +1,33 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class ChestSymptomClusterContainment extends Containment { + public SelectAqlField CHEST_SYMPTOM_CLUSTER = new AqlFieldImp(ChestSymptomCluster.class, "", "ChestSymptomCluster", ChestSymptomCluster.class, this); + + public SelectAqlField SYMPTOM_SIGN_NAME_DEFINING_CODE = new AqlFieldImp(ChestSymptomCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningCode", CodePhrase.class, this); + + public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(ChestSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); + + public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(ChestSymptomCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); + + public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(ChestSymptomCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); + + public ListSelectAqlField ASSOCIATED_SYMPTOM_SIGN = new ListAqlFieldImp(ChestSymptomCluster.class, "/items[at0063]", "associatedSymptomSign", Cluster.class, this); + + public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(ChestSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); + + private ChestSymptomClusterContainment() { + super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); + } + + public static ChestSymptomClusterContainment getInstance() { + return new ChestSymptomClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CirculationIndicatorDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CirculationIndicatorDefiningCode.java new file mode 100644 index 000000000..b9755cab4 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CirculationIndicatorDefiningCode.java @@ -0,0 +1,46 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum CirculationIndicatorDefiningCode implements EnumValueSet { + COLDNESS("Coldness", "Coldness.", "local", "at0098"), + + IMPAIRED_PERFUSION("Impaired perfusion", "Impaired perfusion.", "local", "at0099"), + + SWEATY_CLAMMY("Sweaty/clammy", "Sweaty/clammy.", "local", "at0097"), + + COLOUR_CHANGES_PALE_GREY("Colour changes: pale, grey", "Colour changes: pale, grey.", "local", "at0096"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + CirculationIndicatorDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ClinicalRiskCategoryDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ClinicalRiskCategoryDefiningCode.java new file mode 100644 index 000000000..c99c0e2ec --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ClinicalRiskCategoryDefiningCode.java @@ -0,0 +1,46 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum ClinicalRiskCategoryDefiningCode implements EnumValueSet { + MEDIUM("Medium", "Key threshold for urgent response.", "local", "at0059"), + + LOW("Low", "Ward-based response.", "local", "at0057"), + + LOW_MEDIUM("Low-medium", "Urgent ward-based response.", "local", "at0058"), + + HIGH("High", "Urgent or emergency response.", "local", "at0060"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + ClinicalRiskCategoryDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java new file mode 100644 index 000000000..074b2354a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java @@ -0,0 +1,169 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.health_risk-covid.v0") +public class Covid19ExposureEvaluation { + @Path("/data[at0001]/items[at0002.1]/value|defining_code") + private HealthRiskDefiningCode healthRiskDefiningCode; + + @Path("/data[at0001]/items[at0016 and name/value='Care home has suspected/confirmed Covid-19']/items[at0013.1]/value|defining_code") + private RiskFactorDefiningCode riskFactorDefiningCode; + + @Path("/data[at0001]/items[at0016 and name/value='Care home has suspected/confirmed Covid-19']/items[at0017.1]/value|defining_code") + private PresenceDefiningCode2 presenceDefiningCode; + + @Path("/data[at0001]/items[at0016 and name/value='Care home has suspected/confirmed Covid-19']/items[at0027.1]") + private List careHomeHasSuspectedConfirmedCovid19Detail; + + @Path("/data[at0001]/items[at0016 and name/value='Contact with confirmed case']/items[at0013.1]/value|defining_code") + private RiskFactorDefiningCode2 riskFactorDefiningCode2; + + @Path("/data[at0001]/items[at0016 and name/value='Contact with confirmed case']/items[at0017.1]/value|defining_code") + private PresenceDefiningCode2 presenceDefiningCode2; + + @Path("/data[at0001]/items[at0016 and name/value='Contact with confirmed case']/items[at0027.1]") + private List contactWithConfirmedCaseDetail; + + @Path("/data[at0001]/items[at0016 and name/value='Other residents/household members unwell']/items[at0013.1]/value|defining_code") + private RiskFactorDefiningCode3 riskFactorDefiningCode3; + + @Path("/data[at0001]/items[at0016 and name/value='Other residents/household members unwell']/items[at0017.1]/value|defining_code") + private PresenceDefiningCode2 presenceDefiningCode3; + + @Path("/data[at0001]/items[at0016 and name/value='Other residents/household members unwell']/items[at0027.1]") + private List otherResidentsHouseholdMembersUnwellDetail; + + @Path("/data[at0001]/items[at0003.1]/value|defining_code") + private RiskAssessmentDefiningCode riskAssessmentDefiningCode; + + @Path("/protocol[at0010]/items[at0011]") + private List extension; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setHealthRiskDefiningCode(HealthRiskDefiningCode healthRiskDefiningCode) { + this.healthRiskDefiningCode = healthRiskDefiningCode; + } + + public HealthRiskDefiningCode getHealthRiskDefiningCode() { + return this.healthRiskDefiningCode ; + } + + public void setRiskFactorDefiningCode(RiskFactorDefiningCode riskFactorDefiningCode) { + this.riskFactorDefiningCode = riskFactorDefiningCode; + } + + public RiskFactorDefiningCode getRiskFactorDefiningCode() { + return this.riskFactorDefiningCode ; + } + + public void setPresenceDefiningCode(PresenceDefiningCode2 presenceDefiningCode) { + this.presenceDefiningCode = presenceDefiningCode; + } + + public PresenceDefiningCode2 getPresenceDefiningCode() { + return this.presenceDefiningCode ; + } + + public void setCareHomeHasSuspectedConfirmedCovid19Detail( + List careHomeHasSuspectedConfirmedCovid19Detail) { + this.careHomeHasSuspectedConfirmedCovid19Detail = careHomeHasSuspectedConfirmedCovid19Detail; + } + + public List getCareHomeHasSuspectedConfirmedCovid19Detail() { + return this.careHomeHasSuspectedConfirmedCovid19Detail ; + } + + public void setRiskFactorDefiningCode2(RiskFactorDefiningCode2 riskFactorDefiningCode2) { + this.riskFactorDefiningCode2 = riskFactorDefiningCode2; + } + + public RiskFactorDefiningCode2 getRiskFactorDefiningCode2() { + return this.riskFactorDefiningCode2 ; + } + + public void setPresenceDefiningCode2(PresenceDefiningCode2 presenceDefiningCode2) { + this.presenceDefiningCode2 = presenceDefiningCode2; + } + + public PresenceDefiningCode2 getPresenceDefiningCode2() { + return this.presenceDefiningCode2 ; + } + + public void setContactWithConfirmedCaseDetail(List contactWithConfirmedCaseDetail) { + this.contactWithConfirmedCaseDetail = contactWithConfirmedCaseDetail; + } + + public List getContactWithConfirmedCaseDetail() { + return this.contactWithConfirmedCaseDetail ; + } + + public void setRiskFactorDefiningCode3(RiskFactorDefiningCode3 riskFactorDefiningCode3) { + this.riskFactorDefiningCode3 = riskFactorDefiningCode3; + } + + public RiskFactorDefiningCode3 getRiskFactorDefiningCode3() { + return this.riskFactorDefiningCode3 ; + } + + public void setPresenceDefiningCode3(PresenceDefiningCode2 presenceDefiningCode3) { + this.presenceDefiningCode3 = presenceDefiningCode3; + } + + public PresenceDefiningCode2 getPresenceDefiningCode3() { + return this.presenceDefiningCode3 ; + } + + public void setOtherResidentsHouseholdMembersUnwellDetail( + List otherResidentsHouseholdMembersUnwellDetail) { + this.otherResidentsHouseholdMembersUnwellDetail = otherResidentsHouseholdMembersUnwellDetail; + } + + public List getOtherResidentsHouseholdMembersUnwellDetail() { + return this.otherResidentsHouseholdMembersUnwellDetail ; + } + + public void setRiskAssessmentDefiningCode(RiskAssessmentDefiningCode riskAssessmentDefiningCode) { + this.riskAssessmentDefiningCode = riskAssessmentDefiningCode; + } + + public RiskAssessmentDefiningCode getRiskAssessmentDefiningCode() { + return this.riskAssessmentDefiningCode ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluationContainment.java new file mode 100644 index 000000000..90021c0a1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluationContainment.java @@ -0,0 +1,50 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class Covid19ExposureEvaluationContainment extends Containment { + public SelectAqlField COVID19_EXPOSURE_EVALUATION = new AqlFieldImp(Covid19ExposureEvaluation.class, "", "Covid19ExposureEvaluation", Covid19ExposureEvaluation.class, this); + + public SelectAqlField HEALTH_RISK_DEFINING_CODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0002.1]/value|defining_code", "healthRiskDefiningCode", HealthRiskDefiningCode.class, this); + + public SelectAqlField RISK_FACTOR_DEFINING_CODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0013.1]/value|defining_code", "riskFactorDefiningCode", RiskFactorDefiningCode.class, this); + + public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0017.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode2.class, this); + + public ListSelectAqlField CARE_HOME_HAS_SUSPECTED_CONFIRMED_COVID19_DETAIL = new ListAqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0027.1]", "careHomeHasSuspectedConfirmedCovid19Detail", Cluster.class, this); + + public SelectAqlField RISK_FACTOR_DEFINING_CODE2 = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0013.1]/value|defining_code", "riskFactorDefiningCode2", RiskFactorDefiningCode2.class, this); + + public SelectAqlField PRESENCE_DEFINING_CODE2 = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0017.1]/value|defining_code", "presenceDefiningCode2", PresenceDefiningCode2.class, this); + + public ListSelectAqlField CONTACT_WITH_CONFIRMED_CASE_DETAIL = new ListAqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0027.1]", "contactWithConfirmedCaseDetail", Cluster.class, this); + + public SelectAqlField RISK_FACTOR_DEFINING_CODE3 = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0013.1]/value|defining_code", "riskFactorDefiningCode3", RiskFactorDefiningCode3.class, this); + + public SelectAqlField PRESENCE_DEFINING_CODE3 = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0017.1]/value|defining_code", "presenceDefiningCode3", PresenceDefiningCode2.class, this); + + public ListSelectAqlField OTHER_RESIDENTS_HOUSEHOLD_MEMBERS_UNWELL_DETAIL = new ListAqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0027.1]", "otherResidentsHouseholdMembersUnwellDetail", Cluster.class, this); + + public SelectAqlField RISK_ASSESSMENT_DEFINING_CODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0003.1]/value|defining_code", "riskAssessmentDefiningCode", RiskAssessmentDefiningCode.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(Covid19ExposureEvaluation.class, "/protocol[at0010]/items[at0011]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(Covid19ExposureEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/language", "language", Language.class, this); + + private Covid19ExposureEvaluationContainment() { + super("openEHR-EHR-EVALUATION.health_risk-covid.v0"); + } + + public static Covid19ExposureEvaluationContainment getInstance() { + return new Covid19ExposureEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java new file mode 100644 index 000000000..1f5f03c16 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java @@ -0,0 +1,58 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") +public class CovidNotesEvaluation { + @Path("/data[at0001]/items[at0002]/value|value") + private String synopsisValue; + + @Path("/protocol[at0003]/items[at0004]") + private List extension; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setSynopsisValue(String synopsisValue) { + this.synopsisValue = synopsisValue; + } + + public String getSynopsisValue() { + return this.synopsisValue ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluationContainment.java new file mode 100644 index 000000000..c24e3bf4e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluationContainment.java @@ -0,0 +1,31 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class CovidNotesEvaluationContainment extends Containment { + public SelectAqlField COVID_NOTES_EVALUATION = new AqlFieldImp(CovidNotesEvaluation.class, "", "CovidNotesEvaluation", CovidNotesEvaluation.class, this); + + public SelectAqlField SYNOPSIS_VALUE = new AqlFieldImp(CovidNotesEvaluation.class, "/data[at0001]/items[at0002]/value|value", "synopsisValue", String.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(CovidNotesEvaluation.class, "/protocol[at0003]/items[at0004]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(CovidNotesEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(CovidNotesEvaluation.class, "/language", "language", Language.class, this); + + private CovidNotesEvaluationContainment() { + super("openEHR-EHR-EVALUATION.clinical_synopsis.v1"); + } + + public static CovidNotesEvaluationContainment getInstance() { + return new CovidNotesEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java new file mode 100644 index 000000000..da4c76b4a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java @@ -0,0 +1,53 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-SECTION.adhoc.v1") +public class CovidSection { + @Path("/items[openEHR-EHR-OBSERVATION.story.v1 and name/value='Covid symptoms']") + private CovidSymptomsObservation covidSymptoms; + + @Path("/items[openEHR-EHR-EVALUATION.health_risk-covid.v0 and name/value='Covid-19 exposure']") + private Covid19ExposureEvaluation covid19Exposure; + + @Path("/items[openEHR-EHR-OBSERVATION.laboratory_test_result.v1 and name/value='Latest Covid-19 test']") + private LatestCovid19TestObservation latestCovid19Test; + + @Path("/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Covid notes']") + private CovidNotesEvaluation covidNotes; + + public void setCovidSymptoms(CovidSymptomsObservation covidSymptoms) { + this.covidSymptoms = covidSymptoms; + } + + public CovidSymptomsObservation getCovidSymptoms() { + return this.covidSymptoms ; + } + + public void setCovid19Exposure(Covid19ExposureEvaluation covid19Exposure) { + this.covid19Exposure = covid19Exposure; + } + + public Covid19ExposureEvaluation getCovid19Exposure() { + return this.covid19Exposure ; + } + + public void setLatestCovid19Test(LatestCovid19TestObservation latestCovid19Test) { + this.latestCovid19Test = latestCovid19Test; + } + + public LatestCovid19TestObservation getLatestCovid19Test() { + return this.latestCovid19Test ; + } + + public void setCovidNotes(CovidNotesEvaluation covidNotes) { + this.covidNotes = covidNotes; + } + + public CovidNotesEvaluation getCovidNotes() { + return this.covidNotes ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSectionContainment.java new file mode 100644 index 000000000..8449d844e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSectionContainment.java @@ -0,0 +1,25 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class CovidSectionContainment extends Containment { + public SelectAqlField COVID_SECTION = new AqlFieldImp(CovidSection.class, "", "CovidSection", CovidSection.class, this); + + public SelectAqlField COVID_SYMPTOMS = new AqlFieldImp(CovidSection.class, "/items[openEHR-EHR-OBSERVATION.story.v1]", "covidSymptoms", CovidSymptomsObservation.class, this); + + public SelectAqlField COVID19_EXPOSURE = new AqlFieldImp(CovidSection.class, "/items[openEHR-EHR-EVALUATION.health_risk-covid.v0]", "covid19Exposure", Covid19ExposureEvaluation.class, this); + + public SelectAqlField LATEST_COVID19_TEST = new AqlFieldImp(CovidSection.class, "/items[openEHR-EHR-OBSERVATION.laboratory_test_result.v1]", "latestCovid19Test", LatestCovid19TestObservation.class, this); + + public SelectAqlField COVID_NOTES = new AqlFieldImp(CovidSection.class, "/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1]", "covidNotes", CovidNotesEvaluation.class, this); + + private CovidSectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } + + public static CovidSectionContainment getInstance() { + return new CovidSectionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java new file mode 100644 index 000000000..33e9050d5 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java @@ -0,0 +1,147 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.story.v1") +public class CovidSymptomsObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value") + private String storyValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='First symptoms']") + private FirstSymptomsCluster firstSymptoms; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Key Covid symptom']") + private List keyCovidSymptom; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Chest symptom']") + private List chestSymptom; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Abdomen symptom']") + private List abdomenSymptom; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Neuro symptom']") + private List neuroSymptom; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Other symptom']") + private List otherSymptom; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0007]/items[at0008]") + private List extension; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setStoryValue(String storyValue) { + this.storyValue = storyValue; + } + + public String getStoryValue() { + return this.storyValue ; + } + + public void setFirstSymptoms(FirstSymptomsCluster firstSymptoms) { + this.firstSymptoms = firstSymptoms; + } + + public FirstSymptomsCluster getFirstSymptoms() { + return this.firstSymptoms ; + } + + public void setKeyCovidSymptom(List keyCovidSymptom) { + this.keyCovidSymptom = keyCovidSymptom; + } + + public List getKeyCovidSymptom() { + return this.keyCovidSymptom ; + } + + public void setChestSymptom(List chestSymptom) { + this.chestSymptom = chestSymptom; + } + + public List getChestSymptom() { + return this.chestSymptom ; + } + + public void setAbdomenSymptom(List abdomenSymptom) { + this.abdomenSymptom = abdomenSymptom; + } + + public List getAbdomenSymptom() { + return this.abdomenSymptom ; + } + + public void setNeuroSymptom(List neuroSymptom) { + this.neuroSymptom = neuroSymptom; + } + + public List getNeuroSymptom() { + return this.neuroSymptom ; + } + + public void setOtherSymptom(List otherSymptom) { + this.otherSymptom = otherSymptom; + } + + public List getOtherSymptom() { + return this.otherSymptom ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservationContainment.java new file mode 100644 index 000000000..38c324465 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservationContainment.java @@ -0,0 +1,48 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class CovidSymptomsObservationContainment extends Containment { + public SelectAqlField COVID_SYMPTOMS_OBSERVATION = new AqlFieldImp(CovidSymptomsObservation.class, "", "CovidSymptomsObservation", CovidSymptomsObservation.class, this); + + public SelectAqlField STORY_VALUE = new AqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value", "storyValue", String.class, this); + + public SelectAqlField FIRST_SYMPTOMS = new AqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0]", "firstSymptoms", FirstSymptomsCluster.class, this); + + public ListSelectAqlField KEY_COVID_SYMPTOM = new ListAqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0]", "keyCovidSymptom", KeyCovidSymptomCluster.class, this); + + public ListSelectAqlField CHEST_SYMPTOM = new ListAqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0]", "chestSymptom", ChestSymptomCluster.class, this); + + public ListSelectAqlField ABDOMEN_SYMPTOM = new ListAqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0]", "abdomenSymptom", AbdomenSymptomCluster.class, this); + + public ListSelectAqlField NEURO_SYMPTOM = new ListAqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0]", "neuroSymptom", NeuroSymptomCluster.class, this); + + public ListSelectAqlField OTHER_SYMPTOM = new ListAqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0]", "otherSymptom", OtherSymptomCluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(CovidSymptomsObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(CovidSymptomsObservation.class, "/protocol[at0007]/items[at0008]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(CovidSymptomsObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(CovidSymptomsObservation.class, "/language", "language", Language.class, this); + + private CovidSymptomsObservationContainment() { + super("openEHR-EHR-OBSERVATION.story.v1"); + } + + public static CovidSymptomsObservationContainment getInstance() { + return new CovidSymptomsObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CurrentStateDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CurrentStateDefiningCode.java new file mode 100644 index 000000000..00ea91ce9 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CurrentStateDefiningCode.java @@ -0,0 +1,39 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum CurrentStateDefiningCode implements EnumValueSet { + PLANNED("planned", "planned", null, "526"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + CurrentStateDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java new file mode 100644 index 000000000..8a0fbe296 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Choice; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class DenwisAgitationIndicatorElement { + @Path("/value") + @Choice + private DenwisValueChoice2 value; + + public void setValue(DenwisValueChoice2 value) { + this.value = value; + } + + public DenwisValueChoice2 getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java new file mode 100644 index 000000000..196ef822a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java @@ -0,0 +1,18 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class DenwisBreathingIndicatorElement { + @Path("/value|defining_code") + private BreathingIndicatorDefiningCode value; + + public void setValue(BreathingIndicatorDefiningCode value) { + this.value = value; + } + + public BreathingIndicatorDefiningCode getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java new file mode 100644 index 000000000..4f9dd4bd5 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java @@ -0,0 +1,18 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class DenwisCirculationIndicatorElement { + @Path("/value|defining_code") + private CirculationIndicatorDefiningCode value; + + public void setValue(CirculationIndicatorDefiningCode value) { + this.value = value; + } + + public CirculationIndicatorDefiningCode getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java new file mode 100644 index 000000000..d363466c0 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Choice; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class DenwisMentationIndicatorElement { + @Path("/value") + @Choice + private DenwisValueChoice2 value; + + public void setValue(DenwisValueChoice2 value) { + this.value = value; + } + + public DenwisValueChoice2 getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java new file mode 100644 index 000000000..a1a43f8f3 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Choice; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class DenwisNurseSubjectiveIndicatorElement { + @Path("/value") + @Choice + private DenwisValueChoice6 value; + + public void setValue(DenwisValueChoice6 value) { + this.value = value; + } + + public DenwisValueChoice6 getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java new file mode 100644 index 000000000..c72f3b9f3 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java @@ -0,0 +1,307 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datastructures.ItemTree; +import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Long; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.denwis.v0") +public class DenwisObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0028]/value") + private DvOrdinal q1Breathing; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0062]") + private List breathingIndicator; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0033]/value") + private DvOrdinal q2Circulation; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0071]") + private List circulationIndicator; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0038]/value") + private DvOrdinal q3Temperature; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0076]") + private List temperatureIndicator; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0043]/value") + private DvOrdinal q4Mentation; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0078]") + private List mentationIndicator; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0047]/value") + private DvOrdinal q5Agitation; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0081]") + private List agitationIndicator; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0050]/value") + private DvOrdinal q6Pain; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0084]") + private List painIndicator; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0053]/value") + private DvOrdinal q7Trajectory; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0087]") + private List trajectoryIndicator; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0056]/value") + private DvOrdinal q8PatientSubjective; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0090]") + private List patientIndicator; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0059]/value") + private DvOrdinal q9NurseSubjective; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0093]") + private List nurseSubjectiveIndicator; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0027]/value|value") + private String q10OtherCommentValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|magnitude") + private Long totalScoreMagnitude; + + @Path("/data[at0001]/events[at0002]/state[at0006]") + private ItemTree tree; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0004]/items[at0005]") + private List extension; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setQ1Breathing(DvOrdinal q1Breathing) { + this.q1Breathing = q1Breathing; + } + + public DvOrdinal getQ1Breathing() { + return this.q1Breathing ; + } + + public void setBreathingIndicator(List breathingIndicator) { + this.breathingIndicator = breathingIndicator; + } + + public List getBreathingIndicator() { + return this.breathingIndicator ; + } + + public void setQ2Circulation(DvOrdinal q2Circulation) { + this.q2Circulation = q2Circulation; + } + + public DvOrdinal getQ2Circulation() { + return this.q2Circulation ; + } + + public void setCirculationIndicator( + List circulationIndicator) { + this.circulationIndicator = circulationIndicator; + } + + public List getCirculationIndicator() { + return this.circulationIndicator ; + } + + public void setQ3Temperature(DvOrdinal q3Temperature) { + this.q3Temperature = q3Temperature; + } + + public DvOrdinal getQ3Temperature() { + return this.q3Temperature ; + } + + public void setTemperatureIndicator( + List temperatureIndicator) { + this.temperatureIndicator = temperatureIndicator; + } + + public List getTemperatureIndicator() { + return this.temperatureIndicator ; + } + + public void setQ4Mentation(DvOrdinal q4Mentation) { + this.q4Mentation = q4Mentation; + } + + public DvOrdinal getQ4Mentation() { + return this.q4Mentation ; + } + + public void setMentationIndicator(List mentationIndicator) { + this.mentationIndicator = mentationIndicator; + } + + public List getMentationIndicator() { + return this.mentationIndicator ; + } + + public void setQ5Agitation(DvOrdinal q5Agitation) { + this.q5Agitation = q5Agitation; + } + + public DvOrdinal getQ5Agitation() { + return this.q5Agitation ; + } + + public void setAgitationIndicator(List agitationIndicator) { + this.agitationIndicator = agitationIndicator; + } + + public List getAgitationIndicator() { + return this.agitationIndicator ; + } + + public void setQ6Pain(DvOrdinal q6Pain) { + this.q6Pain = q6Pain; + } + + public DvOrdinal getQ6Pain() { + return this.q6Pain ; + } + + public void setPainIndicator(List painIndicator) { + this.painIndicator = painIndicator; + } + + public List getPainIndicator() { + return this.painIndicator ; + } + + public void setQ7Trajectory(DvOrdinal q7Trajectory) { + this.q7Trajectory = q7Trajectory; + } + + public DvOrdinal getQ7Trajectory() { + return this.q7Trajectory ; + } + + public void setTrajectoryIndicator(List trajectoryIndicator) { + this.trajectoryIndicator = trajectoryIndicator; + } + + public List getTrajectoryIndicator() { + return this.trajectoryIndicator ; + } + + public void setQ8PatientSubjective(DvOrdinal q8PatientSubjective) { + this.q8PatientSubjective = q8PatientSubjective; + } + + public DvOrdinal getQ8PatientSubjective() { + return this.q8PatientSubjective ; + } + + public void setPatientIndicator(List patientIndicator) { + this.patientIndicator = patientIndicator; + } + + public List getPatientIndicator() { + return this.patientIndicator ; + } + + public void setQ9NurseSubjective(DvOrdinal q9NurseSubjective) { + this.q9NurseSubjective = q9NurseSubjective; + } + + public DvOrdinal getQ9NurseSubjective() { + return this.q9NurseSubjective ; + } + + public void setNurseSubjectiveIndicator( + List nurseSubjectiveIndicator) { + this.nurseSubjectiveIndicator = nurseSubjectiveIndicator; + } + + public List getNurseSubjectiveIndicator() { + return this.nurseSubjectiveIndicator ; + } + + public void setQ10OtherCommentValue(String q10OtherCommentValue) { + this.q10OtherCommentValue = q10OtherCommentValue; + } + + public String getQ10OtherCommentValue() { + return this.q10OtherCommentValue ; + } + + public void setTotalScoreMagnitude(Long totalScoreMagnitude) { + this.totalScoreMagnitude = totalScoreMagnitude; + } + + public Long getTotalScoreMagnitude() { + return this.totalScoreMagnitude ; + } + + public void setTree(ItemTree tree) { + this.tree = tree; + } + + public ItemTree getTree() { + return this.tree ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservationContainment.java new file mode 100644 index 000000000..cc7287566 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservationContainment.java @@ -0,0 +1,79 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datastructures.ItemTree; +import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Long; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class DenwisObservationContainment extends Containment { + public SelectAqlField DENWIS_OBSERVATION = new AqlFieldImp(DenwisObservation.class, "", "DenwisObservation", DenwisObservation.class, this); + + public SelectAqlField Q1_BREATHING = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0028]/value", "q1Breathing", DvOrdinal.class, this); + + public ListSelectAqlField BREATHING_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0062]", "breathingIndicator", DenwisBreathingIndicatorElement.class, this); + + public SelectAqlField Q2_CIRCULATION = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0033]/value", "q2Circulation", DvOrdinal.class, this); + + public ListSelectAqlField CIRCULATION_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0071]", "circulationIndicator", DenwisCirculationIndicatorElement.class, this); + + public SelectAqlField Q3_TEMPERATURE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0038]/value", "q3Temperature", DvOrdinal.class, this); + + public ListSelectAqlField TEMPERATURE_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0076]", "temperatureIndicator", DenwisTemperatureIndicatorElement.class, this); + + public SelectAqlField Q4_MENTATION = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0043]/value", "q4Mentation", DvOrdinal.class, this); + + public ListSelectAqlField MENTATION_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0078]", "mentationIndicator", DenwisMentationIndicatorElement.class, this); + + public SelectAqlField Q5_AGITATION = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0047]/value", "q5Agitation", DvOrdinal.class, this); + + public ListSelectAqlField AGITATION_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0081]", "agitationIndicator", DenwisAgitationIndicatorElement.class, this); + + public SelectAqlField Q6_PAIN = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0050]/value", "q6Pain", DvOrdinal.class, this); + + public ListSelectAqlField PAIN_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0084]", "painIndicator", DenwisPainIndicatorElement.class, this); + + public SelectAqlField Q7_TRAJECTORY = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0053]/value", "q7Trajectory", DvOrdinal.class, this); + + public ListSelectAqlField TRAJECTORY_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0087]", "trajectoryIndicator", DenwisTrajectoryIndicatorElement.class, this); + + public SelectAqlField Q8_PATIENT_SUBJECTIVE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0056]/value", "q8PatientSubjective", DvOrdinal.class, this); + + public ListSelectAqlField PATIENT_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0090]", "patientIndicator", DenwisPatientIndicatorElement.class, this); + + public SelectAqlField Q9_NURSE_SUBJECTIVE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0059]/value", "q9NurseSubjective", DvOrdinal.class, this); + + public ListSelectAqlField NURSE_SUBJECTIVE_INDICATOR = new ListAqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0093]", "nurseSubjectiveIndicator", DenwisNurseSubjectiveIndicatorElement.class, this); + + public SelectAqlField Q10_OTHER_COMMENT_VALUE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0027]/value|value", "q10OtherCommentValue", String.class, this); + + public SelectAqlField TOTAL_SCORE_MAGNITUDE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|magnitude", "totalScoreMagnitude", Long.class, this); + + public SelectAqlField TREE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/state[at0006]", "tree", ItemTree.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(DenwisObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(DenwisObservation.class, "/protocol[at0004]/items[at0005]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(DenwisObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(DenwisObservation.class, "/language", "language", Language.class, this); + + private DenwisObservationContainment() { + super("openEHR-EHR-OBSERVATION.denwis.v0"); + } + + public static DenwisObservationContainment getInstance() { + return new DenwisObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java new file mode 100644 index 000000000..9957e73d7 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Choice; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class DenwisPainIndicatorElement { + @Path("/value") + @Choice + private DenwisValueChoice3 value; + + public void setValue(DenwisValueChoice3 value) { + this.value = value; + } + + public DenwisValueChoice3 getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java new file mode 100644 index 000000000..7db2a5e7f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Choice; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class DenwisPatientIndicatorElement { + @Path("/value") + @Choice + private DenwisValueChoice5 value; + + public void setValue(DenwisValueChoice5 value) { + this.value = value; + } + + public DenwisValueChoice5 getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java new file mode 100644 index 000000000..1546423c3 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Choice; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class DenwisTemperatureIndicatorElement { + @Path("/value") + @Choice + private DenwisValueChoice value; + + public void setValue(DenwisValueChoice value) { + this.value = value; + } + + public DenwisValueChoice getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java new file mode 100644 index 000000000..a786771a8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Choice; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class DenwisTrajectoryIndicatorElement { + @Path("/value") + @Choice + private DenwisValueChoice4 value; + + public void setValue(DenwisValueChoice4 value) { + this.value = value; + } + + public DenwisValueChoice4 getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice.java new file mode 100644 index 000000000..f5090eda1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +public interface DenwisValueChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice2.java new file mode 100644 index 000000000..7811059ec --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice2.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +public interface DenwisValueChoice2 { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice3.java new file mode 100644 index 000000000..dec67cc7d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice3.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +public interface DenwisValueChoice3 { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice4.java new file mode 100644 index 000000000..5f32501e4 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice4.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +public interface DenwisValueChoice4 { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice5.java new file mode 100644 index 000000000..188762530 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice5.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +public interface DenwisValueChoice5 { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice6.java new file mode 100644 index 000000000..b58b44c78 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice6.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +public interface DenwisValueChoice6 { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java new file mode 100644 index 000000000..ebe18d0cb --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class DenwisValueDvCodedText implements DenwisValueChoice { + @Path("|defining_code") + private ValueDefiningCode valueDefiningCode; + + public void setValueDefiningCode(ValueDefiningCode valueDefiningCode) { + this.valueDefiningCode = valueDefiningCode; + } + + public ValueDefiningCode getValueDefiningCode() { + return this.valueDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java new file mode 100644 index 000000000..1621d836e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class DenwisValueDvCodedText2 implements DenwisValueChoice2 { + @Path("|defining_code") + private ValueDefiningCode2 valueDefiningCode; + + public void setValueDefiningCode(ValueDefiningCode2 valueDefiningCode) { + this.valueDefiningCode = valueDefiningCode; + } + + public ValueDefiningCode2 getValueDefiningCode() { + return this.valueDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java new file mode 100644 index 000000000..0be21a1ac --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class DenwisValueDvCodedText3 implements DenwisValueChoice3 { + @Path("|defining_code") + private ValueDefiningCode3 valueDefiningCode; + + public void setValueDefiningCode(ValueDefiningCode3 valueDefiningCode) { + this.valueDefiningCode = valueDefiningCode; + } + + public ValueDefiningCode3 getValueDefiningCode() { + return this.valueDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java new file mode 100644 index 000000000..ceec297ae --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class DenwisValueDvCodedText4 implements DenwisValueChoice4 { + @Path("|defining_code") + private ValueDefiningCode4 valueDefiningCode; + + public void setValueDefiningCode(ValueDefiningCode4 valueDefiningCode) { + this.valueDefiningCode = valueDefiningCode; + } + + public ValueDefiningCode4 getValueDefiningCode() { + return this.valueDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java new file mode 100644 index 000000000..45d52851d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class DenwisValueDvCodedText5 implements DenwisValueChoice5 { + @Path("|defining_code") + private ValueDefiningCode5 valueDefiningCode; + + public void setValueDefiningCode(ValueDefiningCode5 valueDefiningCode) { + this.valueDefiningCode = valueDefiningCode; + } + + public ValueDefiningCode5 getValueDefiningCode() { + return this.valueDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java new file mode 100644 index 000000000..b8ec39f42 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class DenwisValueDvCodedText6 implements DenwisValueChoice6 { + @Path("|defining_code") + private ValueDefiningCode6 valueDefiningCode; + + public void setValueDefiningCode(ValueDefiningCode6 valueDefiningCode) { + this.valueDefiningCode = valueDefiningCode; + } + + public ValueDefiningCode6 getValueDefiningCode() { + return this.valueDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java new file mode 100644 index 000000000..113be1a3c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class DenwisValueDvText implements DenwisValueChoice { + @Path("|value") + private String valueValue; + + public void setValueValue(String valueValue) { + this.valueValue = valueValue; + } + + public String getValueValue() { + return this.valueValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java new file mode 100644 index 000000000..db19ab582 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class DenwisValueDvText2 implements DenwisValueChoice2 { + @Path("|value") + private String valueValue; + + public void setValueValue(String valueValue) { + this.valueValue = valueValue; + } + + public String getValueValue() { + return this.valueValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java new file mode 100644 index 000000000..fb3622e75 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class DenwisValueDvText3 implements DenwisValueChoice3 { + @Path("|value") + private String valueValue; + + public void setValueValue(String valueValue) { + this.valueValue = valueValue; + } + + public String getValueValue() { + return this.valueValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java new file mode 100644 index 000000000..d1c2cf438 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class DenwisValueDvText4 implements DenwisValueChoice4 { + @Path("|value") + private String valueValue; + + public void setValueValue(String valueValue) { + this.valueValue = valueValue; + } + + public String getValueValue() { + return this.valueValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java new file mode 100644 index 000000000..ea8124987 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class DenwisValueDvText5 implements DenwisValueChoice5 { + @Path("|value") + private String valueValue; + + public void setValueValue(String valueValue) { + this.valueValue = valueValue; + } + + public String getValueValue() { + return this.valueValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java new file mode 100644 index 000000000..a3dd218c3 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class DenwisValueDvText6 implements DenwisValueChoice6 { + @Path("|value") + private String valueValue; + + public void setValueValue(String valueValue) { + this.valueValue = valueValue; + } + + public String getValueValue() { + return this.valueValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java new file mode 100644 index 000000000..ac608eb0c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java @@ -0,0 +1,125 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") +public class FirstSymptomsCluster { + @Path("/items[at0001.1]/value|defining_code") + private CodePhrase symptomSignNameDefiningCode; + + @Path("/items[at0147]") + private List structuredBodySite; + + @Path("/items[at0152 and name/value='Date of onset of first symptoms']/value|value") + private TemporalAccessor dateOfOnsetOfFirstSymptomsValue; + + @Path("/items[at0028]/value|value") + private TemporalAmount durationValue; + + @Path("/items[at0180 and name/value='Trend']/value|defining_code") + private TrendDefiningCode trendDefiningCode; + + @Path("/items[at0155]/value|value") + private String impactValue; + + @Path("/items[at0153]") + private List specificDetails; + + @Path("/items[at0146]") + private List previousEpisodes; + + @Path("/items[at0063]") + private List associatedSymptomSign; + + @Path("/items[at0.1]/value|defining_code") + private PresenceDefiningCode presenceDefiningCode; + + public void setSymptomSignNameDefiningCode(CodePhrase symptomSignNameDefiningCode) { + this.symptomSignNameDefiningCode = symptomSignNameDefiningCode; + } + + public CodePhrase getSymptomSignNameDefiningCode() { + return this.symptomSignNameDefiningCode ; + } + + public void setStructuredBodySite(List structuredBodySite) { + this.structuredBodySite = structuredBodySite; + } + + public List getStructuredBodySite() { + return this.structuredBodySite ; + } + + public void setDateOfOnsetOfFirstSymptomsValue(TemporalAccessor dateOfOnsetOfFirstSymptomsValue) { + this.dateOfOnsetOfFirstSymptomsValue = dateOfOnsetOfFirstSymptomsValue; + } + + public TemporalAccessor getDateOfOnsetOfFirstSymptomsValue() { + return this.dateOfOnsetOfFirstSymptomsValue ; + } + + public void setDurationValue(TemporalAmount durationValue) { + this.durationValue = durationValue; + } + + public TemporalAmount getDurationValue() { + return this.durationValue ; + } + + public void setTrendDefiningCode(TrendDefiningCode trendDefiningCode) { + this.trendDefiningCode = trendDefiningCode; + } + + public TrendDefiningCode getTrendDefiningCode() { + return this.trendDefiningCode ; + } + + public void setImpactValue(String impactValue) { + this.impactValue = impactValue; + } + + public String getImpactValue() { + return this.impactValue ; + } + + public void setSpecificDetails(List specificDetails) { + this.specificDetails = specificDetails; + } + + public List getSpecificDetails() { + return this.specificDetails ; + } + + public void setPreviousEpisodes(List previousEpisodes) { + this.previousEpisodes = previousEpisodes; + } + + public List getPreviousEpisodes() { + return this.previousEpisodes ; + } + + public void setAssociatedSymptomSign(List associatedSymptomSign) { + this.associatedSymptomSign = associatedSymptomSign; + } + + public List getAssociatedSymptomSign() { + return this.associatedSymptomSign ; + } + + public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { + this.presenceDefiningCode = presenceDefiningCode; + } + + public PresenceDefiningCode getPresenceDefiningCode() { + return this.presenceDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java new file mode 100644 index 000000000..dd6d4bbdf --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class FirstSymptomsClusterContainment extends Containment { + public SelectAqlField FIRST_SYMPTOMS_CLUSTER = new AqlFieldImp(FirstSymptomsCluster.class, "", "FirstSymptomsCluster", FirstSymptomsCluster.class, this); + + public SelectAqlField SYMPTOM_SIGN_NAME_DEFINING_CODE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningCode", CodePhrase.class, this); + + public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(FirstSymptomsCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); + + public SelectAqlField DATE_OF_ONSET_OF_FIRST_SYMPTOMS_VALUE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0152]/value|value", "dateOfOnsetOfFirstSymptomsValue", TemporalAccessor.class, this); + + public SelectAqlField DURATION_VALUE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0028]/value|value", "durationValue", TemporalAmount.class, this); + + public SelectAqlField TREND_DEFINING_CODE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0180]/value|defining_code", "trendDefiningCode", TrendDefiningCode.class, this); + + public SelectAqlField IMPACT_VALUE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0155]/value|value", "impactValue", String.class, this); + + public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(FirstSymptomsCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); + + public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(FirstSymptomsCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); + + public ListSelectAqlField ASSOCIATED_SYMPTOM_SIGN = new ListAqlFieldImp(FirstSymptomsCluster.class, "/items[at0063]", "associatedSymptomSign", Cluster.class, this); + + public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); + + private FirstSymptomsClusterContainment() { + super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); + } + + public static FirstSymptomsClusterContainment getInstance() { + return new FirstSymptomsClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java new file mode 100644 index 000000000..f4af802a0 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java @@ -0,0 +1,81 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.clinical_frailty_scale.v1") +public class FrailtyObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value") + private DvOrdinal assessment; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0014]/items[at0015]") + private List extension; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setAssessment(DvOrdinal assessment) { + this.assessment = assessment; + } + + public DvOrdinal getAssessment() { + return this.assessment ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservationContainment.java new file mode 100644 index 000000000..5af020b9b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservationContainment.java @@ -0,0 +1,36 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class FrailtyObservationContainment extends Containment { + public SelectAqlField FRAILTY_OBSERVATION = new AqlFieldImp(FrailtyObservation.class, "", "FrailtyObservation", FrailtyObservation.class, this); + + public SelectAqlField ASSESSMENT = new AqlFieldImp(FrailtyObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value", "assessment", DvOrdinal.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(FrailtyObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(FrailtyObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(FrailtyObservation.class, "/protocol[at0014]/items[at0015]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(FrailtyObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(FrailtyObservation.class, "/language", "language", Language.class, this); + + private FrailtyObservationContainment() { + super("openEHR-EHR-OBSERVATION.clinical_frailty_scale.v1"); + } + + public static FrailtyObservationContainment getInstance() { + return new FrailtyObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HealthRiskDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HealthRiskDefiningCode.java new file mode 100644 index 000000000..8717e7b68 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HealthRiskDefiningCode.java @@ -0,0 +1,39 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum HealthRiskDefiningCode implements EnumValueSet { + COVID19_RISK_ASSESSMENT("COVID-19 Risk assessment", "Assessment of risk of COVID-19 infection.", "local", "at0.1"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + HealthRiskDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java new file mode 100644 index 000000000..932ecf48c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java @@ -0,0 +1,116 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datastructures.ItemTree; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.height.v2") +public class HeightObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude") + private Double heightLengthMagnitude; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units") + private String heightLengthUnits; + + @Path("/data[at0001]/events[at0002]/state[at0013]") + private ItemTree tree; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0007]/items[at0011]") + private Cluster device; + + @Path("/protocol[at0007]/items[at0022]") + private List extension; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setHeightLengthMagnitude(Double heightLengthMagnitude) { + this.heightLengthMagnitude = heightLengthMagnitude; + } + + public Double getHeightLengthMagnitude() { + return this.heightLengthMagnitude ; + } + + public void setHeightLengthUnits(String heightLengthUnits) { + this.heightLengthUnits = heightLengthUnits; + } + + public String getHeightLengthUnits() { + return this.heightLengthUnits ; + } + + public void setTree(ItemTree tree) { + this.tree = tree; + } + + public ItemTree getTree() { + return this.tree ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setDevice(Cluster device) { + this.device = device; + } + + public Cluster getDevice() { + return this.device ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservationContainment.java new file mode 100644 index 000000000..6e7a8e2b5 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservationContainment.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datastructures.ItemTree; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class HeightObservationContainment extends Containment { + public SelectAqlField HEIGHT_OBSERVATION = new AqlFieldImp(HeightObservation.class, "", "HeightObservation", HeightObservation.class, this); + + public SelectAqlField HEIGHT_LENGTH_MAGNITUDE = new AqlFieldImp(HeightObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude", "heightLengthMagnitude", Double.class, this); + + public SelectAqlField HEIGHT_LENGTH_UNITS = new AqlFieldImp(HeightObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units", "heightLengthUnits", String.class, this); + + public SelectAqlField TREE = new AqlFieldImp(HeightObservation.class, "/data[at0001]/events[at0002]/state[at0013]", "tree", ItemTree.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(HeightObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(HeightObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public SelectAqlField DEVICE = new AqlFieldImp(HeightObservation.class, "/protocol[at0007]/items[at0011]", "device", Cluster.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(HeightObservation.class, "/protocol[at0007]/items[at0022]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(HeightObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(HeightObservation.class, "/language", "language", Language.class, this); + + private HeightObservationContainment() { + super("openEHR-EHR-OBSERVATION.height.v2"); + } + + public static HeightObservationContainment getInstance() { + return new HeightObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java new file mode 100644 index 000000000..42d83d5f2 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java @@ -0,0 +1,78 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") +public class KeyCovidSymptomCluster { + @Path("/items[at0001.1]/value|defining_code") + private CodePhrase symptomSignNameDefiningCode; + + @Path("/items[at0147]") + private List structuredBodySite; + + @Path("/items[at0153]") + private List specificDetails; + + @Path("/items[at0146]") + private List previousEpisodes; + + @Path("/items[at0063]") + private List associatedSymptomSign; + + @Path("/items[at0.1 and name/value='Presence']/value|defining_code") + private PresenceDefiningCode presenceDefiningCode; + + public void setSymptomSignNameDefiningCode(CodePhrase symptomSignNameDefiningCode) { + this.symptomSignNameDefiningCode = symptomSignNameDefiningCode; + } + + public CodePhrase getSymptomSignNameDefiningCode() { + return this.symptomSignNameDefiningCode ; + } + + public void setStructuredBodySite(List structuredBodySite) { + this.structuredBodySite = structuredBodySite; + } + + public List getStructuredBodySite() { + return this.structuredBodySite ; + } + + public void setSpecificDetails(List specificDetails) { + this.specificDetails = specificDetails; + } + + public List getSpecificDetails() { + return this.specificDetails ; + } + + public void setPreviousEpisodes(List previousEpisodes) { + this.previousEpisodes = previousEpisodes; + } + + public List getPreviousEpisodes() { + return this.previousEpisodes ; + } + + public void setAssociatedSymptomSign(List associatedSymptomSign) { + this.associatedSymptomSign = associatedSymptomSign; + } + + public List getAssociatedSymptomSign() { + return this.associatedSymptomSign ; + } + + public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { + this.presenceDefiningCode = presenceDefiningCode; + } + + public PresenceDefiningCode getPresenceDefiningCode() { + return this.presenceDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomClusterContainment.java new file mode 100644 index 000000000..f072031f2 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomClusterContainment.java @@ -0,0 +1,33 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class KeyCovidSymptomClusterContainment extends Containment { + public SelectAqlField KEY_COVID_SYMPTOM_CLUSTER = new AqlFieldImp(KeyCovidSymptomCluster.class, "", "KeyCovidSymptomCluster", KeyCovidSymptomCluster.class, this); + + public SelectAqlField SYMPTOM_SIGN_NAME_DEFINING_CODE = new AqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningCode", CodePhrase.class, this); + + public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); + + public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); + + public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); + + public ListSelectAqlField ASSOCIATED_SYMPTOM_SIGN = new ListAqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0063]", "associatedSymptomSign", Cluster.class, this); + + public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); + + private KeyCovidSymptomClusterContainment() { + super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); + } + + public static KeyCovidSymptomClusterContainment getInstance() { + return new KeyCovidSymptomClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java new file mode 100644 index 000000000..017957406 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java @@ -0,0 +1,194 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +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.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.laboratory_test_result.v1") +public class LatestCovid19TestObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value") + private String testNameValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0065]") + private List specimenDetail; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0097]") + private List testResult; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0098]/value|value") + private String testDiagnosisValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0122]") + private List structuredTestDiagnosis; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0118]") + private List multimediaRepresentation; + + @Path("/data[at0001]/events[at0002]/state[at0112]/items[at0114]") + private List structuredConfoundingFactors; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0004]/items[at0017]") + private Cluster receivingLaboratory; + + @Path("/protocol[at0004]/items[at0094]") + private List testRequestDetails; + + @Path("/protocol[at0004]/items[at0110]") + private List testingDetails; + + @Path("/protocol[at0004]/items[at0117]") + private List extension; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0073]/value") + @Choice + private LatestCovid19TestOverallTestStatusChoice overallTestStatus; + + public void setTestNameValue(String testNameValue) { + this.testNameValue = testNameValue; + } + + public String getTestNameValue() { + return this.testNameValue ; + } + + public void setSpecimenDetail(List specimenDetail) { + this.specimenDetail = specimenDetail; + } + + public List getSpecimenDetail() { + return this.specimenDetail ; + } + + public void setTestResult(List testResult) { + this.testResult = testResult; + } + + public List getTestResult() { + return this.testResult ; + } + + public void setTestDiagnosisValue(String testDiagnosisValue) { + this.testDiagnosisValue = testDiagnosisValue; + } + + public String getTestDiagnosisValue() { + return this.testDiagnosisValue ; + } + + public void setStructuredTestDiagnosis(List structuredTestDiagnosis) { + this.structuredTestDiagnosis = structuredTestDiagnosis; + } + + public List getStructuredTestDiagnosis() { + return this.structuredTestDiagnosis ; + } + + public void setMultimediaRepresentation(List multimediaRepresentation) { + this.multimediaRepresentation = multimediaRepresentation; + } + + public List getMultimediaRepresentation() { + return this.multimediaRepresentation ; + } + + public void setStructuredConfoundingFactors(List structuredConfoundingFactors) { + this.structuredConfoundingFactors = structuredConfoundingFactors; + } + + public List getStructuredConfoundingFactors() { + return this.structuredConfoundingFactors ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setReceivingLaboratory(Cluster receivingLaboratory) { + this.receivingLaboratory = receivingLaboratory; + } + + public Cluster getReceivingLaboratory() { + return this.receivingLaboratory ; + } + + public void setTestRequestDetails( + List testRequestDetails) { + this.testRequestDetails = testRequestDetails; + } + + public List getTestRequestDetails() { + return this.testRequestDetails ; + } + + public void setTestingDetails(List testingDetails) { + this.testingDetails = testingDetails; + } + + public List getTestingDetails() { + return this.testingDetails ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setOverallTestStatus(LatestCovid19TestOverallTestStatusChoice overallTestStatus) { + this.overallTestStatus = overallTestStatus; + } + + public LatestCovid19TestOverallTestStatusChoice getOverallTestStatus() { + return this.overallTestStatus ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservationContainment.java new file mode 100644 index 000000000..7a8edbedf --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservationContainment.java @@ -0,0 +1,56 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class LatestCovid19TestObservationContainment extends Containment { + public SelectAqlField LATEST_COVID19_TEST_OBSERVATION = new AqlFieldImp(LatestCovid19TestObservation.class, "", "LatestCovid19TestObservation", LatestCovid19TestObservation.class, this); + + public SelectAqlField TEST_NAME_VALUE = new AqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value", "testNameValue", String.class, this); + + public ListSelectAqlField SPECIMEN_DETAIL = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0065]", "specimenDetail", Cluster.class, this); + + public ListSelectAqlField TEST_RESULT = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0097]", "testResult", Cluster.class, this); + + public SelectAqlField TEST_DIAGNOSIS_VALUE = new AqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0098]/value|value", "testDiagnosisValue", String.class, this); + + public ListSelectAqlField STRUCTURED_TEST_DIAGNOSIS = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0122]", "structuredTestDiagnosis", Cluster.class, this); + + public ListSelectAqlField MULTIMEDIA_REPRESENTATION = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0118]", "multimediaRepresentation", Cluster.class, this); + + public ListSelectAqlField STRUCTURED_CONFOUNDING_FACTORS = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/state[at0112]/items[at0114]", "structuredConfoundingFactors", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public SelectAqlField RECEIVING_LABORATORY = new AqlFieldImp(LatestCovid19TestObservation.class, "/protocol[at0004]/items[at0017]", "receivingLaboratory", Cluster.class, this); + + public ListSelectAqlField TEST_REQUEST_DETAILS = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/protocol[at0004]/items[at0094]", "testRequestDetails", LatestCovid19TestTestRequestDetailsCluster.class, this); + + public ListSelectAqlField TESTING_DETAILS = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/protocol[at0004]/items[at0110]", "testingDetails", Cluster.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(LatestCovid19TestObservation.class, "/protocol[at0004]/items[at0117]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(LatestCovid19TestObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(LatestCovid19TestObservation.class, "/language", "language", Language.class, this); + + public SelectAqlField OVERALL_TEST_STATUS = new AqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0073]/value", "overallTestStatus", LatestCovid19TestOverallTestStatusChoice.class, this); + + private LatestCovid19TestObservationContainment() { + super("openEHR-EHR-OBSERVATION.laboratory_test_result.v1"); + } + + public static LatestCovid19TestObservationContainment getInstance() { + return new LatestCovid19TestObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusChoice.java new file mode 100644 index 000000000..e264889eb --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +public interface LatestCovid19TestOverallTestStatusChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvCodedText.java new file mode 100644 index 000000000..22c633880 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvCodedText.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class LatestCovid19TestOverallTestStatusDvCodedText implements LatestCovid19TestOverallTestStatusChoice { + @Path("|defining_code") + private OverallTestStatusDefiningCode overallTestStatusDefiningCode; + + public void setOverallTestStatusDefiningCode( + OverallTestStatusDefiningCode overallTestStatusDefiningCode) { + this.overallTestStatusDefiningCode = overallTestStatusDefiningCode; + } + + public OverallTestStatusDefiningCode getOverallTestStatusDefiningCode() { + return this.overallTestStatusDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java new file mode 100644 index 000000000..ffa8a2859 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class LatestCovid19TestOverallTestStatusDvText implements LatestCovid19TestOverallTestStatusChoice { + @Path("|value") + private String overallTestStatusValue; + + public void setOverallTestStatusValue(String overallTestStatusValue) { + this.overallTestStatusValue = overallTestStatusValue; + } + + public String getOverallTestStatusValue() { + return this.overallTestStatusValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java new file mode 100644 index 000000000..af4946d03 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java @@ -0,0 +1,31 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class LatestCovid19TestTestRequestDetailsCluster { + @Path("/items[at0090]") + private Cluster requester; + + @Path("/items[at0035]") + private List distributionList; + + public void setRequester(Cluster requester) { + this.requester = requester; + } + + public Cluster getRequester() { + return this.requester ; + } + + public void setDistributionList(List distributionList) { + this.distributionList = distributionList; + } + + public List getDistributionList() { + return this.distributionList ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java new file mode 100644 index 000000000..984525739 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java @@ -0,0 +1,58 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") +public class MedicationEvaluation { + @Path("/data[at0001]/items[at0002]/value|value") + private String synopsisValue; + + @Path("/protocol[at0003]/items[at0004]") + private List extension; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setSynopsisValue(String synopsisValue) { + this.synopsisValue = synopsisValue; + } + + public String getSynopsisValue() { + return this.synopsisValue ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluationContainment.java new file mode 100644 index 000000000..a279c542c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluationContainment.java @@ -0,0 +1,31 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class MedicationEvaluationContainment extends Containment { + public SelectAqlField MEDICATION_EVALUATION = new AqlFieldImp(MedicationEvaluation.class, "", "MedicationEvaluation", MedicationEvaluation.class, this); + + public SelectAqlField SYNOPSIS_VALUE = new AqlFieldImp(MedicationEvaluation.class, "/data[at0001]/items[at0002]/value|value", "synopsisValue", String.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(MedicationEvaluation.class, "/protocol[at0003]/items[at0004]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(MedicationEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(MedicationEvaluation.class, "/language", "language", Language.class, this); + + private MedicationEvaluationContainment() { + super("openEHR-EHR-EVALUATION.clinical_synopsis.v1"); + } + + public static MedicationEvaluationContainment getInstance() { + return new MedicationEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/N999FlagDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/N999FlagDefiningCode.java new file mode 100644 index 000000000..689b3db4e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/N999FlagDefiningCode.java @@ -0,0 +1,49 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum N999FlagDefiningCode implements EnumValueSet { + N_I_FEEL_I_MIGHT_DIE("‘I feel I might die’", "The patient stated ‘I feel I might die’.", "local", "at0041"), + + EXTREME_SHIVERING_OR_MUSCLE_PAIN("Extreme shivering or muscle pain", "The patient has extreme shivering or muscle pain.", "local", "at0038"), + + SEVERE_BREATHLESSNESS("Severe breathlessness", "The patient has severe breathlessness.", "local", "at0040"), + + SKIN_MOTTLED_ASHEN_BLUE_OR_VERY_PALE("Skin mottled, ashen, blue or very pale", "The patient has skin which is mottled, ashen, blue or very pale.", "local", "at0042"), + + SLURRED_SPEECH_OR_CONFUSION("Slurred speech or confusion", "The patient has slurred speech or confusion.", "local", "at0037"), + + PASSING_NO_URINE_IN_A_DAY("Passing no urine (in a day)", "The patient is passing no urine (in a day).", "local", "at0039"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + N999FlagDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java new file mode 100644 index 000000000..41fdd3ada --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java @@ -0,0 +1,78 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") +public class NeuroSymptomCluster { + @Path("/items[at0001.1]/value|defining_code") + private CodePhrase symptomSignNameDefiningCode; + + @Path("/items[at0147]") + private List structuredBodySite; + + @Path("/items[at0153]") + private List specificDetails; + + @Path("/items[at0146]") + private List previousEpisodes; + + @Path("/items[at0063]") + private List associatedSymptomSign; + + @Path("/items[at0.1 and name/value='Presence']/value|defining_code") + private PresenceDefiningCode presenceDefiningCode; + + public void setSymptomSignNameDefiningCode(CodePhrase symptomSignNameDefiningCode) { + this.symptomSignNameDefiningCode = symptomSignNameDefiningCode; + } + + public CodePhrase getSymptomSignNameDefiningCode() { + return this.symptomSignNameDefiningCode ; + } + + public void setStructuredBodySite(List structuredBodySite) { + this.structuredBodySite = structuredBodySite; + } + + public List getStructuredBodySite() { + return this.structuredBodySite ; + } + + public void setSpecificDetails(List specificDetails) { + this.specificDetails = specificDetails; + } + + public List getSpecificDetails() { + return this.specificDetails ; + } + + public void setPreviousEpisodes(List previousEpisodes) { + this.previousEpisodes = previousEpisodes; + } + + public List getPreviousEpisodes() { + return this.previousEpisodes ; + } + + public void setAssociatedSymptomSign(List associatedSymptomSign) { + this.associatedSymptomSign = associatedSymptomSign; + } + + public List getAssociatedSymptomSign() { + return this.associatedSymptomSign ; + } + + public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { + this.presenceDefiningCode = presenceDefiningCode; + } + + public PresenceDefiningCode getPresenceDefiningCode() { + return this.presenceDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomClusterContainment.java new file mode 100644 index 000000000..f73d095b8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomClusterContainment.java @@ -0,0 +1,33 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class NeuroSymptomClusterContainment extends Containment { + public SelectAqlField NEURO_SYMPTOM_CLUSTER = new AqlFieldImp(NeuroSymptomCluster.class, "", "NeuroSymptomCluster", NeuroSymptomCluster.class, this); + + public SelectAqlField SYMPTOM_SIGN_NAME_DEFINING_CODE = new AqlFieldImp(NeuroSymptomCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningCode", CodePhrase.class, this); + + public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(NeuroSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); + + public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(NeuroSymptomCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); + + public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(NeuroSymptomCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); + + public ListSelectAqlField ASSOCIATED_SYMPTOM_SIGN = new ListAqlFieldImp(NeuroSymptomCluster.class, "/items[at0063]", "associatedSymptomSign", Cluster.class, this); + + public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(NeuroSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); + + private NeuroSymptomClusterContainment() { + super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); + } + + public static NeuroSymptomClusterContainment getInstance() { + return new NeuroSymptomClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java new file mode 100644 index 000000000..01a94a542 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java @@ -0,0 +1,182 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Long; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.news2.v1") +public class News2ScoreObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value") + private DvOrdinal respirationRate; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0029]/value") + private DvOrdinal spoScale1; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0047]/value") + private DvOrdinal spoScale2; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0034]/value") + private DvOrdinal airOrOxygen; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value") + private DvOrdinal systolicBloodPressure; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value") + private DvOrdinal pulse; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value") + private DvOrdinal consciousness; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value") + private DvOrdinal temperature; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0028]/value|magnitude") + private Long totalScoreMagnitude; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0056]/value|defining_code") + private ClinicalRiskCategoryDefiningCode clinicalRiskCategoryDefiningCode; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0045]/items[at0046]") + private List extension; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setRespirationRate(DvOrdinal respirationRate) { + this.respirationRate = respirationRate; + } + + public DvOrdinal getRespirationRate() { + return this.respirationRate ; + } + + public void setSpoScale1(DvOrdinal spoScale1) { + this.spoScale1 = spoScale1; + } + + public DvOrdinal getSpoScale1() { + return this.spoScale1 ; + } + + public void setSpoScale2(DvOrdinal spoScale2) { + this.spoScale2 = spoScale2; + } + + public DvOrdinal getSpoScale2() { + return this.spoScale2 ; + } + + public void setAirOrOxygen(DvOrdinal airOrOxygen) { + this.airOrOxygen = airOrOxygen; + } + + public DvOrdinal getAirOrOxygen() { + return this.airOrOxygen ; + } + + public void setSystolicBloodPressure(DvOrdinal systolicBloodPressure) { + this.systolicBloodPressure = systolicBloodPressure; + } + + public DvOrdinal getSystolicBloodPressure() { + return this.systolicBloodPressure ; + } + + public void setPulse(DvOrdinal pulse) { + this.pulse = pulse; + } + + public DvOrdinal getPulse() { + return this.pulse ; + } + + public void setConsciousness(DvOrdinal consciousness) { + this.consciousness = consciousness; + } + + public DvOrdinal getConsciousness() { + return this.consciousness ; + } + + public void setTemperature(DvOrdinal temperature) { + this.temperature = temperature; + } + + public DvOrdinal getTemperature() { + return this.temperature ; + } + + public void setTotalScoreMagnitude(Long totalScoreMagnitude) { + this.totalScoreMagnitude = totalScoreMagnitude; + } + + public Long getTotalScoreMagnitude() { + return this.totalScoreMagnitude ; + } + + public void setClinicalRiskCategoryDefiningCode( + ClinicalRiskCategoryDefiningCode clinicalRiskCategoryDefiningCode) { + this.clinicalRiskCategoryDefiningCode = clinicalRiskCategoryDefiningCode; + } + + public ClinicalRiskCategoryDefiningCode getClinicalRiskCategoryDefiningCode() { + return this.clinicalRiskCategoryDefiningCode ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservationContainment.java new file mode 100644 index 000000000..e4924dfb2 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservationContainment.java @@ -0,0 +1,55 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Long; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class News2ScoreObservationContainment extends Containment { + public SelectAqlField NEWS2_SCORE_OBSERVATION = new AqlFieldImp(News2ScoreObservation.class, "", "News2ScoreObservation", News2ScoreObservation.class, this); + + public SelectAqlField RESPIRATION_RATE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value", "respirationRate", DvOrdinal.class, this); + + public SelectAqlField SPO_SCALE1 = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0029]/value", "spoScale1", DvOrdinal.class, this); + + public SelectAqlField SPO_SCALE2 = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0047]/value", "spoScale2", DvOrdinal.class, this); + + public SelectAqlField AIR_OR_OXYGEN = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0034]/value", "airOrOxygen", DvOrdinal.class, this); + + public SelectAqlField SYSTOLIC_BLOOD_PRESSURE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value", "systolicBloodPressure", DvOrdinal.class, this); + + public SelectAqlField PULSE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value", "pulse", DvOrdinal.class, this); + + public SelectAqlField CONSCIOUSNESS = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value", "consciousness", DvOrdinal.class, this); + + public SelectAqlField TEMPERATURE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value", "temperature", DvOrdinal.class, this); + + public SelectAqlField TOTAL_SCORE_MAGNITUDE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0028]/value|magnitude", "totalScoreMagnitude", Long.class, this); + + public SelectAqlField CLINICAL_RISK_CATEGORY_DEFINING_CODE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0056]/value|defining_code", "clinicalRiskCategoryDefiningCode", ClinicalRiskCategoryDefiningCode.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(News2ScoreObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(News2ScoreObservation.class, "/protocol[at0045]/items[at0046]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(News2ScoreObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(News2ScoreObservation.class, "/language", "language", Language.class, this); + + private News2ScoreObservationContainment() { + super("openEHR-EHR-OBSERVATION.news2.v1"); + } + + public static News2ScoreObservationContainment getInstance() { + return new News2ScoreObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java new file mode 100644 index 000000000..ff28009d6 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java @@ -0,0 +1,86 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-SECTION.adhoc.v1") +public class News2Section { + @Path("/items[openEHR-EHR-OBSERVATION.body_temperature.v1 and name/value='Temperature']") + private TemperatureObservation temperature; + + @Path("/items[openEHR-EHR-OBSERVATION.pulse_oximetry.v1]") + private PulseOximetryObservation pulseOximetry; + + @Path("/items[openEHR-EHR-OBSERVATION.pulse.v1 and name/value='Pulse']") + private PulseObservation pulse; + + @Path("/items[openEHR-EHR-OBSERVATION.respiration.v1]") + private RespirationsObservation respirations; + + @Path("/items[openEHR-EHR-OBSERVATION.acvpu.v0]") + private AcvpuScaleObservation acvpuScale; + + @Path("/items[openEHR-EHR-OBSERVATION.blood_pressure.v2]") + private BloodPressureObservation bloodPressure; + + @Path("/items[openEHR-EHR-OBSERVATION.news2.v1]") + private News2ScoreObservation news2Score; + + public void setTemperature(TemperatureObservation temperature) { + this.temperature = temperature; + } + + public TemperatureObservation getTemperature() { + return this.temperature ; + } + + public void setPulseOximetry(PulseOximetryObservation pulseOximetry) { + this.pulseOximetry = pulseOximetry; + } + + public PulseOximetryObservation getPulseOximetry() { + return this.pulseOximetry ; + } + + public void setPulse(PulseObservation pulse) { + this.pulse = pulse; + } + + public PulseObservation getPulse() { + return this.pulse ; + } + + public void setRespirations(RespirationsObservation respirations) { + this.respirations = respirations; + } + + public RespirationsObservation getRespirations() { + return this.respirations ; + } + + public void setAcvpuScale(AcvpuScaleObservation acvpuScale) { + this.acvpuScale = acvpuScale; + } + + public AcvpuScaleObservation getAcvpuScale() { + return this.acvpuScale ; + } + + public void setBloodPressure(BloodPressureObservation bloodPressure) { + this.bloodPressure = bloodPressure; + } + + public BloodPressureObservation getBloodPressure() { + return this.bloodPressure ; + } + + public void setNews2Score(News2ScoreObservation news2Score) { + this.news2Score = news2Score; + } + + public News2ScoreObservation getNews2Score() { + return this.news2Score ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2SectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2SectionContainment.java new file mode 100644 index 000000000..b33bbc2f5 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2SectionContainment.java @@ -0,0 +1,31 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class News2SectionContainment extends Containment { + public SelectAqlField NEWS2_SECTION = new AqlFieldImp(News2Section.class, "", "News2Section", News2Section.class, this); + + public SelectAqlField TEMPERATURE = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.body_temperature.v1]", "temperature", TemperatureObservation.class, this); + + public SelectAqlField PULSE_OXIMETRY = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.pulse_oximetry.v1]", "pulseOximetry", PulseOximetryObservation.class, this); + + public SelectAqlField PULSE = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.pulse.v1]", "pulse", PulseObservation.class, this); + + public SelectAqlField RESPIRATIONS = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.respiration.v1]", "respirations", RespirationsObservation.class, this); + + public SelectAqlField ACVPU_SCALE = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.acvpu.v0]", "acvpuScale", AcvpuScaleObservation.class, this); + + public SelectAqlField BLOOD_PRESSURE = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.blood_pressure.v2]", "bloodPressure", BloodPressureObservation.class, this); + + public SelectAqlField NEWS2_SCORE = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.news2.v1]", "news2Score", News2ScoreObservation.class, this); + + private News2SectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } + + public static News2SectionContainment getInstance() { + return new News2SectionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java new file mode 100644 index 000000000..74673cd18 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java @@ -0,0 +1,78 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") +public class OtherSymptomCluster { + @Path("/items[at0001.1]/value|value") + private String symptomSignNameValue; + + @Path("/items[at0147]") + private List structuredBodySite; + + @Path("/items[at0153]") + private List specificDetails; + + @Path("/items[at0146]") + private List previousEpisodes; + + @Path("/items[at0063]") + private List associatedSymptomSign; + + @Path("/items[at0.1 and name/value='Presence']/value|defining_code") + private PresenceDefiningCode presenceDefiningCode; + + public void setSymptomSignNameValue(String symptomSignNameValue) { + this.symptomSignNameValue = symptomSignNameValue; + } + + public String getSymptomSignNameValue() { + return this.symptomSignNameValue ; + } + + public void setStructuredBodySite(List structuredBodySite) { + this.structuredBodySite = structuredBodySite; + } + + public List getStructuredBodySite() { + return this.structuredBodySite ; + } + + public void setSpecificDetails(List specificDetails) { + this.specificDetails = specificDetails; + } + + public List getSpecificDetails() { + return this.specificDetails ; + } + + public void setPreviousEpisodes(List previousEpisodes) { + this.previousEpisodes = previousEpisodes; + } + + public List getPreviousEpisodes() { + return this.previousEpisodes ; + } + + public void setAssociatedSymptomSign(List associatedSymptomSign) { + this.associatedSymptomSign = associatedSymptomSign; + } + + public List getAssociatedSymptomSign() { + return this.associatedSymptomSign ; + } + + public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { + this.presenceDefiningCode = presenceDefiningCode; + } + + public PresenceDefiningCode getPresenceDefiningCode() { + return this.presenceDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomClusterContainment.java new file mode 100644 index 000000000..2a2afe576 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomClusterContainment.java @@ -0,0 +1,33 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class OtherSymptomClusterContainment extends Containment { + public SelectAqlField OTHER_SYMPTOM_CLUSTER = new AqlFieldImp(OtherSymptomCluster.class, "", "OtherSymptomCluster", OtherSymptomCluster.class, this); + + public SelectAqlField SYMPTOM_SIGN_NAME_VALUE = new AqlFieldImp(OtherSymptomCluster.class, "/items[at0001.1]/value|value", "symptomSignNameValue", String.class, this); + + public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(OtherSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); + + public ListSelectAqlField SPECIFIC_DETAILS = new ListAqlFieldImp(OtherSymptomCluster.class, "/items[at0153]", "specificDetails", Cluster.class, this); + + public ListSelectAqlField PREVIOUS_EPISODES = new ListAqlFieldImp(OtherSymptomCluster.class, "/items[at0146]", "previousEpisodes", Cluster.class, this); + + public ListSelectAqlField ASSOCIATED_SYMPTOM_SIGN = new ListAqlFieldImp(OtherSymptomCluster.class, "/items[at0063]", "associatedSymptomSign", Cluster.class, this); + + public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(OtherSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); + + private OtherSymptomClusterContainment() { + super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); + } + + public static OtherSymptomClusterContainment getInstance() { + return new OtherSymptomClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OverallTestStatusDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OverallTestStatusDefiningCode.java new file mode 100644 index 000000000..140db621a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OverallTestStatusDefiningCode.java @@ -0,0 +1,54 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum OverallTestStatusDefiningCode implements EnumValueSet { + AMENDED("Amended", "The result has been modified subsequent to being Final, and is complete and verified by the responsible pathologist, and result data has been changed.", "local", "at0040"), + + PRELIMINARY("Preliminary", "Verified early results are available, but not all results are final. This is a sub-category of 'Partial'.", "local", "at0120"), + + FINAL("Final", "The Test result is complete and verified by an authorised person.", "local", "at0038"), + + APPENDED("Appended", "Subsequent to being final, the report has been modified by adding new content. The existing content is unchanged. This is a sub-category of 'Amended'.", "local", "at0119"), + + CORRECTED("Corrected", "The result has been modified subsequent to being Final, and is complete and verified by the responsible pathologist. This is a sub-category of 'Amended'.", "local", "at0115"), + + CANCELLED("Cancelled", "The result is unavailable because the test was not started or not completed (also sometimes called 'aborted').", "local", "at0074"), + + ENTERED_IN_ERROR("Entered in error", "The Test Result has been withdrawn following previous Final release.", "local", "at0116"), + + PARTIAL("Partial", "This is a partial (e.g. initial, interim or preliminary) Test Result: data in the Test Result may be incomplete or unverified.", "local", "at0037"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + OverallTestStatusDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java new file mode 100644 index 000000000..dafd48f9f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java @@ -0,0 +1,58 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") +public class PastHistoryEvaluation { + @Path("/data[at0001]/items[at0002]/value|value") + private String synopsisValue; + + @Path("/protocol[at0003]/items[at0004]") + private List extension; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setSynopsisValue(String synopsisValue) { + this.synopsisValue = synopsisValue; + } + + public String getSynopsisValue() { + return this.synopsisValue ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluationContainment.java new file mode 100644 index 000000000..1621376cf --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluationContainment.java @@ -0,0 +1,31 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class PastHistoryEvaluationContainment extends Containment { + public SelectAqlField PAST_HISTORY_EVALUATION = new AqlFieldImp(PastHistoryEvaluation.class, "", "PastHistoryEvaluation", PastHistoryEvaluation.class, this); + + public SelectAqlField SYNOPSIS_VALUE = new AqlFieldImp(PastHistoryEvaluation.class, "/data[at0001]/items[at0002]/value|value", "synopsisValue", String.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(PastHistoryEvaluation.class, "/protocol[at0003]/items[at0004]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(PastHistoryEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(PastHistoryEvaluation.class, "/language", "language", Language.class, this); + + private PastHistoryEvaluationContainment() { + super("openEHR-EHR-EVALUATION.clinical_synopsis.v1"); + } + + public static PastHistoryEvaluationContainment getInstance() { + return new PastHistoryEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningCode.java new file mode 100644 index 000000000..fd1a5563f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningCode.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum PresenceDefiningCode implements EnumValueSet { + UNKNOWN("Unknown", "It is not known if the symptom is present.", "local", "at0.4"), + + ABSENT("Absent", "The symptom is absent.", "local", "at0.3"), + + PRESENT("Present", "The symptom is present.", "local", "at0.2"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + PresenceDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningCode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningCode2.java new file mode 100644 index 000000000..b4c15cf91 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PresenceDefiningCode2.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum PresenceDefiningCode2 implements EnumValueSet { + PRESENT("Present", "The risk factor has been identified for this individual.", "local", "at0018"), + + UNKNOWN("Unknown", "No information is available for this risk factor.", "local", "at0.15"), + + ABSENT("Absent", "The risk factor has not been identified for this individual.", "local", "at0019"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + PresenceDefiningCode2(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java new file mode 100644 index 000000000..3da25bd7a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java @@ -0,0 +1,115 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.pulse.v1") +public class PulseObservation { + @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004 and name/value='Pulse Rate']/value|magnitude") + private Double pulseRateMagnitude; + + @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004 and name/value='Pulse Rate']/value|units") + private String pulseRateUnits; + + @Path("/data[at0002]/events[at0003]/state[at0012]/items[at1017]") + private List exertion; + + @Path("/data[at0002]/events[at0003]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0002]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0010]/items[at1013]") + private Cluster device; + + @Path("/protocol[at0010]/items[at1056]") + private List extension; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setPulseRateMagnitude(Double pulseRateMagnitude) { + this.pulseRateMagnitude = pulseRateMagnitude; + } + + public Double getPulseRateMagnitude() { + return this.pulseRateMagnitude ; + } + + public void setPulseRateUnits(String pulseRateUnits) { + this.pulseRateUnits = pulseRateUnits; + } + + public String getPulseRateUnits() { + return this.pulseRateUnits ; + } + + public void setExertion(List exertion) { + this.exertion = exertion; + } + + public List getExertion() { + return this.exertion ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setDevice(Cluster device) { + this.device = device; + } + + public Cluster getDevice() { + return this.device ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservationContainment.java new file mode 100644 index 000000000..fb7f4eb2a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservationContainment.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class PulseObservationContainment extends Containment { + public SelectAqlField PULSE_OBSERVATION = new AqlFieldImp(PulseObservation.class, "", "PulseObservation", PulseObservation.class, this); + + public SelectAqlField PULSE_RATE_MAGNITUDE = new AqlFieldImp(PulseObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude", "pulseRateMagnitude", Double.class, this); + + public SelectAqlField PULSE_RATE_UNITS = new AqlFieldImp(PulseObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units", "pulseRateUnits", String.class, this); + + public ListSelectAqlField EXERTION = new ListAqlFieldImp(PulseObservation.class, "/data[at0002]/events[at0003]/state[at0012]/items[at1017]", "exertion", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(PulseObservation.class, "/data[at0002]/events[at0003]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(PulseObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); + + public SelectAqlField DEVICE = new AqlFieldImp(PulseObservation.class, "/protocol[at0010]/items[at1013]", "device", Cluster.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(PulseObservation.class, "/protocol[at0010]/items[at1056]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(PulseObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(PulseObservation.class, "/language", "language", Language.class, this); + + private PulseObservationContainment() { + super("openEHR-EHR-OBSERVATION.pulse.v1"); + } + + public static PulseObservationContainment getInstance() { + return new PulseObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java new file mode 100644 index 000000000..dcd5e5a51 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java @@ -0,0 +1,136 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.quantity.DvProportion; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.pulse_oximetry.v1") +public class PulseOximetryObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value") + private DvProportion spo; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0054]") + private List waveform; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0060]") + private List multimediaImage; + + @Path("/data[at0001]/events[at0002]/state[at0014]/items[at0034]") + private Cluster exertion; + + @Path("/data[at0001]/events[at0002]/state[at0014]/items[at0015]") + private Cluster inspiredOxygen; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0007]/items[at0018]") + private Cluster oximetryDevice; + + @Path("/protocol[at0007]/items[at0059]") + private List extension; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setSpo(DvProportion spo) { + this.spo = spo; + } + + public DvProportion getSpo() { + return this.spo ; + } + + public void setWaveform(List waveform) { + this.waveform = waveform; + } + + public List getWaveform() { + return this.waveform ; + } + + public void setMultimediaImage(List multimediaImage) { + this.multimediaImage = multimediaImage; + } + + public List getMultimediaImage() { + return this.multimediaImage ; + } + + public void setExertion(Cluster exertion) { + this.exertion = exertion; + } + + public Cluster getExertion() { + return this.exertion ; + } + + public void setInspiredOxygen(Cluster inspiredOxygen) { + this.inspiredOxygen = inspiredOxygen; + } + + public Cluster getInspiredOxygen() { + return this.inspiredOxygen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setOximetryDevice(Cluster oximetryDevice) { + this.oximetryDevice = oximetryDevice; + } + + public Cluster getOximetryDevice() { + return this.oximetryDevice ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservationContainment.java new file mode 100644 index 000000000..6a5967d4d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservationContainment.java @@ -0,0 +1,46 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.quantity.DvProportion; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class PulseOximetryObservationContainment extends Containment { + public SelectAqlField PULSE_OXIMETRY_OBSERVATION = new AqlFieldImp(PulseOximetryObservation.class, "", "PulseOximetryObservation", PulseOximetryObservation.class, this); + + public SelectAqlField SPO = new AqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value", "spo", DvProportion.class, this); + + public ListSelectAqlField WAVEFORM = new ListAqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0054]", "waveform", Cluster.class, this); + + public ListSelectAqlField MULTIMEDIA_IMAGE = new ListAqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0060]", "multimediaImage", Cluster.class, this); + + public SelectAqlField EXERTION = new AqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/state[at0014]/items[at0034]", "exertion", Cluster.class, this); + + public SelectAqlField INSPIRED_OXYGEN = new AqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/state[at0014]/items[at0015]", "inspiredOxygen", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(PulseOximetryObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public SelectAqlField OXIMETRY_DEVICE = new AqlFieldImp(PulseOximetryObservation.class, "/protocol[at0007]/items[at0018]", "oximetryDevice", Cluster.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(PulseOximetryObservation.class, "/protocol[at0007]/items[at0059]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(PulseOximetryObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(PulseOximetryObservation.class, "/language", "language", Language.class, this); + + private PulseOximetryObservationContainment() { + super("openEHR-EHR-OBSERVATION.pulse_oximetry.v1"); + } + + public static PulseOximetryObservationContainment getInstance() { + return new PulseOximetryObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java new file mode 100644 index 000000000..e94af5370 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java @@ -0,0 +1,57 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.recommendation.v1") +public class RecommendationEvaluation { + @Path("/data[at0001]/items[at0002]") + private List recommendation; + + @Path("/protocol[at0004]/items[at0005]") + private List extension; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setRecommendation(List recommendation) { + this.recommendation = recommendation; + } + + public List getRecommendation() { + return this.recommendation ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluationContainment.java new file mode 100644 index 000000000..ebfa5a3bd --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluationContainment.java @@ -0,0 +1,30 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class RecommendationEvaluationContainment extends Containment { + public SelectAqlField RECOMMENDATION_EVALUATION = new AqlFieldImp(RecommendationEvaluation.class, "", "RecommendationEvaluation", RecommendationEvaluation.class, this); + + public ListSelectAqlField RECOMMENDATION = new ListAqlFieldImp(RecommendationEvaluation.class, "/data[at0001]/items[at0002]", "recommendation", RecommendationRecommendationElement.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(RecommendationEvaluation.class, "/protocol[at0004]/items[at0005]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(RecommendationEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(RecommendationEvaluation.class, "/language", "language", Language.class, this); + + private RecommendationEvaluationContainment() { + super("openEHR-EHR-EVALUATION.recommendation.v1"); + } + + public static RecommendationEvaluationContainment getInstance() { + return new RecommendationEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java new file mode 100644 index 000000000..1dbefb506 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java @@ -0,0 +1,19 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class RecommendationRecommendationElement { + @Path("/value|value") + private String value; + + public void setValue(String value) { + this.value = value; + } + + public String getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RedFlagAcuteDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RedFlagAcuteDefiningCode.java new file mode 100644 index 000000000..e5de6abc1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RedFlagAcuteDefiningCode.java @@ -0,0 +1,55 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum RedFlagAcuteDefiningCode implements EnumValueSet { + RESPIRATORY_RATE25_PER_MINUTE("Respiratory rate ≥ 25 per minute", "Respiratory rate ≥ 25 per minute", "local", "at0077"), + + SYSTOLIC_BP90_MMHG_OR_DROP_OF40_FROM_NORMAL("Systolic BP ≤ 90 mmHg (or drop of >40 from normal)", "Systolic BP ≤ 90 mmHg (or drop of >40 from normal)", "local", "at0075"), + + NEEDS_O2_TO_KEEP_SPO29288_IN_COPD("Needs O2 to keep SpO2 ≥ 92% (88% in COPD)", "Needs O2 to keep SpO2 ≥ 92% (88% in COPD)", "local", "at0078"), + + RECENT_CHEMOTHERAPY("Recent chemotherapy", "Recent chemotherapy", "local", "at0081"), + + NOT_PASSED_URINE_IN18_HOURS05ML_KG_HR_IF_CATHETERISED("Not passed urine in 18 hours (<0.5ml/kg/hr if catheterised)", "Not passed urine in 18 hours (<0.5ml/kg/hr if catheterised)", "local", "at0082"), + + HEART_RATE130_PER_MINUTE("Heart rate ≥ 130 per minute", "Heart rate ≥ 130 per minute", "local", "at0076"), + + LACTATE2_MMOL_L("Lactate ≥ 2 mmol/l", "Lactate ≥ 2 mmol/l", "local", "at0080"), + + OBJECTIVE_EVIDENCE_OF_NEW_OR_ALTERED_MENTAL_STATE("Objective evidence of new or altered mental state", "Objective evidence of new or altered mental state", "local", "at0074"), + + NON_BLANCHING_RASH_MOTTLED_ASHEN_CYANOTIC("Non-blanching rash / mottled / ashen / cyanotic", "Non-blanching rash / mottled / ashen / cyanotic", "local", "at0079"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + RedFlagAcuteDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java new file mode 100644 index 000000000..e368e07f0 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java @@ -0,0 +1,115 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.respiration.v1") +public class RespirationsObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude") + private Double rateMagnitude; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units") + private String rateUnits; + + @Path("/data[at0001]/events[at0002]/state[at0022]/items[at0055]") + private Cluster inspiredOxygen; + + @Path("/data[at0001]/events[at0002]/state[at0022]/items[at0037]") + private Cluster exertion; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0057]/items[at0058]") + private List extension; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setRateMagnitude(Double rateMagnitude) { + this.rateMagnitude = rateMagnitude; + } + + public Double getRateMagnitude() { + return this.rateMagnitude ; + } + + public void setRateUnits(String rateUnits) { + this.rateUnits = rateUnits; + } + + public String getRateUnits() { + return this.rateUnits ; + } + + public void setInspiredOxygen(Cluster inspiredOxygen) { + this.inspiredOxygen = inspiredOxygen; + } + + public Cluster getInspiredOxygen() { + return this.inspiredOxygen ; + } + + public void setExertion(Cluster exertion) { + this.exertion = exertion; + } + + public Cluster getExertion() { + return this.exertion ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservationContainment.java new file mode 100644 index 000000000..fa07ce9f9 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservationContainment.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class RespirationsObservationContainment extends Containment { + public SelectAqlField RESPIRATIONS_OBSERVATION = new AqlFieldImp(RespirationsObservation.class, "", "RespirationsObservation", RespirationsObservation.class, this); + + public SelectAqlField RATE_MAGNITUDE = new AqlFieldImp(RespirationsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude", "rateMagnitude", Double.class, this); + + public SelectAqlField RATE_UNITS = new AqlFieldImp(RespirationsObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units", "rateUnits", String.class, this); + + public SelectAqlField INSPIRED_OXYGEN = new AqlFieldImp(RespirationsObservation.class, "/data[at0001]/events[at0002]/state[at0022]/items[at0055]", "inspiredOxygen", Cluster.class, this); + + public SelectAqlField EXERTION = new AqlFieldImp(RespirationsObservation.class, "/data[at0001]/events[at0002]/state[at0022]/items[at0037]", "exertion", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(RespirationsObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(RespirationsObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(RespirationsObservation.class, "/protocol[at0057]/items[at0058]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(RespirationsObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(RespirationsObservation.class, "/language", "language", Language.class, this); + + private RespirationsObservationContainment() { + super("openEHR-EHR-OBSERVATION.respiration.v1"); + } + + public static RespirationsObservationContainment getInstance() { + return new RespirationsObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java new file mode 100644 index 000000000..bddc3f7fc --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-SECTION.adhoc.v1") +public class ResponseSection { + @Path("/items[openEHR-EHR-EVALUATION.recommendation.v1]") + private RecommendationEvaluation recommendation; + + @Path("/items[openEHR-EHR-INSTRUCTION.service_request.v1]") + private List serviceRequest; + + @Path("/items[openEHR-EHR-ACTION.service.v0]") + private List service; + + public void setRecommendation(RecommendationEvaluation recommendation) { + this.recommendation = recommendation; + } + + public RecommendationEvaluation getRecommendation() { + return this.recommendation ; + } + + public void setServiceRequest(List serviceRequest) { + this.serviceRequest = serviceRequest; + } + + public List getServiceRequest() { + return this.serviceRequest ; + } + + public void setService(List service) { + this.service = service; + } + + public List getService() { + return this.service ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSectionContainment.java new file mode 100644 index 000000000..b382f757e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSectionContainment.java @@ -0,0 +1,25 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class ResponseSectionContainment extends Containment { + public SelectAqlField RESPONSE_SECTION = new AqlFieldImp(ResponseSection.class, "", "ResponseSection", ResponseSection.class, this); + + public SelectAqlField RECOMMENDATION = new AqlFieldImp(ResponseSection.class, "/items[openEHR-EHR-EVALUATION.recommendation.v1]", "recommendation", RecommendationEvaluation.class, this); + + public ListSelectAqlField SERVICE_REQUEST = new ListAqlFieldImp(ResponseSection.class, "/items[openEHR-EHR-INSTRUCTION.service_request.v1]", "serviceRequest", ServiceRequestInstruction.class, this); + + public ListSelectAqlField SERVICE = new ListAqlFieldImp(ResponseSection.class, "/items[openEHR-EHR-ACTION.service.v0]", "service", ServiceAction.class, this); + + private ResponseSectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } + + public static ResponseSectionContainment getInstance() { + return new ResponseSectionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskAssessmentDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskAssessmentDefiningCode.java new file mode 100644 index 000000000..50b6e5ec2 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskAssessmentDefiningCode.java @@ -0,0 +1,41 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum RiskAssessmentDefiningCode implements EnumValueSet { + LOW_RISK("Low risk", "The risk of the a patient having a Covid-19 infection is assessed to be low.", "local", "at0.16"), + + HIGH_RISK("High risk", "The risk of the a patient having a Covid-19 infection is assessed to be high.", "local", "at0.17"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + RiskAssessmentDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode.java new file mode 100644 index 000000000..36ca74158 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode.java @@ -0,0 +1,39 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum RiskFactorDefiningCode implements EnumValueSet { + POTENTIAL_CONTACT_EXPOSURE_BASED_ON_LOCATION("Potential contact exposure based on location", "Potential contact exposure based on location.", "local", "at0.14"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + RiskFactorDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode2.java new file mode 100644 index 000000000..48f9a7c80 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode2.java @@ -0,0 +1,39 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum RiskFactorDefiningCode2 implements EnumValueSet { + CONTACT_WITH_CONFIRMED_COVID19_CASE("Contact with confirmed Covid-19 case", "Contact with confirmed Covid-19 case within 14 days before symptom onset.", "local", "at0.9"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + RiskFactorDefiningCode2(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode3.java new file mode 100644 index 000000000..17fc633d6 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorDefiningCode3.java @@ -0,0 +1,39 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum RiskFactorDefiningCode3 implements EnumValueSet { + OTHER_HOUSEHOLD_MEMBERS_ARE_ILL("Other household members are ill", "The patient is in a house with other household members who are ill", "local", "at0.19"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + RiskFactorDefiningCode3(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorsForSepsisDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorsForSepsisDefiningCode.java new file mode 100644 index 000000000..0ac5634b0 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RiskFactorsForSepsisDefiningCode.java @@ -0,0 +1,46 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum RiskFactorsForSepsisDefiningCode implements EnumValueSet { + AGE_OVER75("Age over 75", "Patient is over 75.", "local", "at0007"), + + IMPAIRED_IMMUNITY_E_G_DIABETES_STEROIDS_CHEMOTHERAPY("Impaired immunity (e.g diabetes, steroids, chemotherapy)", "Patient has impaired immunity.", "local", "at0008"), + + INDWELLING_LINES_IVDU_BROKEN_SKIN("Indwelling lines / IVDU / broken skin", "Patient has indwelling lines, IVDU or broken skin.", "local", "at0010"), + + RECENT_TRAUMA_SURGERY_INVASIVE_PROCEDURE("Recent trauma / surgery / invasive procedure", "Patient has had recent trauma, surgery or an invasive procedure.", "local", "at0009"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + RiskFactorsForSepsisDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java new file mode 100644 index 000000000..f05d2a319 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java @@ -0,0 +1,18 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class SepsisScreening999FlagElement { + @Path("/value|defining_code") + private N999FlagDefiningCode value; + + public void setValue(N999FlagDefiningCode value) { + this.value = value; + } + + public N999FlagDefiningCode getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java new file mode 100644 index 000000000..bc2f981b2 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java @@ -0,0 +1,18 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class SepsisScreeningAmberFlagAcuteElement { + @Path("/value|defining_code") + private AmberFlagAcuteDefiningCode value; + + public void setValue(AmberFlagAcuteDefiningCode value) { + this.value = value; + } + + public AmberFlagAcuteDefiningCode getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java new file mode 100644 index 000000000..58bbab93c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Choice; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class SepsisScreeningLikelySourceOfInfectionElement { + @Path("/value") + @Choice + private SepsisScreeningValueChoice value; + + public void setValue(SepsisScreeningValueChoice value) { + this.value = value; + } + + public SepsisScreeningValueChoice getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java new file mode 100644 index 000000000..3287b4621 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java @@ -0,0 +1,126 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.sepsis_screening_tool.v0") +public class SepsisScreeningObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]") + private List riskFactorsForSepsis; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0011]") + private List likelySourceOfInfection; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0058]") + private List redFlagAcute; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0083]") + private List amberFlagAcute; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0036]") + private List N999Flag; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0004]/items[at0005]") + private List extension; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setRiskFactorsForSepsis( + List riskFactorsForSepsis) { + this.riskFactorsForSepsis = riskFactorsForSepsis; + } + + public List getRiskFactorsForSepsis() { + return this.riskFactorsForSepsis ; + } + + public void setLikelySourceOfInfection( + List likelySourceOfInfection) { + this.likelySourceOfInfection = likelySourceOfInfection; + } + + public List getLikelySourceOfInfection() { + return this.likelySourceOfInfection ; + } + + public void setRedFlagAcute(List redFlagAcute) { + this.redFlagAcute = redFlagAcute; + } + + public List getRedFlagAcute() { + return this.redFlagAcute ; + } + + public void setAmberFlagAcute(List amberFlagAcute) { + this.amberFlagAcute = amberFlagAcute; + } + + public List getAmberFlagAcute() { + return this.amberFlagAcute ; + } + + public void setN999Flag(List N999Flag) { + this.N999Flag = N999Flag; + } + + public List getN999Flag() { + return this.N999Flag ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservationContainment.java new file mode 100644 index 000000000..272af5b11 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservationContainment.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class SepsisScreeningObservationContainment extends Containment { + public SelectAqlField SEPSIS_SCREENING_OBSERVATION = new AqlFieldImp(SepsisScreeningObservation.class, "", "SepsisScreeningObservation", SepsisScreeningObservation.class, this); + + public ListSelectAqlField RISK_FACTORS_FOR_SEPSIS = new ListAqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]", "riskFactorsForSepsis", SepsisScreeningRiskFactorsForSepsisElement.class, this); + + public ListSelectAqlField LIKELY_SOURCE_OF_INFECTION = new ListAqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0011]", "likelySourceOfInfection", SepsisScreeningLikelySourceOfInfectionElement.class, this); + + public ListSelectAqlField RED_FLAG_ACUTE = new ListAqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0058]", "redFlagAcute", SepsisScreeningRedFlagAcuteElement.class, this); + + public ListSelectAqlField AMBER_FLAG_ACUTE = new ListAqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0083]", "amberFlagAcute", SepsisScreeningAmberFlagAcuteElement.class, this); + + public ListSelectAqlField N999_FLAG = new ListAqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0036]", "N999Flag", SepsisScreening999FlagElement.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(SepsisScreeningObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(SepsisScreeningObservation.class, "/protocol[at0004]/items[at0005]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(SepsisScreeningObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(SepsisScreeningObservation.class, "/language", "language", Language.class, this); + + private SepsisScreeningObservationContainment() { + super("openEHR-EHR-OBSERVATION.sepsis_screening_tool.v0"); + } + + public static SepsisScreeningObservationContainment getInstance() { + return new SepsisScreeningObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java new file mode 100644 index 000000000..1bd91c293 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java @@ -0,0 +1,18 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class SepsisScreeningRedFlagAcuteElement { + @Path("/value|defining_code") + private RedFlagAcuteDefiningCode value; + + public void setValue(RedFlagAcuteDefiningCode value) { + this.value = value; + } + + public RedFlagAcuteDefiningCode getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java new file mode 100644 index 000000000..48134e9c0 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java @@ -0,0 +1,18 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class SepsisScreeningRiskFactorsForSepsisElement { + @Path("/value|defining_code") + private RiskFactorsForSepsisDefiningCode value; + + public void setValue(RiskFactorsForSepsisDefiningCode value) { + this.value = value; + } + + public RiskFactorsForSepsisDefiningCode getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueChoice.java new file mode 100644 index 000000000..d6637e372 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +public interface SepsisScreeningValueChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java new file mode 100644 index 000000000..d33a51fe8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class SepsisScreeningValueDvCodedText implements SepsisScreeningValueChoice { + @Path("|defining_code") + private ValueDefiningCode7 valueDefiningCode; + + public void setValueDefiningCode(ValueDefiningCode7 valueDefiningCode) { + this.valueDefiningCode = valueDefiningCode; + } + + public ValueDefiningCode7 getValueDefiningCode() { + return this.valueDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java new file mode 100644 index 000000000..63fe4b3e7 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class SepsisScreeningValueDvText implements SepsisScreeningValueChoice { + @Path("|value") + private String valueValue; + + public void setValueValue(String valueValue) { + this.valueValue = valueValue; + } + + public String getValueValue() { + return this.valueValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java new file mode 100644 index 000000000..86eb4cb31 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-SECTION.adhoc.v1") +public class SepsisSection { + @Path("/items[openEHR-EHR-OBSERVATION.sepsis_screening_tool.v0 and name/value='Sepsis screening']") + private SepsisScreeningObservation sepsisScreening; + + public void setSepsisScreening(SepsisScreeningObservation sepsisScreening) { + this.sepsisScreening = sepsisScreening; + } + + public SepsisScreeningObservation getSepsisScreening() { + return this.sepsisScreening ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSectionContainment.java new file mode 100644 index 000000000..20516876a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSectionContainment.java @@ -0,0 +1,19 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class SepsisSectionContainment extends Containment { + public SelectAqlField SEPSIS_SECTION = new AqlFieldImp(SepsisSection.class, "", "SepsisSection", SepsisSection.class, this); + + public SelectAqlField SEPSIS_SCREENING = new AqlFieldImp(SepsisSection.class, "/items[openEHR-EHR-OBSERVATION.sepsis_screening_tool.v0]", "sepsisScreening", SepsisScreeningObservation.class, this); + + private SepsisSectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } + + public static SepsisSectionContainment getInstance() { + return new SepsisSectionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java new file mode 100644 index 000000000..22433ab0d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java @@ -0,0 +1,148 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-ACTION.service.v0") +public class ServiceAction { + @Path("/description[at0001]/items[at0011]/value|defining_code") + private CodePhrase serviceNameDefiningCode; + + @Path("/description[at0001]/items[at0013]/value|value") + private String descriptionValue; + + @Path("/description[at0001]/items[at0027]") + private List serviceDetail; + + @Path("/description[at0001]/items[at0029]") + private List multimedia; + + @Path("/protocol[at0015]/items[at0017]") + private List requestor; + + @Path("/protocol[at0015]/items[at0019]") + private List receiver; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + @Path("/time|value") + private TemporalAccessor timeValue; + + @Path("/ism_transition/careflow_step|defining_code") + private CareflowStepDefiningCode careflowStepDefiningCode; + + @Path("/ism_transition/current_state|defining_code") + private CurrentStateDefiningCode currentStateDefiningCode; + + @Path("/ism_transition/transition|defining_code") + private CodePhrase transitionDefiningCode; + + public void setServiceNameDefiningCode(CodePhrase serviceNameDefiningCode) { + this.serviceNameDefiningCode = serviceNameDefiningCode; + } + + public CodePhrase getServiceNameDefiningCode() { + return this.serviceNameDefiningCode ; + } + + public void setDescriptionValue(String descriptionValue) { + this.descriptionValue = descriptionValue; + } + + public String getDescriptionValue() { + return this.descriptionValue ; + } + + public void setServiceDetail(List serviceDetail) { + this.serviceDetail = serviceDetail; + } + + public List getServiceDetail() { + return this.serviceDetail ; + } + + public void setMultimedia(List multimedia) { + this.multimedia = multimedia; + } + + public List getMultimedia() { + return this.multimedia ; + } + + public void setRequestor(List requestor) { + this.requestor = requestor; + } + + public List getRequestor() { + return this.requestor ; + } + + public void setReceiver(List receiver) { + this.receiver = receiver; + } + + public List getReceiver() { + return this.receiver ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setCareflowStepDefiningCode(CareflowStepDefiningCode careflowStepDefiningCode) { + this.careflowStepDefiningCode = careflowStepDefiningCode; + } + + public CareflowStepDefiningCode getCareflowStepDefiningCode() { + return this.careflowStepDefiningCode ; + } + + public void setCurrentStateDefiningCode(CurrentStateDefiningCode currentStateDefiningCode) { + this.currentStateDefiningCode = currentStateDefiningCode; + } + + public CurrentStateDefiningCode getCurrentStateDefiningCode() { + return this.currentStateDefiningCode ; + } + + public void setTransitionDefiningCode(CodePhrase transitionDefiningCode) { + this.transitionDefiningCode = transitionDefiningCode; + } + + public CodePhrase getTransitionDefiningCode() { + return this.transitionDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java new file mode 100644 index 000000000..f5563384b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java @@ -0,0 +1,49 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class ServiceActionContainment extends Containment { + public SelectAqlField SERVICE_ACTION = new AqlFieldImp(ServiceAction.class, "", "ServiceAction", ServiceAction.class, this); + + public SelectAqlField SERVICE_NAME_DEFINING_CODE = new AqlFieldImp(ServiceAction.class, "/description[at0001]/items[at0011]/value|defining_code", "serviceNameDefiningCode", CodePhrase.class, this); + + public SelectAqlField DESCRIPTION_VALUE = new AqlFieldImp(ServiceAction.class, "/description[at0001]/items[at0013]/value|value", "descriptionValue", String.class, this); + + public ListSelectAqlField SERVICE_DETAIL = new ListAqlFieldImp(ServiceAction.class, "/description[at0001]/items[at0027]", "serviceDetail", Cluster.class, this); + + public ListSelectAqlField MULTIMEDIA = new ListAqlFieldImp(ServiceAction.class, "/description[at0001]/items[at0029]", "multimedia", Cluster.class, this); + + public ListSelectAqlField REQUESTOR = new ListAqlFieldImp(ServiceAction.class, "/protocol[at0015]/items[at0017]", "requestor", Cluster.class, this); + + public ListSelectAqlField RECEIVER = new ListAqlFieldImp(ServiceAction.class, "/protocol[at0015]/items[at0019]", "receiver", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(ServiceAction.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(ServiceAction.class, "/language", "language", Language.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(ServiceAction.class, "/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField CAREFLOW_STEP_DEFINING_CODE = new AqlFieldImp(ServiceAction.class, "/ism_transition/careflow_step|defining_code", "careflowStepDefiningCode", CareflowStepDefiningCode.class, this); + + public SelectAqlField CURRENT_STATE_DEFINING_CODE = new AqlFieldImp(ServiceAction.class, "/ism_transition/current_state|defining_code", "currentStateDefiningCode", CurrentStateDefiningCode.class, this); + + public SelectAqlField TRANSITION_DEFINING_CODE = new AqlFieldImp(ServiceAction.class, "/ism_transition/transition|defining_code", "transitionDefiningCode", CodePhrase.class, this); + + private ServiceActionContainment() { + super("openEHR-EHR-ACTION.service.v0"); + } + + public static ServiceActionContainment getInstance() { + return new ServiceActionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java new file mode 100644 index 000000000..ac2143f0a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java @@ -0,0 +1,123 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class ServiceRequestCurrentActivityActivity { + @Path("/description[at0009]/items[at0121]/value|defining_code") + private CodePhrase serviceNameDefiningCode; + + @Path("/description[at0009]/items[at0062]") + private List reasonForRequest; + + @Path("/description[at0009]/items[at0064 and name/value='Reason for isolation']/value|value") + private String reasonForIsolationValue; + + @Path("/description[at0009]/items[at0151]") + private List complexTiming; + + @Path("/description[at0009]/items[at0145 and name/value='Date isolation due to start']/value|value") + private TemporalAccessor dateIsolationDueToStartValue; + + @Path("/description[at0009]/items[at0144 and name/value='Date isolation due to end']/value|value") + private TemporalAccessor dateIsolationDueToEndValue; + + @Path("/description[at0009]/items[at0132]") + private List specificDetails; + + @Path("/description[at0009]/items[at0149]") + private List supportingInformation; + + @Path("/description[at0009]/items[at0116]") + private List patientRequirements; + + @Path("/timing") + private DvParsable timing; + + public void setServiceNameDefiningCode(CodePhrase serviceNameDefiningCode) { + this.serviceNameDefiningCode = serviceNameDefiningCode; + } + + public CodePhrase getServiceNameDefiningCode() { + return this.serviceNameDefiningCode ; + } + + public void setReasonForRequest(List reasonForRequest) { + this.reasonForRequest = reasonForRequest; + } + + public List getReasonForRequest() { + return this.reasonForRequest ; + } + + public void setReasonForIsolationValue(String reasonForIsolationValue) { + this.reasonForIsolationValue = reasonForIsolationValue; + } + + public String getReasonForIsolationValue() { + return this.reasonForIsolationValue ; + } + + public void setComplexTiming(List complexTiming) { + this.complexTiming = complexTiming; + } + + public List getComplexTiming() { + return this.complexTiming ; + } + + public void setDateIsolationDueToStartValue(TemporalAccessor dateIsolationDueToStartValue) { + this.dateIsolationDueToStartValue = dateIsolationDueToStartValue; + } + + public TemporalAccessor getDateIsolationDueToStartValue() { + return this.dateIsolationDueToStartValue ; + } + + public void setDateIsolationDueToEndValue(TemporalAccessor dateIsolationDueToEndValue) { + this.dateIsolationDueToEndValue = dateIsolationDueToEndValue; + } + + public TemporalAccessor getDateIsolationDueToEndValue() { + return this.dateIsolationDueToEndValue ; + } + + public void setSpecificDetails(List specificDetails) { + this.specificDetails = specificDetails; + } + + public List getSpecificDetails() { + return this.specificDetails ; + } + + public void setSupportingInformation(List supportingInformation) { + this.supportingInformation = supportingInformation; + } + + public List getSupportingInformation() { + return this.supportingInformation ; + } + + public void setPatientRequirements(List patientRequirements) { + this.patientRequirements = patientRequirements; + } + + public List getPatientRequirements() { + return this.patientRequirements ; + } + + public void setTiming(DvParsable timing) { + this.timing = timing; + } + + public DvParsable getTiming() { + return this.timing ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java new file mode 100644 index 000000000..e8b2f0d05 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java @@ -0,0 +1,114 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-INSTRUCTION.service_request.v1") +public class ServiceRequestInstruction { + @Path("/activities[at0001]") + private List currentActivity; + + @Path("/protocol[at0008]/items[at0141]") + private Cluster requester; + + @Path("/protocol[at0008]/items[at0142]") + private Cluster receiver; + + @Path("/protocol[at0008]/items[at0128]") + private List distributionList; + + @Path("/protocol[at0008]/items[at0112]") + private List extension; + + @Path("/subject") + private PartyProxy subject; + + @Path("/narrative|value") + private String narrativeValue; + + @Path("/language") + private Language language; + + @Path("/expiry_time|value") + private TemporalAccessor expiryTimeValue; + + public void setCurrentActivity(List currentActivity) { + this.currentActivity = currentActivity; + } + + public List getCurrentActivity() { + return this.currentActivity ; + } + + public void setRequester(Cluster requester) { + this.requester = requester; + } + + public Cluster getRequester() { + return this.requester ; + } + + public void setReceiver(Cluster receiver) { + this.receiver = receiver; + } + + public Cluster getReceiver() { + return this.receiver ; + } + + public void setDistributionList(List distributionList) { + this.distributionList = distributionList; + } + + public List getDistributionList() { + return this.distributionList ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setNarrativeValue(String narrativeValue) { + this.narrativeValue = narrativeValue; + } + + public String getNarrativeValue() { + return this.narrativeValue ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setExpiryTimeValue(TemporalAccessor expiryTimeValue) { + this.expiryTimeValue = expiryTimeValue; + } + + public TemporalAccessor getExpiryTimeValue() { + return this.expiryTimeValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstructionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstructionContainment.java new file mode 100644 index 000000000..4efc80642 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstructionContainment.java @@ -0,0 +1,42 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class ServiceRequestInstructionContainment extends Containment { + public SelectAqlField SERVICE_REQUEST_INSTRUCTION = new AqlFieldImp(ServiceRequestInstruction.class, "", "ServiceRequestInstruction", ServiceRequestInstruction.class, this); + + public ListSelectAqlField CURRENT_ACTIVITY = new ListAqlFieldImp(ServiceRequestInstruction.class, "/activities[at0001]", "currentActivity", ServiceRequestCurrentActivityActivity.class, this); + + public SelectAqlField REQUESTER = new AqlFieldImp(ServiceRequestInstruction.class, "/protocol[at0008]/items[at0141]", "requester", Cluster.class, this); + + public SelectAqlField RECEIVER = new AqlFieldImp(ServiceRequestInstruction.class, "/protocol[at0008]/items[at0142]", "receiver", Cluster.class, this); + + public ListSelectAqlField DISTRIBUTION_LIST = new ListAqlFieldImp(ServiceRequestInstruction.class, "/protocol[at0008]/items[at0128]", "distributionList", Cluster.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(ServiceRequestInstruction.class, "/protocol[at0008]/items[at0112]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(ServiceRequestInstruction.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField NARRATIVE_VALUE = new AqlFieldImp(ServiceRequestInstruction.class, "/narrative|value", "narrativeValue", String.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(ServiceRequestInstruction.class, "/language", "language", Language.class, this); + + public SelectAqlField EXPIRY_TIME_VALUE = new AqlFieldImp(ServiceRequestInstruction.class, "/expiry_time|value", "expiryTimeValue", TemporalAccessor.class, this); + + private ServiceRequestInstructionContainment() { + super("openEHR-EHR-INSTRUCTION.service_request.v1"); + } + + public static ServiceRequestInstructionContainment getInstance() { + return new ServiceRequestInstructionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java new file mode 100644 index 000000000..3db324ab5 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java @@ -0,0 +1,19 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datatypes.CodePhrase; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class ServiceRequestReasonForRequestElement { + @Path("/value|defining_code") + private CodePhrase value; + + public void setValue(CodePhrase value) { + this.value = value; + } + + public CodePhrase getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java new file mode 100644 index 000000000..299642f88 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-SECTION.adhoc.v1") +public class SituationSection { + @Path("/items[openEHR-EHR-OBSERVATION.story.v1]") + private StoryHistoryObservation storyHistory; + + public void setStoryHistory(StoryHistoryObservation storyHistory) { + this.storyHistory = storyHistory; + } + + public StoryHistoryObservation getStoryHistory() { + return this.storyHistory ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSectionContainment.java new file mode 100644 index 000000000..dbbc9ec4f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSectionContainment.java @@ -0,0 +1,19 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class SituationSectionContainment extends Containment { + public SelectAqlField SITUATION_SECTION = new AqlFieldImp(SituationSection.class, "", "SituationSection", SituationSection.class, this); + + public SelectAqlField STORY_HISTORY = new AqlFieldImp(SituationSection.class, "/items[openEHR-EHR-OBSERVATION.story.v1]", "storyHistory", StoryHistoryObservation.class, this); + + private SituationSectionContainment() { + super("openEHR-EHR-SECTION.adhoc.v1"); + } + + public static SituationSectionContainment getInstance() { + return new SituationSectionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java new file mode 100644 index 000000000..23bcdf0d0 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java @@ -0,0 +1,103 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.story.v1") +public class StoryHistoryObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004 and name/value='Soft signs']") + private List softSigns; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004 and name/value='Notes']/value|value") + private String notesValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]") + private List structuredDetail; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0007]/items[at0008]") + private List extension; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setSoftSigns(List softSigns) { + this.softSigns = softSigns; + } + + public List getSoftSigns() { + return this.softSigns ; + } + + public void setNotesValue(String notesValue) { + this.notesValue = notesValue; + } + + public String getNotesValue() { + return this.notesValue ; + } + + public void setStructuredDetail(List structuredDetail) { + this.structuredDetail = structuredDetail; + } + + public List getStructuredDetail() { + return this.structuredDetail ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservationContainment.java new file mode 100644 index 000000000..0f1758a3b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class StoryHistoryObservationContainment extends Containment { + public SelectAqlField STORY_HISTORY_OBSERVATION = new AqlFieldImp(StoryHistoryObservation.class, "", "StoryHistoryObservation", StoryHistoryObservation.class, this); + + public ListSelectAqlField SOFT_SIGNS = new ListAqlFieldImp(StoryHistoryObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]", "softSigns", StoryHistorySoftSignsElement.class, this); + + public SelectAqlField NOTES_VALUE = new AqlFieldImp(StoryHistoryObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value", "notesValue", String.class, this); + + public ListSelectAqlField STRUCTURED_DETAIL = new ListAqlFieldImp(StoryHistoryObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]", "structuredDetail", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(StoryHistoryObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(StoryHistoryObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(StoryHistoryObservation.class, "/protocol[at0007]/items[at0008]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(StoryHistoryObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(StoryHistoryObservation.class, "/language", "language", Language.class, this); + + private StoryHistoryObservationContainment() { + super("openEHR-EHR-OBSERVATION.story.v1"); + } + + public static StoryHistoryObservationContainment getInstance() { + return new StoryHistoryObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java new file mode 100644 index 000000000..15eb48c4a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java @@ -0,0 +1,19 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class StoryHistorySoftSignsElement { + @Path("/value|value") + private String value; + + public void setValue(String value) { + this.value = value; + } + + public String getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java new file mode 100644 index 000000000..e07b98ba6 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java @@ -0,0 +1,126 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datastructures.Element; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.body_temperature.v1") +public class TemperatureObservation { + @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude") + private Double temperatureMagnitude; + + @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units") + private String temperatureUnits; + + @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0056]") + private Cluster environmentalConditions; + + @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0057]") + private Cluster exertion; + + @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0058]") + private Element menstrualCycle; + + @Path("/data[at0002]/events[at0003]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0002]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0020]/items[at0059]") + private Cluster device; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setTemperatureMagnitude(Double temperatureMagnitude) { + this.temperatureMagnitude = temperatureMagnitude; + } + + public Double getTemperatureMagnitude() { + return this.temperatureMagnitude ; + } + + public void setTemperatureUnits(String temperatureUnits) { + this.temperatureUnits = temperatureUnits; + } + + public String getTemperatureUnits() { + return this.temperatureUnits ; + } + + public void setEnvironmentalConditions(Cluster environmentalConditions) { + this.environmentalConditions = environmentalConditions; + } + + public Cluster getEnvironmentalConditions() { + return this.environmentalConditions ; + } + + public void setExertion(Cluster exertion) { + this.exertion = exertion; + } + + public Cluster getExertion() { + return this.exertion ; + } + + public void setMenstrualCycle(Element menstrualCycle) { + this.menstrualCycle = menstrualCycle; + } + + public Element getMenstrualCycle() { + return this.menstrualCycle ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setDevice(Cluster device) { + this.device = device; + } + + public Cluster getDevice() { + return this.device ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservationContainment.java new file mode 100644 index 000000000..36c4cf756 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservationContainment.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datastructures.Element; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class TemperatureObservationContainment extends Containment { + public SelectAqlField TEMPERATURE_OBSERVATION = new AqlFieldImp(TemperatureObservation.class, "", "TemperatureObservation", TemperatureObservation.class, this); + + public SelectAqlField TEMPERATURE_MAGNITUDE = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude", "temperatureMagnitude", Double.class, this); + + public SelectAqlField TEMPERATURE_UNITS = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units", "temperatureUnits", String.class, this); + + public SelectAqlField ENVIRONMENTAL_CONDITIONS = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0056]", "environmentalConditions", Cluster.class, this); + + public SelectAqlField EXERTION = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0057]", "exertion", Cluster.class, this); + + public SelectAqlField MENSTRUAL_CYCLE = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0058]", "menstrualCycle", Element.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/events[at0003]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(TemperatureObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); + + public SelectAqlField DEVICE = new AqlFieldImp(TemperatureObservation.class, "/protocol[at0020]/items[at0059]", "device", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(TemperatureObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(TemperatureObservation.class, "/language", "language", Language.class, this); + + private TemperatureObservationContainment() { + super("openEHR-EHR-OBSERVATION.body_temperature.v1"); + } + + public static TemperatureObservationContainment getInstance() { + return new TemperatureObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TrendDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TrendDefiningCode.java new file mode 100644 index 000000000..4620eeba4 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TrendDefiningCode.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum TrendDefiningCode implements EnumValueSet { + WORSENING("Worsening", "The severity of the symptom or sign has worsened overall during this episode.", "local", "at0183"), + + IMPROVING("Improving", "The severity of the symptom or sign has improved overall during this episode.", "local", "at0181"), + + UNCHANGED("Unchanged", "The severity of the symptom or sign has not changed overall during this episode.", "local", "at0182"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + TrendDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode.java new file mode 100644 index 000000000..116bfe4ba --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode.java @@ -0,0 +1,39 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum ValueDefiningCode implements EnumValueSet { + RIGORS("Rigors", "Rigors.", "local", "at0100"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + ValueDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode2.java new file mode 100644 index 000000000..9d68bd02b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode2.java @@ -0,0 +1,41 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum ValueDefiningCode2 implements EnumValueSet { + LETHARGIC("Lethargic", "Lethargic.", "local", "at0101"), + + CONFUSED("Confused", "Confused.", "local", "at0102"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + ValueDefiningCode2(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode3.java new file mode 100644 index 000000000..8193255d6 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode3.java @@ -0,0 +1,41 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum ValueDefiningCode3 implements EnumValueSet { + NEW_PAIN("New pain", "New pain.", "local", "at0106"), + + INCREASING_OR_CONSISTING_PAIN("Increasing or consisting pain", "Increasing or consisting pain.", "local", "at0107"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + ValueDefiningCode3(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode4.java new file mode 100644 index 000000000..49fbd0fbf --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode4.java @@ -0,0 +1,41 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum ValueDefiningCode4 implements EnumValueSet { + ABDOMINAL_DISTENSION_NAUSEA_BLEEDING("Abdominal distension/nausea/bleeding", "Abdominal distension/nausea/bleeding.", "local", "at0109"), + + NO_PROGRESS("No progress", "No progress.", "local", "at0108"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + ValueDefiningCode4(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode5.java new file mode 100644 index 000000000..c232fb457 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode5.java @@ -0,0 +1,41 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum ValueDefiningCode5 implements EnumValueSet { + FEELING_OF_IMPENDING_DOOM("Feeling of impending doom", "Feeling of impending doom.", "local", "at0111"), + + NOT_FEELING_WELL("Not feeling well", "Not feeling well.", "local", "at0110"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + ValueDefiningCode5(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode6.java new file mode 100644 index 000000000..888136b15 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode6.java @@ -0,0 +1,41 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum ValueDefiningCode6 implements EnumValueSet { + DOESN_T_LOOK_GOOD("Doesn't look good", "Doesn't look good.", "local", "at0113"), + + CHANGE_IN_BEHAVIOUR("Change in behaviour", "Change in behaviour.", "local", "at0112"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + ValueDefiningCode6(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode7.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode7.java new file mode 100644 index 000000000..339136461 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ValueDefiningCode7.java @@ -0,0 +1,49 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum ValueDefiningCode7 implements EnumValueSet { + SKIN_JOINT_WOUND("Skin / joint/ wound", "The likely source of infection is skin, joint or wound.", "local", "at0026"), + + URINE("Urine", "The likely source of infection is urine.", "local", "at0014"), + + INDWELLING_DEVICE("Indwelling device", "The likely source of infection is an indwelling device.", "local", "at0027"), + + RESPIRATORY("Respiratory", "The likely source of infection is respiratory.", "local", "at0012"), + + SURGICAL("Surgical", "The likely source of infection is surgical.", "local", "at0015"), + + BRAIN("Brain", "The likely source of infection is brain.", "local", "at0013"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + ValueDefiningCode7(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java new file mode 100644 index 000000000..d0cdf2597 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java @@ -0,0 +1,116 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datastructures.ItemTree; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.body_weight.v2") +public class WeightObservation { + @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude") + private Double weightMagnitude; + + @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units") + private String weightUnits; + + @Path("/data[at0002]/events[at0003]/state[at0008]") + private ItemTree stateStructure; + + @Path("/data[at0002]/events[at0003]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0002]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0015]/items[at0020]") + private Cluster device; + + @Path("/protocol[at0015]/items[at0027]") + private List extension; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setWeightMagnitude(Double weightMagnitude) { + this.weightMagnitude = weightMagnitude; + } + + public Double getWeightMagnitude() { + return this.weightMagnitude ; + } + + public void setWeightUnits(String weightUnits) { + this.weightUnits = weightUnits; + } + + public String getWeightUnits() { + return this.weightUnits ; + } + + public void setStateStructure(ItemTree stateStructure) { + this.stateStructure = stateStructure; + } + + public ItemTree getStateStructure() { + return this.stateStructure ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setDevice(Cluster device) { + this.device = device; + } + + public Cluster getDevice() { + return this.device ; + } + + public void setExtension(List extension) { + this.extension = extension; + } + + public List getExtension() { + return this.extension ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservationContainment.java new file mode 100644 index 000000000..cc1af55b6 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservationContainment.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datastructures.ItemTree; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class WeightObservationContainment extends Containment { + public SelectAqlField WEIGHT_OBSERVATION = new AqlFieldImp(WeightObservation.class, "", "WeightObservation", WeightObservation.class, this); + + public SelectAqlField WEIGHT_MAGNITUDE = new AqlFieldImp(WeightObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude", "weightMagnitude", Double.class, this); + + public SelectAqlField WEIGHT_UNITS = new AqlFieldImp(WeightObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units", "weightUnits", String.class, this); + + public SelectAqlField STATE_STRUCTURE = new AqlFieldImp(WeightObservation.class, "/data[at0002]/events[at0003]/state[at0008]", "stateStructure", ItemTree.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(WeightObservation.class, "/data[at0002]/events[at0003]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(WeightObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); + + public SelectAqlField DEVICE = new AqlFieldImp(WeightObservation.class, "/protocol[at0015]/items[at0020]", "device", Cluster.class, this); + + public ListSelectAqlField EXTENSION = new ListAqlFieldImp(WeightObservation.class, "/protocol[at0015]/items[at0027]", "extension", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(WeightObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(WeightObservation.class, "/language", "language", Language.class, this); + + private WeightObservationContainment() { + super("openEHR-EHR-OBSERVATION.body_weight.v2"); + } + + public static WeightObservationContainment getInstance() { + return new WeightObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java new file mode 100644 index 000000000..2bd930c05 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java @@ -0,0 +1,192 @@ +package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +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 org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Id; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.annotations.Template; +import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.AbteilungsfallCluster; +import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.VersorgungsfallCluster; +import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.VersorgungsortAdminEntry; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; +import org.ehrbase.client.openehrclient.VersionUid; + +@Entity +@Archetype("openEHR-EHR-COMPOSITION.event_summary.v0") +@Template("Patientenaufenthalt") +public class PatientenaufenthaltComposition { + @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0 and name/value='Versorgungsfall']") + private VersorgungsfallCluster versorgungsfall; + + @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0 and name/value='Abteilungsfall']") + private AbteilungsfallCluster abteilungsfall; + + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; + + @Path("/context/participations") + private List participations; + + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + @Path("/context/location") + private String location; + + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; + + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; + + @Path("/content[openEHR-EHR-ADMIN_ENTRY.hospitalization.v0 and name/value='Versorgungsort']") + private VersorgungsortAdminEntry versorgungsort; + + @Path("/composer") + private PartyProxy composer; + + @Path("/language") + private Language language; + + @Path("/feeder_audit") + private FeederAudit feederAudit; + + @Path("/category|defining_code") + private Category categoryDefiningCode; + + @Path("/territory") + private Territory territory; + + @Id + private VersionUid versionUid; + + public void setVersorgungsfall(VersorgungsfallCluster versorgungsfall) { + this.versorgungsfall = versorgungsfall; + } + + public VersorgungsfallCluster getVersorgungsfall() { + return this.versorgungsfall ; + } + + public void setAbteilungsfall(AbteilungsfallCluster abteilungsfall) { + this.abteilungsfall = abteilungsfall; + } + + public AbteilungsfallCluster getAbteilungsfall() { + return this.abteilungsfall ; + } + + 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 setVersorgungsort(VersorgungsortAdminEntry versorgungsort) { + this.versorgungsort = versorgungsort; + } + + public VersorgungsortAdminEntry getVersorgungsort() { + return this.versorgungsort ; + } + + 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 setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } + + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } + + 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltCompositionContainment.java new file mode 100644 index 000000000..c5a5f02a1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltCompositionContainment.java @@ -0,0 +1,60 @@ +package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +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 org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.AbteilungsfallCluster; +import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.VersorgungsfallCluster; +import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.VersorgungsortAdminEntry; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; + +public class PatientenaufenthaltCompositionContainment extends Containment { + public SelectAqlField PATIENTENAUFENTHALT_COMPOSITION = new AqlFieldImp(PatientenaufenthaltComposition.class, "", "PatientenaufenthaltComposition", PatientenaufenthaltComposition.class, this); + + public SelectAqlField VERSORGUNGSFALL = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]", "versorgungsfall", VersorgungsfallCluster.class, this); + + public SelectAqlField ABTEILUNGSFALL = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]", "abteilungsfall", AbteilungsfallCluster.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(PatientenaufenthaltComposition.class, "/context/participations", "participations", Participation.class, this); + + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + + public SelectAqlField LOCATION = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/location", "location", String.class, this); + + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(PatientenaufenthaltComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); + + public SelectAqlField VERSORGUNGSORT = new AqlFieldImp(PatientenaufenthaltComposition.class, "/content[openEHR-EHR-ADMIN_ENTRY.hospitalization.v0]", "versorgungsort", VersorgungsortAdminEntry.class, this); + + public SelectAqlField COMPOSER = new AqlFieldImp(PatientenaufenthaltComposition.class, "/composer", "composer", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(PatientenaufenthaltComposition.class, "/language", "language", Language.class, this); + + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(PatientenaufenthaltComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(PatientenaufenthaltComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); + + public SelectAqlField TERRITORY = new AqlFieldImp(PatientenaufenthaltComposition.class, "/territory", "territory", Territory.class, this); + + private PatientenaufenthaltCompositionContainment() { + super("openEHR-EHR-COMPOSITION.event_summary.v0"); + } + + public static PatientenaufenthaltCompositionContainment getInstance() { + return new PatientenaufenthaltCompositionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java new file mode 100644 index 000000000..e062578bf --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.case_identification.v0") +public class AbteilungsfallCluster { + @Path("/items[at0001 and name/value='Zugehörige Abteilungsfall-Kennung']/value|value") + private String zugehorigeAbteilungsfallKennungValue; + + public void setZugehorigeAbteilungsfallKennungValue(String zugehorigeAbteilungsfallKennungValue) { + this.zugehorigeAbteilungsfallKennungValue = zugehorigeAbteilungsfallKennungValue; + } + + public String getZugehorigeAbteilungsfallKennungValue() { + return this.zugehorigeAbteilungsfallKennungValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallClusterContainment.java new file mode 100644 index 000000000..64a9ce533 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallClusterContainment.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; + +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class AbteilungsfallClusterContainment extends Containment { + public SelectAqlField ABTEILUNGSFALL_CLUSTER = new AqlFieldImp(AbteilungsfallCluster.class, "", "AbteilungsfallCluster", AbteilungsfallCluster.class, this); + + public SelectAqlField ZUGEHORIGE_ABTEILUNGSFALL_KENNUNG_VALUE = new AqlFieldImp(AbteilungsfallCluster.class, "/items[at0001]/value|value", "zugehorigeAbteilungsfallKennungValue", String.class, this); + + private AbteilungsfallClusterContainment() { + super("openEHR-EHR-CLUSTER.case_identification.v0"); + } + + public static AbteilungsfallClusterContainment getInstance() { + return new AbteilungsfallClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java new file mode 100644 index 000000000..16b35ec32 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java @@ -0,0 +1,101 @@ +package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.DvIdentifier; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.device.v1") +public class DetailsZumBettCluster { + @Path("/items[at0001]/value|value") + private String geratenameValue; + + @Path("/items[at0003]/value|value") + private String geratetypValue; + + @Path("/items[at0009]") + private List eigenschaften; + + @Path("/items[at0021]/value") + private DvIdentifier eindeutigeIdentifikationsnummerId; + + @Path("/items[at0019]") + private List gerateverwaltung; + + @Path("/items[at0018]") + private List komponenten; + + @Path("/items[at0026]") + private List erweiterung; + + @Path("/items[at0027]") + private List multimedia; + + public void setGeratenameValue(String geratenameValue) { + this.geratenameValue = geratenameValue; + } + + public String getGeratenameValue() { + return this.geratenameValue ; + } + + public void setGeratetypValue(String geratetypValue) { + this.geratetypValue = geratetypValue; + } + + public String getGeratetypValue() { + return this.geratetypValue ; + } + + public void setEigenschaften(List eigenschaften) { + this.eigenschaften = eigenschaften; + } + + public List getEigenschaften() { + return this.eigenschaften ; + } + + public void setEindeutigeIdentifikationsnummerId(DvIdentifier eindeutigeIdentifikationsnummerId) { + this.eindeutigeIdentifikationsnummerId = eindeutigeIdentifikationsnummerId; + } + + public DvIdentifier getEindeutigeIdentifikationsnummerId() { + return this.eindeutigeIdentifikationsnummerId ; + } + + public void setGerateverwaltung(List gerateverwaltung) { + this.gerateverwaltung = gerateverwaltung; + } + + public List getGerateverwaltung() { + return this.gerateverwaltung ; + } + + public void setKomponenten(List komponenten) { + this.komponenten = komponenten; + } + + public List getKomponenten() { + return this.komponenten ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setMultimedia(List multimedia) { + this.multimedia = multimedia; + } + + public List getMultimedia() { + return this.multimedia ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettClusterContainment.java new file mode 100644 index 000000000..b92011443 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettClusterContainment.java @@ -0,0 +1,38 @@ +package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.DvIdentifier; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class DetailsZumBettClusterContainment extends Containment { + public SelectAqlField DETAILS_ZUM_BETT_CLUSTER = new AqlFieldImp(DetailsZumBettCluster.class, "", "DetailsZumBettCluster", DetailsZumBettCluster.class, this); + + public SelectAqlField GERATENAME_VALUE = new AqlFieldImp(DetailsZumBettCluster.class, "/items[at0001]/value|value", "geratenameValue", String.class, this); + + public SelectAqlField GERATETYP_VALUE = new AqlFieldImp(DetailsZumBettCluster.class, "/items[at0003]/value|value", "geratetypValue", String.class, this); + + public ListSelectAqlField EIGENSCHAFTEN = new ListAqlFieldImp(DetailsZumBettCluster.class, "/items[at0009]", "eigenschaften", Cluster.class, this); + + public SelectAqlField EINDEUTIGE_IDENTIFIKATIONSNUMMER_ID = new AqlFieldImp(DetailsZumBettCluster.class, "/items[at0021]/value", "eindeutigeIdentifikationsnummerId", DvIdentifier.class, this); + + public ListSelectAqlField GERATEVERWALTUNG = new ListAqlFieldImp(DetailsZumBettCluster.class, "/items[at0019]", "gerateverwaltung", Cluster.class, this); + + public ListSelectAqlField KOMPONENTEN = new ListAqlFieldImp(DetailsZumBettCluster.class, "/items[at0018]", "komponenten", Cluster.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(DetailsZumBettCluster.class, "/items[at0026]", "erweiterung", Cluster.class, this); + + public ListSelectAqlField MULTIMEDIA = new ListAqlFieldImp(DetailsZumBettCluster.class, "/items[at0027]", "multimedia", Cluster.class, this); + + private DetailsZumBettClusterContainment() { + super("openEHR-EHR-CLUSTER.device.v1"); + } + + public static DetailsZumBettClusterContainment getInstance() { + return new DetailsZumBettClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java new file mode 100644 index 000000000..296a0609b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java @@ -0,0 +1,121 @@ +package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.location.v1") +public class StandortCluster { + @Path("/items[at0040]/value|value") + private String standorttypValue; + + @Path("/items[at0046]/value|value") + private String standortbeschreibungValue; + + @Path("/items[at0048]/value|defining_code") + private StandortschlusselDefiningCode standortschlusselDefiningCode; + + @Path("/items[at0024]/value|value") + private String campusValue; + + @Path("/items[at0025]/value|value") + private String gebaudegruppeValue; + + @Path("/items[at0028]/value|value") + private String ebeneValue; + + @Path("/items[at0027 and name/value='Stationskennung']/value|value") + private String stationskennungValue; + + @Path("/items[at0029 and name/value='Zimmerkennung']/value|value") + private String zimmerkennungValue; + + @Path("/items[at0034 and name/value='Bettplatzkennung']/value|value") + private String bettplatzkennungValue; + + @Path("/items[openEHR-EHR-CLUSTER.device.v1 and name/value='Details zum Bett']") + private DetailsZumBettCluster detailsZumBett; + + public void setStandorttypValue(String standorttypValue) { + this.standorttypValue = standorttypValue; + } + + public String getStandorttypValue() { + return this.standorttypValue ; + } + + public void setStandortbeschreibungValue(String standortbeschreibungValue) { + this.standortbeschreibungValue = standortbeschreibungValue; + } + + public String getStandortbeschreibungValue() { + return this.standortbeschreibungValue ; + } + + public void setStandortschlusselDefiningCode( + StandortschlusselDefiningCode standortschlusselDefiningCode) { + this.standortschlusselDefiningCode = standortschlusselDefiningCode; + } + + public StandortschlusselDefiningCode getStandortschlusselDefiningCode() { + return this.standortschlusselDefiningCode ; + } + + public void setCampusValue(String campusValue) { + this.campusValue = campusValue; + } + + public String getCampusValue() { + return this.campusValue ; + } + + public void setGebaudegruppeValue(String gebaudegruppeValue) { + this.gebaudegruppeValue = gebaudegruppeValue; + } + + public String getGebaudegruppeValue() { + return this.gebaudegruppeValue ; + } + + public void setEbeneValue(String ebeneValue) { + this.ebeneValue = ebeneValue; + } + + public String getEbeneValue() { + return this.ebeneValue ; + } + + public void setStationskennungValue(String stationskennungValue) { + this.stationskennungValue = stationskennungValue; + } + + public String getStationskennungValue() { + return this.stationskennungValue ; + } + + public void setZimmerkennungValue(String zimmerkennungValue) { + this.zimmerkennungValue = zimmerkennungValue; + } + + public String getZimmerkennungValue() { + return this.zimmerkennungValue ; + } + + public void setBettplatzkennungValue(String bettplatzkennungValue) { + this.bettplatzkennungValue = bettplatzkennungValue; + } + + public String getBettplatzkennungValue() { + return this.bettplatzkennungValue ; + } + + public void setDetailsZumBett(DetailsZumBettCluster detailsZumBett) { + this.detailsZumBett = detailsZumBett; + } + + public DetailsZumBettCluster getDetailsZumBett() { + return this.detailsZumBett ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortClusterContainment.java new file mode 100644 index 000000000..631cb838d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortClusterContainment.java @@ -0,0 +1,38 @@ +package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; + +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class StandortClusterContainment extends Containment { + public SelectAqlField STANDORT_CLUSTER = new AqlFieldImp(StandortCluster.class, "", "StandortCluster", StandortCluster.class, this); + + public SelectAqlField STANDORTTYP_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0040]/value|value", "standorttypValue", String.class, this); + + public SelectAqlField STANDORTBESCHREIBUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0046]/value|value", "standortbeschreibungValue", String.class, this); + + public SelectAqlField STANDORTSCHLUSSEL_DEFINING_CODE = new AqlFieldImp(StandortCluster.class, "/items[at0048]/value|defining_code", "standortschlusselDefiningCode", StandortschlusselDefiningCode.class, this); + + public SelectAqlField CAMPUS_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0024]/value|value", "campusValue", String.class, this); + + public SelectAqlField GEBAUDEGRUPPE_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0025]/value|value", "gebaudegruppeValue", String.class, this); + + public SelectAqlField EBENE_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0028]/value|value", "ebeneValue", String.class, this); + + public SelectAqlField STATIONSKENNUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0027]/value|value", "stationskennungValue", String.class, this); + + public SelectAqlField ZIMMERKENNUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0029]/value|value", "zimmerkennungValue", String.class, this); + + public SelectAqlField BETTPLATZKENNUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0034]/value|value", "bettplatzkennungValue", String.class, this); + + public SelectAqlField DETAILS_ZUM_BETT = new AqlFieldImp(StandortCluster.class, "/items[openEHR-EHR-CLUSTER.device.v1]", "detailsZumBett", DetailsZumBettCluster.class, this); + + private StandortClusterContainment() { + super("openEHR-EHR-CLUSTER.location.v1"); + } + + public static StandortClusterContainment getInstance() { + return new StandortClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortschlusselDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortschlusselDefiningCode.java new file mode 100644 index 000000000..33a6aa353 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortschlusselDefiningCode.java @@ -0,0 +1,332 @@ +package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum StandortschlusselDefiningCode implements EnumValueSet { + NEUROCHIRURGIE("Neurochirurgie", "Neurochirurgie", "§301 SGB V", "1700"), + + HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE_SCHWERPUNKT_FRAUENHEILKUNDE("Hämatologie und internistische Onkologie/Schwerpunkt Frauenheilkunde", "Hämatologie und internistische Onkologie/Schwerpunkt Frauenheilkunde", "§301 SGB V", "0524"), + + INTENSIVMEDIZIN_SCHWERPUNKT_KARDIOLOGIE("Intensivmedizin/Schwerpunkt Kardiologie", "Intensivmedizin/Schwerpunkt Kardiologie", "§301 SGB V", "3603"), + + INNERE_MEDIZIN_SCHWERPUNKT_KARDIOLOGIE("Innere Medizin/Schwerpunkt Kardiologie", "Innere Medizin/Schwerpunkt Kardiologie", "§301 SGB V", "0103"), + + NEUROLOGIE_SCHWERPUNKT_GERONTOLOGIE("Neurologie/Schwerpunkt Gerontologie", "Neurologie/Schwerpunkt Gerontologie", "§301 SGB V", "2851"), + + ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_SUCHTBEHANDLUNG_TAGESKLINIK("Allgemeine Psychiatrie/Schwerpunkt Suchtbehandlung, Tagesklinik", "Allgemeine Psychiatrie/Schwerpunkt Suchtbehandlung, Tagesklinik", "§301 SGB V", "2953"), + + WEANINGEINHEIT("Weaningeinheit", "Weaningeinheit", "§301 SGB V", "3758"), + + INNERE_MEDIZIN_SCHWERPUNKT_GASTROENTEROLOGIE("Innere Medizin/Schwerpunkt Gastroenterologie", "Innere Medizin/Schwerpunkt Gastroenterologie", "§301 SGB V", "0107"), + + ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_FORENSISCHE_BEHANDLUNG("Allgemeine Psychiatrie/Schwerpunkt Forensische Behandlung", "Allgemeine Psychiatrie/Schwerpunkt Forensische Behandlung", "§301 SGB V", "2952"), + + INNERE_MEDIZIN_SCHWERPUNKT_HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE("Innere Medizin/Schwerpunkt Hämatologie und internistische Onkologie", "Innere Medizin/Schwerpunkt Hämatologie und internistische Onkologie", "§301 SGB V", "0105"), + + GERIATRIE_TAGESKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Geriatrie/Tagesklinik (für teilstationäre Pflegesätze)", "Geriatrie/Tagesklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "0260"), + + RHEUMATOLOGIE_SCHWERPUNKT_PADIATRIE("Rheumatologie/Schwerpunkt Pädiatrie", "Rheumatologie/Schwerpunkt Pädiatrie", "§301 SGB V", "0910"), + + PADIATRIE_SCHWERPUNKT_KINDERNEUROLOGIE("Pädiatrie/Schwerpunkt Kinderneurologie", "Pädiatrie/Schwerpunkt Kinderneurologie", "§301 SGB V", "1028"), + + ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_GERONTOPSYCHIATRIE_TAGESKLINIK("Allgemeine Psychiatrie/Schwerpunkt Gerontopsychiatrie, Tagesklinik", "Allgemeine Psychiatrie/Schwerpunkt Gerontopsychiatrie, Tagesklinik", "§301 SGB V", "2955"), + + HERZCHIRURGIE_SCHWERPUNKT_THORAXCHIRURGIE_INTENSIVMEDIZIN("Herzchirurgie/Schwerpunkt Thoraxchirurgie Intensivmedizin", "Herzchirurgie/Schwerpunkt Thoraxchirurgie Intensivmedizin", "§301 SGB V", "2150"), + + ENDOKRINOLOGIE_SCHWERPUNKT_GASTROENTEROLOGIE("Endokrinologie/Schwerpunkt Gastroenterologie", "Endokrinologie/Schwerpunkt Gastroenterologie", "§301 SGB V", "0607"), + + NEONATOLOGIE("Neonatologie", "Neonatologie", "§301 SGB V", "1200"), + + SUCHTMEDIZIN("Suchtmedizin", "Suchtmedizin", "§301 SGB V", "3756"), + + GERIATRIE("Geriatrie", "Geriatrie", "§301 SGB V", "0200"), + + ALLGEMEINE_CHIRURGIE_INTENSIVMEDIZIN13_ABS2_SATZ32_HALBS_BPFLV_IN_DER_AM31122003_GELTENDEN_FASSUNG("Allgemeine Chirurgie/Intensivmedizin (§ 13 Abs. 2 Satz 3, 2. Halbs. BPflV in der am 31.12.2003 geltenden Fassung)", "Allgemeine Chirurgie/Intensivmedizin (§ 13 Abs. 2 Satz 3, 2. Halbs. BPflV in der am 31.12.2003 geltenden Fassung)", "§301 SGB V", "1536"), + + PADIATRIE_SCHWERPUNKT_HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE("Pädiatrie/Schwerpunkt Hämatologie und internistische Onkologie", "Pädiatrie/Schwerpunkt Hämatologie und internistische Onkologie", "§301 SGB V", "1005"), + + INTENSIVMEDIZIN_HERZ_THORAXCHIRURGIE("Intensivmedizin/Herz-Thoraxchirurgie", "Intensivmedizin/Herz-Thoraxchirurgie", "§301 SGB V", "3652"), + + ANGIOLOGIE("Angiologie", "Angiologie", "§301 SGB V", "3750"), + + NEPHROLOGIE_INTENSIVMEDIZIN("Nephrologie/Intensivmedizin", "Nephrologie/Intensivmedizin", "§301 SGB V", "0436"), + + FRAUENHEILKUNDE("Frauenheilkunde", "Frauenheilkunde", "§301 SGB V", "2425"), + + KINDERCHIRURGIE("Kinderchirurgie", "Kinderchirurgie", "§301 SGB V", "1300"), + + DERMATOLOGIE_TAGESKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Dermatologie/Tagesklinik (für teilstationäre Pflegesätze)", "Dermatologie/Tagesklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "3460"), + + PSYCHOSOMATIK_PSYCHOTHERAPIE("Psychosomatik/Psychotherapie", "Psychosomatik/Psychotherapie", "§301 SGB V", "3100"), + + PADIATRIE_SCHWERPUNKT_NEONATOLOGIE("Pädiatrie/Schwerpunkt Neonatologie", "Pädiatrie/Schwerpunkt Neonatologie", "§301 SGB V", "1012"), + + UROLOGIE("Urologie", "Urologie", "§301 SGB V", "2200"), + + INNERE_MEDIZIN_SCHWERPUNKT_LUNGEN_UND_BRONCHIALHEILKUNDE("Innere Medizin/Schwerpunkt Lungen- und Bronchialheilkunde", "Innere Medizin/Schwerpunkt Lungen- und Bronchialheilkunde", "§301 SGB V", "0114"), + + THORAXCHIRURGIE("Thoraxchirurgie", "Thoraxchirurgie", "§301 SGB V", "2000"), + + PADIATRIE_SCHWERPUNKT_NEPHROLOGIE("Pädiatrie/Schwerpunkt Nephrologie", "Pädiatrie/Schwerpunkt Nephrologie", "§301 SGB V", "1004"), + + HERZCHIRURGIE_INTENSIVMEDIZIN13_ABS2_SATZ32_HALBSATZ_BPFLV_IN_DER_AM31122003_GELTENDEN_FASSUNG("Herzchirurgie/Intensivmedizin (§ 13 Abs. 2 Satz 3 2. Halbsatz BPflV in der am 31.12.2003 geltenden Fassung)", "Herzchirurgie/Intensivmedizin (§ 13 Abs. 2 Satz 3 2. Halbsatz BPflV in der am 31.12.2003 geltenden Fassung)", "§301 SGB V", "2136"), + + INNERE_MEDIZIN_SCHWERPUNKT_SCHLAGANFALLPATIENTEN("Innere Medizin/Schwerpunkt Schlaganfallpatienten", "Innere Medizin/Schwerpunkt Schlaganfallpatienten", "§301 SGB V", "0156"), + + ENDOKRINOLOGIE_SCHWERPUNKT_PADIATRIE("Endokrinologie/Schwerpunkt Pädiatrie", "Endokrinologie/Schwerpunkt Pädiatrie", "§301 SGB V", "0610"), + + PSYCHOSOMATIK_PSYCHOTHERAPIE_NACHTKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Psychosomatik/Psychotherapie/Nachtklinik (für teilstationäre Pflegesätze)", "Psychosomatik/Psychotherapie/Nachtklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "3161"), + + GASTROENTEROLOGIE("Gastroenterologie", "Gastroenterologie", "§301 SGB V", "0700"), + + NEUROLOGIE("Neurologie", "Neurologie", "§301 SGB V", "2800"), + + GASTROENTEROLOGIE_SCHWERPUNKT_PADIATRIE("Gastroenterologie/Schwerpunkt Pädiatrie", "Gastroenterologie/Schwerpunkt Pädiatrie", "§301 SGB V", "0710"), + + UNFALLCHIRURGIE("Unfallchirurgie", "Unfallchirurgie", "§301 SGB V", "1600"), + + LUNGEN_UND_BRONCHIALHEILKUNDE_SCHWERPUNKT_PADIATRIE("Lungen- und Bronchialheilkunde/Schwerpunkt Pädiatrie", "Lungen- und Bronchialheilkunde/Schwerpunkt Pädiatrie", "§301 SGB V", "1410"), + + INNERE_MEDIZIN_SCHWERPUNKT_NEPHROLOGIE("Innere Medizin/Schwerpunkt Nephrologie", "Innere Medizin/Schwerpunkt Nephrologie", "§301 SGB V", "0104"), + + HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE("Hämatologie und internistische Onkologie", "Hämatologie und internistische Onkologie", "§301 SGB V", "0500"), + + ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_SUCHTBEHANDLUNG_NACHTKLINIK("Allgemeine Psychiatrie/Schwerpunkt Suchtbehandlung, Nachtklinik", "Allgemeine Psychiatrie/Schwerpunkt Suchtbehandlung, Nachtklinik", "§301 SGB V", "2954"), + + PADIATRIE_SCHWERPUNKT_ENDOKRINOLOGIE("Pädiatrie/Schwerpunkt Endokrinologie", "Pädiatrie/Schwerpunkt Endokrinologie", "§301 SGB V", "1006"), + + PADIATRIE_SCHWERPUNKT_LUNGEN_UND_BRONCHIALHEILKUNDE("Pädiatrie/Schwerpunkt Lungen- und Bronchialheilkunde", "Pädiatrie/Schwerpunkt Lungen- und Bronchialheilkunde", "§301 SGB V", "1014"), + + INNERE_MEDIZIN_SCHWERPUNKT_INFEKTIONSKRANKHEITEN("Innere Medizin/Schwerpunkt Infektionskrankheiten", "Innere Medizin/Schwerpunkt Infektionskrankheiten", "§301 SGB V", "0152"), + + PADIATRIE_SCHWERPUNKT_PERINATALMEDIZIN("Pädiatrie/Schwerpunkt Perinatalmedizin", "Pädiatrie/Schwerpunkt Perinatalmedizin", "§301 SGB V", "1050"), + + INTENSIVMEDIZIN("Intensivmedizin", "Intensivmedizin", "§301 SGB V", "3600"), + + ALLGEMEINE_PSYCHIATRIE_NACHTKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Allgemeine Psychiatrie/Nachtklinik (für teilstationäre Pflegesätze)", "Allgemeine Psychiatrie/Nachtklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "2961"), + + ENDOKRINOLOGIE("Endokrinologie", "Endokrinologie", "§301 SGB V", "0600"), + + INTENSIVMEDIZIN_SCHWERPUNKT_INNERE_MEDIZIN("Intensivmedizin/Schwerpunkt Innere Medizin", "Intensivmedizin/Schwerpunkt Innere Medizin", "§301 SGB V", "3601"), + + INTENSIVMEDIZIN_SCHWERPUNKT_CHIRURGIE("Intensivmedizin/Schwerpunkt Chirurgie", "Intensivmedizin/Schwerpunkt Chirurgie", "§301 SGB V", "3618"), + + NEUROLOGIE_SCHWERPUNKT_PADIATRIE("Neurologie/Schwerpunkt Pädiatrie", "Neurologie/Schwerpunkt Pädiatrie", "§301 SGB V", "2810"), + + OPERATIVE_INTENSIVMEDIZIN_SCHWERPUNKT_CHIRURGIE("Operative Intensivmedizin/Schwerpunkt Chirurgie", "Operative Intensivmedizin/Schwerpunkt Chirurgie", "§301 SGB V", "3650"), + + AUGENHEILKUNDE("Augenheilkunde", "Augenheilkunde", "§301 SGB V", "2700"), + + STRAHLENHEILKUNDE("Strahlenheilkunde", "Strahlenheilkunde", "§301 SGB V", "3300"), + + INNERE_MEDIZIN_SCHWERPUNKT_DIABETES("Innere Medizin/Schwerpunkt Diabetes", "Innere Medizin/Schwerpunkt Diabetes", "§301 SGB V", "0153"), + + SCHMERZTHERAPIE("Schmerztherapie", "Schmerztherapie", "§301 SGB V", "3753"), + + KINDER_UND_JUGENDPSYCHIATRIE_NACHTKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Kinder- und Jugendpsychiatrie/Nachtklinik (für teilstationäre Pflegesätze)", "Kinder- und Jugendpsychiatrie/Nachtklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "3061"), + + INTENSIVMEDIZIN_HERZCHIRURGIE("Intensivmedizin/Herzchirurgie", "Intensivmedizin/Herzchirurgie", "§301 SGB V", "3621"), + + ORTHOPADIE_SCHWERPUNKT_CHIRURGIE("Orthopädie/Schwerpunkt Chirurgie", "Orthopädie/Schwerpunkt Chirurgie", "§301 SGB V", "2315"), + + INNERE_MEDIZIN_SCHWERPUNKT_NATURHEILKUNDE("Innere Medizin/Schwerpunkt Naturheilkunde", "Innere Medizin/Schwerpunkt Naturheilkunde", "§301 SGB V", "0154"), + + ORTHOPADIE_SCHWERPUNKT_RHEUMATOLOGIE("Orthopädie/Schwerpunkt Rheumatologie", "Orthopädie/Schwerpunkt Rheumatologie", "§301 SGB V", "2309"), + + FRAUENHEILKUNDE_SCHWERPUNKT_GERIATRIE("Frauenheilkunde/Schwerpunkt Geriatrie", "Frauenheilkunde/Schwerpunkt Geriatrie", "§301 SGB V", "2402"), + + ALLGEMEINE_CHIRURGIE("Allgemeine Chirurgie", "Allgemeine Chirurgie", "§301 SGB V", "1500"), + + ALLGEMEINE_PSYCHIATRIE_TAGESKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Allgemeine Psychiatrie/Tagesklinik (für teilstationäre Pflegesätze)", "Allgemeine Psychiatrie/Tagesklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "2960"), + + ZAHN_UND_KIEFERHEILKUNDE_MUND_UND_KIEFERCHIRURGIE("Zahn- und Kieferheilkunde, Mund- und Kieferchirurgie", "Zahn- und Kieferheilkunde, Mund- und Kieferchirurgie", "§301 SGB V", "3500"), + + PADIATRIE("Pädiatrie", "Pädiatrie", "§301 SGB V", "1000"), + + STRAHLENHEILKUNDE_SCHWERPUNKT_RADIOLOGIE("Strahlenheilkunde/Schwerpunkt Radiologie", "Strahlenheilkunde/Schwerpunkt Radiologie", "§301 SGB V", "3350"), + + LANGZEITBEREICH_KINDER("Langzeitbereich Kinder", "Langzeitbereich Kinder", "§301 SGB V", "1051"), + + ALLGEMEINE_CHIRURGIE_SCHWERPUNKT_THORAXCHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Thoraxchirurgie", "Allgemeine Chirurgie/Schwerpunkt Thoraxchirurgie", "§301 SGB V", "1520"), + + PADIATRIE_SCHWERPUNKT_GASTROENTEROLOGIE("Pädiatrie/Schwerpunkt Gastroenterologie", "Pädiatrie/Schwerpunkt Gastroenterologie", "§301 SGB V", "1007"), + + HERZCHIRURGIE_SCHWERPUNKT_THORAXCHIRURGIE("Herzchirurgie/Schwerpunkt Thoraxchirurgie", "Herzchirurgie/Schwerpunkt Thoraxchirurgie", "§301 SGB V", "2120"), + + ALLGEMEINE_CHIRURGIE_SCHWERPUNKT_GEFASSCHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Gefäßchirurgie", "Allgemeine Chirurgie/Schwerpunkt Gefäßchirurgie", "§301 SGB V", "1518"), + + PADIATRIE_SCHWERPUNKT_RHEUMATOLOGIE("Pädiatrie/Schwerpunkt Rheumatologie", "Pädiatrie/Schwerpunkt Rheumatologie", "§301 SGB V", "1009"), + + INNERE_MEDIZIN_TUMORFORSCHUNG("Innere Medizin/Tumorforschung", "Innere Medizin/Tumorforschung", "§301 SGB V", "0150"), + + INTENSIVMEDIZIN_SCHWERPUNKT_PADIATRIE("Intensivmedizin/Schwerpunkt Pädiatrie", "Intensivmedizin/Schwerpunkt Pädiatrie", "§301 SGB V", "3610"), + + HALS_NASEN_OHRENHEILKUNDE("Hals-, Nasen-, Ohrenheilkunde", "Hals-, Nasen-, Ohrenheilkunde", "§301 SGB V", "2600"), + + HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE_SCHWERPUNKT_STRAHLENHEILKUNDE("Hämatologie und internistische Onkologie/Schwerpunkt Strahlenheilkunde", "Hämatologie und internistische Onkologie/Schwerpunkt Strahlenheilkunde", "§301 SGB V", "0533"), + + ALLGEMEINE_CHIRURGIE_SCHWERPUNKT_PLASTISCHE_CHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Plastische Chirurgie", "Allgemeine Chirurgie/Schwerpunkt Plastische Chirurgie", "§301 SGB V", "1519"), + + THORAXCHIRURGIE_SCHWERPUNKT_HERZCHIRURGIE("Thoraxchirurgie/Schwerpunkt Herzchirurgie", "Thoraxchirurgie/Schwerpunkt Herzchirurgie", "§301 SGB V", "2021"), + + HERZCHIRURGIE_SCHWERPUNKT_GEFASSCHIRURGIE("Herzchirurgie/Schwerpunkt Gefäßchirurgie", "Herzchirurgie/Schwerpunkt Gefäßchirurgie", "§301 SGB V", "2118"), + + GEFASSCHIRURGIE("Gefäßchirurgie", "Gefäßchirurgie", "§301 SGB V", "1800"), + + FRAUENHEILKUNDE_UND_GEBURTSHILFE("Frauenheilkunde und Geburtshilfe", "Frauenheilkunde und Geburtshilfe", "§301 SGB V", "2400"), + + INNERE_MEDIZIN_SCHWERPUNKT_COLOPROKTOLOGIE("Innere Medizin/Schwerpunkt Coloproktologie", "Innere Medizin/Schwerpunkt Coloproktologie", "§301 SGB V", "0151"), + + ALLGEMEINE_CHIRURGIE_SCHWERPUNKT_HANDCHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Handchirurgie", "Allgemeine Chirurgie/Schwerpunkt Handchirurgie", "§301 SGB V", "1551"), + + PLASTISCHE_CHIRURGIE("Plastische Chirurgie", "Plastische Chirurgie", "§301 SGB V", "1900"), + + DERMATOLOGIE("Dermatologie", "Dermatologie", "§301 SGB V", "3400"), + + THORAXCHIRURGIE_SCHWERPUNKT_HERZCHIRURGIE_INTENSIVMEDIZIN("Thoraxchirurgie/Schwerpunkt Herzchirurgie Intensivmedizin", "Thoraxchirurgie/Schwerpunkt Herzchirurgie Intensivmedizin", "§301 SGB V", "2050"), + + INTENSIVMEDIZIN_SCHWERPUNKT_HALS_NASEN_OHRENHEILKUNDE("Intensivmedizin/Schwerpunkt Hals-, Nasen-, Ohrenheilkunde", "Intensivmedizin/Schwerpunkt Hals-, Nasen-, Ohrenheilkunde", "§301 SGB V", "3626"), + + PNEUMOLOGIE("Pneumologie", "Pneumologie", "§301 SGB V", "0800"), + + PSYCHOSOMATIK_PSYCHOTHERAPIE_SCHWERPUNKT_KINDER_UND_JUGENDPSYCHOSOMATIK("Psychosomatik/Psychotherapie/Schwerpunkt Kinder- und Jugendpsychosomatik", "Psychosomatik/Psychotherapie/Schwerpunkt Kinder- und Jugendpsychosomatik", "§301 SGB V", "3110"), + + INTENSIVMEDIZIN_SCHWERPUNKT_UROLOGIE("Intensivmedizin/Schwerpunkt Urologie", "Intensivmedizin/Schwerpunkt Urologie", "§301 SGB V", "3622"), + + HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE_SCHWERPUNKT_PADIATRIE("Hämatologie und internistische Onkologie/Schwerpunkt Pädiatrie", "Hämatologie und internistische Onkologie/Schwerpunkt Pädiatrie", "§301 SGB V", "0510"), + + NUKLEARMEDIZIN("Nuklearmedizin", "Nuklearmedizin", "§301 SGB V", "3200"), + + NUKLEARMEDIZIN_SCHWERPUNKT_STRAHLENHEILKUNDE("Nuklearmedizin/Schwerpunkt Strahlenheilkunde", "Nuklearmedizin/Schwerpunkt Strahlenheilkunde", "§301 SGB V", "3233"), + + ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_SUCHTBEHANDLUNG("Allgemeine Psychiatrie/Schwerpunkt Suchtbehandlung", "Allgemeine Psychiatrie/Schwerpunkt Suchtbehandlung", "§301 SGB V", "2950"), + + GERIATRIE_NACHTKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Geriatrie/Nachtklinik (für teilstationäre Pflegesätze)", "Geriatrie/Nachtklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "0261"), + + HEILTHERAPEUTISCHE_ABTEILUNG("Heiltherapeutische Abteilung", "Heiltherapeutische Abteilung", "§301 SGB V", "3754"), + + GERIATRIE_SCHWERPUNKT_FRAUENHEILKUNDE("Geriatrie/Schwerpunkt Frauenheilkunde", "Geriatrie/Schwerpunkt Frauenheilkunde", "§301 SGB V", "0224"), + + ORTHOPADIE_UND_UNFALLCHIRURGIE("Orthopädie und Unfallchirurgie", "Orthopädie und Unfallchirurgie", "§301 SGB V", "2316"), + + ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_GERONTOPSYCHIATRIE("Allgemeine Psychiatrie/Schwerpunkt Gerontopsychiatrie", "Allgemeine Psychiatrie/Schwerpunkt Gerontopsychiatrie", "§301 SGB V", "2951"), + + HERZCHIRURGIE("Herzchirurgie", "Herzchirurgie", "§301 SGB V", "2100"), + + FRAUENHEILKUNDE_SCHWERPUNKT_HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE("Frauenheilkunde/Schwerpunkt Hämatologie und internistische Onkologie", "Frauenheilkunde/Schwerpunkt Hämatologie und internistische Onkologie", "§301 SGB V", "2405"), + + ALLGEMEINE_CHIRURGIE_SCHWERPUNKT_ABDOMINAL_UND_GEFASSCHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Abdominal- und Gefäßchirurgie", "Allgemeine Chirurgie/Schwerpunkt Abdominal- und Gefäßchirurgie", "§301 SGB V", "1550"), + + SONSTIGE_FACHABTEILUNG("Sonstige Fachabteilung", "Sonstige Fachabteilung", "§301 SGB V", "3700"), + + RHEUMATOLOGIE("Rheumatologie", "Rheumatologie", "§301 SGB V", "0900"), + + THORAXCHIRURGIE_INTENSIVMEDIZIN("Thoraxchirurgie/Intensivmedizin", "Thoraxchirurgie/Intensivmedizin", "§301 SGB V", "2036"), + + LUNGEN_UND_BRONCHIALHEILKUNDE("Lungen- und Bronchialheilkunde", "Lungen- und Bronchialheilkunde", "§301 SGB V", "1400"), + + KINDER_UND_JUGENDPSYCHIATRIE_TAGESKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Kinder- und Jugendpsychiatrie/Tagesklinik (für teilstationäre Pflegesätze)", "Kinder- und Jugendpsychiatrie/Tagesklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "3060"), + + ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_NEUROLOGIE("Allgemeine Psychiatrie/Schwerpunkt Neurologie", "Allgemeine Psychiatrie/Schwerpunkt Neurologie", "§301 SGB V", "2928"), + + INTENSIVMEDIZIN_SCHWERPUNKT_FRAUENHEILKUNDE_UND_GEBURTSHILFE("Intensivmedizin/Schwerpunkt Frauenheilkunde und Geburtshilfe", "Intensivmedizin/Schwerpunkt Frauenheilkunde und Geburtshilfe", "§301 SGB V", "3624"), + + WIRBELSAULENCHIRURGIE("Wirbelsäulenchirurgie", "Wirbelsäulenchirurgie", "§301 SGB V", "3755"), + + PADIATRIE_SCHWERPUNKT_KINDERKARDIOLOGIE("Pädiatrie/Schwerpunkt Kinderkardiologie", "Pädiatrie/Schwerpunkt Kinderkardiologie", "§301 SGB V", "1011"), + + VISCERALCHIRURGIE("Visceralchirurgie", "Visceralchirurgie", "§301 SGB V", "3757"), + + PALLIATIVMEDIZIN("Palliativmedizin", "Palliativmedizin", "§301 SGB V", "3752"), + + CHIRURGIE_SCHWERPUNKT_ORTHOPADIE("Chirurgie/Schwerpunkt Orthopädie", "Chirurgie/Schwerpunkt Orthopädie", "§301 SGB V", "1523"), + + GASTROENTEROLOGIE_SCHWERPUNKT_ENDOKRINOLOGIE("Gastroenterologie/Schwerpunkt Endokrinologie", "Gastroenterologie/Schwerpunkt Endokrinologie", "§301 SGB V", "0706"), + + INNERE_MEDIZIN("Innere Medizin", "Innere Medizin", "§301 SGB V", "0100"), + + DAVON_GEBURTSHILFE("davon Geburtshilfe", "davon Geburtshilfe", "§301 SGB V", "2500"), + + ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_PSYCHOSOMATIK_PSYCHOTHERAPIE("Allgemeine Psychiatrie/Schwerpunkt Psychosomatik/Psychotherapie", "Allgemeine Psychiatrie/Schwerpunkt Psychosomatik/Psychotherapie", "§301 SGB V", "2931"), + + ALLGEMEINE_CHIRURGIE_SCHWERPUNKT_KINDERCHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Kinderchirurgie", "Allgemeine Chirurgie/Schwerpunkt Kinderchirurgie", "§301 SGB V", "1513"), + + KINDERKARDIOLOGIE("Kinderkardiologie", "Kinderkardiologie", "§301 SGB V", "1100"), + + INNERE_MEDIZIN_SCHWERPUNKT_ENDOKRINOLOGIE("Innere Medizin/Schwerpunkt Endokrinologie", "Innere Medizin/Schwerpunkt Endokrinologie", "§301 SGB V", "0106"), + + KINDERKARDIOLOGIE_SCHWERPUNKT_INTENSIVMEDIZIN("Kinderkardiologie/Schwerpunkt Intensivmedizin", "Kinderkardiologie/Schwerpunkt Intensivmedizin", "§301 SGB V", "1136"), + + INTENSIVMEDIZIN_THORAX_HERZCHIRURGIE("Intensivmedizin/Thorax-Herzchirurgie", "Intensivmedizin/Thorax-Herzchirurgie", "§301 SGB V", "3651"), + + ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_GERONTOPSYCHIATRIE_NACHTKLINIK("Allgemeine Psychiatrie/Schwerpunkt Gerontopsychiatrie, Nachtklinik", "Allgemeine Psychiatrie/Schwerpunkt Gerontopsychiatrie, Nachtklinik", "§301 SGB V", "2956"), + + RADIOLOGIE("Radiologie", "Radiologie", "§301 SGB V", "3751"), + + KARDIOLOGIE("Kardiologie", "Kardiologie", "§301 SGB V", "0300"), + + INTENSIVMEDIZIN_SCHWERPUNKT_NEUROLOGIE("Intensivmedizin/Schwerpunkt Neurologie", "Intensivmedizin/Schwerpunkt Neurologie", "§301 SGB V", "3628"), + + FRAUENHEILKUNDE_SCHWERPUNKT_ENDOKRINOLOGIE("Frauenheilkunde/Schwerpunkt Endokrinologie", "Frauenheilkunde/Schwerpunkt Endokrinologie", "§301 SGB V", "2406"), + + NEPHROLOGIE("Nephrologie", "Nephrologie", "§301 SGB V", "0400"), + + NEUROLOGIE_SCHWERPUNKT_SCHLAGANFALLPATIENTEN("Neurologie/Schwerpunkt Schlaganfallpatienten", "Neurologie/Schwerpunkt Schlaganfallpatienten", "§301 SGB V", "2856"), + + ALLGEMEINE_PSYCHIATRIE_SCHWERPUNKT_KINDER_UND_JUGENDPSYCHIATRIE("Allgemeine Psychiatrie/Schwerpunkt Kinder- und Jugendpsychiatrie", "Allgemeine Psychiatrie/Schwerpunkt Kinder- und Jugendpsychiatrie", "§301 SGB V", "2930"), + + PSYCHOSOMATIK_PSYCHOTHERAPIE_TAGESKLINIK_FUR_TEILSTATIONARE_PFLEGESATZE("Psychosomatik/Psychotherapie/Tagesklinik (für teilstationäre Pflegesätze)", "Psychosomatik/Psychotherapie/Tagesklinik (für teilstationäre Pflegesätze)", "§301 SGB V", "3160"), + + NEPHROLOGIE_SCHWERPUNKT_PADIATRIE("Nephrologie/Schwerpunkt Pädiatrie", "Nephrologie/Schwerpunkt Pädiatrie", "§301 SGB V", "0410"), + + INNERE_MEDIZIN_SCHWERPUNKT_RHEUMATOLOGIE("Innere Medizin/Schwerpunkt Rheumatologie", "Innere Medizin/Schwerpunkt Rheumatologie", "§301 SGB V", "0109"), + + INNERE_MEDIZIN_SCHWERPUNKT_GERIATRIE("Innere Medizin/Schwerpunkt Geriatrie", "Innere Medizin/Schwerpunkt Geriatrie", "§301 SGB V", "0102"), + + INTENSIVMEDIZIN_SCHWERPUNKT_NEUROCHIRURGIE("Intensivmedizin/Schwerpunkt Neurochirurgie", "Intensivmedizin/Schwerpunkt Neurochirurgie", "§301 SGB V", "3617"), + + ALLGEMEINE_PSYCHIATRIE("Allgemeine Psychiatrie", "Allgemeine Psychiatrie", "§301 SGB V", "2900"), + + KINDER_UND_JUGENDPSYCHIATRIE("Kinder- und Jugendpsychiatrie", "Kinder- und Jugendpsychiatrie", "§301 SGB V", "3000"), + + INNERE_MEDIZIN_SCHWERPUNKT_PNEUMOLOGIE("Innere Medizin/Schwerpunkt Pneumologie", "Innere Medizin/Schwerpunkt Pneumologie", "§301 SGB V", "0108"), + + STRAHLENHEILKUNDE_SCHWERPUNKT_HAMATOLOGIE_UND_INTERNISTISCHE_ONKOLOGIE("Strahlenheilkunde/Schwerpunkt Hämatologie und internistische Onkologie", "Strahlenheilkunde/Schwerpunkt Hämatologie und internistische Onkologie", "§301 SGB V", "3305"), + + ORTHOPADIE("Orthopädie", "Orthopädie", "§301 SGB V", "2300"), + + ALLGEMEINE_CHIRURGIE_SCHWERPUNKT_UNFALLCHIRURGIE("Allgemeine Chirurgie/Schwerpunkt Unfallchirurgie", "Allgemeine Chirurgie/Schwerpunkt Unfallchirurgie", "§301 SGB V", "1516"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + StandortschlusselDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java new file mode 100644 index 000000000..b1d7b54e5 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java @@ -0,0 +1,22 @@ +package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.case_identification.v0") +public class VersorgungsfallCluster { + @Path("/items[at0001 and name/value='Zugehörige Versorgungsfall-Kennung']/value|value") + private String zugehorigeVersorgungsfallKennungValue; + + public void setZugehorigeVersorgungsfallKennungValue( + String zugehorigeVersorgungsfallKennungValue) { + this.zugehorigeVersorgungsfallKennungValue = zugehorigeVersorgungsfallKennungValue; + } + + public String getZugehorigeVersorgungsfallKennungValue() { + return this.zugehorigeVersorgungsfallKennungValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallClusterContainment.java new file mode 100644 index 000000000..d1f5b4a3a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallClusterContainment.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; + +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class VersorgungsfallClusterContainment extends Containment { + public SelectAqlField VERSORGUNGSFALL_CLUSTER = new AqlFieldImp(VersorgungsfallCluster.class, "", "VersorgungsfallCluster", VersorgungsfallCluster.class, this); + + public SelectAqlField ZUGEHORIGE_VERSORGUNGSFALL_KENNUNG_VALUE = new AqlFieldImp(VersorgungsfallCluster.class, "/items[at0001]/value|value", "zugehorigeVersorgungsfallKennungValue", String.class, this); + + private VersorgungsfallClusterContainment() { + super("openEHR-EHR-CLUSTER.case_identification.v0"); + } + + public static VersorgungsfallClusterContainment getInstance() { + return new VersorgungsfallClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java new file mode 100644 index 000000000..ae32fd27b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java @@ -0,0 +1,90 @@ +package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; + +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-ADMIN_ENTRY.hospitalization.v0") +public class VersorgungsortAdminEntry { + @Path("/data[at0001]/items[at0004]/value|value") + private TemporalAccessor beginnValue; + + @Path("/data[at0001]/items[at0005]/value|value") + private TemporalAccessor endeValue; + + @Path("/data[at0001]/items[at0006]/value|value") + private String grundDesAufenthaltesValue; + + @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.location.v1]") + private StandortCluster standort; + + @Path("/data[at0001]/items[at0009]/value|value") + private String kommentarValue; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setBeginnValue(TemporalAccessor beginnValue) { + this.beginnValue = beginnValue; + } + + public TemporalAccessor getBeginnValue() { + return this.beginnValue ; + } + + public void setEndeValue(TemporalAccessor endeValue) { + this.endeValue = endeValue; + } + + public TemporalAccessor getEndeValue() { + return this.endeValue ; + } + + public void setGrundDesAufenthaltesValue(String grundDesAufenthaltesValue) { + this.grundDesAufenthaltesValue = grundDesAufenthaltesValue; + } + + public String getGrundDesAufenthaltesValue() { + return this.grundDesAufenthaltesValue ; + } + + public void setStandort(StandortCluster standort) { + this.standort = standort; + } + + public StandortCluster getStandort() { + return this.standort ; + } + + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } + + public String getKommentarValue() { + return this.kommentarValue ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntryContainment.java new file mode 100644 index 000000000..2b82cce8d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntryContainment.java @@ -0,0 +1,35 @@ +package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; + +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class VersorgungsortAdminEntryContainment extends Containment { + public SelectAqlField VERSORGUNGSORT_ADMIN_ENTRY = new AqlFieldImp(VersorgungsortAdminEntry.class, "", "VersorgungsortAdminEntry", VersorgungsortAdminEntry.class, this); + + public SelectAqlField BEGINN_VALUE = new AqlFieldImp(VersorgungsortAdminEntry.class, "/data[at0001]/items[at0004]/value|value", "beginnValue", TemporalAccessor.class, this); + + public SelectAqlField ENDE_VALUE = new AqlFieldImp(VersorgungsortAdminEntry.class, "/data[at0001]/items[at0005]/value|value", "endeValue", TemporalAccessor.class, this); + + public SelectAqlField GRUND_DES_AUFENTHALTES_VALUE = new AqlFieldImp(VersorgungsortAdminEntry.class, "/data[at0001]/items[at0006]/value|value", "grundDesAufenthaltesValue", String.class, this); + + public SelectAqlField STANDORT = new AqlFieldImp(VersorgungsortAdminEntry.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.location.v1]", "standort", StandortCluster.class, this); + + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(VersorgungsortAdminEntry.class, "/data[at0001]/items[at0009]/value|value", "kommentarValue", String.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(VersorgungsortAdminEntry.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(VersorgungsortAdminEntry.class, "/language", "language", Language.class, this); + + private VersorgungsortAdminEntryContainment() { + super("openEHR-EHR-ADMIN_ENTRY.hospitalization.v0"); + } + + public static VersorgungsortAdminEntryContainment getInstance() { + return new VersorgungsortAdminEntryContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java new file mode 100644 index 000000000..047b47d88 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java @@ -0,0 +1,203 @@ +package org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +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 org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Id; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.annotations.Template; +import org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition.SchwangerschaftsstatusObservation; +import org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition.StatusDefiningCode; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; +import org.ehrbase.client.openehrclient.VersionUid; + +@Entity +@Archetype("openEHR-EHR-COMPOSITION.registereintrag.v1") +@Template("Schwangerschaftsstatus") +public class SchwangerschaftsstatusComposition { + @Path("/context/other_context[at0001]/items[at0002]") + private List erweiterung; + + @Path("/context/other_context[at0001]/items[at0004]/value|defining_code") + private StatusDefiningCode statusDefiningCode; + + @Path("/context/other_context[at0001]/items[at0005]/value|value") + private String kategorieValue; + + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; + + @Path("/context/participations") + private List participations; + + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + @Path("/context/location") + private String location; + + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; + + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; + + @Path("/content[openEHR-EHR-OBSERVATION.pregnancy_status.v0]") + private SchwangerschaftsstatusObservation schwangerschaftsstatus; + + @Path("/composer") + private PartyProxy composer; + + @Path("/language") + private Language language; + + @Path("/feeder_audit") + private FeederAudit feederAudit; + + @Path("/category|defining_code") + private Category categoryDefiningCode; + + @Path("/territory") + private Territory territory; + + @Id + private VersionUid versionUid; + + 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 setKategorieValue(String kategorieValue) { + this.kategorieValue = kategorieValue; + } + + public String getKategorieValue() { + return this.kategorieValue ; + } + + 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 setSchwangerschaftsstatus(SchwangerschaftsstatusObservation schwangerschaftsstatus) { + this.schwangerschaftsstatus = schwangerschaftsstatus; + } + + public SchwangerschaftsstatusObservation getSchwangerschaftsstatus() { + return this.schwangerschaftsstatus ; + } + + 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 setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } + + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } + + 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusCompositionContainment.java new file mode 100644 index 000000000..5f853a4ff --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusCompositionContainment.java @@ -0,0 +1,62 @@ +package org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +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 org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition.SchwangerschaftsstatusObservation; +import org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition.StatusDefiningCode; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; + +public class SchwangerschaftsstatusCompositionContainment extends Containment { + public SelectAqlField SCHWANGERSCHAFTSSTATUS_COMPOSITION = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "", "SchwangerschaftsstatusComposition", SchwangerschaftsstatusComposition.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/other_context[at0001]/items[at0002]", "erweiterung", Cluster.class, this); + + public SelectAqlField STATUS_DEFINING_CODE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/other_context[at0001]/items[at0004]/value|defining_code", "statusDefiningCode", StatusDefiningCode.class, this); + + public SelectAqlField KATEGORIE_VALUE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "kategorieValue", String.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/participations", "participations", Participation.class, this); + + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + + public SelectAqlField LOCATION = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/location", "location", String.class, this); + + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); + + public SelectAqlField SCHWANGERSCHAFTSSTATUS = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/content[openEHR-EHR-OBSERVATION.pregnancy_status.v0]", "schwangerschaftsstatus", SchwangerschaftsstatusObservation.class, this); + + public SelectAqlField COMPOSER = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/composer", "composer", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/language", "language", Language.class, this); + + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); + + public SelectAqlField TERRITORY = new AqlFieldImp(SchwangerschaftsstatusComposition.class, "/territory", "territory", Territory.class, this); + + private SchwangerschaftsstatusCompositionContainment() { + super("openEHR-EHR-COMPOSITION.registereintrag.v1"); + } + + public static SchwangerschaftsstatusCompositionContainment getInstance() { + return new SchwangerschaftsstatusCompositionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java new file mode 100644 index 000000000..1e84831b4 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java @@ -0,0 +1,80 @@ +package org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.pregnancy_status.v0") +public class SchwangerschaftsstatusObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|defining_code") + private StatusDefiningCode2 statusDefiningCode; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0021]/items[at0022]") + private List erweiterungen; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setStatusDefiningCode(StatusDefiningCode2 statusDefiningCode) { + this.statusDefiningCode = statusDefiningCode; + } + + public StatusDefiningCode2 getStatusDefiningCode() { + return this.statusDefiningCode ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterungen(List erweiterungen) { + this.erweiterungen = erweiterungen; + } + + public List getErweiterungen() { + return this.erweiterungen ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservationContainment.java new file mode 100644 index 000000000..24d7573d7 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservationContainment.java @@ -0,0 +1,35 @@ +package org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class SchwangerschaftsstatusObservationContainment extends Containment { + public SelectAqlField SCHWANGERSCHAFTSSTATUS_OBSERVATION = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "", "SchwangerschaftsstatusObservation", SchwangerschaftsstatusObservation.class, this); + + public SelectAqlField STATUS_DEFINING_CODE = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|defining_code", "statusDefiningCode", StatusDefiningCode2.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNGEN = new ListAqlFieldImp(SchwangerschaftsstatusObservation.class, "/protocol[at0021]/items[at0022]", "erweiterungen", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "/language", "language", Language.class, this); + + private SchwangerschaftsstatusObservationContainment() { + super("openEHR-EHR-OBSERVATION.pregnancy_status.v0"); + } + + public static SchwangerschaftsstatusObservationContainment getInstance() { + return new SchwangerschaftsstatusObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningCode.java new file mode 100644 index 000000000..12136f133 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningCode.java @@ -0,0 +1,45 @@ +package org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum StatusDefiningCode implements EnumValueSet { + VORLAUFIG("vorläufig", "*", "local", "at0011"), + + FINAL("final", "*", "local", "at0012"), + + REGISTRIERT("registriert", "*", "local", "at0010"), + + GEANDERT("geändert", "*", "local", "at0013"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + StatusDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningCode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningCode2.java new file mode 100644 index 000000000..59f762ecf --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/StatusDefiningCode2.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum StatusDefiningCode2 implements EnumValueSet { + SCHWANGER("Schwanger", "Die Person ist schwanger.", "local", "at0012"), + + NICHT_SCHWANGER("Nicht schwanger", "Die Person ist nicht schwanger.", "local", "at0013"), + + UNBEKANNT("Unbekannt", "Es ist nicht bekannt, ob die Person schwanger ist oder nicht.", "local", "at0014"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + StatusDefiningCode2(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java new file mode 100644 index 000000000..881c2ecc4 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java @@ -0,0 +1,202 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +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 org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Id; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.annotations.Template; +import org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition.EventsummaryCluster; +import org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition.SmicsErgebnisObservation; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; +import org.ehrbase.client.openehrclient.VersionUid; + +@Entity +@Archetype("openEHR-EHR-COMPOSITION.report.v1") +@Template("SmICS-Befund") +public class SmICSBefundComposition { + @Path("/context/other_context[at0001]/items[at0002]/value|value") + private String berichtIdValue; + + @Path("/context/other_context[at0001]/items[at0005]/value|value") + private String statusValue; + + @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.eventsummary.v0]") + private List eventsummary; + + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; + + @Path("/context/participations") + private List participations; + + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + @Path("/context/location") + private String location; + + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; + + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; + + @Path("/content[openEHR-EHR-OBSERVATION.smics_befund.v1]") + private SmicsErgebnisObservation smicsErgebnis; + + @Path("/composer") + private PartyProxy composer; + + @Path("/language") + private Language language; + + @Path("/feeder_audit") + private FeederAudit feederAudit; + + @Path("/category|defining_code") + private Category categoryDefiningCode; + + @Path("/territory") + private Territory territory; + + @Id + private VersionUid versionUid; + + public void setBerichtIdValue(String berichtIdValue) { + this.berichtIdValue = berichtIdValue; + } + + public String getBerichtIdValue() { + return this.berichtIdValue ; + } + + public void setStatusValue(String statusValue) { + this.statusValue = statusValue; + } + + public String getStatusValue() { + return this.statusValue ; + } + + public void setEventsummary(List eventsummary) { + this.eventsummary = eventsummary; + } + + public List getEventsummary() { + return this.eventsummary ; + } + + 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 setSmicsErgebnis(SmicsErgebnisObservation smicsErgebnis) { + this.smicsErgebnis = smicsErgebnis; + } + + public SmicsErgebnisObservation getSmicsErgebnis() { + return this.smicsErgebnis ; + } + + 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 setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } + + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } + + 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundCompositionContainment.java new file mode 100644 index 000000000..50d07f8ec --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundCompositionContainment.java @@ -0,0 +1,61 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +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 org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition.EventsummaryCluster; +import org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition.SmicsErgebnisObservation; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; + +public class SmICSBefundCompositionContainment extends Containment { + public SelectAqlField SM_I_C_S_BEFUND_COMPOSITION = new AqlFieldImp(SmICSBefundComposition.class, "", "SmICSBefundComposition", SmICSBefundComposition.class, this); + + public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(SmICSBefundComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); + + public SelectAqlField STATUS_VALUE = new AqlFieldImp(SmICSBefundComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "statusValue", String.class, this); + + public ListSelectAqlField EVENTSUMMARY = new ListAqlFieldImp(SmICSBefundComposition.class, "/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.eventsummary.v0]", "eventsummary", EventsummaryCluster.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(SmICSBefundComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(SmICSBefundComposition.class, "/context/participations", "participations", Participation.class, this); + + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(SmICSBefundComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + + public SelectAqlField LOCATION = new AqlFieldImp(SmICSBefundComposition.class, "/context/location", "location", String.class, this); + + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(SmICSBefundComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(SmICSBefundComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); + + public SelectAqlField SMICS_ERGEBNIS = new AqlFieldImp(SmICSBefundComposition.class, "/content[openEHR-EHR-OBSERVATION.smics_befund.v1]", "smicsErgebnis", SmicsErgebnisObservation.class, this); + + public SelectAqlField COMPOSER = new AqlFieldImp(SmICSBefundComposition.class, "/composer", "composer", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(SmICSBefundComposition.class, "/language", "language", Language.class, this); + + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(SmICSBefundComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(SmICSBefundComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); + + public SelectAqlField TERRITORY = new AqlFieldImp(SmICSBefundComposition.class, "/territory", "territory", Territory.class, this); + + private SmICSBefundCompositionContainment() { + super("openEHR-EHR-COMPOSITION.report.v1"); + } + + public static SmICSBefundCompositionContainment getInstance() { + return new SmICSBefundCompositionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java new file mode 100644 index 000000000..97e79b29a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.laboratory_test_panel.v0") +public class AntibiogrammCluster { + @Path("/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]") + private List laboranalytResultat; + + public void setLaboranalytResultat(List laboranalytResultat) { + this.laboranalytResultat = laboranalytResultat; + } + + public List getLaboranalytResultat() { + return this.laboranalytResultat ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammClusterContainment.java new file mode 100644 index 000000000..fa4e766e2 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammClusterContainment.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class AntibiogrammClusterContainment extends Containment { + public SelectAqlField ANTIBIOGRAMM_CLUSTER = new AqlFieldImp(AntibiogrammCluster.class, "", "AntibiogrammCluster", AntibiogrammCluster.class, this); + + public ListSelectAqlField LABORANALYT_RESULTAT = new ListAqlFieldImp(AntibiogrammCluster.class, "/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]", "laboranalytResultat", LaboranalytResultatCluster.class, this); + + private AntibiogrammClusterContainment() { + super("openEHR-EHR-CLUSTER.laboratory_test_panel.v0"); + } + + public static AntibiogrammClusterContainment getInstance() { + return new AntibiogrammClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiotikumDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiotikumDefiningCode.java new file mode 100644 index 000000000..5249e6c97 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiotikumDefiningCode.java @@ -0,0 +1,397 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum AntibiotikumDefiningCode implements EnumValueSet { + RAMOPLANIN("Ramoplanin", "Ramoplanin", "LOINC", "41737-8"), + + MOXALACTAM_LATAMOXEF("Moxalactam (Latamoxef)", "Moxalactam (Latamoxef)", "LOINC", "18950-6"), + + MUPIROCIN("Mupirocin", "Mupirocin", "LOINC", "20389-3"), + + TRIMETHOPRIM("Trimethoprim", "Trimethoprim", "LOINC", "18997-7"), + + CEFSULODIN("Cefsulodin", "Cefsulodin", "LOINC", "18892-0"), + + SOLITHROMYCIN("Solithromycin", "Solithromycin", "LOINC", "73587-8"), + + CEFONICID("Cefonicid", "Cefonicid", "LOINC", "18883-9"), + + CEFTIZOXIM("Ceftizoxim", "Ceftizoxim", "LOINC", "18894-6"), + + TEMOCILLIN("Temocillin", "Temocillin", "LOINC", "18991-0"), + + STAVUDIN("Stavudin", "Stavudin", "LOINC", "30302-4"), + + CEFTAROLIN("Ceftarolin", "Ceftarolin", "LOINC", "73605-8"), + + NOVOBIOCIN("Novobiocin", "Novobiocin", "LOINC", "18957-1"), + + AMPICILLIN_SULBACTAM("Ampicillin/Sulbactam", "Ampicillin/Sulbactam", "LOINC", "18865-6"), + + GENTAMICIN("Gentamicin", "Gentamicin", "LOINC", "18928-2"), + + FIDAXOMICIN("Fidaxomicin", "Fidaxomicin", "LOINC", "73599-3"), + + ETHAMBUTOL("Ethambutol", "Ethambutol", "LOINC", "18921-7"), + + OMADACYCLIN("Omadacyclin", "Omadacyclin", "LOINC", "73594-4"), + + FOSFOMYCIN("Fosfomycin", "Fosfomycin", "LOINC", "25596-8"), + + CEFAMANDOL("Cefamandol", "Cefamandol", "LOINC", "18876-3"), + + N5_FLUOROCYTOSIN("5-Fluorocytosin", "5-Fluorocytosin", "LOINC", "18855-7"), + + AZITHROMYCIN("Azithromycin", "Azithromycin", "LOINC", "18866-4"), + + NAFCILLIN("Nafcillin", "Nafcillin", "LOINC", "18951-4"), + + ZALCITABIN("Zalcitabin", "Zalcitabin", "LOINC", "30301-6"), + + CEFDITOREN("Cefditoren", "Cefditoren", "LOINC", "35762-4"), + + MEZLOCILLIN("Mezlocillin", "Mezlocillin", "LOINC", "18947-2"), + + POLYMYXIN_B("Polymyxin B", "Polymyxin B", "LOINC", "421-8"), + + TIGECYCLIN("Tigecyclin", "Tigecyclin", "LOINC", "42357-4"), + + CEFPODOXIM("Cefpodoxim", "Cefpodoxim", "LOINC", "18890-4"), + + SPARFLOXACIN("Sparfloxacin", "Sparfloxacin", "LOINC", "23628-1"), + + TEMAFLOXACIN("Temafloxacin", "Temafloxacin", "LOINC", "18990-2"), + + CEFAZOLIN("Cefazolin", "Cefazolin", "LOINC", "18878-9"), + + NETILMICIN("Netilmicin", "Netilmicin", "LOINC", "18954-8"), + + TELITHROMYCIN("Telithromycin", "Telithromycin", "LOINC", "35845-7"), + + CINOXACIN("Cinoxacin", "Cinoxacin", "LOINC", "18905-0"), + + FUSIDINSAURE("Fusidinsäure", "Fusidinsäure", "LOINC", "18927-4"), + + CEFIXIM("Cefixim", "Cefixim", "LOINC", "18880-5"), + + GATIFLOXACIN("Gatifloxacin", "Gatifloxacin", "LOINC", "31038-3"), + + ICLAPRIM("Iclaprim", "Iclaprim", "LOINC", "73597-7"), + + PREMAFLOXACIN("Premafloxacin", "Premafloxacin", "LOINC", "73591-0"), + + SULFISOXAZOL("Sulfisoxazol", "Sulfisoxazol", "LOINC", "18986-0"), + + ITRACONAZOL("Itraconazol", "Itraconazol", "LOINC", "32603-3"), + + CLARITHROMYCIN("Clarithromycin", "Clarithromycin", "LOINC", "18907-6"), + + CEFEPIM("Cefepim", "Cefepim", "LOINC", "18879-7"), + + ENOXACIN("Enoxacin", "Enoxacin", "LOINC", "18918-3"), + + COLISTIN("Colistin", "Colistin", "LOINC", "18912-6"), + + MECILLINAM_AMDINOCILLIN("Mecillinam (Amdinocillin)", "Mecillinam (Amdinocillin)", "LOINC", "8-3"), + + CEFTAROLIN_AVIBACTAM("Ceftarolin/Avibactam", "Ceftarolin/Avibactam", "LOINC", "73604-1"), + + GENTAMICIN_HIGH_LEVEL("Gentamicin High-Level", "Gentamicin High-Level", "LOINC", "18929-0"), + + ISAVUCONAZOL("Isavuconazol", "Isavuconazol", "LOINC", "88887-5"), + + OFLOXACIN("Ofloxacin", "Ofloxacin", "LOINC", "18959-7"), + + TOBRAMYCIN("Tobramycin", "Tobramycin", "LOINC", "18996-9"), + + KANAMYCIN("Kanamycin", "Kanamycin", "LOINC", "18935-7"), + + CEFTAZIDIM_CLAVULANSAURE("Ceftazidim/Clavulansäure", "Ceftazidim/Clavulansäure", "LOINC", "35776-4"), + + PENICILLIN("Penicillin", "Penicillin", "LOINC", "18964-7"), + + DIRITHROMYCIN("Dirithromycin", "Dirithromycin", "LOINC", "35795-4"), + + DALBAVANCIN("Dalbavancin", "Dalbavancin", "LOINC", "41734-5"), + + TOSUFLOXACIN("Tosufloxacin", "Tosufloxacin", "LOINC", "76146-0"), + + VORICONAZOL("Voriconazol", "Voriconazol", "LOINC", "32379-0"), + + CEFTRIAXON("Ceftriaxon", "Ceftriaxon", "LOINC", "18895-3"), + + VANCOMYCIN("Vancomycin", "Vancomycin", "LOINC", "19000-9"), + + CEFCAPEN("Cefcapen", "Cefcapen", "LOINC", "76143-7"), + + STREPTOMYCIN_HIGH("Streptomycin-High", "Streptomycin-High", "LOINC", "18983-7"), + + RAZUPENEM("Razupenem", "Razupenem", "LOINC", "73590-2"), + + OXACILLIN("Oxacillin", "Oxacillin", "LOINC", "18961-3"), + + SULFONAMID("Sulfonamid", "Sulfonamid", "LOINC", "18987-8"), + + PIPERACILLIN_TAZOBACTAM("Piperacillin/Tazobactam", "Piperacillin/Tazobactam", "LOINC", "18970-4"), + + BESIFLOXACIN("Besifloxacin", "Besifloxacin", "LOINC", "73606-6"), + + METHICILLIN("Methicillin", "Methicillin", "LOINC", "18945-6"), + + CEFOPERAZON("Cefoperazon", "Cefoperazon", "LOINC", "18884-7"), + + CLOFAZIMIN("Clofazimin", "Clofazimin", "LOINC", "23627-3"), + + QUINUPRISTIN_DALFOPRISTIN("Quinupristin/Dalfopristin", "Quinupristin/Dalfopristin", "LOINC", "23640-6"), + + CEFOTAXIM("Cefotaxim", "Cefotaxim", "LOINC", "18886-2"), + + CLINAFLOXACIN("Clinafloxacin", "Clinafloxacin", "LOINC", "32376-6"), + + GREPAFLOXACIN("Grepafloxacin", "Grepafloxacin", "LOINC", "23638-0"), + + AMPHOTERICIN_B("Amphotericin B", "Amphotericin B", "LOINC", "18863-1"), + + JOSAMYCIN("Josamycin", "Josamycin", "LOINC", "25597-6"), + + ERYTHROMYCIN("Erythromycin", "Erythromycin", "LOINC", "18919-1"), + + LAMIVUDIN("Lamivudin", "Lamivudin", "LOINC", "30298-4"), + + CEPHALEXIN("Cephalexin", "Cephalexin", "LOINC", "18897-9"), + + DANOFLOXACIN("Danofloxacin", "Danofloxacin", "LOINC", "73601-7"), + + DOXYCYCLIN("Doxycyclin", "Doxycyclin", "LOINC", "18917-5"), + + ERTAPENEM("Ertapenem", "Ertapenem", "LOINC", "35802-8"), + + SULBACTAM("Sulbactam", "Sulbactam", "LOINC", "55614-2"), + + CEFOTIAM("Cefotiam", "Cefotiam", "LOINC", "32374-1"), + + NORFLOXACIN("Norfloxacin", "Norfloxacin", "LOINC", "18956-3"), + + CEFTOBIPROL("Ceftobiprol", "Ceftobiprol", "LOINC", "43272-4"), + + FLORFENICOL("Florfenicol", "Florfenicol", "LOINC", "23740-4"), + + LINCOMYCIN("Lincomycin", "Lincomycin", "LOINC", "18938-1"), + + ROXITHROMYCIN("Roxithromycin", "Roxithromycin", "LOINC", "18978-7"), + + CLINDAMYCIN("Clindamycin", "Clindamycin", "LOINC", "18908-4"), + + MEROPENEM_VABORBACTAM("Meropenem/Vaborbactam", "Meropenem/Vaborbactam", "LOINC", "88892-5"), + + ANIDULAFUNGIN("Anidulafungin", "Anidulafungin", "LOINC", "57095-2"), + + DORIPENEM("Doripenem", "Doripenem", "LOINC", "60535-2"), + + PLAZOMICIN("Plazomicin", "Plazomicin", "LOINC", "73592-8"), + + CEFACLOR("Cefaclor", "Cefaclor", "LOINC", "18874-8"), + + SPECTINOMYCIN("Spectinomycin", "Spectinomycin", "LOINC", "18980-3"), + + MINOCYCLIN("Minocyclin", "Minocyclin", "LOINC", "18948-0"), + + TICARCILLIN_CLAVULANSAURE("Ticarcillin/Clavulansäure", "Ticarcillin/Clavulansäure", "LOINC", "18995-1"), + + CARBENICILLIN("Carbenicillin", "Carbenicillin", "LOINC", "18873-0"), + + CEFTAZIDIM("Ceftazidim", "Ceftazidim", "LOINC", "18893-8"), + + CEFETAMET("Cefetamet", "Cefetamet", "LOINC", "32377-4"), + + FINAFLOXACIN("Finafloxacin", "Finafloxacin", "LOINC", "73598-5"), + + ZIDOVUDIN("Zidovudin", "Zidovudin", "LOINC", "531-4"), + + AZTREONAM("Aztreonam", "Aztreonam", "LOINC", "18868-0"), + + NITROFURANTOIN("Nitrofurantoin", "Nitrofurantoin", "LOINC", "18955-5"), + + AMPICILLIN("Ampicillin", "Ampicillin", "LOINC", "18864-9"), + + DIDANOSIN("Didanosin", "Didanosin", "LOINC", "30300-8"), + + TEICOPLANIN("Teicoplanin", "Teicoplanin", "LOINC", "18989-4"), + + GARENOXACIN("Garenoxacin", "Garenoxacin", "LOINC", "35813-5"), + + PIPERACILLIN_SULBACTAM("Piperacillin/Sulbactam", "Piperacillin/Sulbactam", "LOINC", "54197-9"), + + PENICILLIN_G("Penicillin G", "Penicillin G", "LOINC", "18965-4"), + + LORACARBEF("Loracarbef", "Loracarbef", "LOINC", "18940-7"), + + PARA_AMINO_SALICYLSAURE("para-Amino-Salicylsäure", "para-Amino-Salicylsäure", "LOINC", "23629-9"), + + AMOXYCILLIN_CLAVULANSAURE("Amoxycillin/Clavulansäure", "Amoxycillin/Clavulansäure", "LOINC", "18862-3"), + + FAROPENEM("Faropenem", "Faropenem", "LOINC", "73600-9"), + + NITROCEPHIN("Nitrocephin", "Nitrocephin", "LOINC", "6985-6"), + + LINEZOLID("Linezolid", "Linezolid", "LOINC", "29258-1"), + + LEVOFLOXACIN("Levofloxacin", "Levofloxacin", "LOINC", "20629-2"), + + RIFAMPIN("Rifampin", "Rifampin", "LOINC", "18974-6"), + + CAPREOMYCIN("Capreomycin", "Capreomycin", "LOINC", "18872-2"), + + CASPOFUNGIN_E_TEST("Caspofungin (E-Test)", "Caspofungin (E-Test)", "LOINC", "54185-4"), + + TELAVANCIN("Telavancin", "Telavancin", "LOINC", "88886-7"), + + ESBL_TESTUNG("ESBL - Testung", "ESBL - Testung", "LOINC", "6984-9"), + + BACITRACIN("Bacitracin", "Bacitracin", "LOINC", "18870-6"), + + CEFPIROM("Cefpirom", "Cefpirom", "LOINC", "18889-6"), + + KANAMYCIN_HIGH("Kanamycin-High", "Kanamycin-High", "LOINC", "18936-5"), + + PIPERACILLIN("Piperacillin", "Piperacillin", "LOINC", "18969-6"), + + CEPHALOTHIN("Cephalothin", "Cephalothin", "LOINC", "18900-1"), + + SULFAMETHOXAZOL("Sulfamethoxazol", "Sulfamethoxazol", "LOINC", "18985-2"), + + CIPROFLOXACIN("Ciprofloxacin", "Ciprofloxacin", "LOINC", "18906-8"), + + ISONIAZID("Isoniazid", "Isoniazid", "LOINC", "18934-0"), + + MICAFUNGIN_E_TEST("Micafungin (E-Test)", "Micafungin (E-Test)", "LOINC", "85048-7"), + + PROTIONAMID("Protionamid", "Protionamid", "LOINC", "63565-6"), + + CEFMETAZOL("Cefmetazol", "Cefmetazol", "LOINC", "18881-3"), + + CEFTOLOZAN_TAZOBACTAM("Ceftolozan/Tazobactam", "Ceftolozan/Tazobactam", "LOINC", "73602-5"), + + BEDAQUILINE("Bedaquiline", "Bedaquiline", "LOINC", "88703-4"), + + FLUCONAZOL("Fluconazol", "Fluconazol", "LOINC", "18924-1"), + + CEFOXITIN("Cefoxitin", "Cefoxitin", "LOINC", "18888-8"), + + NEOMYCIN("Neomycin", "Neomycin", "LOINC", "18953-0"), + + PRISTINAMYCIN("Pristinamycin", "Pristinamycin", "LOINC", "32383-2"), + + CEFDINIR("Cefdinir", "Cefdinir", "LOINC", "23636-4"), + + LOMEFLOXACIN("Lomefloxacin", "Lomefloxacin", "LOINC", "18939-9"), + + DAPTOMYCIN("Daptomycin", "Daptomycin", "LOINC", "35789-7"), + + AMIKACIN("Amikacin", "Amikacin", "LOINC", "18860-7"), + + CEFUROXIM("Cefuroxim", "Cefuroxim", "LOINC", "51724-3"), + + RIFABUTIN("Rifabutin", "Rifabutin", "LOINC", "19149-4"), + + TETRACYCLIN("Tetracyclin", "Tetracyclin", "LOINC", "18993-6"), + + CEFOTETAN("Cefotetan", "Cefotetan", "LOINC", "18887-0"), + + CYCLOSERIN("Cycloserin", "Cycloserin", "LOINC", "18914-2"), + + CEFTAZIDIM_AVIBACTAM("Ceftazidim/Avibactam", "Ceftazidim/Avibactam", "LOINC", "73603-3"), + + SULOPENEM("Sulopenem", "Sulopenem", "LOINC", "55289-3"), + + STREPTOMYCIN("Streptomycin", "Streptomycin", "LOINC", "18982-9"), + + CEFTERAM("Cefteram", "Cefteram", "LOINC", "76144-5"), + + PENICILLIN_V("Penicillin V", "Penicillin V", "LOINC", "18966-2"), + + FOSCARNET("Foscarnet", "Foscarnet", "LOINC", "256-8"), + + CEFOTAXIM_CLAVULANSAURE("Cefotaxim/Clavulansäure", "Cefotaxim/Clavulansäure", "LOINC", "35771-5"), + + TICARCILLIN("Ticarcillin", "Ticarcillin", "LOINC", "18994-4"), + + METRONIDAZOL("Metronidazol", "Metronidazol", "LOINC", "18946-4"), + + SULFAMETHOXAZOL_TRIMETHOPRIM_COTRIMOXAZOL("Sulfamethoxazol/Trimethoprim (Cotrimoxazol)", "Sulfamethoxazol/Trimethoprim (Cotrimoxazol)", "LOINC", "18998-5"), + + NALIDIXINSAURE("Nalidixinsäure", "Nalidixinsäure", "LOINC", "18952-2"), + + DIFLOXACIN("Difloxacin", "Difloxacin", "LOINC", "35792-1"), + + CEFADROXIL("Cefadroxil", "Cefadroxil", "LOINC", "18875-5"), + + IMIPENEM("Imipenem", "Imipenem", "LOINC", "18932-4"), + + CEFTIBUTEN("Ceftibuten", "Ceftibuten", "LOINC", "35779-8"), + + NYSTATIN("Nystatin", "Nystatin", "LOINC", "10697-1"), + + CHLORAMPHENICOL("Chloramphenicol", "Chloramphenicol", "LOINC", "18903-5"), + + PYRAZINAMID("Pyrazinamid", "Pyrazinamid", "LOINC", "18973-8"), + + CEFPROZIL("Cefprozil", "Cefprozil", "LOINC", "18891-2"), + + FLEROXACIN("Fleroxacin", "Fleroxacin", "LOINC", "32372-5"), + + FLUCLOXACILLIN("Flucloxacillin", "Flucloxacillin", "LOINC", "18923-3"), + + TROVAFLOXACIN("Trovafloxacin", "Trovafloxacin", "LOINC", "23642-2"), + + ORITAVANCIN("Oritavancin", "Oritavancin", "LOINC", "41736-0"), + + AZLOCILLIN("Azlocillin", "Azlocillin", "LOINC", "18867-2"), + + MEROPENEM("Meropenem", "Meropenem", "LOINC", "18943-1"), + + MOXIFLOXACIN("Moxifloxacin", "Moxifloxacin", "LOINC", "31039-1"), + + POSACONAZOL_E_TEST("Posaconazol (E-Test)", "Posaconazol (E-Test)", "LOINC", "54186-2"), + + AMOXICILLIN("Amoxicillin", "Amoxicillin", "LOINC", "18861-5"), + + CEFOPERAZON_SULBACTAM("Cefoperazon/Sulbactam", "Cefoperazon/Sulbactam", "LOINC", "54166-4"), + + SARAFLOXACIN("Sarafloxacin", "Sarafloxacin", "LOINC", "73588-6"), + + GEMIFLOXACIN("Gemifloxacin", "Gemifloxacin", "LOINC", "35816-8"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + AntibiotikumDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ArtDerTypisierungDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ArtDerTypisierungDefiningCode.java new file mode 100644 index 000000000..e78016790 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ArtDerTypisierungDefiningCode.java @@ -0,0 +1,48 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum ArtDerTypisierungDefiningCode implements EnumValueSet { + ANDERE("Andere", "*", "local", "at0007"), + + PULSFELDGELELEKTROPHORESE_PFGE("Pulsfeldgelelektrophorese (PFGE)", "*", "local", "at0003"), + + CORE_GENOM_MULTILOCUS_SEQUENCE_TYPING_CGMLST("core genom Multilocus Sequence Typing (cgMLST)", "*", "local", "at0005"), + + MULTILOCUS_SEQUENCE_TYPING_MLST("Multilocus Sequence Typing (MLST)", "*", "local", "at0004"), + + SPA_TYPISIERUNG_STAPHYLOCOCCUS_AUREUS("spa-Typisierung (Staphylococcus aureus)", "*", "local", "at0006"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + ArtDerTypisierungDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java new file mode 100644 index 000000000..99e030a1c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java @@ -0,0 +1,125 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; +import java.lang.Double; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.erregerdetails.v1") +public class ErregerdetailsCluster { + @Path("/items[at0047]") + private List keimSubtyp; + + @Path("/items[at0035]/value|magnitude") + private Double keimzahlMagnitude; + + @Path("/items[at0035]/value|units") + private String keimzahlUnits; + + @Path("/items[at0003]/value") + private DvOrdinal haufigkeit; + + @Path("/items[at0016]/value|value") + private String virulenzfaktorValue; + + @Path("/items[openEHR-EHR-CLUSTER.laboratory_test_panel.v0 and name/value='Antibiogramm']") + private AntibiogrammCluster antibiogramm; + + @Path("/items[at0057]") + private List resistenzmechanismus; + + @Path("/items[at0018]/value|defining_code") + private MreKlasseDefiningCode mreKlasseDefiningCode; + + @Path("/items[at0062]/value|value") + private String kommentarValue; + + @Path("/items[at0059]") + private List weitereErganzungen; + + public void setKeimSubtyp(List keimSubtyp) { + this.keimSubtyp = keimSubtyp; + } + + public List getKeimSubtyp() { + return this.keimSubtyp ; + } + + public void setKeimzahlMagnitude(Double keimzahlMagnitude) { + this.keimzahlMagnitude = keimzahlMagnitude; + } + + public Double getKeimzahlMagnitude() { + return this.keimzahlMagnitude ; + } + + public void setKeimzahlUnits(String keimzahlUnits) { + this.keimzahlUnits = keimzahlUnits; + } + + public String getKeimzahlUnits() { + return this.keimzahlUnits ; + } + + public void setHaufigkeit(DvOrdinal haufigkeit) { + this.haufigkeit = haufigkeit; + } + + public DvOrdinal getHaufigkeit() { + return this.haufigkeit ; + } + + public void setVirulenzfaktorValue(String virulenzfaktorValue) { + this.virulenzfaktorValue = virulenzfaktorValue; + } + + public String getVirulenzfaktorValue() { + return this.virulenzfaktorValue ; + } + + public void setAntibiogramm(AntibiogrammCluster antibiogramm) { + this.antibiogramm = antibiogramm; + } + + public AntibiogrammCluster getAntibiogramm() { + return this.antibiogramm ; + } + + public void setResistenzmechanismus( + List resistenzmechanismus) { + this.resistenzmechanismus = resistenzmechanismus; + } + + public List getResistenzmechanismus() { + return this.resistenzmechanismus ; + } + + public void setMreKlasseDefiningCode(MreKlasseDefiningCode mreKlasseDefiningCode) { + this.mreKlasseDefiningCode = mreKlasseDefiningCode; + } + + public MreKlasseDefiningCode getMreKlasseDefiningCode() { + return this.mreKlasseDefiningCode ; + } + + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } + + public String getKommentarValue() { + return this.kommentarValue ; + } + + public void setWeitereErganzungen(List weitereErganzungen) { + this.weitereErganzungen = weitereErganzungen; + } + + public List getWeitereErganzungen() { + return this.weitereErganzungen ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsClusterContainment.java new file mode 100644 index 000000000..08183a74a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsClusterContainment.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; +import java.lang.Double; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class ErregerdetailsClusterContainment extends Containment { + public SelectAqlField ERREGERDETAILS_CLUSTER = new AqlFieldImp(ErregerdetailsCluster.class, "", "ErregerdetailsCluster", ErregerdetailsCluster.class, this); + + public ListSelectAqlField KEIM_SUBTYP = new ListAqlFieldImp(ErregerdetailsCluster.class, "/items[at0047]", "keimSubtyp", ErregerdetailsKeimSubtypElement.class, this); + + public SelectAqlField KEIMZAHL_MAGNITUDE = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0035]/value|magnitude", "keimzahlMagnitude", Double.class, this); + + public SelectAqlField KEIMZAHL_UNITS = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0035]/value|units", "keimzahlUnits", String.class, this); + + public SelectAqlField HAUFIGKEIT = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0003]/value", "haufigkeit", DvOrdinal.class, this); + + public SelectAqlField VIRULENZFAKTOR_VALUE = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0016]/value|value", "virulenzfaktorValue", String.class, this); + + public SelectAqlField ANTIBIOGRAMM = new AqlFieldImp(ErregerdetailsCluster.class, "/items[openEHR-EHR-CLUSTER.laboratory_test_panel.v0]", "antibiogramm", AntibiogrammCluster.class, this); + + public ListSelectAqlField RESISTENZMECHANISMUS = new ListAqlFieldImp(ErregerdetailsCluster.class, "/items[at0057]", "resistenzmechanismus", ErregerdetailsResistenzmechanismusCluster.class, this); + + public SelectAqlField MRE_KLASSE_DEFINING_CODE = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0018]/value|defining_code", "mreKlasseDefiningCode", MreKlasseDefiningCode.class, this); + + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ErregerdetailsCluster.class, "/items[at0062]/value|value", "kommentarValue", String.class, this); + + public ListSelectAqlField WEITERE_ERGANZUNGEN = new ListAqlFieldImp(ErregerdetailsCluster.class, "/items[at0059]", "weitereErganzungen", Cluster.class, this); + + private ErregerdetailsClusterContainment() { + super("openEHR-EHR-CLUSTER.erregerdetails.v1"); + } + + public static ErregerdetailsClusterContainment getInstance() { + return new ErregerdetailsClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java new file mode 100644 index 000000000..a8d8b678d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java @@ -0,0 +1,19 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class ErregerdetailsKeimSubtypElement { + @Path("/value|value") + private String value; + + public void setValue(String value) { + this.value = value; + } + + public String getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java new file mode 100644 index 000000000..4ebee1e08 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java @@ -0,0 +1,19 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class ErregerdetailsResistenzmechanismusCluster { + @Path("/items[at0017]/value|value") + private String resistenzmechanismusBezeichnungValue; + + public void setResistenzmechanismusBezeichnungValue(String resistenzmechanismusBezeichnungValue) { + this.resistenzmechanismusBezeichnungValue = resistenzmechanismusBezeichnungValue; + } + + public String getResistenzmechanismusBezeichnungValue() { + return this.resistenzmechanismusBezeichnungValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregernameDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregernameDefiningCode.java new file mode 100644 index 000000000..776680619 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregernameDefiningCode.java @@ -0,0 +1,1289 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum ErregernameDefiningCode implements EnumValueSet { + PARABURKHOLDERIA_PHENAZINIUM("Paraburkholderia phenazinium", "Paraburkholderia phenazinium", "SNOMED-CT", "431166001"), + + MYCOBACTERIUM_MICROTI_ORGANISM("Mycobacterium microti (organism)", "Mycobacterium microti (organism)", "SNOMED-CT", "70801007"), + + LEGIONELLA_PNEUMOPHILA_SEROGROUP1_ORGANISM("Legionella pneumophila serogroup 1 (organism)", "Legionella pneumophila serogroup 1 (organism)", "SNOMED-CT", "103463005"), + + RHIZOBIUM_RADIOBACTER_ORGANISM("Rhizobium radiobacter (organism)", "Rhizobium radiobacter (organism)", "SNOMED-CT", "438107000"), + + GENUS_CUTIBACTERIUM_ORGANISM("Genus Cutibacterium (organism)", "Genus Cutibacterium (organism)", "SNOMED-CT", "763051006"), + + ENTEROCOCCUS_FAECIUM_ORGANISM("Enterococcus faecium (organism)", "Enterococcus faecium (organism)", "SNOMED-CT", "90272000"), + + LACTOBACILLUS_CASEI_ORGANISM("Lactobacillus casei (organism)", "Lactobacillus casei (organism)", "SNOMED-CT", "1017006"), + + PSEUDOMONAS_AERUGINOSA_ORGANISM("Pseudomonas aeruginosa (organism)", "Pseudomonas aeruginosa (organism)", "SNOMED-CT", "52499004"), + + PROVIDENCIA_HEIMBACHAE_ORGANISM("Providencia heimbachae (organism)", "Providencia heimbachae (organism)", "SNOMED-CT", "47300009"), + + CITROBACTER_BRAAKII_ORGANISM("Citrobacter braakii (organism)", "Citrobacter braakii (organism)", "SNOMED-CT", "114262000"), + + STREPTOCOCCUS_INTERMEDIUS_ORGANISM("Streptococcus intermedius (organism)", "Streptococcus intermedius (organism)", "SNOMED-CT", "62170002"), + + HAEMOPHILUS_PARAHAEMOLYTICUS_ORGANISM("Haemophilus parahaemolyticus (organism)", "Haemophilus parahaemolyticus (organism)", "SNOMED-CT", "89800007"), + + AEROMONAS_JANDEI_ORGANISM("Aeromonas jandei (organism)", "Aeromonas jandei (organism)", "SNOMED-CT", "115034008"), + + KOSAKONIA_COWANII("Kosakonia cowanii", "Kosakonia cowanii", "SNOMED-CT", "416229008"), + + PASTEURELLA_DAGMATIS_ORGANISM("Pasteurella dagmatis (organism)", "Pasteurella dagmatis (organism)", "SNOMED-CT", "80948000"), + + SAPROCHAETE_CAPITATA_ORGANISM("Saprochaete capitata (organism)", "Saprochaete capitata (organism)", "SNOMED-CT", "67999003"), + + AGGREGATIBACTER_ACTINOMYCETEMCOMITANS_ORGANISM("Aggregatibacter actinomycetemcomitans (organism)", "Aggregatibacter actinomycetemcomitans (organism)", "SNOMED-CT", "442680008"), + + BREVUNDIMONAS_DIMINUTA_ORGANISM("Brevundimonas diminuta (organism)", "Brevundimonas diminuta (organism)", "SNOMED-CT", "113689009"), + + SALMONELLA_DERBY("Salmonella Derby", "Salmonella Derby", "SNOMED-CT", "37091006"), + + CORYNEBACTERIUM_GLUCURONOLYTICUM_ORGANISM("Corynebacterium glucuronolyticum (organism)", "Corynebacterium glucuronolyticum (organism)", "SNOMED-CT", "413927008"), + + SALMONELLA_WIEN("Salmonella Wien", "Salmonella Wien", "SNOMED-CT", "21975008"), + + ENTEROBACTER_LUDWIGII("Enterobacter ludwigii", "Enterobacter ludwigii", "SNOMED-CT", "432763001"), + + AEROMONAS_HYDROPHILA_ORGANISM("Aeromonas hydrophila (organism)", "Aeromonas hydrophila (organism)", "SNOMED-CT", "85823000"), + + SALMONELLA_BREDENEY("Salmonella Bredeney", "Salmonella Bredeney", "SNOMED-CT", "82364007"), + + SACCHAROMYCES_CEREVISIAE_ORGANISM("Saccharomyces cerevisiae (organism)", "Saccharomyces cerevisiae (organism)", "SNOMED-CT", "58296003"), + + GENUS_FUSOBACTERIUM_ORGANISM("Genus Fusobacterium (organism)", "Genus Fusobacterium (organism)", "SNOMED-CT", "33562003"), + + GENUS_ACTINOMYCES_ORGANISM("Genus Actinomyces (organism)", "Genus Actinomyces (organism)", "SNOMED-CT", "40560008"), + + KLEBSIELLA_VARIICOLA_ORGANISM("Klebsiella variicola (organism)", "Klebsiella variicola (organism)", "SNOMED-CT", "431976004"), + + SALMONELLA_TENNESSEE("Salmonella Tennessee", "Salmonella Tennessee", "SNOMED-CT", "79153007"), + + SALMONELLA_VIRCHOW("Salmonella Virchow", "Salmonella Virchow", "SNOMED-CT", "5929008"), + + PARABURKHOLDERIA_XENOVORANS("Paraburkholderia xenovorans", "Paraburkholderia xenovorans", "SNOMED-CT", "431176003"), + + STAPHYLOCOCCUS_CAPRAE_ORGANISM("Staphylococcus caprae (organism)", "Staphylococcus caprae (organism)", "SNOMED-CT", "76969000"), + + LEGIONELLA_PNEUMOPHILIA_SEROGROUP12_ORGANISM("Legionella pneumophilia serogroup 12 (organism)", "Legionella pneumophilia serogroup 12 (organism)", "SNOMED-CT", "131324005"), + + LEGIONELLA_BELIARDENSIS_ORGANISM("Legionella beliardensis (organism)", "Legionella beliardensis (organism)", "SNOMED-CT", "432714000"), + + CITROBACTER_FARMERI_ORGANISM("Citrobacter farmeri (organism)", "Citrobacter farmeri (organism)", "SNOMED-CT", "114263005"), + + STAPHYLOCOCCUS_WARNERI_ORGANISM("Staphylococcus warneri (organism)", "Staphylococcus warneri (organism)", "SNOMED-CT", "63550006"), + + CITROBACTER_FREUNDII_COMPLEX_ORGANISM("Citrobacter freundii complex (organism)", "Citrobacter freundii complex (organism)", "SNOMED-CT", "782522004"), + + PANTOEA_DISPERSA_ORGANISM("Pantoea dispersa (organism)", "Pantoea dispersa (organism)", "SNOMED-CT", "115017000"), + + GENUS_LEGIONELLA_ORGANISM("Genus Legionella (organism)", "Genus Legionella (organism)", "SNOMED-CT", "7527002"), + + CANDIDA_ALBICANS_ORGANISM("Candida albicans (organism)", "Candida albicans (organism)", "SNOMED-CT", "53326005"), + + STAPHYLOCOCCUS_PETTENKOFERI_ORGANISM("Staphylococcus pettenkoferi (organism)", "Staphylococcus pettenkoferi (organism)", "SNOMED-CT", "428731005"), + + PANTOEA_ANANATIS_ORGANISM("Pantoea ananatis (organism)", "Pantoea ananatis (organism)", "SNOMED-CT", "115014007"), + + MYCOBACTERIUM_TUBERCULOSIS_ORGANISM("Mycobacterium tuberculosis (organism)", "Mycobacterium tuberculosis (organism)", "SNOMED-CT", "113861009"), + + SALMONELLA_ORANIENBURG("Salmonella Oranienburg", "Salmonella Oranienburg", "SNOMED-CT", "46667007"), + + BURKHOLDERIA_CENOCEPACIA_ORGANISM("Burkholderia cenocepacia (organism)", "Burkholderia cenocepacia (organism)", "SNOMED-CT", "416941006"), + + GENUS_CLOSTRIDIUM_ORGANISM("Genus Clostridium (organism)", "Genus Clostridium (organism)", "SNOMED-CT", "8191000"), + + KLEBSIELLA_PNEUMONIAE_SS_PNEUMONIAE_ORGANISM("Klebsiella pneumoniae ss. pneumoniae (organism)", "Klebsiella pneumoniae ss. pneumoniae (organism)", "SNOMED-CT", "18400002"), + + CRONOBACTER_UNIVERSALIS_ORGANISM("Cronobacter universalis (organism)", "Cronobacter universalis (organism)", "SNOMED-CT", "707335003"), + + LEGIONELLA_GORMANII_ORGANISM("Legionella gormanii (organism)", "Legionella gormanii (organism)", "SNOMED-CT", "113721003"), + + MORAXELLA_OSLOENSIS_ORGANISM("Moraxella osloensis (organism)", "Moraxella osloensis (organism)", "SNOMED-CT", "72401008"), + + SALMONELLA_HAVANA("Salmonella Havana", "Salmonella Havana", "SNOMED-CT", "38788001"), + + SALMONELLA_GOLDCOAST("Salmonella Goldcoast", "Salmonella Goldcoast", "SNOMED-CT", "16820003"), + + SALMONELLA_SANDIEGO("Salmonella Sandiego", "Salmonella Sandiego", "SNOMED-CT", "112287008"), + + ASPERGILLUS_TERREUS_ORGANISM("Aspergillus terreus (organism)", "Aspergillus terreus (organism)", "SNOMED-CT", "26406003"), + + PANTOEA_STEWARTII_ORGANISM("Pantoea stewartii (organism)", "Pantoea stewartii (organism)", "SNOMED-CT", "131300002"), + + SALMONELLA_CHOLERAESUIS_VAR_KUNZENDORF("Salmonella Choleraesuis var. Kunzendorf", "Salmonella Choleraesuis var. Kunzendorf", "SNOMED-CT", "370577001"), + + BREVUNDIMONAS_VESICULARIS_ORGANISM("Brevundimonas vesicularis (organism)", "Brevundimonas vesicularis (organism)", "SNOMED-CT", "113690000"), + + LEGIONELLA_PNEUMOPHILA_SEROGROUP6_ORGANISM("Legionella pneumophila serogroup 6 (organism)", "Legionella pneumophila serogroup 6 (organism)", "SNOMED-CT", "103468001"), + + ENTEROBACTER_KOBEI_ORGANISM("Enterobacter kobei (organism)", "Enterobacter kobei (organism)", "SNOMED-CT", "114456008"), + + BURKHOLDERIA_DOLOSA("Burkholderia dolosa", "Burkholderia dolosa", "SNOMED-CT", "431173006"), + + LEGIONELLA_PNEUMOPHILIA_SEROGROUP11_ORGANISM("Legionella pneumophilia serogroup 11 (organism)", "Legionella pneumophilia serogroup 11 (organism)", "SNOMED-CT", "131323004"), + + BACTEROIDES_FRAGILIS_ORGANISM("Bacteroides fragilis (organism)", "Bacteroides fragilis (organism)", "SNOMED-CT", "55247009"), + + STREPTOCOCCUS_DYSGALACTIAE_SUBSPECIES_EQUISIMILIS_ORGANISM("Streptococcus dysgalactiae subspecies equisimilis (organism)", "Streptococcus dysgalactiae subspecies equisimilis (organism)", "SNOMED-CT", "128338004"), + + CANDIDA_UTILIS_ORGANISM("Candida utilis (organism)", "Candida utilis (organism)", "SNOMED-CT", "243464000"), + + ESCHERICHIA_COLI_ORGANISM("Escherichia coli (organism)", "Escherichia coli (organism)", "SNOMED-CT", "112283007"), + + AEROMONAS_VERONII_ORGANISM("Aeromonas veronii (organism)", "Aeromonas veronii (organism)", "SNOMED-CT", "9281006"), + + SALMONELLA_NEWPORT("Salmonella Newport", "Salmonella Newport", "SNOMED-CT", "56077000"), + + STREPTOCOCCUS_CONSTELLATUS_ORGANISM("Streptococcus constellatus (organism)", "Streptococcus constellatus (organism)", "SNOMED-CT", "76199005"), + + CANDIDA_LUSITANIAE_ORGANISM("Candida lusitaniae (organism)", "Candida lusitaniae (organism)", "SNOMED-CT", "47608006"), + + MORAXELLA_LACUNATA_ORGANISM("Moraxella lacunata (organism)", "Moraxella lacunata (organism)", "SNOMED-CT", "84066001"), + + SALMONELLA_PANAMA("Salmonella Panama", "Salmonella Panama", "SNOMED-CT", "40114001"), + + CORYNEBACTERIUM_PSEUDODIPHTHERITICUM_ORGANISM("Corynebacterium pseudodiphtheriticum (organism)", "Corynebacterium pseudodiphtheriticum (organism)", "SNOMED-CT", "12050008"), + + ACTINOMYCES_NEUII_ORGANISM("Actinomyces neuii (organism)", "Actinomyces neuii (organism)", "SNOMED-CT", "877802991000087109"), + + ASPERGILLUS_FUMIGATUS_SPECIES_COMPLEX_ORGANISM("Aspergillus fumigatus species complex (organism)", "Aspergillus fumigatus species complex (organism)", "SNOMED-CT", "719029007"), + + CRONOBACTER_MALONATICUS("Cronobacter malonaticus", "Cronobacter malonaticus", "SNOMED-CT", "445560007"), + + HAEMOPHILUS_PARAINFLUENZAE_ORGANISM("Haemophilus parainfluenzae (organism)", "Haemophilus parainfluenzae (organism)", "SNOMED-CT", "51593004"), + + LEGIONELLA_TUCSONENSIS_ORGANISM("Legionella tucsonensis (organism)", "Legionella tucsonensis (organism)", "SNOMED-CT", "103461007"), + + GENUS_PICHIA_ORGANISM("Genus Pichia (organism)", "Genus Pichia (organism)", "SNOMED-CT", "4163004"), + + YEAST_ORGANISM("Yeast (organism)", "Yeast (organism)", "SNOMED-CT", "62093005"), + + ENTEROBACTER_AMNIGENUS_BIOGROUP_II_ORGANISM("Enterobacter amnigenus biogroup II (organism)", "Enterobacter amnigenus biogroup II (organism)", "SNOMED-CT", "114453000"), + + CRONOBACTER_DUBLINENSIS_SUBSPECIES_LAUSANNENSIS("Cronobacter dublinensis subspecies lausannensis", "Cronobacter dublinensis subspecies lausannensis", "SNOMED-CT", "5711000087108"), + + ASPERGILLUS_NIDULANS_GROUP_ORGANISM("Aspergillus nidulans Group (organism)", "Aspergillus nidulans Group (organism)", "SNOMED-CT", "415879008"), + + CLOSTRIDIOIDES_DIFFICILE_ORGANISM("Clostridioides difficile (organism)", "Clostridioides difficile (organism)", "SNOMED-CT", "5933001"), + + SALMONELLA_MONSCHAUI("Salmonella Monschaui", "Salmonella Monschaui", "SNOMED-CT", "65132007"), + + GENUS_PSEUDOMONAS_ORGANISM("Genus Pseudomonas (organism)", "Genus Pseudomonas (organism)", "SNOMED-CT", "57032008"), + + PROTEUS_MYXOFACIENS_ORGANISM("Proteus myxofaciens (organism)", "Proteus myxofaciens (organism)", "SNOMED-CT", "86145008"), + + RHODOTORULA_RUBRA_ORGANISM("Rhodotorula rubra (organism)", "Rhodotorula rubra (organism)", "SNOMED-CT", "86724009"), + + STAPHYLOCOCCUS_SACCHAROLYTICUS_ORGANISM("Staphylococcus saccharolyticus (organism)", "Staphylococcus saccharolyticus (organism)", "SNOMED-CT", "41103009"), + + CANDIDA_MAGNOLIAE_ORGANISM("Candida magnoliae (organism)", "Candida magnoliae (organism)", "SNOMED-CT", "446239009"), + + EIKENELLA_CORRODENS_ORGANISM("Eikenella corrodens (organism)", "Eikenella corrodens (organism)", "SNOMED-CT", "52591004"), + + HAFNIA_ALVEI_ORGANISM("Hafnia alvei (organism)", "Hafnia alvei (organism)", "SNOMED-CT", "76694001"), + + SERRATIA_GRIMESII_ORGANISM("Serratia grimesii (organism)", "Serratia grimesii (organism)", "SNOMED-CT", "115005002"), + + SALMONELLA_BRANDENBURG("Salmonella Brandenburg", "Salmonella Brandenburg", "SNOMED-CT", "16888008"), + + SUBGENUS_MORAXELLA_ORGANISM("Subgenus Moraxella (organism)", "Subgenus Moraxella (organism)", "SNOMED-CT", "427057001"), + + YERSINIA_ENTEROCOLITICA_SEROGROUP_O5_ORGANISM("Yersinia enterocolitica serogroup O:5 (organism)", "Yersinia enterocolitica serogroup O:5 (organism)", "SNOMED-CT", "103431004"), + + LEUCONOSTOC_LACTIS_ORGANISM("Leuconostoc lactis (organism)", "Leuconostoc lactis (organism)", "SNOMED-CT", "70285009"), + + SALMONELLA_MANCHESTER("Salmonella Manchester", "Salmonella Manchester", "SNOMED-CT", "70605000"), + + LEGIONELLA_PNEUMOPHILIA_SEROGROUP13_ORGANISM("Legionella pneumophilia serogroup 13 (organism)", "Legionella pneumophilia serogroup 13 (organism)", "SNOMED-CT", "131325006"), + + BIFIDOBACTERIUM_DENTIUM_ORGANISM("Bifidobacterium dentium (organism)", "Bifidobacterium dentium (organism)", "SNOMED-CT", "36623007"), + + CLOSTRIDIUM_PERFRINGENS_ORGANISM("Clostridium perfringens (organism)", "Clostridium perfringens (organism)", "SNOMED-CT", "8331005"), + + CRYPTOCOCCUS_ORGANISM("Cryptococcus (organism)", "Cryptococcus (organism)", "SNOMED-CT", "17579001"), + + MIXTA_CALIDA_ORGANISM("Mixta calida (organism)", "Mixta calida (organism)", "SNOMED-CT", "709310002"), + + SALMONELLA_ALBANY("Salmonella Albany", "Salmonella Albany", "SNOMED-CT", "72033009"), + + STREPTOCOCCUS_VESTIBULARIS_ORGANISM("Streptococcus vestibularis (organism)", "Streptococcus vestibularis (organism)", "SNOMED-CT", "113998009"), + + LEGIONELLA_BIRMINGHAMENSIS_ORGANISM("Legionella birminghamensis (organism)", "Legionella birminghamensis (organism)", "SNOMED-CT", "22592008"), + + STREPTOCOCCUS_VIRIDANS_GROUP_ORGANISM("Streptococcus, viridans group (organism)", "Streptococcus, viridans group (organism)", "SNOMED-CT", "31703004"), + + PANTOEA_AGGLOMERANS_ORGANISM("Pantoea agglomerans (organism)", "Pantoea agglomerans (organism)", "SNOMED-CT", "115015008"), + + SERRATIA_PLYMUTHICA_ORGANISM("Serratia plymuthica (organism)", "Serratia plymuthica (organism)", "SNOMED-CT", "28955009"), + + ANAEROBIC_GRAM_NEGATIVE_BACILLUS_ORGANISM("Anaerobic Gram-negative bacillus (organism)", "Anaerobic Gram-negative bacillus (organism)", "SNOMED-CT", "243386003"), + + BREVUNDIMONAS_AURANTIACA("Brevundimonas aurantiaca", "Brevundimonas aurantiaca", "SNOMED-CT", "423035009"), + + BETA_HEMOLYTIC_STREPTOCOCCUS_GROUP_A_ORGANISM("Beta-hemolytic Streptococcus, group A (organism)", "Beta-hemolytic Streptococcus, group A (organism)", "SNOMED-CT", "413643004"), + + NEISSERIA_GONORRHOEAE_ORGANISM("Neisseria gonorrhoeae (organism)", "Neisseria gonorrhoeae (organism)", "SNOMED-CT", "68704007"), + + BURKHOLDERIA_VIETNAMIENSIS_ORGANISM("Burkholderia vietnamiensis (organism)", "Burkholderia vietnamiensis (organism)", "SNOMED-CT", "113680008"), + + PEPTONIPHILUS_HAREI_ORGANISM("Peptoniphilus harei (organism)", "Peptoniphilus harei (organism)", "SNOMED-CT", "433373007"), + + SALMONELLA_ENTERICA_SUBSP_ENTERICA_ORGANISM("Salmonella enterica subsp. enterica (organism)", "Salmonella enterica subsp. enterica (organism)", "SNOMED-CT", "398508004"), + + DERMABACTER_HOMINIS_ORGANISM("Dermabacter hominis (organism)", "Dermabacter hominis (organism)", "SNOMED-CT", "413977006"), + + MORGANELLA_MORGANII_SUBSP_SIBONII_ORGANISM("Morganella morganii subsp sibonii (organism)", "Morganella morganii subsp sibonii (organism)", "SNOMED-CT", "243303008"), + + STENOTROPHOMONAS_ACIDAMINIPHILA_ORGANISM("Stenotrophomonas acidaminiphila (organism)", "Stenotrophomonas acidaminiphila (organism)", "SNOMED-CT", "415583001"), + + LEGIONELLA_ERYTHRA_ORGANISM("Legionella erythra (organism)", "Legionella erythra (organism)", "SNOMED-CT", "28109006"), + + SALMONELLA_SINSTORF("Salmonella Sinstorf", "Salmonella Sinstorf", "SNOMED-CT", "71443004"), + + PSEUDOMONAS_MENDOCINA_ORGANISM("Pseudomonas mendocina (organism)", "Pseudomonas mendocina (organism)", "SNOMED-CT", "59419001"), + + ANAEROBIC_GRAM_POSITIVE_BACILLUS_ORGANISM("Anaerobic Gram-positive bacillus (organism)", "Anaerobic Gram-positive bacillus (organism)", "SNOMED-CT", "243398008"), + + ENTEROBACTER_HORMAECHEI_ORGANISM("Enterobacter hormaechei (organism)", "Enterobacter hormaechei (organism)", "SNOMED-CT", "114454006"), + + BURKHOLDERIA_MALLEI("Burkholderia mallei", "Burkholderia mallei", "SNOMED-CT", "113674000"), + + BURKHOLDERIA_PYRROCINIA("Burkholderia pyrrocinia", "Burkholderia pyrrocinia", "SNOMED-CT", "113677007"), + + SALMONELLA_CHOLERAESUIS_ORGANISM("Salmonella Choleraesuis (organism)", "Salmonella Choleraesuis (organism)", "SNOMED-CT", "80232006"), + + LEGIONELLA_PNEUMOPHILA_SEROGROUP2_ORGANISM("Legionella pneumophila serogroup 2 (organism)", "Legionella pneumophila serogroup 2 (organism)", "SNOMED-CT", "103464004"), + + STENOTROPHOMONAS_NITRITIREDUCENS_ORGANISM("Stenotrophomonas nitritireducens (organism)", "Stenotrophomonas nitritireducens (organism)", "SNOMED-CT", "416746005"), + + STREPTOCOCCUS_CONSTELLATUS_SUBSPECIES_CONSTELLATUS_ORGANISM("Streptococcus constellatus subspecies constellatus (organism)", "Streptococcus constellatus subspecies constellatus (organism)", "SNOMED-CT", "415601009"), + + BREVUNDIMONAS_NASDAE("Brevundimonas nasdae", "Brevundimonas nasdae", "SNOMED-CT", "424717001"), + + PARABURKHOLDERIA_TERRICOLA("Paraburkholderia terricola", "Paraburkholderia terricola", "SNOMED-CT", "431683009"), + + CHRYSEOBACTERIUM_GLEUM_ORGANISM("Chryseobacterium gleum (organism)", "Chryseobacterium gleum (organism)", "SNOMED-CT", "113548000"), + + ACINETOBACTER_URSINGII_ORGANISM("Acinetobacter ursingii (organism)", "Acinetobacter ursingii (organism)", "SNOMED-CT", "424791004"), + + SALMONELLA_RICHMOND("Salmonella Richmond", "Salmonella Richmond", "SNOMED-CT", "31517006"), + + ASPERGILLUS_NIGER_ORGANISM("Aspergillus niger (organism)", "Aspergillus niger (organism)", "SNOMED-CT", "89354002"), + + MYCOBACTERIUM_BOVIS_ORGANISM("Mycobacterium bovis (organism)", "Mycobacterium bovis (organism)", "SNOMED-CT", "27142009"), + + MYCOBACTERIUM_BOVIS_SUBSPECIES_BOVIS_ORGANISM("Mycobacterium bovis subspecies bovis (organism)", "Mycobacterium bovis subspecies bovis (organism)", "SNOMED-CT", "832924651000087107"), + + LEGIONELLA_ISRAELENSIS_ORGANISM("Legionella israelensis (organism)", "Legionella israelensis (organism)", "SNOMED-CT", "3128001"), + + SALMONELLA_PARATYPHI_B_VAR_JAVA("Salmonella Paratyphi B var. Java", "Salmonella Paratyphi B var. Java", "SNOMED-CT", "128388007"), + + ACINETOBACTER_TANDOII_ORGANISM("Acinetobacter tandoii (organism)", "Acinetobacter tandoii (organism)", "SNOMED-CT", "424021002"), + + PROTEUS_VULGARIS_ORGANISM("Proteus vulgaris (organism)", "Proteus vulgaris (organism)", "SNOMED-CT", "45834001"), + + SALMONELLA_SEROGROUP_C_ORGANISM("Salmonella, serogroup C (organism)", "Salmonella, serogroup C (organism)", "SNOMED-CT", "116048001"), + + LACTOCOCCUS_LACTIS_SUBSPECIES_LACTIS_ORGANISM("Lactococcus lactis subspecies lactis (organism)", "Lactococcus lactis subspecies lactis (organism)", "SNOMED-CT", "38518005"), + + LEGIONELLA_PNEUMOPHILIA_SEROGROUP14_ORGANISM("Legionella pneumophilia serogroup 14 (organism)", "Legionella pneumophilia serogroup 14 (organism)", "SNOMED-CT", "131326007"), + + PEDIOCOCCUS_ACIDILACTICI_ORGANISM("Pediococcus acidilactici (organism)", "Pediococcus acidilactici (organism)", "SNOMED-CT", "243237003"), + + GENUS_ALCALIGENES_ORGANISM("Genus Alcaligenes (organism)", "Genus Alcaligenes (organism)", "SNOMED-CT", "68571003"), + + ASPERGILLUS_USTUS_ORGANISM("Aspergillus ustus (organism)", "Aspergillus ustus (organism)", "SNOMED-CT", "23179008"), + + CLOSTRIDIUM_RAMOSUM_ORGANISM("Clostridium ramosum (organism)", "Clostridium ramosum (organism)", "SNOMED-CT", "42706008"), + + KOCURIA_KRISTINAE_ORGANISM("Kocuria kristinae (organism)", "Kocuria kristinae (organism)", "SNOMED-CT", "113772007"), + + CAMPYLOBACTER_JEJUNI_ORGANISM("Campylobacter jejuni (organism)", "Campylobacter jejuni (organism)", "SNOMED-CT", "66543000"), + + PANTOEA_SEPTICA_ORGANISM("Pantoea septica (organism)", "Pantoea septica (organism)", "SNOMED-CT", "5681000146105"), + + STREPTOCOCCUS_ORALIS_ORGANISM("Streptococcus oralis (organism)", "Streptococcus oralis (organism)", "SNOMED-CT", "19870004"), + + PREVOTELLA_INTERMEDIA_ORGANISM("Prevotella intermedia (organism)", "Prevotella intermedia (organism)", "SNOMED-CT", "114142000"), + + LEGIONELLA_BRUNENSIS_ORGANISM("Legionella brunensis (organism)", "Legionella brunensis (organism)", "SNOMED-CT", "103448007"), + + STREPTOCOCCUS_AGALACTIAE_ORGANISM("Streptococcus agalactiae (organism)", "Streptococcus agalactiae (organism)", "SNOMED-CT", "43492007"), + + STREPTOCOCCUS_MITIS_GROUP_ORGANISM("Streptococcus mitis group (organism)", "Streptococcus mitis group (organism)", "SNOMED-CT", "127539005"), + + ACINETOBACTER_GENOSPECIES11_ORGANISM("Acinetobacter genospecies 11 (organism)", "Acinetobacter genospecies 11 (organism)", "SNOMED-CT", "113380002"), + + PARABURKHOLDERIA_ANDROPOGONIS("Paraburkholderia andropogonis", "Paraburkholderia andropogonis", "SNOMED-CT", "113667005"), + + BREVUNDIMONAS_INTERMEDIA("Brevundimonas intermedia", "Brevundimonas intermedia", "SNOMED-CT", "423923008"), + + CORYNEBACTERIUM_AFERMENTANS_ORGANISM("Corynebacterium afermentans (organism)", "Corynebacterium afermentans (organism)", "SNOMED-CT", "113608003"), + + NEISSERIA_SUBFLAVA_ORGANISM("Neisseria subflava (organism)", "Neisseria subflava (organism)", "SNOMED-CT", "77700001"), + + CORYNEBACTERIUM_TUBERCULOSTEARICUM_ORGANISM("Corynebacterium tuberculostearicum (organism)", "Corynebacterium tuberculostearicum (organism)", "SNOMED-CT", "416356007"), + + BACILLUS_THURINGIENSIS_ORGANISM("Bacillus thuringiensis (organism)", "Bacillus thuringiensis (organism)", "SNOMED-CT", "64840009"), + + STREPTOCOCCUS_ANGINOSUS_GROUP_ORGANISM("Streptococcus anginosus group (organism)", "Streptococcus anginosus group (organism)", "SNOMED-CT", "415597009"), + + PAENIBACILLUS_MACERANS_ORGANISM("Paenibacillus macerans (organism)", "Paenibacillus macerans (organism)", "SNOMED-CT", "114101003"), + + PARABURKHOLDERIA_FUNGORUM_ORGANISM("Paraburkholderia fungorum (organism)", "Paraburkholderia fungorum (organism)", "SNOMED-CT", "417285005"), + + FINEGOLDIA_MAGNA_ORGANISM("Finegoldia magna (organism)", "Finegoldia magna (organism)", "SNOMED-CT", "417469002"), + + ASPERGILLUS_GLAUCUS("Aspergillus glaucus", "Aspergillus glaucus", "SNOMED-CT", "19556009"), + + CANDIDA_DUBLINIENSIS_ORGANISM("Candida dubliniensis (organism)", "Candida dubliniensis (organism)", "SNOMED-CT", "115952006"), + + STREPTOCOCCUS_SANGUINIS_ORGANISM("Streptococcus sanguinis (organism)", "Streptococcus sanguinis (organism)", "SNOMED-CT", "113993000"), + + PROVIDENCIA_RUSTIGIANII_ORGANISM("Providencia rustigianii (organism)", "Providencia rustigianii (organism)", "SNOMED-CT", "19196004"), + + SHIGELLA_FLEXNERI_ORGANISM("Shigella flexneri (organism)", "Shigella flexneri (organism)", "SNOMED-CT", "85729005"), + + BURKHOLDERIA_MULTIVORANS_ORGANISM("Burkholderia multivorans (organism)", "Burkholderia multivorans (organism)", "SNOMED-CT", "113675004"), + + CITROBACTER_MURLINIAE("Citrobacter murliniae", "Citrobacter murliniae", "SNOMED-CT", "417581000"), + + PREVOTELLA_NANCEIENSIS_ORGANISM("Prevotella nanceiensis (organism)", "Prevotella nanceiensis (organism)", "SNOMED-CT", "441625003"), + + GENUS_ACINETOBACTER_ORGANISM("Genus Acinetobacter (organism)", "Genus Acinetobacter (organism)", "SNOMED-CT", "7757008"), + + ASPERGILLUS_SPECIES_NOT_ASPERGILLUS_FUMIGATUS_ORGANISM("Aspergillus species not Aspergillus fumigatus (organism)", "Aspergillus species not Aspergillus fumigatus (organism)", "SNOMED-CT", "413584009"), + + STAPHYLOCOCCUS_PASTEURI_ORGANISM("Staphylococcus pasteuri (organism)", "Staphylococcus pasteuri (organism)", "SNOMED-CT", "103495006"), + + PREVOTELLA_BIVIA_ORGANISM("Prevotella bivia (organism)", "Prevotella bivia (organism)", "SNOMED-CT", "114131009"), + + MORGANELLA_MORGANII_ORGANISM("Morganella morganii (organism)", "Morganella morganii (organism)", "SNOMED-CT", "243301005"), + + PREVOTELLA_BUCCAE_ORGANISM("Prevotella buccae (organism)", "Prevotella buccae (organism)", "SNOMED-CT", "114134001"), + + KLUYVERA_INTERMEDIA("Kluyvera intermedia", "Kluyvera intermedia", "SNOMED-CT", "431977008"), + + PROVIDENCIA_VERMICOLA_ORGANISM("Providencia vermicola (organism)", "Providencia vermicola (organism)", "SNOMED-CT", "6031000146109"), + + CUTIBACTERIUM_ACNES_ORGANISM("Cutibacterium acnes (organism)", "Cutibacterium acnes (organism)", "SNOMED-CT", "39473003"), + + PASTEURELLA_CANIS_ORGANISM("Pasteurella canis (organism)", "Pasteurella canis (organism)", "SNOMED-CT", "7784009"), + + LEGIONELLA_YABUUCHIAE_ORGANISM("Legionella yabuuchiae (organism)", "Legionella yabuuchiae (organism)", "SNOMED-CT", "5131000146101"), + + HAEMOPHILUS_HAEMOLYTICUS_ORGANISM("Haemophilus haemolyticus (organism)", "Haemophilus haemolyticus (organism)", "SNOMED-CT", "54950008"), + + BACILLUS_CIRCULANS_ORGANISM("Bacillus circulans (organism)", "Bacillus circulans (organism)", "SNOMED-CT", "71812004"), + + LEGIONELLA_RUBRILUCENS_ORGANISM("Legionella rubrilucens (organism)", "Legionella rubrilucens (organism)", "SNOMED-CT", "17298000"), + + STREPTOCOCCUS_GORDONII_ORGANISM("Streptococcus gordonii (organism)", "Streptococcus gordonii (organism)", "SNOMED-CT", "113986004"), + + PASTEURELLA_STOMATIS_ORGANISM("Pasteurella stomatis (organism)", "Pasteurella stomatis (organism)", "SNOMED-CT", "46827009"), + + PSEUDOMONAS_PUTIDA_ORGANISM("Pseudomonas putida (organism)", "Pseudomonas putida (organism)", "SNOMED-CT", "68608003"), + + ASPERGILLUS_FLAVUS_ORGANISM("Aspergillus flavus (organism)", "Aspergillus flavus (organism)", "SNOMED-CT", "66821001"), + + MYCOBACTERIUM_CAPRAE_ORGANISM("Mycobacterium caprae (organism)", "Mycobacterium caprae (organism)", "SNOMED-CT", "430579009"), + + SALMONELLA_TYPHI_ORGANISM("Salmonella Typhi (organism)", "Salmonella Typhi (organism)", "SNOMED-CT", "5595000"), + + STREPTOCOCCUS_EQUINUS_ORGANISM("Streptococcus equinus (organism)", "Streptococcus equinus (organism)", "SNOMED-CT", "72646003"), + + GENUS_PREVOTELLA_ORGANISM("Genus Prevotella (organism)", "Genus Prevotella (organism)", "SNOMED-CT", "114129000"), + + ASPERGILLUS_TAMARII_ORGANISM("Aspergillus tamarii (organism)", "Aspergillus tamarii (organism)", "SNOMED-CT", "3111000146107"), + + CANDIDA_SPECIES_NOT_CANDIDA_ALBICANS_ORGANISM("Candida species not Candida albicans (organism)", "Candida species not Candida albicans (organism)", "SNOMED-CT", "714313009"), + + AEROMONAS_ENCHELEIA_ORGANISM("Aeromonas encheleia (organism)", "Aeromonas encheleia (organism)", "SNOMED-CT", "115028001"), + + PARABURKHOLDERIA_TROPICA("Paraburkholderia tropica", "Paraburkholderia tropica", "SNOMED-CT", "431175004"), + + LACTOBACILLUS_GASSERI_ORGANISM("Lactobacillus gasseri (organism)", "Lactobacillus gasseri (organism)", "SNOMED-CT", "71158000"), + + SHIGELLA_BOYDII_ORGANISM("Shigella boydii (organism)", "Shigella boydii (organism)", "SNOMED-CT", "55462008"), + + KLEBSIELLA_OXYTOCA_ORGANISM("Klebsiella oxytoca (organism)", "Klebsiella oxytoca (organism)", "SNOMED-CT", "40886007"), + + GENUS_MYCOBACTERIUM_ORGANISM("Genus Mycobacterium (organism)", "Genus Mycobacterium (organism)", "SNOMED-CT", "243368001"), + + LEGIONELLA_BOZEMANAE_ORGANISM("Legionella bozemanae (organism)", "Legionella bozemanae (organism)", "SNOMED-CT", "450611004"), + + BURKHOLDERIA_GLUMAE("Burkholderia glumae", "Burkholderia glumae", "SNOMED-CT", "113673006"), + + PREVOTELLA_DISIENS_ORGANISM("Prevotella disiens (organism)", "Prevotella disiens (organism)", "SNOMED-CT", "114139006"), + + AEROMONAS_POPOFFII_ORGANISM("Aeromonas popoffii (organism)", "Aeromonas popoffii (organism)", "SNOMED-CT", "115035009"), + + PARABURKHOLDERIA_PHYMATUM("Paraburkholderia phymatum", "Paraburkholderia phymatum", "SNOMED-CT", "431165002"), + + ACINETOBACTER_TOWNERI_ORGANISM("Acinetobacter towneri (organism)", "Acinetobacter towneri (organism)", "SNOMED-CT", "424930007"), + + ACINETOBACTER_BAYLYI_ORGANISM("Acinetobacter baylyi (organism)", "Acinetobacter baylyi (organism)", "SNOMED-CT", "423974000"), + + ANAEROBIC_BACTERIA_ORGANISM("Anaerobic bacteria (organism)", "Anaerobic bacteria (organism)", "SNOMED-CT", "59343002"), + + PSEUDOMONAS_CITRONELLOLIS_ORGANISM("Pseudomonas citronellolis (organism)", "Pseudomonas citronellolis (organism)", "SNOMED-CT", "31277003"), + + SALMONELLA_OHIO("Salmonella Ohio", "Salmonella Ohio", "SNOMED-CT", "67210008"), + + NEOSARTORYA_HIRATSUKAE_ORGANISM("Neosartorya hiratsukae (organism)", "Neosartorya hiratsukae (organism)", "SNOMED-CT", "414835000"), + + ACTINOMYCES_NAESLUNDII_ORGANISM("Actinomyces naeslundii (organism)", "Actinomyces naeslundii (organism)", "SNOMED-CT", "8940004"), + + SALMONELLA_SPECIES("Salmonella species", "Salmonella species", "SNOMED-CT", "27268008"), + + SERRATIA_RUBIDAEA_ORGANISM("Serratia rubidaea (organism)", "Serratia rubidaea (organism)", "SNOMED-CT", "55825002"), + + PREVOTELLA_ORIS_ORGANISM("Prevotella oris (organism)", "Prevotella oris (organism)", "SNOMED-CT", "114147006"), + + CITROBACTER_GILLENII("Citrobacter gillenii", "Citrobacter gillenii", "SNOMED-CT", "416990006"), + + MYCOBACTERIUM_INTRACELLULARE_ORGANISM("Mycobacterium intracellulare (organism)", "Mycobacterium intracellulare (organism)", "SNOMED-CT", "83841006"), + + CUPRIAVIDUS_PAUCULUS_ORGANISM("Cupriavidus pauculus (organism)", "Cupriavidus pauculus (organism)", "SNOMED-CT", "429465001"), + + ELIZABETHKINGIA_MIRICOLA_ORGANISM("Elizabethkingia miricola (organism)", "Elizabethkingia miricola (organism)", "SNOMED-CT", "444815005"), + + GRAM_POSITIVE_COCCUS_ORGANISM("Gram-positive coccus (organism)", "Gram-positive coccus (organism)", "SNOMED-CT", "59206002"), + + ACINETOBACTER_NOSOCOMIALIS_ORGANISM("Acinetobacter nosocomialis (organism)", "Acinetobacter nosocomialis (organism)", "SNOMED-CT", "708859003"), + + CITROBACTER_FREUNDII_ORGANISM("Citrobacter freundii (organism)", "Citrobacter freundii (organism)", "SNOMED-CT", "6265002"), + + BURKHOLDERIA_ANTHINA("Burkholderia anthina", "Burkholderia anthina", "SNOMED-CT", "417565005"), + + SERRATIA_QUINIVORANS_ORGANISM("Serratia quinivorans (organism)", "Serratia quinivorans (organism)", "SNOMED-CT", "438199009"), + + GENUS_AEROCOCCUS_ORGANISM("Genus Aerococcus (organism)", "Genus Aerococcus (organism)", "SNOMED-CT", "9008009"), + + ENTEROCOCCUS_GALLINARUM_ORGANISM("Enterococcus gallinarum (organism)", "Enterococcus gallinarum (organism)", "SNOMED-CT", "53233007"), + + CAMPYLOBACTER_UREOLYTICUS_ORGANISM("Campylobacter ureolyticus (organism)", "Campylobacter ureolyticus (organism)", "SNOMED-CT", "450602004"), + + GRANULICATELLA_ADIACENS_ORGANISM("Granulicatella adiacens (organism)", "Granulicatella adiacens (organism)", "SNOMED-CT", "113713009"), + + ACHROMOBACTER_XYLOSOXIDANS_ORGANISM("Achromobacter xylosoxidans (organism)", "Achromobacter xylosoxidans (organism)", "SNOMED-CT", "413424009"), + + GENUS_PROPIONIBACTERIUM_ORGANISM("Genus Propionibacterium (organism)", "Genus Propionibacterium (organism)", "SNOMED-CT", "34844008"), + + SERRATIA_ENTOMOPHILA_ORGANISM("Serratia entomophila (organism)", "Serratia entomophila (organism)", "SNOMED-CT", "76656001"), + + ASPERGILLUS_NIVEUS_ORGANISM("Aspergillus niveus (organism)", "Aspergillus niveus (organism)", "SNOMED-CT", "18651002"), + + LACTOBACILLUS_PARACASEI_ORGANISM("Lactobacillus paracasei (organism)", "Lactobacillus paracasei (organism)", "SNOMED-CT", "113792000"), + + PASTEURELLA_MULTOCIDA_ORGANISM("Pasteurella multocida (organism)", "Pasteurella multocida (organism)", "SNOMED-CT", "10879005"), + + GENUS_STREPTOCOCCUS_ORGANISM("Genus Streptococcus (organism)", "Genus Streptococcus (organism)", "SNOMED-CT", "58800005"), + + BACTEROIDES_THETAIOTAOMICRON_ORGANISM("Bacteroides thetaiotaomicron (organism)", "Bacteroides thetaiotaomicron (organism)", "SNOMED-CT", "34236001"), + + YERSINIA_ENTEROCOLITICA_SEROGROUP_O3_ORGANISM("Yersinia enterocolitica serogroup O:3 (organism)", "Yersinia enterocolitica serogroup O:3 (organism)", "SNOMED-CT", "103430003"), + + BURKHOLDERIA_CALEDONICA("Burkholderia caledonica", "Burkholderia caledonica", "SNOMED-CT", "423159001"), + + AGGREGATIBACTER_APHROPHILUS_ORGANISM("Aggregatibacter aphrophilus (organism)", "Aggregatibacter aphrophilus (organism)", "SNOMED-CT", "442683005"), + + CRONOBACTER_TURICENSIS("Cronobacter turicensis", "Cronobacter turicensis", "SNOMED-CT", "445639005"), + + EGGERTHELLA_LENTA_ORGANISM("Eggerthella lenta (organism)", "Eggerthella lenta (organism)", "SNOMED-CT", "414077004"), + + INTERFERON_GAMMA_ASSAY_POSITIVE_FINDING("Interferon gamma assay positive (finding)", "Interferon gamma assay positive (finding)", "SNOMED-CT", "440662009"), + + LEGIONELLA_PNEUMOPHILA_SEROGROUP4_ORGANISM("Legionella pneumophila serogroup 4 (organism)", "Legionella pneumophila serogroup 4 (organism)", "SNOMED-CT", "103466002"), + + ASPERGILLUS_NIDULANS_ORGANISM("Aspergillus nidulans (organism)", "Aspergillus nidulans (organism)", "SNOMED-CT", "60264008"), + + ACINETOBACTER_SCHINDLERI_ORGANISM("Acinetobacter schindleri (organism)", "Acinetobacter schindleri (organism)", "SNOMED-CT", "423732001"), + + LEGIONELLA_PNEUMOPHILA_SEROGROUP7_ORGANISM("Legionella pneumophila serogroup 7 (organism)", "Legionella pneumophila serogroup 7 (organism)", "SNOMED-CT", "103469009"), + + LEGIONELLA_DUMOFFII_ORGANISM("Legionella dumoffii (organism)", "Legionella dumoffii (organism)", "SNOMED-CT", "113720002"), + + SHEWANELLA_PUTREFACIENS_ORGANISM("Shewanella putrefaciens (organism)", "Shewanella putrefaciens (organism)", "SNOMED-CT", "113700003"), + + GENUS_PEPTONIPHILUS_ORGANISM("Genus Peptoniphilus (organism)", "Genus Peptoniphilus (organism)", "SNOMED-CT", "430742009"), + + SALMONELLA_POMONA("Salmonella Pomona", "Salmonella Pomona", "SNOMED-CT", "112314009"), + + LEGIONELLA_PNEUMOPHILA_ORGANISM("Legionella pneumophila (organism)", "Legionella pneumophila (organism)", "SNOMED-CT", "80897008"), + + PSEUDOMONAS_FLUORESCENS_ORGANISM("Pseudomonas fluorescens (organism)", "Pseudomonas fluorescens (organism)", "SNOMED-CT", "39289003"), + + ASPERGILLUS_BRASILIENSIS_ORGANISM("Aspergillus brasiliensis (organism)", "Aspergillus brasiliensis (organism)", "SNOMED-CT", "3101000146105"), + + BACILLUS_SIMPLEX_ORGANISM("Bacillus simplex (organism)", "Bacillus simplex (organism)", "SNOMED-CT", "113479004"), + + DERMATOPHYTE_ORGANISM("Dermatophyte (organism)", "Dermatophyte (organism)", "SNOMED-CT", "115651002"), + + ENTEROBACTER_CLOACAE_SUBSPECIES_DISSOLVENS("Enterobacter cloacae subspecies dissolvens", "Enterobacter cloacae subspecies dissolvens", "SNOMED-CT", "56813009"), + + BREVUNDIMONAS_SUBVIBRIOIDES("Brevundimonas subvibrioides", "Brevundimonas subvibrioides", "SNOMED-CT", "423492004"), + + LEGIONELLA_LANSINGENSIS_ORGANISM("Legionella lansingensis (organism)", "Legionella lansingensis (organism)", "SNOMED-CT", "103452007"), + + SALMONELLA_GROUP_O35_ORGANISM("Salmonella group O:35 (organism)", "Salmonella group O:35 (organism)", "SNOMED-CT", "404341009"), + + CANDIDA_KEFYR_ORGANISM("Candida kefyr (organism)", "Candida kefyr (organism)", "SNOMED-CT", "446237006"), + + SALMONELLA_GIVE("Salmonella Give", "Salmonella Give", "SNOMED-CT", "71768003"), + + PSEUDOMONAS_KOREENSIS_ORGANISM("Pseudomonas koreensis (organism)", "Pseudomonas koreensis (organism)", "SNOMED-CT", "438724003"), + + SALMONELLA_TYPHIMURIUM_ORGANISM("Salmonella Typhimurium (organism)", "Salmonella Typhimurium (organism)", "SNOMED-CT", "50136005"), + + CANDIDA_GLABRATA_ORGANISM("Candida glabrata (organism)", "Candida glabrata (organism)", "SNOMED-CT", "444877006"), + + STAPHYLOCOCCUS_CAPITIS_ORGANISM("Staphylococcus capitis (organism)", "Staphylococcus capitis (organism)", "SNOMED-CT", "40347003"), + + SALMONELLA_SEROGROUP_D_ORGANISM("Salmonella, serogroup D (organism)", "Salmonella, serogroup D (organism)", "SNOMED-CT", "115408009"), + + MANNHEIMIA_HAEMOLYTICA_ORGANISM("Mannheimia haemolytica (organism)", "Mannheimia haemolytica (organism)", "SNOMED-CT", "128385005"), + + PREVOTELLA_MELANINOGENICA_ORGANISM("Prevotella melaninogenica (organism)", "Prevotella melaninogenica (organism)", "SNOMED-CT", "114144004"), + + CANDIDA_PARAPSILOSIS_ORGANISM("Candida parapsilosis (organism)", "Candida parapsilosis (organism)", "SNOMED-CT", "61302002"), + + CITROBACTER_YOUNGAE_ORGANISM("Citrobacter youngae (organism)", "Citrobacter youngae (organism)", "SNOMED-CT", "114443001"), + + CORYNEBACTERIUM_AURIMUCOSUM_ORGANISM("Corynebacterium aurimucosum (organism)", "Corynebacterium aurimucosum (organism)", "SNOMED-CT", "385503009"), + + PEDIOCOCCUS_PENTOSACEUS_ORGANISM("Pediococcus pentosaceus (organism)", "Pediococcus pentosaceus (organism)", "SNOMED-CT", "243242006"), + + PNEUMOCYSTIS_JIROVECII_ORGANISM("Pneumocystis jirovecii (organism)", "Pneumocystis jirovecii (organism)", "SNOMED-CT", "79909001"), + + CRYPTOCOCCUS_LAURENTII_ORGANISM("Cryptococcus laurentii (organism)", "Cryptococcus laurentii (organism)", "SNOMED-CT", "7299008"), + + LEGIONELLA_PNEUMOPHILA_SEROGROUP3_ORGANISM("Legionella pneumophila serogroup 3 (organism)", "Legionella pneumophila serogroup 3 (organism)", "SNOMED-CT", "103465003"), + + SALMONELLA_MUENSTER("Salmonella Muenster", "Salmonella Muenster", "SNOMED-CT", "68916009"), + + GENUS_BACILLUS_ORGANISM("Genus Bacillus (organism)", "Genus Bacillus (organism)", "SNOMED-CT", "44762009"), + + STREPTOCOCCUS_CONSTELLATUS_SUBSPECIES_PHARYNGIS_ORGANISM("Streptococcus constellatus subspecies pharyngis (organism)", "Streptococcus constellatus subspecies pharyngis (organism)", "SNOMED-CT", "415602002"), + + KLEBSIELLA_AEROGENES_ORGANISM("Klebsiella aerogenes (organism)", "Klebsiella aerogenes (organism)", "SNOMED-CT", "62592009"), + + PLURALIBACTER_GERGOVIAE("Pluralibacter gergoviae", "Pluralibacter gergoviae", "SNOMED-CT", "716346000"), + + SALMONELLA_AGONA("Salmonella Agona", "Salmonella Agona", "SNOMED-CT", "80627004"), + + SALMONELLA_PARATYPHI_A("Salmonella Paratyphi A", "Salmonella Paratyphi A", "SNOMED-CT", "79128009"), + + GENUS_NEISSERIA_ORGANISM("Genus Neisseria (organism)", "Genus Neisseria (organism)", "SNOMED-CT", "59083001"), + + STREPTOCOCCUS_SALIVARIUS_GROUP_ORGANISM("Streptococcus salivarius group (organism)", "Streptococcus salivarius group (organism)", "SNOMED-CT", "127537007"), + + ACINETOBACTER_SEIFERTII_ORGANISM("Acinetobacter seifertii (organism)", "Acinetobacter seifertii (organism)", "SNOMED-CT", "787184002"), + + ASPERGILLUS_OCHRACEUS_ORGANISM("Aspergillus ochraceus (organism)", "Aspergillus ochraceus (organism)", "SNOMED-CT", "60111002"), + + CRONOBACTER_SAKAZAKII_ORGANISM("Cronobacter sakazakii (organism)", "Cronobacter sakazakii (organism)", "SNOMED-CT", "445562004"), + + ACINETOBACTER_JOHNSONII_ORGANISM("Acinetobacter johnsonii (organism)", "Acinetobacter johnsonii (organism)", "SNOMED-CT", "252000"), + + LEGIONELLA_CHERRII_ORGANISM("Legionella cherrii (organism)", "Legionella cherrii (organism)", "SNOMED-CT", "52462004"), + + WEEKSELLA_VIROSA_ORGANISM("Weeksella virosa (organism)", "Weeksella virosa (organism)", "SNOMED-CT", "83326004"), + + ACTINOMYCES_TURICENSIS_ORGANISM("Actinomyces turicensis (organism)", "Actinomyces turicensis (organism)", "SNOMED-CT", "113422006"), + + CANDIDA_PARAPSILOSIS_COMPLEX_ORGANISM("Candida parapsilosis complex (organism)", "Candida parapsilosis complex (organism)", "SNOMED-CT", "717979000"), + + BACTEROIDES_VULGATUS_ORGANISM("Bacteroides vulgatus (organism)", "Bacteroides vulgatus (organism)", "SNOMED-CT", "52798008"), + + STAPHYLOCOCCUS_LUGDUNENSIS_ORGANISM("Staphylococcus lugdunensis (organism)", "Staphylococcus lugdunensis (organism)", "SNOMED-CT", "103494005"), + + GENUS_BURKHOLDERIA_ORGANISM("Genus Burkholderia (organism)", "Genus Burkholderia (organism)", "SNOMED-CT", "414324002"), + + CITROBACTER_RODENTIUM("Citrobacter rodentium", "Citrobacter rodentium", "SNOMED-CT", "114444007"), + + CRONOBACTER_MUYTJENSII("Cronobacter muytjensii", "Cronobacter muytjensii", "SNOMED-CT", "445561006"), + + PASTEURELLA_BETTYAE_ORGANISM("Pasteurella bettyae (organism)", "Pasteurella bettyae (organism)", "SNOMED-CT", "113902004"), + + ACHROMOBACTER_DENITRIFICANS_ORGANISM("Achromobacter denitrificans (organism)", "Achromobacter denitrificans (organism)", "SNOMED-CT", "413414001"), + + BURKHOLDERIA_CEPACIA_ORGANISM("Burkholderia cepacia (organism)", "Burkholderia cepacia (organism)", "SNOMED-CT", "113669008"), + + ENTEROBACTER_AMNIGENUS("Enterobacter amnigenus", "Enterobacter amnigenus", "SNOMED-CT", "84221003"), + + SALMONELLA_MUENCHEN("Salmonella Muenchen", "Salmonella Muenchen", "SNOMED-CT", "77584005"), + + SALMONELLA_STANLEYVILLE("Salmonella Stanleyville", "Salmonella Stanleyville", "SNOMED-CT", "47441000"), + + RAOULTELLA_TERRIGENA_ORGANISM("Raoultella terrigena (organism)", "Raoultella terrigena (organism)", "SNOMED-CT", "416096003"), + + NEISSERIA_MENINGITIDIS_ORGANISM("Neisseria meningitidis (organism)", "Neisseria meningitidis (organism)", "SNOMED-CT", "17872004"), + + MYCOBACTERIUM_GORDONAE_ORGANISM("Mycobacterium gordonae (organism)", "Mycobacterium gordonae (organism)", "SNOMED-CT", "24871004"), + + CLOSTRIDIUM_PARAPUTRIFICUM_ORGANISM("Clostridium paraputrificum (organism)", "Clostridium paraputrificum (organism)", "SNOMED-CT", "41966004"), + + FAMILY_ENTEROBACTERIACEAE_ORGANISM("Family Enterobacteriaceae (organism)", "Family Enterobacteriaceae (organism)", "SNOMED-CT", "106544002"), + + AEROMONAS_ICHTHIOSMIA_ORGANISM("Aeromonas ichthiosmia (organism)", "Aeromonas ichthiosmia (organism)", "SNOMED-CT", "115033002"), + + STAPHYLOCOCCUS_XYLOSUS_ORGANISM("Staphylococcus xylosus (organism)", "Staphylococcus xylosus (organism)", "SNOMED-CT", "32737005"), + + STREPTOCOCCUS_GALLOLYTICUS_ORGANISM("Streptococcus gallolyticus (organism)", "Streptococcus gallolyticus (organism)", "SNOMED-CT", "113985000"), + + ENTEROBACTER_PYRINUS("Enterobacter pyrinus", "Enterobacter pyrinus", "SNOMED-CT", "114455007"), + + MYCOBACTERIUM_TUBERCULOSIS_COMPLEX_ORGANISM("Mycobacterium tuberculosis complex (organism)", "Mycobacterium tuberculosis complex (organism)", "SNOMED-CT", "113858008"), + + ACINETOBACTER_LWOFFI_ORGANISM("Acinetobacter lwoffi (organism)", "Acinetobacter lwoffi (organism)", "SNOMED-CT", "83088009"), + + SALMONELLA_MANHATTAN("Salmonella Manhattan", "Salmonella Manhattan", "SNOMED-CT", "20073008"), + + AEROMONAS_CAVIAE_ORGANISM("Aeromonas caviae (organism)", "Aeromonas caviae (organism)", "SNOMED-CT", "115036005"), + + STENOTROPHOMONAS_MALTOPHILIA_ORGANISM("Stenotrophomonas maltophilia (organism)", "Stenotrophomonas maltophilia (organism)", "SNOMED-CT", "113697002"), + + KYTOCOCCUS_SCHROETERI_ORGANISM("Kytococcus schroeteri (organism)", "Kytococcus schroeteri (organism)", "SNOMED-CT", "428721003"), + + SALMONELLA_POTSDAM("Salmonella Potsdam", "Salmonella Potsdam", "SNOMED-CT", "8544001"), + + YERSINIA_PSEUDOTUBERCULOSIS_ORGANISM("Yersinia pseudotuberculosis (organism)", "Yersinia pseudotuberculosis (organism)", "SNOMED-CT", "90530002"), + + SHEWANELLA_ALGAE_ORGANISM("Shewanella algae (organism)", "Shewanella algae (organism)", "SNOMED-CT", "113702006"), + + GENUS_PANTOEA_ORGANISM("Genus Pantoea (organism)", "Genus Pantoea (organism)", "SNOMED-CT", "115013001"), + + SALMONELLA_ADELAIDE("Salmonella Adelaide", "Salmonella Adelaide", "SNOMED-CT", "10343005"), + + PROTEUS_PENNERI_ORGANISM("Proteus penneri (organism)", "Proteus penneri (organism)", "SNOMED-CT", "45298005"), + + ACHROMOBACTER_RUHLANDII_ORGANISM("Achromobacter ruhlandii (organism)", "Achromobacter ruhlandii (organism)", "SNOMED-CT", "413421001"), + + SALMONELLA_ENTERITIDIS_ORGANISM("Salmonella Enteritidis (organism)", "Salmonella Enteritidis (organism)", "SNOMED-CT", "73525009"), + + TOXIGENIC_CLOSTRIDIUM_DIFFICILE_ORGANISM("Toxigenic Clostridium difficile (organism)", "Toxigenic Clostridium difficile (organism)", "SNOMED-CT", "736050006"), + + ESCHERICHIA_VULNERIS_ORGANISM("Escherichia vulneris (organism)", "Escherichia vulneris (organism)", "SNOMED-CT", "53013003"), + + ACINETOBACTER_JUNII_ORGANISM("Acinetobacter junii (organism)", "Acinetobacter junii (organism)", "SNOMED-CT", "13879009"), + + OCHROBACTRUM_ANTHROPI_ORGANISM("Ochrobactrum anthropi (organism)", "Ochrobactrum anthropi (organism)", "SNOMED-CT", "116490002"), + + ACINETOBACTER_CALCOACETICUS_ORGANISM("Acinetobacter calcoaceticus (organism)", "Acinetobacter calcoaceticus (organism)", "SNOMED-CT", "82550008"), + + PSEUDOMONAS_FLUORESCENS_GROUP_ORGANISM("Pseudomonas fluorescens group (organism)", "Pseudomonas fluorescens group (organism)", "SNOMED-CT", "415197003"), + + GENUS_CORYNEBACTERIUM_ORGANISM("Genus Corynebacterium (organism)", "Genus Corynebacterium (organism)", "SNOMED-CT", "77086004"), + + LACTOBACILLUS_JENSENII_ORGANISM("Lactobacillus jensenii (organism)", "Lactobacillus jensenii (organism)", "SNOMED-CT", "65904004"), + + SHIGELLA_SONNEI_ORGANISM("Shigella sonnei (organism)", "Shigella sonnei (organism)", "SNOMED-CT", "4298009"), + + CANDIDA_RUGOSA_ORGANISM("Candida rugosa (organism)", "Candida rugosa (organism)", "SNOMED-CT", "23773004"), + + CANDIDA_AURIS_ORGANISM("Candida auris (organism)", "Candida auris (organism)", "SNOMED-CT", "3491000146109"), + + ROTHIA_DENTOCARIOSA_ORGANISM("Rothia dentocariosa (organism)", "Rothia dentocariosa (organism)", "SNOMED-CT", "35379007"), + + SALMONELLA_DUISBURG("Salmonella Duisburg", "Salmonella Duisburg", "SNOMED-CT", "42410007"), + + SERRATIA_LIQUEFACIENS_COMPLEX_ORGANISM("Serratia liquefaciens complex (organism)", "Serratia liquefaciens complex (organism)", "SNOMED-CT", "722258003"), + + ACINETOBACTER_DIJKSHOORNIAE_ORGANISM("Acinetobacter dijkshoorniae (organism)", "Acinetobacter dijkshoorniae (organism)", "SNOMED-CT", "787183008"), + + LEGIONELLA_HACKELIAE_ORGANISM("Legionella hackeliae (organism)", "Legionella hackeliae (organism)", "SNOMED-CT", "58939000"), + + YERSINIA_ENTEROCOLITICA_SEROGROUP_O9_ORGANISM("Yersinia enterocolitica serogroup O:9 (organism)", "Yersinia enterocolitica serogroup O:9 (organism)", "SNOMED-CT", "103433001"), + + PENICILLIUM_ORGANISM("Penicillium (organism)", "Penicillium (organism)", "SNOMED-CT", "42993004"), + + ACINETOBACTER_GUILLOUIAE_ORGANISM("Acinetobacter guillouiae (organism)", "Acinetobacter guillouiae (organism)", "SNOMED-CT", "700397005"), + + LEGIONELLA_OAKRIDGENSIS_ORGANISM("Legionella oakridgensis (organism)", "Legionella oakridgensis (organism)", "SNOMED-CT", "638008"), + + BACILLUS_LICHENIFORMIS_ORGANISM("Bacillus licheniformis (organism)", "Bacillus licheniformis (organism)", "SNOMED-CT", "74867004"), + + PROTEUS_HAUSERI_ORGANISM("Proteus hauseri (organism)", "Proteus hauseri (organism)", "SNOMED-CT", "417592004"), + + ACTINOMYCES_ODONTOLYTICUS_ORGANISM("Actinomyces odontolyticus (organism)", "Actinomyces odontolyticus (organism)", "SNOMED-CT", "12069003"), + + ACINETOBACTER_CALCOACETICUS_ACINETOBACTER_BAUMANNII_COMPLEX_ORGANISM("Acinetobacter calcoaceticus-Acinetobacter baumannii complex (organism)", "Acinetobacter calcoaceticus-Acinetobacter baumannii complex (organism)", "SNOMED-CT", "113376007"), + + SALMONELLA_READING("Salmonella Reading", "Salmonella Reading", "SNOMED-CT", "63396002"), + + BACILLUS_PUMILUS_ORGANISM("Bacillus pumilus (organism)", "Bacillus pumilus (organism)", "SNOMED-CT", "16580009"), + + BURKHOLDERIA_PSEUDOMALLEI_ORGANISM("Burkholderia pseudomallei (organism)", "Burkholderia pseudomallei (organism)", "SNOMED-CT", "116399000"), + + ENTEROCOCCUS_CASSELIFLAVUS_ORGANISM("Enterococcus casseliflavus (organism)", "Enterococcus casseliflavus (organism)", "SNOMED-CT", "30949009"), + + GENUS_PASTEURELLA_ORGANISM("Genus Pasteurella (organism)", "Genus Pasteurella (organism)", "SNOMED-CT", "87579009"), + + LEGIONELLA_PNEUMOPHILA_SEROGROUP5_ORGANISM("Legionella pneumophila serogroup 5 (organism)", "Legionella pneumophila serogroup 5 (organism)", "SNOMED-CT", "103467006"), + + FLAVIMONAS_ORYZIHABITANS_ORGANISM("Flavimonas oryzihabitans (organism)", "Flavimonas oryzihabitans (organism)", "SNOMED-CT", "113931000"), + + SALMONELLA_SEROGROUP_E_ORGANISM("Salmonella, serogroup E (organism)", "Salmonella, serogroup E (organism)", "SNOMED-CT", "115409001"), + + VEILLONELLA_PARVULA_ORGANISM("Veillonella parvula (organism)", "Veillonella parvula (organism)", "SNOMED-CT", "90435009"), + + LEGIONELLA_PNEUMOPHILIA_SEROGROUP10_ORGANISM("Legionella pneumophilia serogroup 10 (organism)", "Legionella pneumophilia serogroup 10 (organism)", "SNOMED-CT", "131322009"), + + LEGIONELLA_SAINTHELENS_ORGANISM("Legionella sainthelens (organism)", "Legionella sainthelens (organism)", "SNOMED-CT", "87271006"), + + SALMONELLA_HEIDELBERG("Salmonella Heidelberg", "Salmonella Heidelberg", "SNOMED-CT", "71865006"), + + ENTEROBACTER_CLOACAE_SUBSP_CLOACAE("Enterobacter cloacae subsp. cloacae", "Enterobacter cloacae subsp. cloacae", "SNOMED-CT", "721950003"), + + SALMONELLA_GALLINARUM("Salmonella Gallinarum", "Salmonella Gallinarum", "SNOMED-CT", "370576005"), + + GENUS_ENTEROBACTER_ORGANISM("Genus Enterobacter (organism)", "Genus Enterobacter (organism)", "SNOMED-CT", "58683007"), + + PROTEUS_MIRABILIS_ORGANISM("Proteus mirabilis (organism)", "Proteus mirabilis (organism)", "SNOMED-CT", "73457008"), + + MYCOBACTERIUM_CHELONAE_ORGANISM("Mycobacterium chelonae (organism)", "Mycobacterium chelonae (organism)", "SNOMED-CT", "243377008"), + + MYCOBACTERIUM_AFRICANUM_ORGANISM("Mycobacterium africanum (organism)", "Mycobacterium africanum (organism)", "SNOMED-CT", "51320008"), + + BURKHOLDERIA_GLADIOLI_ORGANISM("Burkholderia gladioli (organism)", "Burkholderia gladioli (organism)", "SNOMED-CT", "113671008"), + + CLOSTRIDIUM_SEPTICUM_ORGANISM("Clostridium septicum (organism)", "Clostridium septicum (organism)", "SNOMED-CT", "33101000"), + + PASTEURELLA_MAIRII_ORGANISM("Pasteurella mairii (organism)", "Pasteurella mairii (organism)", "SNOMED-CT", "113905002"), + + SALMONELLA_LIVINGSTONE("Salmonella Livingstone", "Salmonella Livingstone", "SNOMED-CT", "66713000"), + + GENUS_STENOTROPHOMONAS_ORGANISM("Genus Stenotrophomonas (organism)", "Genus Stenotrophomonas (organism)", "SNOMED-CT", "115656007"), + + GENUS_PROTEUS_ORGANISM("Genus Proteus (organism)", "Genus Proteus (organism)", "SNOMED-CT", "50517009"), + + AEROMONAS_SOBRIA_ORGANISM("Aeromonas sobria (organism)", "Aeromonas sobria (organism)", "SNOMED-CT", "43731003"), + + PASTEURELLA_PNEUMOTROPICA_ORGANISM("Pasteurella pneumotropica (organism)", "Pasteurella pneumotropica (organism)", "SNOMED-CT", "32562008"), + + RAOULTELLA_PLANTICOLA_ORGANISM("Raoultella planticola (organism)", "Raoultella planticola (organism)", "SNOMED-CT", "416264004"), + + GENUS_ACHROMOBACTER_ORGANISM("Genus Achromobacter (organism)", "Genus Achromobacter (organism)", "SNOMED-CT", "91620006"), + + PROVIDENCIA_RETTGERI_ORGANISM("Providencia rettgeri (organism)", "Providencia rettgeri (organism)", "SNOMED-CT", "14196002"), + + KOSAKONIA_RADICINCITANS("Kosakonia radicincitans", "Kosakonia radicincitans", "SNOMED-CT", "8181000146108"), + + BURKHOLDERIA_AMBIFARIA("Burkholderia ambifaria", "Burkholderia ambifaria", "SNOMED-CT", "416467009"), + + GARDNERELLA_VAGINALIS_ORGANISM("Gardnerella vaginalis (organism)", "Gardnerella vaginalis (organism)", "SNOMED-CT", "64071004"), + + ACINETOBACTER_GENOSPECIES_ORGANISM("Acinetobacter genospecies (organism)", "Acinetobacter genospecies (organism)", "SNOMED-CT", "131203002"), + + GENUS_CITROBACTER_ORGANISM("Genus Citrobacter (organism)", "Genus Citrobacter (organism)", "SNOMED-CT", "75972000"), + + SALMONELLA_BOVISMORBIFICANS("Salmonella Bovismorbificans", "Salmonella Bovismorbificans", "SNOMED-CT", "81938008"), + + SALMONELLA_THOMPSON("Salmonella Thompson", "Salmonella Thompson", "SNOMED-CT", "4361005"), + + ACINETOBACTER_BAUMANNII_ORGANISM("Acinetobacter baumannii (organism)", "Acinetobacter baumannii (organism)", "SNOMED-CT", "91288006"), + + LACTOBACILLUS_CRISPATUS_ORGANISM("Lactobacillus crispatus (organism)", "Lactobacillus crispatus (organism)", "SNOMED-CT", "89237007"), + + LEGIONELLA_CINCINNATIENSIS_ORGANISM("Legionella cincinnatiensis (organism)", "Legionella cincinnatiensis (organism)", "SNOMED-CT", "58923007"), + + PSEUDOGLUTAMICIBACTER_CUMMINSII_ORGANISM("Pseudoglutamicibacter cumminsii (organism)", "Pseudoglutamicibacter cumminsii (organism)", "SNOMED-CT", "113436001"), + + BACILLUS_SUBTILIS_ORGANISM("Bacillus subtilis (organism)", "Bacillus subtilis (organism)", "SNOMED-CT", "83512007"), + + ALCALIGENES_FAECALIS_SUBSPECIES_FAECALIS_ORGANISM("Alcaligenes faecalis subspecies faecalis (organism)", "Alcaligenes faecalis subspecies faecalis (organism)", "SNOMED-CT", "424719003"), + + ALCALIGENES_FAECALIS_ORGANISM("Alcaligenes faecalis (organism)", "Alcaligenes faecalis (organism)", "SNOMED-CT", "25223004"), + + STREPTOCOCCUS_THORALTENSIS_ORGANISM("Streptococcus thoraltensis (organism)", "Streptococcus thoraltensis (organism)", "SNOMED-CT", "113997004"), + + SALMONELLA_GROUP_O4_ORGANISM("Salmonella group O:4 (organism)", "Salmonella group O:4 (organism)", "SNOMED-CT", "398467008"), + + GENUS_VEILLONELLA_ORGANISM("Genus Veillonella (organism)", "Genus Veillonella (organism)", "SNOMED-CT", "29875005"), + + AEROCOCCUS_URINAEHOMINIS_ORGANISM("Aerococcus urinaehominis (organism)", "Aerococcus urinaehominis (organism)", "SNOMED-CT", "409819000"), + + ASPERGILLUS_FLAVUS_GROUP_ORGANISM("Aspergillus flavus group (organism)", "Aspergillus flavus group (organism)", "SNOMED-CT", "243491003"), + + LEGIONELLA_IMPLETISOLI_ORGANISM("Legionella impletisoli (organism)", "Legionella impletisoli (organism)", "SNOMED-CT", "5121000146103"), + + PARABURKHOLDERIA_TUBERUM("Paraburkholderia tuberum", "Paraburkholderia tuberum", "SNOMED-CT", "431167005"), + + BURKHOLDERIA_PLANTARII("Burkholderia plantarii", "Burkholderia plantarii", "SNOMED-CT", "113676003"), + + GENUS_MYCOPLASMA_ORGANISM("Genus Mycoplasma (organism)", "Genus Mycoplasma (organism)", "SNOMED-CT", "78981005"), + + GENUS_PROVIDENCIA_ORGANISM("Genus Providencia (organism)", "Genus Providencia (organism)", "SNOMED-CT", "112284001"), + + KLEBSIELLA_PNEUMONIAE_SS_RHINOSCLEROMATIS_ORGANISM("Klebsiella pneumoniae ss. rhinoscleromatis (organism)", "Klebsiella pneumoniae ss. rhinoscleromatis (organism)", "SNOMED-CT", "17688001"), + + MYCOBACTERIUM_ABSCESSUS_ORGANISM("Mycobacterium abscessus (organism)", "Mycobacterium abscessus (organism)", "SNOMED-CT", "113838007"), + + STREPTOCOCCUS_DYSGALACTIAE_SUBSPECIES_DYSGALACTIAE_ORGANISM("Streptococcus dysgalactiae subspecies dysgalactiae (organism)", "Streptococcus dysgalactiae subspecies dysgalactiae (organism)", "SNOMED-CT", "113982002"), + + SALMONELLA_SCHWARZENGRUND("Salmonella Schwarzengrund", "Salmonella Schwarzengrund", "SNOMED-CT", "45651006"), + + BACILLUS_CEREUS_ORGANISM("Bacillus cereus (organism)", "Bacillus cereus (organism)", "SNOMED-CT", "84408007"), + + SALMONELLA_POONA("Salmonella Poona", "Salmonella Poona", "SNOMED-CT", "57101009"), + + GENUS_ANAEROCOCCUS_ORGANISM("Genus Anaerococcus (organism)", "Genus Anaerococcus (organism)", "SNOMED-CT", "413518000"), + + MICROCOCCUS_LUTEUS_ORGANISM("Micrococcus luteus (organism)", "Micrococcus luteus (organism)", "SNOMED-CT", "48299003"), + + BIFIDOBACTERIUM_BREVE_ORGANISM("Bifidobacterium breve (organism)", "Bifidobacterium breve (organism)", "SNOMED-CT", "35011006"), + + LEGIONELLA_FEELEII_ORGANISM("Legionella feeleii (organism)", "Legionella feeleii (organism)", "SNOMED-CT", "17083009"), + + PARABURKHOLDERIA_SACCHARI("Paraburkholderia sacchari", "Paraburkholderia sacchari", "SNOMED-CT", "431164003"), + + STAPHYLOCOCCUS_HAEMOLYTICUS_ORGANISM("Staphylococcus haemolyticus (organism)", "Staphylococcus haemolyticus (organism)", "SNOMED-CT", "83452006"), + + FUSOBACTERIUM_NUCLEATUM_ORGANISM("Fusobacterium nucleatum (organism)", "Fusobacterium nucleatum (organism)", "SNOMED-CT", "32763000"), + + CORYNEBACTERIUM_ACCOLENS_ORGANISM("Corynebacterium accolens (organism)", "Corynebacterium accolens (organism)", "SNOMED-CT", "243254006"), + + ACINETOBACTER_BEREZINIAE_ORGANISM("Acinetobacter bereziniae (organism)", "Acinetobacter bereziniae (organism)", "SNOMED-CT", "700398000"), + + AEROMONAS_MOLLUSCORUM_ORGANISM("Aeromonas molluscorum (organism)", "Aeromonas molluscorum (organism)", "SNOMED-CT", "425862003"), + + SALMONELLA_INDIANA("Salmonella Indiana", "Salmonella Indiana", "SNOMED-CT", "12278000"), + + GENUS_CANDIDA_ORGANISM("Genus Candida (organism)", "Genus Candida (organism)", "SNOMED-CT", "3265006"), + + STREPTOCOCCUS_DYSGALACTIAE_ORGANISM("Streptococcus dysgalactiae (organism)", "Streptococcus dysgalactiae (organism)", "SNOMED-CT", "40812000"), + + GENUS_MYROIDES_ORGANISM("Genus Myroides (organism)", "Genus Myroides (organism)", "SNOMED-CT", "115127008"), + + SALMONELLA_MONTEVIDEO("Salmonella Montevideo", "Salmonella Montevideo", "SNOMED-CT", "80268001"), + + SALMONELLA_PARATYPHI_C("Salmonella Paratyphi C", "Salmonella Paratyphi C", "SNOMED-CT", "32488009"), + + SALMONELLA_UGANDA("Salmonella Uganda", "Salmonella Uganda", "SNOMED-CT", "2434007"), + + SERRATIA_LIQUEFACIENS_ORGANISM("Serratia liquefaciens (organism)", "Serratia liquefaciens (organism)", "SNOMED-CT", "23787004"), + + ASPERGILLUS_FUMIGATUS_ORGANISM("Aspergillus fumigatus (organism)", "Aspergillus fumigatus (organism)", "SNOMED-CT", "32684000"), + + SALMONELLA_LONDON("Salmonella London", "Salmonella London", "SNOMED-CT", "2291004"), + + LEGIONELLA_PARISIENSIS_ORGANISM("Legionella parisiensis (organism)", "Legionella parisiensis (organism)", "SNOMED-CT", "38322001"), + + BURKHOLDERIA_CARIBENSIS("Burkholderia caribensis", "Burkholderia caribensis", "SNOMED-CT", "431682004"), + + PEPTOSTREPTOCOCCUS_ANAEROBIUS_ORGANISM("Peptostreptococcus anaerobius (organism)", "Peptostreptococcus anaerobius (organism)", "SNOMED-CT", "19217002"), + + MUCOID_PSEUDOMONAS_AERUGINOSA_ORGANISM("Mucoid Pseudomonas aeruginosa (organism)", "Mucoid Pseudomonas aeruginosa (organism)", "SNOMED-CT", "733537009"), + + TRICHOPHYTON_MENTAGROPHYTES_VAR_INTERDIGITALE_ORGANISM("Trichophyton mentagrophytes var. interdigitale (organism)", "Trichophyton mentagrophytes var. interdigitale (organism)", "SNOMED-CT", "76040007"), + + STREPTOCOCCUS_PNEUMONIAE_ORGANISM("Streptococcus pneumoniae (organism)", "Streptococcus pneumoniae (organism)", "SNOMED-CT", "9861002"), + + CITROBACTER_AMALONATICUS_ORGANISM("Citrobacter amalonaticus (organism)", "Citrobacter amalonaticus (organism)", "SNOMED-CT", "55744003"), + + GENUS_GEOTRICHUM_ORGANISM("Genus Geotrichum (organism)", "Genus Geotrichum (organism)", "SNOMED-CT", "34324005"), + + KLEBSIELLA_PNEUMONIAE_SS_OZAENAE_ORGANISM("Klebsiella pneumoniae ss. ozaenae (organism)", "Klebsiella pneumoniae ss. ozaenae (organism)", "SNOMED-CT", "65186004"), + + LECLERCIA_ADECARBOXYLATA_ORGANISM("Leclercia adecarboxylata (organism)", "Leclercia adecarboxylata (organism)", "SNOMED-CT", "57459006"), + + TATUMELLA_TERREA_ORGANISM("Tatumella terrea (organism)", "Tatumella terrea (organism)", "SNOMED-CT", "8301000146102"), + + SALMONELLA_ENTERICA_SUBSPECIES_DIARIZONAE("Salmonella enterica subspecies diarizonae", "Salmonella enterica subspecies diarizonae", "SNOMED-CT", "398428002"), + + GENUS_CAPNOCYTOPHAGA_ORGANISM("Genus Capnocytophaga (organism)", "Genus Capnocytophaga (organism)", "SNOMED-CT", "22294008"), + + SERRATIA_UREILYTICA_ORGANISM("Serratia ureilytica (organism)", "Serratia ureilytica (organism)", "SNOMED-CT", "450416004"), + + BURKHOLDERIA_STABILIS("Burkholderia stabilis", "Burkholderia stabilis", "SNOMED-CT", "416616001"), + + GRAM_NEGATIVE_BACILLUS_ORGANISM("Gram-negative bacillus (organism)", "Gram-negative bacillus (organism)", "SNOMED-CT", "87172008"), + + MICROBACTERIUM_FLAVESCENS_ORGANISM("Microbacterium flavescens (organism)", "Microbacterium flavescens (organism)", "SNOMED-CT", "114061003"), + + ENTEROCOCCUS_MALODORATUS_ORGANISM("Enterococcus malodoratus (organism)", "Enterococcus malodoratus (organism)", "SNOMED-CT", "10262005"), + + PROVIDENCIA_STUARTII_ORGANISM("Providencia stuartii (organism)", "Providencia stuartii (organism)", "SNOMED-CT", "1445008"), + + YERSINIA_ENTEROCOLITICA_ORGANISM("Yersinia enterocolitica (organism)", "Yersinia enterocolitica (organism)", "SNOMED-CT", "65255000"), + + SALMONELLA_BAREILLY("Salmonella Bareilly", "Salmonella Bareilly", "SNOMED-CT", "8044005"), + + BACTEROIDES_CACCAE_ORGANISM("Bacteroides caccae (organism)", "Bacteroides caccae (organism)", "SNOMED-CT", "14342006"), + + STENOTROPHOMONAS_RHIZOPHILA_ORGANISM("Stenotrophomonas rhizophila (organism)", "Stenotrophomonas rhizophila (organism)", "SNOMED-CT", "416084005"), + + GENUS_BREVUNDIMONAS_ORGANISM("Genus Brevundimonas (organism)", "Genus Brevundimonas (organism)", "SNOMED-CT", "115154006"), + + BURKHOLDERIA_CEPACIA_COMPLEX_ORGANISM("Burkholderia cepacia complex (organism)", "Burkholderia cepacia complex (organism)", "SNOMED-CT", "131281002"), + + STREPTOCOCCUS_GALLOLYTICUS_SUBSPECIES_GALLOLYTICUS_ORGANISM("Streptococcus gallolyticus subspecies gallolyticus (organism)", "Streptococcus gallolyticus subspecies gallolyticus (organism)", "SNOMED-CT", "421544007"), + + ASPERGILLUS_VERSICOLOR_ORGANISM("Aspergillus versicolor (organism)", "Aspergillus versicolor (organism)", "SNOMED-CT", "48315007"), + + SPHINGOBACTERIUM_MULTIVORUM_ORGANISM("Sphingobacterium multivorum (organism)", "Sphingobacterium multivorum (organism)", "SNOMED-CT", "51595006"), + + GRAM_POSITIVE_BACILLUS_ORGANISM("Gram-positive bacillus (organism)", "Gram-positive bacillus (organism)", "SNOMED-CT", "83514008"), + + GENUS_SHIGELLA_ORGANISM("Genus Shigella (organism)", "Genus Shigella (organism)", "SNOMED-CT", "77352002"), + + STREPTOCOCCUS_CRISTATUS_ORGANISM("Streptococcus cristatus (organism)", "Streptococcus cristatus (organism)", "SNOMED-CT", "113980005"), + + CANDIDA_GUILLIERMONDII_ORGANISM("Candida guilliermondii (organism)", "Candida guilliermondii (organism)", "SNOMED-CT", "16557001"), + + STREPTOCOCCUS_AGALACTIAE_SEROTYPE_IB_ORGANISM("Streptococcus agalactiae serotype Ib (organism)", "Streptococcus agalactiae serotype Ib (organism)", "SNOMED-CT", "698166003"), + + ACHROMOBACTER_SPANIUS_ORGANISM("Achromobacter spanius (organism)", "Achromobacter spanius (organism)", "SNOMED-CT", "413422008"), + + MYCOBACTERIUM_KANSASII_ORGANISM("Mycobacterium kansasii (organism)", "Mycobacterium kansasii (organism)", "SNOMED-CT", "1507005"), + + GENUS_RAOULTELLA_ORGANISM("Genus Raoultella (organism)", "Genus Raoultella (organism)", "SNOMED-CT", "417468005"), + + ENTEROBACTER_ASBURIAE_ORGANISM("Enterobacter asburiae (organism)", "Enterobacter asburiae (organism)", "SNOMED-CT", "33115003"), + + CORYNEBACTERIUM_AMYCOLATUM_ORGANISM("Corynebacterium amycolatum (organism)", "Corynebacterium amycolatum (organism)", "SNOMED-CT", "113611002"), + + SALMONELLA_KENTUCKY("Salmonella Kentucky", "Salmonella Kentucky", "SNOMED-CT", "8455004"), + + SALMONELLA_HADAR("Salmonella Hadar", "Salmonella Hadar", "SNOMED-CT", "49491006"), + + GEOTRICHUM_CANDIDUM_ORGANISM("Geotrichum candidum (organism)", "Geotrichum candidum (organism)", "SNOMED-CT", "41625002"), + + VAGOCOCCUS_FLUVIALIS_ORGANISM("Vagococcus fluvialis (organism)", "Vagococcus fluvialis (organism)", "SNOMED-CT", "116418005"), + + CAMPYLOBACTER_COLI("Campylobacter coli", "Campylobacter coli", "SNOMED-CT", "40614002"), + + LEGIONELLA_JORDANIS_ORGANISM("Legionella jordanis (organism)", "Legionella jordanis (organism)", "SNOMED-CT", "39739007"), + + PEPTONIPHILUS_ASACCHAROLYTICUS_ORGANISM("Peptoniphilus asaccharolyticus (organism)", "Peptoniphilus asaccharolyticus (organism)", "SNOMED-CT", "433440001"), + + SALMONELLA_TYPHIMURIUM_VAR_COPENHAGEN("Salmonella Typhimurium var. Copenhagen", "Salmonella Typhimurium var. Copenhagen", "SNOMED-CT", "370578006"), + + STAPHYLOCOCCUS_INTERMEDIUS_ORGANISM("Staphylococcus intermedius (organism)", "Staphylococcus intermedius (organism)", "SNOMED-CT", "34605002"), + + CITROBACTER_KOSERI("Citrobacter koseri", "Citrobacter koseri", "SNOMED-CT", "114264004"), + + SALMONELLA_ENTERICA_SUBSP_ARIZONAE_ORGANISM("Salmonella enterica subsp. arizonae (organism)", "Salmonella enterica subsp. arizonae (organism)", "SNOMED-CT", "397502001"), + + SALMONELLA_STANLEY("Salmonella Stanley", "Salmonella Stanley", "SNOMED-CT", "88091007"), + + LEGIONELLA_LONGBEACHAE_ORGANISM("Legionella longbeachae (organism)", "Legionella longbeachae (organism)", "SNOMED-CT", "89605004"), + + ZYGOSACCHAROMYCES_BAILII_ORGANISM("Zygosaccharomyces bailii (organism)", "Zygosaccharomyces bailii (organism)", "SNOMED-CT", "442943004"), + + ACTINOTIGNUM_SCHAALII_ORGANISM("Actinotignum schaalii (organism)", "Actinotignum schaalii (organism)", "SNOMED-CT", "716526006"), + + MOLD_ORGANISM("Mold (organism)", "Mold (organism)", "SNOMED-CT", "84489001"), + + WANGIELLA_DERMATITIDIS_ORGANISM("Wangiella dermatitidis (organism)", "Wangiella dermatitidis (organism)", "SNOMED-CT", "20586007"), + + ACINETOBACTER_GERNERI_ORGANISM("Acinetobacter gerneri (organism)", "Acinetobacter gerneri (organism)", "SNOMED-CT", "424700008"), + + ENTEROBACTER_CLOACAE_ORGANISM("Enterobacter cloacae (organism)", "Enterobacter cloacae (organism)", "SNOMED-CT", "14385002"), + + SERRATIA_PROTEAMACULANS_ORGANISM("Serratia proteamaculans (organism)", "Serratia proteamaculans (organism)", "SNOMED-CT", "116135003"), + + CHRYSEOBACTERIUM_INDOLOGENES_ORGANISM("Chryseobacterium indologenes (organism)", "Chryseobacterium indologenes (organism)", "SNOMED-CT", "113549008"), + + GAMMA_HEMOLYTIC_STREPTOCOCCUS_ORGANISM("Gamma-hemolytic streptococcus (organism)", "Gamma-hemolytic streptococcus (organism)", "SNOMED-CT", "22339002"), + + PARABACTEROIDES_DISTASONIS_ORGANISM("Parabacteroides distasonis (organism)", "Parabacteroides distasonis (organism)", "SNOMED-CT", "447512008"), + + STAPHYLOCOCCUS_HOMINIS_SUBSPECIES_HOMINIS_ORGANISM("Staphylococcus hominis subspecies hominis (organism)", "Staphylococcus hominis subspecies hominis (organism)", "SNOMED-CT", "432505008"), + + LEGIONELLA_SANTICRUCIS_ORGANISM("Legionella santicrucis (organism)", "Legionella santicrucis (organism)", "SNOMED-CT", "72814000"), + + GENUS_BACTEROIDES_ORGANISM("Genus Bacteroides (organism)", "Genus Bacteroides (organism)", "SNOMED-CT", "57522007"), + + BACILLUS_CEREUS_GROUP_ORGANISM("Bacillus cereus group (organism)", "Bacillus cereus group (organism)", "SNOMED-CT", "413618005"), + + ACINETOBACTER_BOUVETII_ORGANISM("Acinetobacter bouvetii (organism)", "Acinetobacter bouvetii (organism)", "SNOMED-CT", "424539001"), + + ACHROMOBACTER_XYLOSOXIDANS_XYLOSOXIDANS_ORGANISM("Achromobacter xylosoxidans xylosoxidans (organism)", "Achromobacter xylosoxidans xylosoxidans (organism)", "SNOMED-CT", "423897003"), + + ASPERGILLUS_SYDOWII_ORGANISM("Aspergillus sydowii (organism)", "Aspergillus sydowii (organism)", "SNOMED-CT", "46388006"), + + INQUILINUS_LIMOSUS_ORGANISM("Inquilinus limosus (organism)", "Inquilinus limosus (organism)", "SNOMED-CT", "427977006"), + + ENTEROBACTER_CANCEROGENUS("Enterobacter cancerogenus", "Enterobacter cancerogenus", "SNOMED-CT", "114451003"), + + PSEUDOMONAS_SPECIES_NOT_AERUGINOSA_ORGANISM("Pseudomonas species not aeruginosa (organism)", "Pseudomonas species not aeruginosa (organism)", "SNOMED-CT", "710336008"), + + STAPHYLOCOCCUS_SIMULANS_ORGANISM("Staphylococcus simulans (organism)", "Staphylococcus simulans (organism)", "SNOMED-CT", "52122005"), + + MORAXELLA_NONLIQUEFACIENS_ORGANISM("Moraxella nonliquefaciens (organism)", "Moraxella nonliquefaciens (organism)", "SNOMED-CT", "46455003"), + + ENTEROBACTER_AMNIGENUS_BIOGROUP_I_ORGANISM("Enterobacter amnigenus biogroup I (organism)", "Enterobacter amnigenus biogroup I (organism)", "SNOMED-CT", "114452005"), + + CLOSTRIDIUM_INNOCUUM_ORGANISM("Clostridium innocuum (organism)", "Clostridium innocuum (organism)", "SNOMED-CT", "19415008"), + + ACINETOBACTER_HAEMOLYTICUS_ORGANISM("Acinetobacter haemolyticus (organism)", "Acinetobacter haemolyticus (organism)", "SNOMED-CT", "77045006"), + + AEROCOCCUS_URINAE_ORGANISM("Aerococcus urinae (organism)", "Aerococcus urinae (organism)", "SNOMED-CT", "243230001"), + + SALMONELLA_ALTONA("Salmonella Altona", "Salmonella Altona", "SNOMED-CT", "47229009"), + + UREAPLASMA_UREALYTICUM_ORGANISM("Ureaplasma urealyticum (organism)", "Ureaplasma urealyticum (organism)", "SNOMED-CT", "12006007"), + + AEROMONAS_SALMONICIDA_SS_SALMONICIDA_ORGANISM("Aeromonas salmonicida ss. salmonicida (organism)", "Aeromonas salmonicida ss. salmonicida (organism)", "SNOMED-CT", "62520007"), + + EUBACTERIUM_LIMOSUM_ORGANISM("Eubacterium limosum (organism)", "Eubacterium limosum (organism)", "SNOMED-CT", "87632000"), + + CANDIDA_TROPICALIS_ORGANISM("Candida tropicalis (organism)", "Candida tropicalis (organism)", "SNOMED-CT", "47885008"), + + STREPTOCOCCUS_PARASANGUINIS_ORGANISM("Streptococcus parasanguinis (organism)", "Streptococcus parasanguinis (organism)", "SNOMED-CT", "113990002"), + + ASPERGILLUS_ORGANISM("Aspergillus (organism)", "Aspergillus (organism)", "SNOMED-CT", "2429008"), + + BORDETELLA_PERTUSSIS_ORGANISM("Bordetella pertussis (organism)", "Bordetella pertussis (organism)", "SNOMED-CT", "5247005"), + + SALMONELLA_PARATYPHI_B("Salmonella Paratyphi B", "Salmonella Paratyphi B", "SNOMED-CT", "85908006"), + + RAOULTELLA_ORNITHINOLYTICA_ORGANISM("Raoultella ornithinolytica (organism)", "Raoultella ornithinolytica (organism)", "SNOMED-CT", "416832000"), + + STREPTOCOCCUS_PYOGENES_ORGANISM("Streptococcus pyogenes (organism)", "Streptococcus pyogenes (organism)", "SNOMED-CT", "80166006"), + + STAPHYLOCOCCUS_AUREUS_ORGANISM("Staphylococcus aureus (organism)", "Staphylococcus aureus (organism)", "SNOMED-CT", "3092008"), + + SERRATIA_FICARIA_ORGANISM("Serratia ficaria (organism)", "Serratia ficaria (organism)", "SNOMED-CT", "802004"), + + STREPTOCOCCUS_MITIS_ORGANISM("Streptococcus mitis (organism)", "Streptococcus mitis (organism)", "SNOMED-CT", "57997003"), + + DELFTIA_ACIDOVORANS_ORGANISM("Delftia acidovorans (organism)", "Delftia acidovorans (organism)", "SNOMED-CT", "20432002"), + + SERRATIA_MARCESCENS_ORGANISM("Serratia marcescens (organism)", "Serratia marcescens (organism)", "SNOMED-CT", "33522002"), + + ENTEROCOCCUS_FAECALIS_ORGANISM("Enterococcus faecalis (organism)", "Enterococcus faecalis (organism)", "SNOMED-CT", "78065002"), + + AEROMONAS_BESTIARUM_ORGANISM("Aeromonas bestiarum (organism)", "Aeromonas bestiarum (organism)", "SNOMED-CT", "115027006"), + + ENTEROHEMORRHAGIC_ESCHERICHIA_COLI_ORGANISM("Enterohemorrhagic Escherichia coli (organism)", "Enterohemorrhagic Escherichia coli (organism)", "SNOMED-CT", "116395006"), + + SALMONELLA_DUBLIN("Salmonella Dublin", "Salmonella Dublin", "SNOMED-CT", "62136003"), + + CORYNEBACTERIUM_PROPINQUUM_ORGANISM("Corynebacterium propinquum (organism)", "Corynebacterium propinquum (organism)", "SNOMED-CT", "113612009"), + + LEGIONELLA_PNEUMOPHILA_SEROGROUP9_ORGANISM("Legionella pneumophila serogroup 9 (organism)", "Legionella pneumophila serogroup 9 (organism)", "SNOMED-CT", "103471009"), + + GENUS_ROTHIA_ORGANISM("Genus Rothia (organism)", "Genus Rothia (organism)", "SNOMED-CT", "90163001"), + + SALMONELLA_GROUP_O18_ORGANISM("Salmonella group O:18 (organism)", "Salmonella group O:18 (organism)", "SNOMED-CT", "404294002"), + + BACTEROIDES_OVATUS_ORGANISM("Bacteroides ovatus (organism)", "Bacteroides ovatus (organism)", "SNOMED-CT", "86936008"), + + STAPHYLOCOCCUS_HOMINIS_ORGANISM("Staphylococcus hominis (organism)", "Staphylococcus hominis (organism)", "SNOMED-CT", "44827007"), + + SERRATIA_FONTICOLA_ORGANISM("Serratia fonticola (organism)", "Serratia fonticola (organism)", "SNOMED-CT", "112329006"), + + NON_TOXIGENIC_CLOSTRIDIUM_DIFFICILE_ORGANISM("Non-Toxigenic Clostridium difficile (organism)", "Non-Toxigenic Clostridium difficile (organism)", "SNOMED-CT", "736051005"), + + LACTOBACILLUS_RHAMNOSUS_ORGANISM("Lactobacillus rhamnosus (organism)", "Lactobacillus rhamnosus (organism)", "SNOMED-CT", "113798001"), + + STAPHYLOCOCCUS_SAPROPHYTICUS("Staphylococcus saprophyticus", "Staphylococcus saprophyticus", "SNOMED-CT", "19743000"), + + STAPHYLOCOCCUS_EPIDERMIDIS_ORGANISM("Staphylococcus epidermidis (organism)", "Staphylococcus epidermidis (organism)", "SNOMED-CT", "60875001"), + + AEROMONAS_EUCRENOPHILIA_ORGANISM("Aeromonas eucrenophilia (organism)", "Aeromonas eucrenophilia (organism)", "SNOMED-CT", "115030004"), + + CITROBACTER_SEDLAKII("Citrobacter sedlakii", "Citrobacter sedlakii", "SNOMED-CT", "114265003"), + + ANAEROBIC_NON_SPORING_GRAM_POSITIVE_BACILLUS_ORGANISM("Anaerobic non-sporing Gram-positive bacillus (organism)", "Anaerobic non-sporing Gram-positive bacillus (organism)", "SNOMED-CT", "243399000"), + + SALMONELLA_SAINTPAUL("Salmonella Saintpaul", "Salmonella Saintpaul", "SNOMED-CT", "2820001"), + + GENUS_LACTOBACILLUS_ORGANISM("Genus Lactobacillus (organism)", "Genus Lactobacillus (organism)", "SNOMED-CT", "43690008"), + + PASTEURELLA_AEROGENES_ORGANISM("Pasteurella aerogenes (organism)", "Pasteurella aerogenes (organism)", "SNOMED-CT", "87075007"), + + ACINETOBACTER_TJERNBERGIAE_ORGANISM("Acinetobacter tjernbergiae (organism)", "Acinetobacter tjernbergiae (organism)", "SNOMED-CT", "425109008"), + + GENUS_AEROMONAS_ORGANISM("Genus Aeromonas (organism)", "Genus Aeromonas (organism)", "SNOMED-CT", "88529008"), + + ACINETOBACTER_GENOSPECIES3_ORGANISM("Acinetobacter genospecies 3 (organism)", "Acinetobacter genospecies 3 (organism)", "SNOMED-CT", "113377003"), + + GENUS_UREAPLASMA_ORGANISM("Genus Ureaplasma (organism)", "Genus Ureaplasma (organism)", "SNOMED-CT", "29680004"), + + CORYNEBACTERIUM_STRIATUM_ORGANISM("Corynebacterium striatum (organism)", "Corynebacterium striatum (organism)", "SNOMED-CT", "63815007"), + + LISTERIA_MONOCYTOGENES_ORGANISM("Listeria monocytogenes (organism)", "Listeria monocytogenes (organism)", "SNOMED-CT", "36094007"), + + CHRYSEOMONAS_LUTEOLA_ORGANISM("Chryseomonas luteola (organism)", "Chryseomonas luteola (organism)", "SNOMED-CT", "33919008"), + + ASPERGILLUS_NIGER_GROUP_ORGANISM("Aspergillus niger group (organism)", "Aspergillus niger group (organism)", "SNOMED-CT", "243494006"), + + ENTEROCOCCUS_AVIUM_ORGANISM("Enterococcus avium (organism)", "Enterococcus avium (organism)", "SNOMED-CT", "87875008"), + + LEGIONELLA_JAMESTOWNIENSIS_ORGANISM("Legionella jamestowniensis (organism)", "Legionella jamestowniensis (organism)", "SNOMED-CT", "89709001"), + + CORYNEBACTERIUM_JEIKEIUM_ORGANISM("Corynebacterium jeikeium (organism)", "Corynebacterium jeikeium (organism)", "SNOMED-CT", "63410006"), + + MORAXELLA_CATARRHALIS_ORGANISM("Moraxella catarrhalis (organism)", "Moraxella catarrhalis (organism)", "SNOMED-CT", "24226003"), + + PSEUDOMONAS_STUTZERI_ORGANISM("Pseudomonas stutzeri (organism)", "Pseudomonas stutzeri (organism)", "SNOMED-CT", "58024003"), + + HAEMOPHILUS_INFLUENZAE_ORGANISM("Haemophilus influenzae (organism)", "Haemophilus influenzae (organism)", "SNOMED-CT", "44470000"), + + BACTEROIDES_UNIFORMIS_ORGANISM("Bacteroides uniformis (organism)", "Bacteroides uniformis (organism)", "SNOMED-CT", "59604009"), + + SALMONELLA_KIAMBU("Salmonella Kiambu", "Salmonella Kiambu", "SNOMED-CT", "11901002"), + + MYCOBACTERIUM_AVIUM_ORGANISM("Mycobacterium avium (organism)", "Mycobacterium avium (organism)", "SNOMED-CT", "83723009"), + + ACINETOBACTER_VARIABILIS_ORGANISM("Acinetobacter variabilis (organism)", "Acinetobacter variabilis (organism)", "SNOMED-CT", "113384006"), + + SALMONELLA_KUMASI("Salmonella Kumasi", "Salmonella Kumasi", "SNOMED-CT", "58946009"), + + SALMONELLA_MIKAWASIMA("Salmonella Mikawasima", "Salmonella Mikawasima", "SNOMED-CT", "42709001"), + + STAPHYLOCOCCUS_ARGENTEUS_ORGANISM("Staphylococcus argenteus (organism)", "Staphylococcus argenteus (organism)", "SNOMED-CT", "782316009"), + + AEROMONAS_TROTA_ORGANISM("Aeromonas trota (organism)", "Aeromonas trota (organism)", "SNOMED-CT", "243316008"), + + ACHROMOBACTER_INSOLITUS_ORGANISM("Achromobacter insolitus (organism)", "Achromobacter insolitus (organism)", "SNOMED-CT", "413417008"), + + PREVOTELLA_DENTICOLA_ORGANISM("Prevotella denticola (organism)", "Prevotella denticola (organism)", "SNOMED-CT", "114138003"), + + KLEBSIELLA_PNEUMONIAE_ORGANISM("Klebsiella pneumoniae (organism)", "Klebsiella pneumoniae (organism)", "SNOMED-CT", "56415008"), + + STAPHYLOCOCCUS_COAGULASE_NEGATIVE_ORGANISM("Staphylococcus, coagulase negative (organism)", "Staphylococcus, coagulase negative (organism)", "SNOMED-CT", "116197008"), + + SALMONELLA_CORVALLIS("Salmonella Corvallis", "Salmonella Corvallis", "SNOMED-CT", "45548005"), + + CANDIDA_NORVEGENSIS_ORGANISM("Candida norvegensis (organism)", "Candida norvegensis (organism)", "SNOMED-CT", "243458007"), + + STREPTOCOCCUS_SALIVARIUS_SUBSPECIES_THERMOPHILUS_ORGANISM("Streptococcus salivarius subspecies thermophilus (organism)", "Streptococcus salivarius subspecies thermophilus (organism)", "SNOMED-CT", "23310006"), + + STREPTOCOCCUS_ANGINOSUS_ORGANISM("Streptococcus anginosus (organism)", "Streptococcus anginosus (organism)", "SNOMED-CT", "44304009"), + + GENUS_SERRATIA_ORGANISM("Genus Serratia (organism)", "Genus Serratia (organism)", "SNOMED-CT", "42025004"), + + BURKHOLDERIA_THAILANDENSIS_ORGANISM("Burkholderia thailandensis (organism)", "Burkholderia thailandensis (organism)", "SNOMED-CT", "113678002"), + + STREPTOCOCCUS_SALIVARIUS_ORGANISM("Streptococcus salivarius (organism)", "Streptococcus salivarius (organism)", "SNOMED-CT", "39888004"), + + BACTEROIDES_STERCORIS_ORGANISM("Bacteroides stercoris (organism)", "Bacteroides stercoris (organism)", "SNOMED-CT", "163009"), + + SALMONELLA_BRAENDERUP("Salmonella Braenderup", "Salmonella Braenderup", "SNOMED-CT", "35225001"), + + ESCHERICHIA_COLI_SEROGROUP_O157_ORGANISM("Escherichia coli serogroup O157 (organism)", "Escherichia coli serogroup O157 (organism)", "SNOMED-CT", "407166006"), + + ANAEROBIC_GRAM_POSITIVE_COCCUS_ORGANISM("Anaerobic Gram-positive coccus (organism)", "Anaerobic Gram-positive coccus (organism)", "SNOMED-CT", "243416009"), + + PROVIDENCIA_ALCALIFACIENS_ORGANISM("Providencia alcalifaciens (organism)", "Providencia alcalifaciens (organism)", "SNOMED-CT", "46349009"), + + SALMONELLA_BLOCKLEY("Salmonella Blockley", "Salmonella Blockley", "SNOMED-CT", "53684004"), + + CANDIDA_KRUSEI_ORGANISM("Candida krusei (organism)", "Candida krusei (organism)", "SNOMED-CT", "76995003"), + + ELIZABETHKINGIA_MENINGOSEPTICA_ORGANISM("Elizabethkingia meningoseptica (organism)", "Elizabethkingia meningoseptica (organism)", "SNOMED-CT", "425774009"), + + ABIOTROPHIA_DEFECTIVA_ORGANISM("Abiotrophia defectiva (organism)", "Abiotrophia defectiva (organism)", "SNOMED-CT", "113714003"), + + MORGANELLA_MORGANII_SUBSP_MORGANII_ORGANISM("Morganella morganii subsp morganii (organism)", "Morganella morganii subsp morganii (organism)", "SNOMED-CT", "243302003"), + + SHIGELLA_DYSENTERIAE_ORGANISM("Shigella dysenteriae (organism)", "Shigella dysenteriae (organism)", "SNOMED-CT", "43612004"), + + LEGIONELLA_WADSWORTHII_ORGANISM("Legionella wadsworthii (organism)", "Legionella wadsworthii (organism)", "SNOMED-CT", "8147000"), + + CANDIDA_INCONSPICUA_ORGANISM("Candida inconspicua (organism)", "Candida inconspicua (organism)", "SNOMED-CT", "283871001"), + + ACINETOBACTER_RADIORESISTENS_ORGANISM("Acinetobacter radioresistens (organism)", "Acinetobacter radioresistens (organism)", "SNOMED-CT", "113381003"), + + CORYNEBACTERIUM_DIPHTHERIAE_ORGANISM("Corynebacterium diphtheriae (organism)", "Corynebacterium diphtheriae (organism)", "SNOMED-CT", "5851001"), + + BACTEROIDES_FRAGILIS_GROUP_ORGANISM("Bacteroides fragilis group (organism)", "Bacteroides fragilis group (organism)", "SNOMED-CT", "417375007"), + + LEGIONELLA_MICDADEI_ORGANISM("Legionella micdadei (organism)", "Legionella micdadei (organism)", "SNOMED-CT", "116380009"), + + GENUS_NOCARDIA_ORGANISM("Genus Nocardia (organism)", "Genus Nocardia (organism)", "SNOMED-CT", "59674005"), + + ENTEROBACTER_CLOACAE_COMPLEX_ORGANISM("Enterobacter cloacae complex (organism)", "Enterobacter cloacae complex (organism)", "SNOMED-CT", "414102007"), + + LEGIONELLA_PNEUMOPHILA_SEROGROUP8_ORGANISM("Legionella pneumophila serogroup 8 (organism)", "Legionella pneumophila serogroup 8 (organism)", "SNOMED-CT", "103470005"), + + FUSOBACTERIUM_NECROPHORUM_ORGANISM("Fusobacterium necrophorum (organism)", "Fusobacterium necrophorum (organism)", "SNOMED-CT", "27274008"), + + HAEMOPHILUS_INFLUENZAE_TYPE_B_ORGANISM("Haemophilus influenzae type b (organism)", "Haemophilus influenzae type b (organism)", "SNOMED-CT", "103442008"), + + AEROMONAS_SCHUBERTII_ORGANISM("Aeromonas schubertii (organism)", "Aeromonas schubertii (organism)", "SNOMED-CT", "115039003"), + + PARVIMONAS_MICRA_ORGANISM("Parvimonas micra (organism)", "Parvimonas micra (organism)", "SNOMED-CT", "434293007"), + + ASPERGILLUS_TERREUS_GROUP_ORGANISM("Aspergillus terreus group (organism)", "Aspergillus terreus group (organism)", "SNOMED-CT", "243500005"), + + LEGIONELLA_MORAVICA_ORGANISM("Legionella moravica (organism)", "Legionella moravica (organism)", "SNOMED-CT", "103454008"), + + AEROMONAS_SIMIAE_ORGANISM("Aeromonas simiae (organism)", "Aeromonas simiae (organism)", "SNOMED-CT", "426333004"), + + AEROMONAS_MEDIA_ORGANISM("Aeromonas media (organism)", "Aeromonas media (organism)", "SNOMED-CT", "65192005"), + + LEGIONELLA_ANISA_ORGANISM("Legionella anisa (organism)", "Legionella anisa (organism)", "SNOMED-CT", "18214000"), + + LACTOBACILLUS_FERMENTUM_ORGANISM("Lactobacillus fermentum (organism)", "Lactobacillus fermentum (organism)", "SNOMED-CT", "65506008"), + + SALMONELLA_SENFTENBERG("Salmonella Senftenberg", "Salmonella Senftenberg", "SNOMED-CT", "18163008"), + + GENUS_ENTEROCOCCUS_ORGANISM("Genus Enterococcus (organism)", "Genus Enterococcus (organism)", "SNOMED-CT", "2785000"), + + ROTHIA_MUCILAGINOSA_ORGANISM("Rothia mucilaginosa (organism)", "Rothia mucilaginosa (organism)", "SNOMED-CT", "416544005"), + + ENTEROCOCCUS_DURANS_ORGANISM("Enterococcus durans (organism)", "Enterococcus durans (organism)", "SNOMED-CT", "46464008"), + + STREPTOCOCCUS_CANIS_ORGANISM("Streptococcus canis (organism)", "Streptococcus canis (organism)", "SNOMED-CT", "88231003"), + + SERRATIA_ODORIFERA_ORGANISM("Serratia odorifera (organism)", "Serratia odorifera (organism)", "SNOMED-CT", "10413007"), + + ENTEROCOCCUS_HIRAE_ORGANISM("Enterococcus hirae (organism)", "Enterococcus hirae (organism)", "SNOMED-CT", "73852008"), + + SALMONELLA_APAPA("Salmonella Apapa", "Salmonella Apapa", "SNOMED-CT", "46399008"), + + SALMONELLA_INFANTIS("Salmonella Infantis", "Salmonella Infantis", "SNOMED-CT", "82071007"), + + GENUS_STAPHYLOCOCCUS_ORGANISM("Genus Staphylococcus (organism)", "Genus Staphylococcus (organism)", "SNOMED-CT", "65119002"), + + GENUS_KLEBSIELLA_ORGANISM("Genus Klebsiella (organism)", "Genus Klebsiella (organism)", "SNOMED-CT", "75032006"), + + ACINETOBACTER_PITTII_ORGANISM("Acinetobacter pittii (organism)", "Acinetobacter pittii (organism)", "SNOMED-CT", "698244000"), + + BACILLUS_MEGATERIUM_ORGANISM("Bacillus megaterium (organism)", "Bacillus megaterium (organism)", "SNOMED-CT", "79109002"), + + ACHROMOBACTER_PIECHAUDII_ORGANISM("Achromobacter piechaudii (organism)", "Achromobacter piechaudii (organism)", "SNOMED-CT", "413420000"), + + PREVOTELLA_BERGENSIS_ORGANISM("Prevotella bergensis (organism)", "Prevotella bergensis (organism)", "SNOMED-CT", "708941000"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + ErregernameDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java new file mode 100644 index 000000000..6c64a33d7 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java @@ -0,0 +1,18 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class ErregertypisierungArtDerTypisierungElement { + @Path("/value|defining_code") + private ArtDerTypisierungDefiningCode value; + + public void setValue(ArtDerTypisierungDefiningCode value) { + this.value = value; + } + + public ArtDerTypisierungDefiningCode getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java new file mode 100644 index 000000000..c78413728 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java @@ -0,0 +1,56 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.molekulare_typisierung.v0") +public class ErregertypisierungCluster { + @Path("/items[at0001]") + private List artDerTypisierung; + + @Path("/items[at0008]") + private List ergebnis; + + @Path("/items[at0009]/value|value") + private String bewertungValue; + + @Path("/items[at0002]/value|value") + private String kommentarValue; + + public void setArtDerTypisierung( + List artDerTypisierung) { + this.artDerTypisierung = artDerTypisierung; + } + + public List getArtDerTypisierung() { + return this.artDerTypisierung ; + } + + public void setErgebnis(List ergebnis) { + this.ergebnis = ergebnis; + } + + public List getErgebnis() { + return this.ergebnis ; + } + + public void setBewertungValue(String bewertungValue) { + this.bewertungValue = bewertungValue; + } + + public String getBewertungValue() { + return this.bewertungValue ; + } + + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } + + public String getKommentarValue() { + return this.kommentarValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungClusterContainment.java new file mode 100644 index 000000000..8b62923a3 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungClusterContainment.java @@ -0,0 +1,28 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class ErregertypisierungClusterContainment extends Containment { + public SelectAqlField ERREGERTYPISIERUNG_CLUSTER = new AqlFieldImp(ErregertypisierungCluster.class, "", "ErregertypisierungCluster", ErregertypisierungCluster.class, this); + + public ListSelectAqlField ART_DER_TYPISIERUNG = new ListAqlFieldImp(ErregertypisierungCluster.class, "/items[at0001]", "artDerTypisierung", ErregertypisierungArtDerTypisierungElement.class, this); + + public ListSelectAqlField ERGEBNIS = new ListAqlFieldImp(ErregertypisierungCluster.class, "/items[at0008]", "ergebnis", ErregertypisierungErgebnisElement.class, this); + + public SelectAqlField BEWERTUNG_VALUE = new AqlFieldImp(ErregertypisierungCluster.class, "/items[at0009]/value|value", "bewertungValue", String.class, this); + + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ErregertypisierungCluster.class, "/items[at0002]/value|value", "kommentarValue", String.class, this); + + private ErregertypisierungClusterContainment() { + super("openEHR-EHR-CLUSTER.molekulare_typisierung.v0"); + } + + public static ErregertypisierungClusterContainment getInstance() { + return new ErregertypisierungClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java new file mode 100644 index 000000000..7b8e76802 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java @@ -0,0 +1,19 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import com.nedap.archie.rm.datavalues.encapsulated.DvMultimedia; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class ErregertypisierungErgebnisElement { + @Path("/value") + private DvMultimedia value; + + public void setValue(DvMultimedia value) { + this.value = value; + } + + public DvMultimedia getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java new file mode 100644 index 000000000..5445e4645 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java @@ -0,0 +1,31 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class EventsummaryBeteiligtePersonenCluster { + @Path("/items[at0011]/value|value") + private String artDerPersonValue; + + @Path("/items[at0010]") + private List idDerPerson; + + public void setArtDerPersonValue(String artDerPersonValue) { + this.artDerPersonValue = artDerPersonValue; + } + + public String getArtDerPersonValue() { + return this.artDerPersonValue ; + } + + public void setIdDerPerson(List idDerPerson) { + this.idDerPerson = idDerPerson; + } + + public List getIdDerPerson() { + return this.idDerPerson ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java new file mode 100644 index 000000000..ca4c70342 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java @@ -0,0 +1,67 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.eventsummary.v0") +public class EventsummaryCluster { + @Path("/items[at0001 and name/value='Fallidentifikation']/value|value") + private String fallidentifikationValue; + + @Path("/items[at0002 and name/value='Fall-Art']/value|value") + private String fallArtValue; + + @Path("/items[at0007]") + private List beteiligtePersonen; + + @Path("/items[at0004 and name/value='Fall-Kategorie']/value|value") + private String fallKategorieValue; + + @Path("/items[at0006]/value|value") + private String kommentarValue; + + public void setFallidentifikationValue(String fallidentifikationValue) { + this.fallidentifikationValue = fallidentifikationValue; + } + + public String getFallidentifikationValue() { + return this.fallidentifikationValue ; + } + + public void setFallArtValue(String fallArtValue) { + this.fallArtValue = fallArtValue; + } + + public String getFallArtValue() { + return this.fallArtValue ; + } + + public void setBeteiligtePersonen( + List beteiligtePersonen) { + this.beteiligtePersonen = beteiligtePersonen; + } + + public List getBeteiligtePersonen() { + return this.beteiligtePersonen ; + } + + public void setFallKategorieValue(String fallKategorieValue) { + this.fallKategorieValue = fallKategorieValue; + } + + public String getFallKategorieValue() { + return this.fallKategorieValue ; + } + + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } + + public String getKommentarValue() { + return this.kommentarValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryClusterContainment.java new file mode 100644 index 000000000..952e87af9 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryClusterContainment.java @@ -0,0 +1,30 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class EventsummaryClusterContainment extends Containment { + public SelectAqlField EVENTSUMMARY_CLUSTER = new AqlFieldImp(EventsummaryCluster.class, "", "EventsummaryCluster", EventsummaryCluster.class, this); + + public SelectAqlField FALLIDENTIFIKATION_VALUE = new AqlFieldImp(EventsummaryCluster.class, "/items[at0001]/value|value", "fallidentifikationValue", String.class, this); + + public SelectAqlField FALL_ART_VALUE = new AqlFieldImp(EventsummaryCluster.class, "/items[at0002]/value|value", "fallArtValue", String.class, this); + + public ListSelectAqlField BETEILIGTE_PERSONEN = new ListAqlFieldImp(EventsummaryCluster.class, "/items[at0007]", "beteiligtePersonen", EventsummaryBeteiligtePersonenCluster.class, this); + + public SelectAqlField FALL_KATEGORIE_VALUE = new AqlFieldImp(EventsummaryCluster.class, "/items[at0004]/value|value", "fallKategorieValue", String.class, this); + + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(EventsummaryCluster.class, "/items[at0006]/value|value", "kommentarValue", String.class, this); + + private EventsummaryClusterContainment() { + super("openEHR-EHR-CLUSTER.eventsummary.v0"); + } + + public static EventsummaryClusterContainment getInstance() { + return new EventsummaryClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java new file mode 100644 index 000000000..5e5d43887 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import org.ehrbase.client.annotations.Choice; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class EventsummaryIdDerPersonElement { + @Path("/value") + @Choice + private EventsummaryValueChoice value; + + public void setValue(EventsummaryValueChoice value) { + this.value = value; + } + + public EventsummaryValueChoice getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueChoice.java new file mode 100644 index 000000000..e4db29d47 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +public interface EventsummaryValueChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java new file mode 100644 index 000000000..8caf0e5b8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import com.nedap.archie.rm.datavalues.DvIdentifier; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_IDENTIFIER") +public class EventsummaryValueDvIdentifier implements EventsummaryValueChoice { + @Path("") + private DvIdentifier value; + + public void setValue(DvIdentifier value) { + this.value = value; + } + + public DvIdentifier getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java new file mode 100644 index 000000000..ae6e20aa2 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import java.net.URI; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_URI") +public class EventsummaryValueDvUri implements EventsummaryValueChoice { + @Path("|value") + private URI valueValue; + + public void setValueValue(URI valueValue) { + this.valueValue = valueValue; + } + + public URI getValueValue() { + return this.valueValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java new file mode 100644 index 000000000..e60df6216 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java @@ -0,0 +1,79 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") +public class LaboranalytResultatCluster { + @Path("/items[at0024 and name/value='Antibiotikum']/value|defining_code") + private AntibiotikumDefiningCode antibiotikumDefiningCode; + + @Path("/items[at0001 and name/value='Minimale Hemmkonzentration']/value|magnitude") + private Double minimaleHemmkonzentrationMagnitude; + + @Path("/items[at0001 and name/value='Minimale Hemmkonzentration']/value|units") + private String minimaleHemmkonzentrationUnits; + + @Path("/items[at0014]") + private List analyseergebnisDetails; + + @Path("/items[at0004 and name/value='Resistenz']/value|value") + private String resistenzValue; + + @Path("/items[at0003]/value|value") + private String kommentarValue; + + public void setAntibiotikumDefiningCode(AntibiotikumDefiningCode antibiotikumDefiningCode) { + this.antibiotikumDefiningCode = antibiotikumDefiningCode; + } + + public AntibiotikumDefiningCode getAntibiotikumDefiningCode() { + return this.antibiotikumDefiningCode ; + } + + public void setMinimaleHemmkonzentrationMagnitude(Double minimaleHemmkonzentrationMagnitude) { + this.minimaleHemmkonzentrationMagnitude = minimaleHemmkonzentrationMagnitude; + } + + public Double getMinimaleHemmkonzentrationMagnitude() { + return this.minimaleHemmkonzentrationMagnitude ; + } + + public void setMinimaleHemmkonzentrationUnits(String minimaleHemmkonzentrationUnits) { + this.minimaleHemmkonzentrationUnits = minimaleHemmkonzentrationUnits; + } + + public String getMinimaleHemmkonzentrationUnits() { + return this.minimaleHemmkonzentrationUnits ; + } + + public void setAnalyseergebnisDetails(List analyseergebnisDetails) { + this.analyseergebnisDetails = analyseergebnisDetails; + } + + public List getAnalyseergebnisDetails() { + return this.analyseergebnisDetails ; + } + + public void setResistenzValue(String resistenzValue) { + this.resistenzValue = resistenzValue; + } + + public String getResistenzValue() { + return this.resistenzValue ; + } + + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } + + public String getKommentarValue() { + return this.kommentarValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatClusterContainment.java new file mode 100644 index 000000000..9321467ee --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatClusterContainment.java @@ -0,0 +1,34 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class LaboranalytResultatClusterContainment extends Containment { + public SelectAqlField LABORANALYT_RESULTAT_CLUSTER = new AqlFieldImp(LaboranalytResultatCluster.class, "", "LaboranalytResultatCluster", LaboranalytResultatCluster.class, this); + + public SelectAqlField ANTIBIOTIKUM_DEFINING_CODE = new AqlFieldImp(LaboranalytResultatCluster.class, "/items[at0024]/value|defining_code", "antibiotikumDefiningCode", AntibiotikumDefiningCode.class, this); + + public SelectAqlField MINIMALE_HEMMKONZENTRATION_MAGNITUDE = new AqlFieldImp(LaboranalytResultatCluster.class, "/items[at0001]/value|magnitude", "minimaleHemmkonzentrationMagnitude", Double.class, this); + + public SelectAqlField MINIMALE_HEMMKONZENTRATION_UNITS = new AqlFieldImp(LaboranalytResultatCluster.class, "/items[at0001]/value|units", "minimaleHemmkonzentrationUnits", String.class, this); + + public ListSelectAqlField ANALYSEERGEBNIS_DETAILS = new ListAqlFieldImp(LaboranalytResultatCluster.class, "/items[at0014]", "analyseergebnisDetails", Cluster.class, this); + + public SelectAqlField RESISTENZ_VALUE = new AqlFieldImp(LaboranalytResultatCluster.class, "/items[at0004]/value|value", "resistenzValue", String.class, this); + + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(LaboranalytResultatCluster.class, "/items[at0003]/value|value", "kommentarValue", String.class, this); + + private LaboranalytResultatClusterContainment() { + super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); + } + + public static LaboranalytResultatClusterContainment getInstance() { + return new LaboranalytResultatClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/MreKlasseDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/MreKlasseDefiningCode.java new file mode 100644 index 000000000..a4ba03366 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/MreKlasseDefiningCode.java @@ -0,0 +1,51 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum MreKlasseDefiningCode implements EnumValueSet { + N3MRGN("3MRGN", "Multiresistente Gramnegative Bakterien (Resistenz gegen 3 der 4 Antibiotikagruppen)", "local", "at0065"), + + N2MRGN("2MRGN", "Multiresistente Gramnegative Bakterien (Resistenz gegen 2 der 4 Antibiotikagruppen)", "local", "at0048"), + + VRE("VRE", "Vancomycin-resistente Enterokokken", "local", "at0055"), + + MRSA("MRSA", "Methicillin-resistenter Staphylococcus aureus (und CA- community-acquired, LA – lifestock acquired, HA – hospital acquired)", "local", "at0019"), + + LVRE("LVRE", "Linezolid-Vancomycin-resistenter Enterokokken", "local", "at0056"), + + N4MRGN("4MRGN", "Multiresistente Gramnegative Bakterien (Resistenz gegen 4 der 4 Antibiotikagruppen)", "local", "at0066"), + + LRE("LRE", "Linezolid-resistente Enterokokken", "local", "at0067"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + MreKlasseDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java new file mode 100644 index 000000000..a3a5bb9b4 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java @@ -0,0 +1,19 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import java.lang.Long; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class SmicsErgebnisAnzahlDerErregernachweiseElement { + @Path("/value|magnitude") + private Long value; + + public void setValue(Long value) { + this.value = value; + } + + public Long getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java new file mode 100644 index 000000000..1f27a1768 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java @@ -0,0 +1,251 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Boolean; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.smics_befund.v1") +public class SmicsErgebnisObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|defining_code") + private SmicsErgebniskategorieDefiningCode smicsErgebniskategorieDefiningCode; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value") + private Boolean multispeziesValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value|value") + private TemporalAccessor beginnValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|value") + private TemporalAccessor beginnDerUntersuchungValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|value") + private TemporalAccessor endeValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0009]/value|value") + private TemporalAmount dauerValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.location.v1]") + private List standort; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|value") + private String baumKommentarValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0014]/value|value") + private String ubertragungswegValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0013]/value|value") + private String transmissionswegValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0038]/value|value") + private String artDerUbertragungKommentarValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0016]/value|defining_code") + private ErregernameDefiningCode erregernameDefiningCode; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0037]") + private List anzahlDerErregernachweise; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[openEHR-EHR-CLUSTER.erregerdetails.v1]") + private ErregerdetailsCluster erregerdetails; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[openEHR-EHR-CLUSTER.molekulare_typisierung.v0 and name/value='Erregertypisierung']") + private ErregertypisierungCluster erregertypisierung; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0021]/value|value") + private TemporalAccessor zeitpunktDesErstenErregernachweisesValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0020]/value|value") + private TemporalAccessor zeitpunktDesLetztenErregernachweisesValue; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setSmicsErgebniskategorieDefiningCode( + SmicsErgebniskategorieDefiningCode smicsErgebniskategorieDefiningCode) { + this.smicsErgebniskategorieDefiningCode = smicsErgebniskategorieDefiningCode; + } + + public SmicsErgebniskategorieDefiningCode getSmicsErgebniskategorieDefiningCode() { + return this.smicsErgebniskategorieDefiningCode ; + } + + public void setMultispeziesValue(Boolean multispeziesValue) { + this.multispeziesValue = multispeziesValue; + } + + public Boolean isMultispeziesValue() { + return this.multispeziesValue ; + } + + public void setBeginnValue(TemporalAccessor beginnValue) { + this.beginnValue = beginnValue; + } + + public TemporalAccessor getBeginnValue() { + return this.beginnValue ; + } + + public void setBeginnDerUntersuchungValue(TemporalAccessor beginnDerUntersuchungValue) { + this.beginnDerUntersuchungValue = beginnDerUntersuchungValue; + } + + public TemporalAccessor getBeginnDerUntersuchungValue() { + return this.beginnDerUntersuchungValue ; + } + + public void setEndeValue(TemporalAccessor endeValue) { + this.endeValue = endeValue; + } + + public TemporalAccessor getEndeValue() { + return this.endeValue ; + } + + public void setDauerValue(TemporalAmount dauerValue) { + this.dauerValue = dauerValue; + } + + public TemporalAmount getDauerValue() { + return this.dauerValue ; + } + + public void setStandort(List standort) { + this.standort = standort; + } + + public List getStandort() { + return this.standort ; + } + + public void setBaumKommentarValue(String baumKommentarValue) { + this.baumKommentarValue = baumKommentarValue; + } + + public String getBaumKommentarValue() { + return this.baumKommentarValue ; + } + + public void setUbertragungswegValue(String ubertragungswegValue) { + this.ubertragungswegValue = ubertragungswegValue; + } + + public String getUbertragungswegValue() { + return this.ubertragungswegValue ; + } + + public void setTransmissionswegValue(String transmissionswegValue) { + this.transmissionswegValue = transmissionswegValue; + } + + public String getTransmissionswegValue() { + return this.transmissionswegValue ; + } + + public void setArtDerUbertragungKommentarValue(String artDerUbertragungKommentarValue) { + this.artDerUbertragungKommentarValue = artDerUbertragungKommentarValue; + } + + public String getArtDerUbertragungKommentarValue() { + return this.artDerUbertragungKommentarValue ; + } + + public void setErregernameDefiningCode(ErregernameDefiningCode erregernameDefiningCode) { + this.erregernameDefiningCode = erregernameDefiningCode; + } + + public ErregernameDefiningCode getErregernameDefiningCode() { + return this.erregernameDefiningCode ; + } + + public void setAnzahlDerErregernachweise( + List anzahlDerErregernachweise) { + this.anzahlDerErregernachweise = anzahlDerErregernachweise; + } + + public List getAnzahlDerErregernachweise() { + return this.anzahlDerErregernachweise ; + } + + public void setErregerdetails(ErregerdetailsCluster erregerdetails) { + this.erregerdetails = erregerdetails; + } + + public ErregerdetailsCluster getErregerdetails() { + return this.erregerdetails ; + } + + public void setErregertypisierung(ErregertypisierungCluster erregertypisierung) { + this.erregertypisierung = erregertypisierung; + } + + public ErregertypisierungCluster getErregertypisierung() { + return this.erregertypisierung ; + } + + public void setZeitpunktDesErstenErregernachweisesValue( + TemporalAccessor zeitpunktDesErstenErregernachweisesValue) { + this.zeitpunktDesErstenErregernachweisesValue = zeitpunktDesErstenErregernachweisesValue; + } + + public TemporalAccessor getZeitpunktDesErstenErregernachweisesValue() { + return this.zeitpunktDesErstenErregernachweisesValue ; + } + + public void setZeitpunktDesLetztenErregernachweisesValue( + TemporalAccessor zeitpunktDesLetztenErregernachweisesValue) { + this.zeitpunktDesLetztenErregernachweisesValue = zeitpunktDesLetztenErregernachweisesValue; + } + + public TemporalAccessor getZeitpunktDesLetztenErregernachweisesValue() { + return this.zeitpunktDesLetztenErregernachweisesValue ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservationContainment.java new file mode 100644 index 000000000..e563259ff --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservationContainment.java @@ -0,0 +1,67 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Boolean; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class SmicsErgebnisObservationContainment extends Containment { + public SelectAqlField SMICS_ERGEBNIS_OBSERVATION = new AqlFieldImp(SmicsErgebnisObservation.class, "", "SmicsErgebnisObservation", SmicsErgebnisObservation.class, this); + + public SelectAqlField SMICS_ERGEBNISKATEGORIE_DEFINING_CODE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|defining_code", "smicsErgebniskategorieDefiningCode", SmicsErgebniskategorieDefiningCode.class, this); + + public SelectAqlField MULTISPEZIES_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value", "multispeziesValue", Boolean.class, this); + + public SelectAqlField BEGINN_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value|value", "beginnValue", TemporalAccessor.class, this); + + public SelectAqlField BEGINN_DER_UNTERSUCHUNG_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|value", "beginnDerUntersuchungValue", TemporalAccessor.class, this); + + public SelectAqlField ENDE_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|value", "endeValue", TemporalAccessor.class, this); + + public SelectAqlField DAUER_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0009]/value|value", "dauerValue", TemporalAmount.class, this); + + public ListSelectAqlField STANDORT = new ListAqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.location.v1]", "standort", StandortCluster.class, this); + + public SelectAqlField BAUM_KOMMENTAR_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|value", "baumKommentarValue", String.class, this); + + public SelectAqlField UBERTRAGUNGSWEG_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0014]/value|value", "ubertragungswegValue", String.class, this); + + public SelectAqlField TRANSMISSIONSWEG_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0013]/value|value", "transmissionswegValue", String.class, this); + + public SelectAqlField ART_DER_UBERTRAGUNG_KOMMENTAR_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0038]/value|value", "artDerUbertragungKommentarValue", String.class, this); + + public SelectAqlField ERREGERNAME_DEFINING_CODE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0016]/value|defining_code", "erregernameDefiningCode", ErregernameDefiningCode.class, this); + + public ListSelectAqlField ANZAHL_DER_ERREGERNACHWEISE = new ListAqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0037]", "anzahlDerErregernachweise", SmicsErgebnisAnzahlDerErregernachweiseElement.class, this); + + public SelectAqlField ERREGERDETAILS = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[openEHR-EHR-CLUSTER.erregerdetails.v1]", "erregerdetails", ErregerdetailsCluster.class, this); + + public SelectAqlField ERREGERTYPISIERUNG = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[openEHR-EHR-CLUSTER.molekulare_typisierung.v0]", "erregertypisierung", ErregertypisierungCluster.class, this); + + public SelectAqlField ZEITPUNKT_DES_ERSTEN_ERREGERNACHWEISES_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0021]/value|value", "zeitpunktDesErstenErregernachweisesValue", TemporalAccessor.class, this); + + public SelectAqlField ZEITPUNKT_DES_LETZTEN_ERREGERNACHWEISES_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0020]/value|value", "zeitpunktDesLetztenErregernachweisesValue", TemporalAccessor.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(SmicsErgebnisObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(SmicsErgebnisObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(SmicsErgebnisObservation.class, "/language", "language", Language.class, this); + + private SmicsErgebnisObservationContainment() { + super("openEHR-EHR-OBSERVATION.smics_befund.v1"); + } + + public static SmicsErgebnisObservationContainment getInstance() { + return new SmicsErgebnisObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebniskategorieDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebniskategorieDefiningCode.java new file mode 100644 index 000000000..d6754c74c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebniskategorieDefiningCode.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum SmicsErgebniskategorieDefiningCode implements EnumValueSet { + ANDERE("Andere", "*", "local", "at0028"), + + HAUFUNG("Häufung", "*", "local", "at0026"), + + AUSBRUCH("Ausbruch", "*", "local", "at0027"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + SmicsErgebniskategorieDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java new file mode 100644 index 000000000..5aaa3e5bb --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java @@ -0,0 +1,78 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.location.v1") +public class StandortCluster { + @Path("/items[at0040]/value|value") + private String standorttypValue; + + @Path("/items[at0046]/value|value") + private String standortbeschreibungValue; + + @Path("/items[at0048]/value|value") + private String standortschlusselValue; + + @Path("/items[at0027]/value|value") + private String stationValue; + + @Path("/items[at0029]/value|value") + private String zimmerValue; + + @Path("/items[at0047]") + private List details; + + public void setStandorttypValue(String standorttypValue) { + this.standorttypValue = standorttypValue; + } + + public String getStandorttypValue() { + return this.standorttypValue ; + } + + public void setStandortbeschreibungValue(String standortbeschreibungValue) { + this.standortbeschreibungValue = standortbeschreibungValue; + } + + public String getStandortbeschreibungValue() { + return this.standortbeschreibungValue ; + } + + public void setStandortschlusselValue(String standortschlusselValue) { + this.standortschlusselValue = standortschlusselValue; + } + + public String getStandortschlusselValue() { + return this.standortschlusselValue ; + } + + public void setStationValue(String stationValue) { + this.stationValue = stationValue; + } + + public String getStationValue() { + return this.stationValue ; + } + + public void setZimmerValue(String zimmerValue) { + this.zimmerValue = zimmerValue; + } + + public String getZimmerValue() { + return this.zimmerValue ; + } + + public void setDetails(List details) { + this.details = details; + } + + public List getDetails() { + return this.details ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortClusterContainment.java new file mode 100644 index 000000000..8e8f17e87 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortClusterContainment.java @@ -0,0 +1,33 @@ +package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class StandortClusterContainment extends Containment { + public SelectAqlField STANDORT_CLUSTER = new AqlFieldImp(StandortCluster.class, "", "StandortCluster", StandortCluster.class, this); + + public SelectAqlField STANDORTTYP_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0040]/value|value", "standorttypValue", String.class, this); + + public SelectAqlField STANDORTBESCHREIBUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0046]/value|value", "standortbeschreibungValue", String.class, this); + + public SelectAqlField STANDORTSCHLUSSEL_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0048]/value|value", "standortschlusselValue", String.class, this); + + public SelectAqlField STATION_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0027]/value|value", "stationValue", String.class, this); + + public SelectAqlField ZIMMER_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0029]/value|value", "zimmerValue", String.class, this); + + public ListSelectAqlField DETAILS = new ListAqlFieldImp(StandortCluster.class, "/items[at0047]", "details", Cluster.class, this); + + private StandortClusterContainment() { + super("openEHR-EHR-CLUSTER.location.v1"); + } + + public static StandortClusterContainment getInstance() { + return new StandortClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java new file mode 100644 index 000000000..7a478e58e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java @@ -0,0 +1,226 @@ +package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +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 org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Id; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.annotations.Template; +import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.AufnahmedatenAdminEntry; +import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.EntlassungsdatenAdminEntry; +import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.FalltypDefiningCode; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; +import org.ehrbase.client.openehrclient.VersionUid; + +@Entity +@Archetype("openEHR-EHR-COMPOSITION.fall.v0") +@Template("Stationärer Versorgungsfall") +public class StationarerVersorgungsfallComposition { + @Path("/context/other_context[at0001]/items[at0005]/value|defining_code") + private FalltypDefiningCode falltypDefiningCode; + + @Path("/context/other_context[at0001]/items[at0004]/value|value") + private String fallklasseValue; + + @Path("/context/other_context[at0001]/items[at0003 and name/value='Fall-Kennung']/value|value") + private String fallKennungValue; + + @Path("/context/other_context[at0001]/items[at0002]") + private List erweiterung; + + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; + + @Path("/context/participations") + private List participations; + + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + @Path("/context/location") + private String location; + + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; + + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; + + @Path("/content[openEHR-EHR-ADMIN_ENTRY.admission.v0 and name/value='Aufnahmedaten']") + private AufnahmedatenAdminEntry aufnahmedaten; + + @Path("/content[openEHR-EHR-ADMIN_ENTRY.discharge_summary.v0]") + private EntlassungsdatenAdminEntry entlassungsdaten; + + @Path("/composer") + private PartyProxy composer; + + @Path("/language") + private Language language; + + @Path("/feeder_audit") + private FeederAudit feederAudit; + + @Path("/category|defining_code") + private Category categoryDefiningCode; + + @Path("/territory") + private Territory territory; + + @Id + private VersionUid versionUid; + + public void setFalltypDefiningCode(FalltypDefiningCode falltypDefiningCode) { + this.falltypDefiningCode = falltypDefiningCode; + } + + public FalltypDefiningCode getFalltypDefiningCode() { + return this.falltypDefiningCode ; + } + + public void setFallklasseValue(String fallklasseValue) { + this.fallklasseValue = fallklasseValue; + } + + public String getFallklasseValue() { + return this.fallklasseValue ; + } + + public void setFallKennungValue(String fallKennungValue) { + this.fallKennungValue = fallKennungValue; + } + + public String getFallKennungValue() { + return this.fallKennungValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + 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 setAufnahmedaten(AufnahmedatenAdminEntry aufnahmedaten) { + this.aufnahmedaten = aufnahmedaten; + } + + public AufnahmedatenAdminEntry getAufnahmedaten() { + return this.aufnahmedaten ; + } + + public void setEntlassungsdaten(EntlassungsdatenAdminEntry entlassungsdaten) { + this.entlassungsdaten = entlassungsdaten; + } + + public EntlassungsdatenAdminEntry getEntlassungsdaten() { + return this.entlassungsdaten ; + } + + 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 setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } + + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } + + 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallCompositionContainment.java new file mode 100644 index 000000000..91a004845 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallCompositionContainment.java @@ -0,0 +1,67 @@ +package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +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 org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.AufnahmedatenAdminEntry; +import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.EntlassungsdatenAdminEntry; +import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.FalltypDefiningCode; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; + +public class StationarerVersorgungsfallCompositionContainment extends Containment { + public SelectAqlField STATIONARER_VERSORGUNGSFALL_COMPOSITION = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "", "StationarerVersorgungsfallComposition", StationarerVersorgungsfallComposition.class, this); + + public SelectAqlField FALLTYP_DEFINING_CODE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/other_context[at0001]/items[at0005]/value|defining_code", "falltypDefiningCode", FalltypDefiningCode.class, this); + + public SelectAqlField FALLKLASSE_VALUE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/other_context[at0001]/items[at0004]/value|value", "fallklasseValue", String.class, this); + + public SelectAqlField FALL_KENNUNG_VALUE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/other_context[at0001]/items[at0003]/value|value", "fallKennungValue", String.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/other_context[at0001]/items[at0002]", "erweiterung", Cluster.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/participations", "participations", Participation.class, this); + + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + + public SelectAqlField LOCATION = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/location", "location", String.class, this); + + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); + + public SelectAqlField AUFNAHMEDATEN = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/content[openEHR-EHR-ADMIN_ENTRY.admission.v0]", "aufnahmedaten", AufnahmedatenAdminEntry.class, this); + + public SelectAqlField ENTLASSUNGSDATEN = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/content[openEHR-EHR-ADMIN_ENTRY.discharge_summary.v0]", "entlassungsdaten", EntlassungsdatenAdminEntry.class, this); + + public SelectAqlField COMPOSER = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/composer", "composer", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/language", "language", Language.class, this); + + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); + + public SelectAqlField TERRITORY = new AqlFieldImp(StationarerVersorgungsfallComposition.class, "/territory", "territory", Territory.class, this); + + private StationarerVersorgungsfallCompositionContainment() { + super("openEHR-EHR-COMPOSITION.fall.v0"); + } + + public static StationarerVersorgungsfallCompositionContainment getInstance() { + return new StationarerVersorgungsfallCompositionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java new file mode 100644 index 000000000..7b2e44001 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java @@ -0,0 +1,92 @@ +package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-ADMIN_ENTRY.admission.v0") +public class AufnahmedatenAdminEntry { + @Path("/data[at0001]/items[at0013 and name/value='Versorgungsfallgrund']/value|value") + private String versorgungsfallgrundValue; + + @Path("/data[at0001]/items[at0049]/value|value") + private String artDerAufnahmeValue; + + @Path("/data[at0001]/items[at0071]/value|value") + private TemporalAccessor datumUhrzeitDerAufnahmeValue; + + @Path("/data[at0001]/items[at0131]") + private List zugewiesenerPatientenstandort; + + @Path("/data[at0001]/items[at0132]") + private List vorherigerPatientenstandort; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setVersorgungsfallgrundValue(String versorgungsfallgrundValue) { + this.versorgungsfallgrundValue = versorgungsfallgrundValue; + } + + public String getVersorgungsfallgrundValue() { + return this.versorgungsfallgrundValue ; + } + + public void setArtDerAufnahmeValue(String artDerAufnahmeValue) { + this.artDerAufnahmeValue = artDerAufnahmeValue; + } + + public String getArtDerAufnahmeValue() { + return this.artDerAufnahmeValue ; + } + + public void setDatumUhrzeitDerAufnahmeValue(TemporalAccessor datumUhrzeitDerAufnahmeValue) { + this.datumUhrzeitDerAufnahmeValue = datumUhrzeitDerAufnahmeValue; + } + + public TemporalAccessor getDatumUhrzeitDerAufnahmeValue() { + return this.datumUhrzeitDerAufnahmeValue ; + } + + public void setZugewiesenerPatientenstandort(List zugewiesenerPatientenstandort) { + this.zugewiesenerPatientenstandort = zugewiesenerPatientenstandort; + } + + public List getZugewiesenerPatientenstandort() { + return this.zugewiesenerPatientenstandort ; + } + + public void setVorherigerPatientenstandort(List vorherigerPatientenstandort) { + this.vorherigerPatientenstandort = vorherigerPatientenstandort; + } + + public List getVorherigerPatientenstandort() { + return this.vorherigerPatientenstandort ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntryContainment.java new file mode 100644 index 000000000..9f9ade2a5 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntryContainment.java @@ -0,0 +1,38 @@ +package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class AufnahmedatenAdminEntryContainment extends Containment { + public SelectAqlField AUFNAHMEDATEN_ADMIN_ENTRY = new AqlFieldImp(AufnahmedatenAdminEntry.class, "", "AufnahmedatenAdminEntry", AufnahmedatenAdminEntry.class, this); + + public SelectAqlField VERSORGUNGSFALLGRUND_VALUE = new AqlFieldImp(AufnahmedatenAdminEntry.class, "/data[at0001]/items[at0013]/value|value", "versorgungsfallgrundValue", String.class, this); + + public SelectAqlField ART_DER_AUFNAHME_VALUE = new AqlFieldImp(AufnahmedatenAdminEntry.class, "/data[at0001]/items[at0049]/value|value", "artDerAufnahmeValue", String.class, this); + + public SelectAqlField DATUM_UHRZEIT_DER_AUFNAHME_VALUE = new AqlFieldImp(AufnahmedatenAdminEntry.class, "/data[at0001]/items[at0071]/value|value", "datumUhrzeitDerAufnahmeValue", TemporalAccessor.class, this); + + public ListSelectAqlField ZUGEWIESENER_PATIENTENSTANDORT = new ListAqlFieldImp(AufnahmedatenAdminEntry.class, "/data[at0001]/items[at0131]", "zugewiesenerPatientenstandort", Cluster.class, this); + + public ListSelectAqlField VORHERIGER_PATIENTENSTANDORT = new ListAqlFieldImp(AufnahmedatenAdminEntry.class, "/data[at0001]/items[at0132]", "vorherigerPatientenstandort", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(AufnahmedatenAdminEntry.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(AufnahmedatenAdminEntry.class, "/language", "language", Language.class, this); + + private AufnahmedatenAdminEntryContainment() { + super("openEHR-EHR-ADMIN_ENTRY.admission.v0"); + } + + public static AufnahmedatenAdminEntryContainment getInstance() { + return new AufnahmedatenAdminEntryContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java new file mode 100644 index 000000000..7e975ea23 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java @@ -0,0 +1,104 @@ +package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-ADMIN_ENTRY.discharge_summary.v0") +public class EntlassungsdatenAdminEntry { + @Path("/data[at0001]/items[at0040]/value|value") + private String artDerEntlassungValue; + + @Path("/data[at0001]/items[at0002]/value|defining_code") + private KlinischerZustandDesPatientenDefiningCode klinischerZustandDesPatientenDefiningCode; + + @Path("/data[at0001]/items[at0011 and name/value='Datum/Uhrzeit der Entlassung']/value|value") + private TemporalAccessor datumUhrzeitDerEntlassungValue; + + @Path("/data[at0001]/items[at0050]/value|value") + private String zusatzlicheInformationenValue; + + @Path("/data[at0001]/items[at0066]") + private List letzterPatientenstandort; + + @Path("/data[at0001]/items[at0067]") + private List zugewiesenerPatientenstandort; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setArtDerEntlassungValue(String artDerEntlassungValue) { + this.artDerEntlassungValue = artDerEntlassungValue; + } + + public String getArtDerEntlassungValue() { + return this.artDerEntlassungValue ; + } + + public void setKlinischerZustandDesPatientenDefiningCode( + KlinischerZustandDesPatientenDefiningCode klinischerZustandDesPatientenDefiningCode) { + this.klinischerZustandDesPatientenDefiningCode = klinischerZustandDesPatientenDefiningCode; + } + + public KlinischerZustandDesPatientenDefiningCode getKlinischerZustandDesPatientenDefiningCode() { + return this.klinischerZustandDesPatientenDefiningCode ; + } + + public void setDatumUhrzeitDerEntlassungValue(TemporalAccessor datumUhrzeitDerEntlassungValue) { + this.datumUhrzeitDerEntlassungValue = datumUhrzeitDerEntlassungValue; + } + + public TemporalAccessor getDatumUhrzeitDerEntlassungValue() { + return this.datumUhrzeitDerEntlassungValue ; + } + + public void setZusatzlicheInformationenValue(String zusatzlicheInformationenValue) { + this.zusatzlicheInformationenValue = zusatzlicheInformationenValue; + } + + public String getZusatzlicheInformationenValue() { + return this.zusatzlicheInformationenValue ; + } + + public void setLetzterPatientenstandort(List letzterPatientenstandort) { + this.letzterPatientenstandort = letzterPatientenstandort; + } + + public List getLetzterPatientenstandort() { + return this.letzterPatientenstandort ; + } + + public void setZugewiesenerPatientenstandort(List zugewiesenerPatientenstandort) { + this.zugewiesenerPatientenstandort = zugewiesenerPatientenstandort; + } + + public List getZugewiesenerPatientenstandort() { + return this.zugewiesenerPatientenstandort ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntryContainment.java new file mode 100644 index 000000000..dadff48ee --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntryContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class EntlassungsdatenAdminEntryContainment extends Containment { + public SelectAqlField ENTLASSUNGSDATEN_ADMIN_ENTRY = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "", "EntlassungsdatenAdminEntry", EntlassungsdatenAdminEntry.class, this); + + public SelectAqlField ART_DER_ENTLASSUNG_VALUE = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0040]/value|value", "artDerEntlassungValue", String.class, this); + + public SelectAqlField KLINISCHER_ZUSTAND_DES_PATIENTEN_DEFINING_CODE = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0002]/value|defining_code", "klinischerZustandDesPatientenDefiningCode", KlinischerZustandDesPatientenDefiningCode.class, this); + + public SelectAqlField DATUM_UHRZEIT_DER_ENTLASSUNG_VALUE = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0011]/value|value", "datumUhrzeitDerEntlassungValue", TemporalAccessor.class, this); + + public SelectAqlField ZUSATZLICHE_INFORMATIONEN_VALUE = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0050]/value|value", "zusatzlicheInformationenValue", String.class, this); + + public ListSelectAqlField LETZTER_PATIENTENSTANDORT = new ListAqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0066]", "letzterPatientenstandort", Cluster.class, this); + + public ListSelectAqlField ZUGEWIESENER_PATIENTENSTANDORT = new ListAqlFieldImp(EntlassungsdatenAdminEntry.class, "/data[at0001]/items[at0067]", "zugewiesenerPatientenstandort", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/language", "language", Language.class, this); + + private EntlassungsdatenAdminEntryContainment() { + super("openEHR-EHR-ADMIN_ENTRY.discharge_summary.v0"); + } + + public static EntlassungsdatenAdminEntryContainment getInstance() { + return new EntlassungsdatenAdminEntryContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/FalltypDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/FalltypDefiningCode.java new file mode 100644 index 000000000..33e928d74 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/FalltypDefiningCode.java @@ -0,0 +1,39 @@ +package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum FalltypDefiningCode implements EnumValueSet { + VERSORGUNGSFALL("Versorgungsfall", "Versorgungsfall", "local", "at0006"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + FalltypDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/KlinischerZustandDesPatientenDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/KlinischerZustandDesPatientenDefiningCode.java new file mode 100644 index 000000000..0f4036c1d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/KlinischerZustandDesPatientenDefiningCode.java @@ -0,0 +1,52 @@ +package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum KlinischerZustandDesPatientenDefiningCode implements EnumValueSet { + IDENTISCHER_ZUSTAND("Identischer Zustand", "Der Gesundheitszustand des Patienten ist identisch, wie bei der Aufnahme.", "local", "at0005"), + + UNBESTIMMT("Unbestimmt", "Unbestimmt.", "local", "at0008"), + + GEHEILT("Geheilt", "Der Patient ist geheilt.", "local", "at0003"), + + SONSTIGE("Sonstige", "Sonstige", "local", "at0068"), + + SCHLECHTER("Schlechter", "Der Gesundheitszustand des Patienten ist schlechter, als bei der Aufnahme.", "local", "at0006"), + + VERBESSERT("Verbessert", "Der Gesundheitszustand des Patienten hat sich verbessert.", "local", "at0004"), + + VERSTORBEN("Verstorben", "Der Patient verstarb während des Krankenhausaufenthaltes.", "local", "at0007"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + KlinischerZustandDesPatientenDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java new file mode 100644 index 000000000..be6c11123 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java @@ -0,0 +1,205 @@ +package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +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 org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Id; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.annotations.Template; +import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.ContextCodedTextDefiningCode; +import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesEvaluation; +import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesObservation; +import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesSection; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; +import org.ehrbase.client.openehrclient.VersionUid; + +@Entity +@Archetype("openEHR-EHR-COMPOSITION.test_all_types.v1") +@Template("test_all_types.en.v1") +public class TestAllTypesEnV1Composition { + @Path("/context/other_context[at0004]/item[at0005]/value|defining_code") + private ContextCodedTextDefiningCode contextCodedTextDefiningCode; + + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; + + @Path("/context/participations") + private List participations; + + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + @Path("/context/location") + private String location; + + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; + + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; + + @Path("/content[openEHR-EHR-OBSERVATION.test_all_types.v1]") + private List testAllTypesTestAllTypes; + + @Path("/content[openEHR-EHR-EVALUATION.test_all_types.v1]") + private List testAllTypesTestAllTypes2; + + @Path("/content[openEHR-EHR-SECTION.test_all_types.v1]") + private List testAllTypesTestAllTypes3; + + @Path("/composer") + private PartyProxy composer; + + @Path("/language") + private Language language; + + @Path("/feeder_audit") + private FeederAudit feederAudit; + + @Path("/category|defining_code") + private Category categoryDefiningCode; + + @Path("/territory") + private Territory territory; + + @Id + private VersionUid versionUid; + + public void setContextCodedTextDefiningCode( + ContextCodedTextDefiningCode contextCodedTextDefiningCode) { + this.contextCodedTextDefiningCode = contextCodedTextDefiningCode; + } + + public ContextCodedTextDefiningCode getContextCodedTextDefiningCode() { + return this.contextCodedTextDefiningCode ; + } + + 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 setTestAllTypesTestAllTypes(List testAllTypesTestAllTypes) { + this.testAllTypesTestAllTypes = testAllTypesTestAllTypes; + } + + public List getTestAllTypesTestAllTypes() { + return this.testAllTypesTestAllTypes ; + } + + public void setTestAllTypesTestAllTypes2(List testAllTypesTestAllTypes2) { + this.testAllTypesTestAllTypes2 = testAllTypesTestAllTypes2; + } + + public List getTestAllTypesTestAllTypes2() { + return this.testAllTypesTestAllTypes2 ; + } + + public void setTestAllTypesTestAllTypes3(List testAllTypesTestAllTypes3) { + this.testAllTypesTestAllTypes3 = testAllTypesTestAllTypes3; + } + + public List getTestAllTypesTestAllTypes3() { + return this.testAllTypesTestAllTypes3 ; + } + + 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 setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } + + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } + + 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java new file mode 100644 index 000000000..ddef03d1a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java @@ -0,0 +1,63 @@ +package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +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 org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.ContextCodedTextDefiningCode; +import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesEvaluation; +import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesObservation; +import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesSection; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; + +public class TestAllTypesEnV1CompositionContainment extends Containment { + public SelectAqlField TEST_ALL_TYPES_EN_V1_COMPOSITION = new AqlFieldImp(TestAllTypesEnV1Composition.class, "", "TestAllTypesEnV1Composition", TestAllTypesEnV1Composition.class, this); + + public SelectAqlField CONTEXT_CODED_TEXT_DEFINING_CODE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/other_context[at0004]/item[at0005]/value|defining_code", "contextCodedTextDefiningCode", ContextCodedTextDefiningCode.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/context/participations", "participations", Participation.class, this); + + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + + public SelectAqlField LOCATION = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/location", "location", String.class, this); + + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); + + public ListSelectAqlField TEST_ALL_TYPES_TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-OBSERVATION.test_all_types.v1]", "testAllTypesTestAllTypes", TestAllTypesObservation.class, this); + + public ListSelectAqlField TEST_ALL_TYPES_TEST_ALL_TYPES2 = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-EVALUATION.test_all_types.v1]", "testAllTypesTestAllTypes2", TestAllTypesEvaluation.class, this); + + public ListSelectAqlField TEST_ALL_TYPES_TEST_ALL_TYPES3 = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-SECTION.test_all_types.v1]", "testAllTypesTestAllTypes3", TestAllTypesSection.class, this); + + public SelectAqlField COMPOSER = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/composer", "composer", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/language", "language", Language.class, this); + + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); + + public SelectAqlField TERRITORY = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/territory", "territory", Territory.class, this); + + private TestAllTypesEnV1CompositionContainment() { + super("openEHR-EHR-COMPOSITION.test_all_types.v1"); + } + + public static TestAllTypesEnV1CompositionContainment getInstance() { + return new TestAllTypesEnV1CompositionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CareflowStepDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CareflowStepDefiningCode.java new file mode 100644 index 000000000..9b86c5b65 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CareflowStepDefiningCode.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum CareflowStepDefiningCode implements EnumValueSet { + PLANNED("Planned", "*", null, "at0003"), + + ACTIVE("Active", "*", null, "at0004"), + + COMPLETED("Completed", "*", null, "at0005"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + CareflowStepDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ContextCodedTextDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ContextCodedTextDefiningCode.java new file mode 100644 index 000000000..82f69efd0 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/ContextCodedTextDefiningCode.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum ContextCodedTextDefiningCode implements EnumValueSet { + VALUE1("value1", "*", "local", "at0006"), + + VALUE2("value2", "*", "local", "at0007"), + + VALUE3("value3", "*", "local", "at0008"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + ContextCodedTextDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CurrentStateDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CurrentStateDefiningCode.java new file mode 100644 index 000000000..2615d9361 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CurrentStateDefiningCode.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum CurrentStateDefiningCode implements EnumValueSet { + COMPLETED("completed", "completed", null, "532"), + + PLANNED("planned", "planned", null, "526"), + + ACTIVE("active", "active", null, "245"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + CurrentStateDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java new file mode 100644 index 000000000..4c4853e97 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java @@ -0,0 +1,91 @@ +package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; + +import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-ACTION.test_all_types.v1") +public class TestAllTypesAction { + @Path("/description[at0001]/items[openEHR-EHR-CLUSTER.test_all_types.v1]") + private List testAllTypes; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + @Path("/time|value") + private TemporalAccessor timeValue; + + @Path("/ism_transition/careflow_step|defining_code") + private CareflowStepDefiningCode careflowStepDefiningCode; + + @Path("/ism_transition/current_state|defining_code") + private CurrentStateDefiningCode currentStateDefiningCode; + + @Path("/ism_transition/transition|defining_code") + private CodePhrase transitionDefiningCode; + + public void setTestAllTypes(List testAllTypes) { + this.testAllTypes = testAllTypes; + } + + public List getTestAllTypes() { + return this.testAllTypes ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setCareflowStepDefiningCode(CareflowStepDefiningCode careflowStepDefiningCode) { + this.careflowStepDefiningCode = careflowStepDefiningCode; + } + + public CareflowStepDefiningCode getCareflowStepDefiningCode() { + return this.careflowStepDefiningCode ; + } + + public void setCurrentStateDefiningCode(CurrentStateDefiningCode currentStateDefiningCode) { + this.currentStateDefiningCode = currentStateDefiningCode; + } + + public CurrentStateDefiningCode getCurrentStateDefiningCode() { + return this.currentStateDefiningCode ; + } + + public void setTransitionDefiningCode(CodePhrase transitionDefiningCode) { + this.transitionDefiningCode = transitionDefiningCode; + } + + public CodePhrase getTransitionDefiningCode() { + return this.transitionDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java new file mode 100644 index 000000000..eddcd95e9 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java @@ -0,0 +1,37 @@ +package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; + +import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class TestAllTypesActionContainment extends Containment { + public SelectAqlField TEST_ALL_TYPES_ACTION = new AqlFieldImp(TestAllTypesAction.class, "", "TestAllTypesAction", TestAllTypesAction.class, this); + + public ListSelectAqlField TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesAction.class, "/description[at0001]/items[openEHR-EHR-CLUSTER.test_all_types.v1]", "testAllTypes", TestAllTypesCluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(TestAllTypesAction.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesAction.class, "/language", "language", Language.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(TestAllTypesAction.class, "/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField CAREFLOW_STEP_DEFINING_CODE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition/careflow_step|defining_code", "careflowStepDefiningCode", CareflowStepDefiningCode.class, this); + + public SelectAqlField CURRENT_STATE_DEFINING_CODE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition/current_state|defining_code", "currentStateDefiningCode", CurrentStateDefiningCode.class, this); + + public SelectAqlField TRANSITION_DEFINING_CODE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition/transition|defining_code", "transitionDefiningCode", CodePhrase.class, this); + + private TestAllTypesActionContainment() { + super("openEHR-EHR-ACTION.test_all_types.v1"); + } + + public static TestAllTypesActionContainment getInstance() { + return new TestAllTypesActionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java new file mode 100644 index 000000000..79bfc0b9a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java @@ -0,0 +1,45 @@ +package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; + +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Long; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-ADMIN_ENTRY.test_all_types.v1") +public class TestAllTypesAdminEntry { + @Path("/data[at0001]/item[at0002]/value|magnitude") + private Long count3Magnitude; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setCount3Magnitude(Long count3Magnitude) { + this.count3Magnitude = count3Magnitude; + } + + public Long getCount3Magnitude() { + return this.count3Magnitude ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java new file mode 100644 index 000000000..d024d2456 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java @@ -0,0 +1,26 @@ +package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; + +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Long; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class TestAllTypesAdminEntryContainment extends Containment { + public SelectAqlField TEST_ALL_TYPES_ADMIN_ENTRY = new AqlFieldImp(TestAllTypesAdminEntry.class, "", "TestAllTypesAdminEntry", TestAllTypesAdminEntry.class, this); + + public SelectAqlField COUNT3_MAGNITUDE = new AqlFieldImp(TestAllTypesAdminEntry.class, "/data[at0001]/item[at0002]/value|magnitude", "count3Magnitude", Long.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(TestAllTypesAdminEntry.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesAdminEntry.class, "/language", "language", Language.class, this); + + private TestAllTypesAdminEntryContainment() { + super("openEHR-EHR-ADMIN_ENTRY.test_all_types.v1"); + } + + public static TestAllTypesAdminEntryContainment getInstance() { + return new TestAllTypesAdminEntryContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceChoice.java new file mode 100644 index 000000000..f850dac65 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; + +public interface TestAllTypesChoiceChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java new file mode 100644 index 000000000..b2e1a971b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; + +import java.lang.Long; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_COUNT") +public class TestAllTypesChoiceDvCount implements TestAllTypesChoiceChoice { + @Path("|magnitude") + private Long choiceMagnitude; + + public void setChoiceMagnitude(Long choiceMagnitude) { + this.choiceMagnitude = choiceMagnitude; + } + + public Long getChoiceMagnitude() { + return this.choiceMagnitude ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java new file mode 100644 index 000000000..65c47bd21 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java @@ -0,0 +1,33 @@ +package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; + +import java.lang.Double; +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_QUANTITY") +public class TestAllTypesChoiceDvQuantity implements TestAllTypesChoiceChoice { + @Path("|magnitude") + private Double choiceMagnitude; + + @Path("|units") + private String choiceUnits; + + public void setChoiceMagnitude(Double choiceMagnitude) { + this.choiceMagnitude = choiceMagnitude; + } + + public Double getChoiceMagnitude() { + return this.choiceMagnitude ; + } + + public void setChoiceUnits(String choiceUnits) { + this.choiceUnits = choiceUnits; + } + + public String getChoiceUnits() { + return this.choiceUnits ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java new file mode 100644 index 000000000..760d6fca3 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; + +import java.lang.Boolean; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.test_all_types.v1") +public class TestAllTypesCluster { + @Path("/items[at0001]/items[at0002]/items[at0003]/value|value") + private Boolean boolean2Value; + + public void setBoolean2Value(Boolean boolean2Value) { + this.boolean2Value = boolean2Value; + } + + public Boolean isBoolean2Value() { + return this.boolean2Value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java new file mode 100644 index 000000000..a2012313d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; + +import java.lang.Boolean; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class TestAllTypesClusterContainment extends Containment { + public SelectAqlField TEST_ALL_TYPES_CLUSTER = new AqlFieldImp(TestAllTypesCluster.class, "", "TestAllTypesCluster", TestAllTypesCluster.class, this); + + public SelectAqlField BOOLEAN2_VALUE = new AqlFieldImp(TestAllTypesCluster.class, "/items[at0001]/items[at0002]/items[at0003]/value|value", "boolean2Value", Boolean.class, this); + + private TestAllTypesClusterContainment() { + super("openEHR-EHR-CLUSTER.test_all_types.v1"); + } + + public static TestAllTypesClusterContainment getInstance() { + return new TestAllTypesClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java new file mode 100644 index 000000000..0bd143a90 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java @@ -0,0 +1,228 @@ +package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; + +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Boolean; +import java.lang.Double; +import java.lang.Long; +import java.lang.String; +import java.net.URI; +import java.time.temporal.TemporalAccessor; +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.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.test_all_types.v1") +public class TestAllTypesEvaluation { + @Path("/data[at0001]/items[at0002]/value|value") + private URI uriValue; + + @Path("/data[at0001]/items[at0003]/value/upper|magnitude") + private Long upperMagnitude; + + @Path("/data[at0001]/items[at0003]/value/lower|magnitude") + private Long lowerMagnitude; + + @Path("/data[at0001]/items[at0003]/value/lower_included") + private Boolean intervalCountLowerIncluded; + + @Path("/data[at0001]/items[at0003]/value/upper_included") + private Boolean intervalCountUpperIncluded; + + @Path("/data[at0001]/items[at0004]/value/upper|magnitude") + private Double upperMagnitude2; + + @Path("/data[at0001]/items[at0004]/value/upper|units") + private String upperUnits; + + @Path("/data[at0001]/items[at0004]/value/lower|magnitude") + private Double lowerMagnitude2; + + @Path("/data[at0001]/items[at0004]/value/lower|units") + private String lowerUnits; + + @Path("/data[at0001]/items[at0004]/value/lower_included") + private Boolean intervalQuantityLowerIncluded; + + @Path("/data[at0001]/items[at0004]/value/upper_included") + private Boolean intervalQuantityUpperIncluded; + + @Path("/data[at0001]/items[at0005]/value/upper|value") + private TemporalAccessor intervalDatetimeUpperValue; + + @Path("/data[at0001]/items[at0005]/value/lower|value") + private TemporalAccessor intervalDatetimeLowerValue; + + @Path("/data[at0001]/items[at0005]/value/lower_included") + private Boolean intervalDatetimeLowerIncluded; + + @Path("/data[at0001]/items[at0005]/value/upper_included") + private Boolean intervalDatetimeUpperIncluded; + + @Path("/data[at0001]/items[at0006]/items[at0007]/items[at0008]/items[at0010]/value|value") + private String text2Value; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + @Path("/data[at0001]/items[at0009]/value") + @Choice + private TestAllTypesChoiceChoice choice; + + public void setUriValue(URI uriValue) { + this.uriValue = uriValue; + } + + public URI getUriValue() { + return this.uriValue ; + } + + public void setUpperMagnitude(Long upperMagnitude) { + this.upperMagnitude = upperMagnitude; + } + + public Long getUpperMagnitude() { + return this.upperMagnitude ; + } + + public void setLowerMagnitude(Long lowerMagnitude) { + this.lowerMagnitude = lowerMagnitude; + } + + public Long getLowerMagnitude() { + return this.lowerMagnitude ; + } + + public void setIntervalCountLowerIncluded(Boolean intervalCountLowerIncluded) { + this.intervalCountLowerIncluded = intervalCountLowerIncluded; + } + + public Boolean isIntervalCountLowerIncluded() { + return this.intervalCountLowerIncluded ; + } + + public void setIntervalCountUpperIncluded(Boolean intervalCountUpperIncluded) { + this.intervalCountUpperIncluded = intervalCountUpperIncluded; + } + + public Boolean isIntervalCountUpperIncluded() { + return this.intervalCountUpperIncluded ; + } + + public void setUpperMagnitude2(Double upperMagnitude2) { + this.upperMagnitude2 = upperMagnitude2; + } + + public Double getUpperMagnitude2() { + return this.upperMagnitude2 ; + } + + public void setUpperUnits(String upperUnits) { + this.upperUnits = upperUnits; + } + + public String getUpperUnits() { + return this.upperUnits ; + } + + public void setLowerMagnitude2(Double lowerMagnitude2) { + this.lowerMagnitude2 = lowerMagnitude2; + } + + public Double getLowerMagnitude2() { + return this.lowerMagnitude2 ; + } + + public void setLowerUnits(String lowerUnits) { + this.lowerUnits = lowerUnits; + } + + public String getLowerUnits() { + return this.lowerUnits ; + } + + public void setIntervalQuantityLowerIncluded(Boolean intervalQuantityLowerIncluded) { + this.intervalQuantityLowerIncluded = intervalQuantityLowerIncluded; + } + + public Boolean isIntervalQuantityLowerIncluded() { + return this.intervalQuantityLowerIncluded ; + } + + public void setIntervalQuantityUpperIncluded(Boolean intervalQuantityUpperIncluded) { + this.intervalQuantityUpperIncluded = intervalQuantityUpperIncluded; + } + + public Boolean isIntervalQuantityUpperIncluded() { + return this.intervalQuantityUpperIncluded ; + } + + public void setIntervalDatetimeUpperValue(TemporalAccessor intervalDatetimeUpperValue) { + this.intervalDatetimeUpperValue = intervalDatetimeUpperValue; + } + + public TemporalAccessor getIntervalDatetimeUpperValue() { + return this.intervalDatetimeUpperValue ; + } + + public void setIntervalDatetimeLowerValue(TemporalAccessor intervalDatetimeLowerValue) { + this.intervalDatetimeLowerValue = intervalDatetimeLowerValue; + } + + public TemporalAccessor getIntervalDatetimeLowerValue() { + return this.intervalDatetimeLowerValue ; + } + + public void setIntervalDatetimeLowerIncluded(Boolean intervalDatetimeLowerIncluded) { + this.intervalDatetimeLowerIncluded = intervalDatetimeLowerIncluded; + } + + public Boolean isIntervalDatetimeLowerIncluded() { + return this.intervalDatetimeLowerIncluded ; + } + + public void setIntervalDatetimeUpperIncluded(Boolean intervalDatetimeUpperIncluded) { + this.intervalDatetimeUpperIncluded = intervalDatetimeUpperIncluded; + } + + public Boolean isIntervalDatetimeUpperIncluded() { + return this.intervalDatetimeUpperIncluded ; + } + + public void setText2Value(String text2Value) { + this.text2Value = text2Value; + } + + public String getText2Value() { + return this.text2Value ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setChoice(TestAllTypesChoiceChoice choice) { + this.choice = choice; + } + + public TestAllTypesChoiceChoice getChoice() { + return this.choice ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java new file mode 100644 index 000000000..2bd2f2deb --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java @@ -0,0 +1,63 @@ +package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; + +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Boolean; +import java.lang.Double; +import java.lang.Long; +import java.lang.String; +import java.net.URI; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class TestAllTypesEvaluationContainment extends Containment { + public SelectAqlField TEST_ALL_TYPES_EVALUATION = new AqlFieldImp(TestAllTypesEvaluation.class, "", "TestAllTypesEvaluation", TestAllTypesEvaluation.class, this); + + public SelectAqlField URI_VALUE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0002]/value|value", "uriValue", URI.class, this); + + public SelectAqlField UPPER_MAGNITUDE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0003]/value/upper|magnitude", "upperMagnitude", Long.class, this); + + public SelectAqlField LOWER_MAGNITUDE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0003]/value/lower|magnitude", "lowerMagnitude", Long.class, this); + + public SelectAqlField INTERVAL_COUNT_LOWER_INCLUDED = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0003]/value/lower_included", "intervalCountLowerIncluded", Boolean.class, this); + + public SelectAqlField INTERVAL_COUNT_UPPER_INCLUDED = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0003]/value/upper_included", "intervalCountUpperIncluded", Boolean.class, this); + + public SelectAqlField UPPER_MAGNITUDE2 = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0004]/value/upper|magnitude", "upperMagnitude2", Double.class, this); + + public SelectAqlField UPPER_UNITS = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0004]/value/upper|units", "upperUnits", String.class, this); + + public SelectAqlField LOWER_MAGNITUDE2 = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0004]/value/lower|magnitude", "lowerMagnitude2", Double.class, this); + + public SelectAqlField LOWER_UNITS = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0004]/value/lower|units", "lowerUnits", String.class, this); + + public SelectAqlField INTERVAL_QUANTITY_LOWER_INCLUDED = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0004]/value/lower_included", "intervalQuantityLowerIncluded", Boolean.class, this); + + public SelectAqlField INTERVAL_QUANTITY_UPPER_INCLUDED = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0004]/value/upper_included", "intervalQuantityUpperIncluded", Boolean.class, this); + + public SelectAqlField INTERVAL_DATETIME_UPPER_VALUE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0005]/value/upper|value", "intervalDatetimeUpperValue", TemporalAccessor.class, this); + + public SelectAqlField INTERVAL_DATETIME_LOWER_VALUE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0005]/value/lower|value", "intervalDatetimeLowerValue", TemporalAccessor.class, this); + + public SelectAqlField INTERVAL_DATETIME_LOWER_INCLUDED = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0005]/value/lower_included", "intervalDatetimeLowerIncluded", Boolean.class, this); + + public SelectAqlField INTERVAL_DATETIME_UPPER_INCLUDED = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0005]/value/upper_included", "intervalDatetimeUpperIncluded", Boolean.class, this); + + public SelectAqlField TEXT2_VALUE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0006]/items[at0007]/items[at0008]/items[at0010]/value|value", "text2Value", String.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(TestAllTypesEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesEvaluation.class, "/language", "language", Language.class, this); + + public SelectAqlField CHOICE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0009]/value", "choice", TestAllTypesChoiceChoice.class, this); + + private TestAllTypesEvaluationContainment() { + super("openEHR-EHR-EVALUATION.test_all_types.v1"); + } + + public static TestAllTypesEvaluationContainment getInstance() { + return new TestAllTypesEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java new file mode 100644 index 000000000..493a5fe03 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java @@ -0,0 +1,92 @@ +package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; + +import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.Temporal; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-INSTRUCTION.test_all_types.v1") +public class TestAllTypesInstruction { + @Path("/activities[at0001]/description[at0002]/items[at0003]/value|value") + private Temporal partialDateValue; + + @Path("/activities[at0001]/description[at0002]/items[at0004]/value|value") + private TemporalAccessor partialDatetimeValue; + + @Path("/activities[at0001]/timing") + private DvParsable timing; + + @Path("/subject") + private PartyProxy subject; + + @Path("/narrative|value") + private String narrativeValue; + + @Path("/language") + private Language language; + + @Path("/expiry_time|value") + private TemporalAccessor expiryTimeValue; + + public void setPartialDateValue(Temporal partialDateValue) { + this.partialDateValue = partialDateValue; + } + + public Temporal getPartialDateValue() { + return this.partialDateValue ; + } + + public void setPartialDatetimeValue(TemporalAccessor partialDatetimeValue) { + this.partialDatetimeValue = partialDatetimeValue; + } + + public TemporalAccessor getPartialDatetimeValue() { + return this.partialDatetimeValue ; + } + + public void setTiming(DvParsable timing) { + this.timing = timing; + } + + public DvParsable getTiming() { + return this.timing ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setNarrativeValue(String narrativeValue) { + this.narrativeValue = narrativeValue; + } + + public String getNarrativeValue() { + return this.narrativeValue ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setExpiryTimeValue(TemporalAccessor expiryTimeValue) { + this.expiryTimeValue = expiryTimeValue; + } + + public TemporalAccessor getExpiryTimeValue() { + return this.expiryTimeValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java new file mode 100644 index 000000000..055f8f3b2 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java @@ -0,0 +1,37 @@ +package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; + +import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.Temporal; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class TestAllTypesInstructionContainment extends Containment { + public SelectAqlField TEST_ALL_TYPES_INSTRUCTION = new AqlFieldImp(TestAllTypesInstruction.class, "", "TestAllTypesInstruction", TestAllTypesInstruction.class, this); + + public SelectAqlField PARTIAL_DATE_VALUE = new AqlFieldImp(TestAllTypesInstruction.class, "/activities[at0001]/description[at0002]/items[at0003]/value|value", "partialDateValue", Temporal.class, this); + + public SelectAqlField PARTIAL_DATETIME_VALUE = new AqlFieldImp(TestAllTypesInstruction.class, "/activities[at0001]/description[at0002]/items[at0004]/value|value", "partialDatetimeValue", TemporalAccessor.class, this); + + public SelectAqlField TIMING = new AqlFieldImp(TestAllTypesInstruction.class, "/activities[at0001]/timing", "timing", DvParsable.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(TestAllTypesInstruction.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField NARRATIVE_VALUE = new AqlFieldImp(TestAllTypesInstruction.class, "/narrative|value", "narrativeValue", String.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesInstruction.class, "/language", "language", Language.class, this); + + public SelectAqlField EXPIRY_TIME_VALUE = new AqlFieldImp(TestAllTypesInstruction.class, "/expiry_time|value", "expiryTimeValue", TemporalAccessor.class, this); + + private TestAllTypesInstructionContainment() { + super("openEHR-EHR-INSTRUCTION.test_all_types.v1"); + } + + public static TestAllTypesInstructionContainment getInstance() { + return new TestAllTypesInstructionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java new file mode 100644 index 000000000..e4751888a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java @@ -0,0 +1,255 @@ +package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; + +import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.datavalues.DvIdentifier; +import com.nedap.archie.rm.datavalues.encapsulated.DvMultimedia; +import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; +import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; +import com.nedap.archie.rm.datavalues.quantity.DvProportion; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Boolean; +import java.lang.Double; +import java.lang.Long; +import java.lang.String; +import java.time.temporal.Temporal; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.test_all_types.v1") +public class TestAllTypesObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value") + private String textValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|defining_code") + private CodePhrase codedTextDefiningCode; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value|defining_code") + private CodePhrase codedTextTerminologyDefiningCode; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|magnitude") + private Double quantityMagnitude; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|units") + private String quantityUnits; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|magnitude") + private Long countMagnitude; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0009]/value|value") + private Temporal dateValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0010]/value|value") + private TemporalAccessor datetimeValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|value") + private TemporalAccessor datetimeAnyValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0012]/value|value") + private TemporalAccessor arbolTimeValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0013]/value") + private DvOrdinal ordinal; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0017]/value|value") + private Boolean booleanValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0018]/value|value") + private TemporalAmount durationAnyValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0019]/value") + private DvMultimedia multimediaAny; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0020]/value") + private DvParsable parsableAny; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0021]/value") + private DvIdentifier identifier; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/value") + private DvProportion proportionAny; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor cualquierEventoTimeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setTextValue(String textValue) { + this.textValue = textValue; + } + + public String getTextValue() { + return this.textValue ; + } + + public void setCodedTextDefiningCode(CodePhrase codedTextDefiningCode) { + this.codedTextDefiningCode = codedTextDefiningCode; + } + + public CodePhrase getCodedTextDefiningCode() { + return this.codedTextDefiningCode ; + } + + public void setCodedTextTerminologyDefiningCode(CodePhrase codedTextTerminologyDefiningCode) { + this.codedTextTerminologyDefiningCode = codedTextTerminologyDefiningCode; + } + + public CodePhrase getCodedTextTerminologyDefiningCode() { + return this.codedTextTerminologyDefiningCode ; + } + + public void setQuantityMagnitude(Double quantityMagnitude) { + this.quantityMagnitude = quantityMagnitude; + } + + public Double getQuantityMagnitude() { + return this.quantityMagnitude ; + } + + public void setQuantityUnits(String quantityUnits) { + this.quantityUnits = quantityUnits; + } + + public String getQuantityUnits() { + return this.quantityUnits ; + } + + public void setCountMagnitude(Long countMagnitude) { + this.countMagnitude = countMagnitude; + } + + public Long getCountMagnitude() { + return this.countMagnitude ; + } + + public void setDateValue(Temporal dateValue) { + this.dateValue = dateValue; + } + + public Temporal getDateValue() { + return this.dateValue ; + } + + public void setDatetimeValue(TemporalAccessor datetimeValue) { + this.datetimeValue = datetimeValue; + } + + public TemporalAccessor getDatetimeValue() { + return this.datetimeValue ; + } + + public void setDatetimeAnyValue(TemporalAccessor datetimeAnyValue) { + this.datetimeAnyValue = datetimeAnyValue; + } + + public TemporalAccessor getDatetimeAnyValue() { + return this.datetimeAnyValue ; + } + + public void setArbolTimeValue(TemporalAccessor arbolTimeValue) { + this.arbolTimeValue = arbolTimeValue; + } + + public TemporalAccessor getArbolTimeValue() { + return this.arbolTimeValue ; + } + + public void setOrdinal(DvOrdinal ordinal) { + this.ordinal = ordinal; + } + + public DvOrdinal getOrdinal() { + return this.ordinal ; + } + + public void setBooleanValue(Boolean booleanValue) { + this.booleanValue = booleanValue; + } + + public Boolean isBooleanValue() { + return this.booleanValue ; + } + + public void setDurationAnyValue(TemporalAmount durationAnyValue) { + this.durationAnyValue = durationAnyValue; + } + + public TemporalAmount getDurationAnyValue() { + return this.durationAnyValue ; + } + + public void setMultimediaAny(DvMultimedia multimediaAny) { + this.multimediaAny = multimediaAny; + } + + public DvMultimedia getMultimediaAny() { + return this.multimediaAny ; + } + + public void setParsableAny(DvParsable parsableAny) { + this.parsableAny = parsableAny; + } + + public DvParsable getParsableAny() { + return this.parsableAny ; + } + + public void setIdentifier(DvIdentifier identifier) { + this.identifier = identifier; + } + + public DvIdentifier getIdentifier() { + return this.identifier ; + } + + public void setProportionAny(DvProportion proportionAny) { + this.proportionAny = proportionAny; + } + + public DvProportion getProportionAny() { + return this.proportionAny ; + } + + public void setCualquierEventoTimeValue(TemporalAccessor cualquierEventoTimeValue) { + this.cualquierEventoTimeValue = cualquierEventoTimeValue; + } + + public TemporalAccessor getCualquierEventoTimeValue() { + return this.cualquierEventoTimeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java new file mode 100644 index 000000000..96cf0c114 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java @@ -0,0 +1,74 @@ +package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; + +import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.datavalues.DvIdentifier; +import com.nedap.archie.rm.datavalues.encapsulated.DvMultimedia; +import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; +import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; +import com.nedap.archie.rm.datavalues.quantity.DvProportion; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Boolean; +import java.lang.Double; +import java.lang.Long; +import java.lang.String; +import java.time.temporal.Temporal; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class TestAllTypesObservationContainment extends Containment { + public SelectAqlField TEST_ALL_TYPES_OBSERVATION = new AqlFieldImp(TestAllTypesObservation.class, "", "TestAllTypesObservation", TestAllTypesObservation.class, this); + + public SelectAqlField TEXT_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value", "textValue", String.class, this); + + public SelectAqlField CODED_TEXT_DEFINING_CODE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|defining_code", "codedTextDefiningCode", CodePhrase.class, this); + + public SelectAqlField CODED_TEXT_TERMINOLOGY_DEFINING_CODE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value|defining_code", "codedTextTerminologyDefiningCode", CodePhrase.class, this); + + public SelectAqlField QUANTITY_MAGNITUDE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|magnitude", "quantityMagnitude", Double.class, this); + + public SelectAqlField QUANTITY_UNITS = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|units", "quantityUnits", String.class, this); + + public SelectAqlField COUNT_MAGNITUDE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|magnitude", "countMagnitude", Long.class, this); + + public SelectAqlField DATE_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0009]/value|value", "dateValue", Temporal.class, this); + + public SelectAqlField DATETIME_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0010]/value|value", "datetimeValue", TemporalAccessor.class, this); + + public SelectAqlField DATETIME_ANY_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|value", "datetimeAnyValue", TemporalAccessor.class, this); + + public SelectAqlField ARBOL_TIME_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0012]/value|value", "arbolTimeValue", TemporalAccessor.class, this); + + public SelectAqlField ORDINAL = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0013]/value", "ordinal", DvOrdinal.class, this); + + public SelectAqlField BOOLEAN_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0017]/value|value", "booleanValue", Boolean.class, this); + + public SelectAqlField DURATION_ANY_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0018]/value|value", "durationAnyValue", TemporalAmount.class, this); + + public SelectAqlField MULTIMEDIA_ANY = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0019]/value", "multimediaAny", DvMultimedia.class, this); + + public SelectAqlField PARSABLE_ANY = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0020]/value", "parsableAny", DvParsable.class, this); + + public SelectAqlField IDENTIFIER = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0021]/value", "identifier", DvIdentifier.class, this); + + public SelectAqlField PROPORTION_ANY = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/value", "proportionAny", DvProportion.class, this); + + public SelectAqlField CUALQUIER_EVENTO_TIME_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/time|value", "cualquierEventoTimeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(TestAllTypesObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesObservation.class, "/language", "language", Language.class, this); + + private TestAllTypesObservationContainment() { + super("openEHR-EHR-OBSERVATION.test_all_types.v1"); + } + + public static TestAllTypesObservationContainment getInstance() { + return new TestAllTypesObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java new file mode 100644 index 000000000..abea012f5 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; + +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-SECTION.test_all_types.v1") +public class TestAllTypesSection { + @Path("/items[at0001]/items[at0002]/items[openEHR-EHR-INSTRUCTION.test_all_types.v1]") + private List section3TestAllTypes; + + @Path("/items[at0001]/items[at0002]/items[openEHR-EHR-ACTION.test_all_types.v1]") + private List section3TestAllTypes2; + + @Path("/items[at0001]/items[openEHR-EHR-ADMIN_ENTRY.test_all_types.v1]") + private List section2TestAllTypes; + + public void setSection3TestAllTypes(List section3TestAllTypes) { + this.section3TestAllTypes = section3TestAllTypes; + } + + public List getSection3TestAllTypes() { + return this.section3TestAllTypes ; + } + + public void setSection3TestAllTypes2(List section3TestAllTypes2) { + this.section3TestAllTypes2 = section3TestAllTypes2; + } + + public List getSection3TestAllTypes2() { + return this.section3TestAllTypes2 ; + } + + public void setSection2TestAllTypes(List section2TestAllTypes) { + this.section2TestAllTypes = section2TestAllTypes; + } + + public List getSection2TestAllTypes() { + return this.section2TestAllTypes ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSectionContainment.java new file mode 100644 index 000000000..7bedd1cf3 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSectionContainment.java @@ -0,0 +1,25 @@ +package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class TestAllTypesSectionContainment extends Containment { + public SelectAqlField TEST_ALL_TYPES_SECTION = new AqlFieldImp(TestAllTypesSection.class, "", "TestAllTypesSection", TestAllTypesSection.class, this); + + public ListSelectAqlField SECTION3_TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesSection.class, "/items[at0001]/items[at0002]/items[openEHR-EHR-INSTRUCTION.test_all_types.v1]", "section3TestAllTypes", TestAllTypesInstruction.class, this); + + public ListSelectAqlField SECTION3_TEST_ALL_TYPES2 = new ListAqlFieldImp(TestAllTypesSection.class, "/items[at0001]/items[at0002]/items[openEHR-EHR-ACTION.test_all_types.v1]", "section3TestAllTypes2", TestAllTypesAction.class, this); + + public ListSelectAqlField SECTION2_TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesSection.class, "/items[at0001]/items[openEHR-EHR-ADMIN_ENTRY.test_all_types.v1]", "section2TestAllTypes", TestAllTypesAdminEntry.class, this); + + private TestAllTypesSectionContainment() { + super("openEHR-EHR-SECTION.test_all_types.v1"); + } + + public static TestAllTypesSectionContainment getInstance() { + return new TestAllTypesSectionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java new file mode 100644 index 000000000..273136c2f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java @@ -0,0 +1,202 @@ +package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +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 org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Id; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.annotations.Template; +import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.BefundObservation; +import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.FallidentifikationCluster; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; +import org.ehrbase.client.openehrclient.VersionUid; + +@Entity +@Archetype("openEHR-EHR-COMPOSITION.report-result.v1") +@Template("Virologischer Befund") +public class VirologischerBefundComposition { + @Path("/context/other_context[at0001]/items[at0002]/value|value") + private String berichtIdValue; + + @Path("/context/other_context[at0001]/items[at0005]/value|value") + private String statusValue; + + @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]") + private FallidentifikationCluster fallidentifikation; + + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; + + @Path("/context/participations") + private List participations; + + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + @Path("/context/location") + private String location; + + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; + + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; + + @Path("/content[openEHR-EHR-OBSERVATION.laboratory_test_result.v1 and name/value='Befund']") + private BefundObservation befund; + + @Path("/composer") + private PartyProxy composer; + + @Path("/language") + private Language language; + + @Path("/feeder_audit") + private FeederAudit feederAudit; + + @Path("/category|defining_code") + private Category categoryDefiningCode; + + @Path("/territory") + private Territory territory; + + @Id + private VersionUid versionUid; + + public void setBerichtIdValue(String berichtIdValue) { + this.berichtIdValue = berichtIdValue; + } + + public String getBerichtIdValue() { + return this.berichtIdValue ; + } + + public void setStatusValue(String statusValue) { + this.statusValue = statusValue; + } + + public String getStatusValue() { + return this.statusValue ; + } + + public void setFallidentifikation(FallidentifikationCluster fallidentifikation) { + this.fallidentifikation = fallidentifikation; + } + + public FallidentifikationCluster getFallidentifikation() { + return this.fallidentifikation ; + } + + 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 setBefund(BefundObservation befund) { + this.befund = befund; + } + + public BefundObservation getBefund() { + return this.befund ; + } + + 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 setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } + + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } + + 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/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundCompositionContainment.java new file mode 100644 index 000000000..a49ff5a30 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundCompositionContainment.java @@ -0,0 +1,61 @@ +package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +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 org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.BefundObservation; +import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.FallidentifikationCluster; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; + +public class VirologischerBefundCompositionContainment extends Containment { + public SelectAqlField VIROLOGISCHER_BEFUND_COMPOSITION = new AqlFieldImp(VirologischerBefundComposition.class, "", "VirologischerBefundComposition", VirologischerBefundComposition.class, this); + + public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(VirologischerBefundComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); + + public SelectAqlField STATUS_VALUE = new AqlFieldImp(VirologischerBefundComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "statusValue", String.class, this); + + public SelectAqlField FALLIDENTIFIKATION = new AqlFieldImp(VirologischerBefundComposition.class, "/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]", "fallidentifikation", FallidentifikationCluster.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(VirologischerBefundComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(VirologischerBefundComposition.class, "/context/participations", "participations", Participation.class, this); + + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(VirologischerBefundComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + + public SelectAqlField LOCATION = new AqlFieldImp(VirologischerBefundComposition.class, "/context/location", "location", String.class, this); + + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(VirologischerBefundComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(VirologischerBefundComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); + + public SelectAqlField BEFUND = new AqlFieldImp(VirologischerBefundComposition.class, "/content[openEHR-EHR-OBSERVATION.laboratory_test_result.v1]", "befund", BefundObservation.class, this); + + public SelectAqlField COMPOSER = new AqlFieldImp(VirologischerBefundComposition.class, "/composer", "composer", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(VirologischerBefundComposition.class, "/language", "language", Language.class, this); + + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(VirologischerBefundComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(VirologischerBefundComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); + + public SelectAqlField TERRITORY = new AqlFieldImp(VirologischerBefundComposition.class, "/territory", "territory", Territory.class, this); + + private VirologischerBefundCompositionContainment() { + super("openEHR-EHR-COMPOSITION.report-result.v1"); + } + + public static VirologischerBefundCompositionContainment getInstance() { + return new VirologischerBefundCompositionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java new file mode 100644 index 000000000..de73ea967 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java @@ -0,0 +1,45 @@ +package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.anatomical_location.v1") +public class AnatomischeLokalisationCluster { + @Path("/items[at0001]/value|value") + private String nameDerKorperstelleValue; + + @Path("/items[at0053]") + private List alternativeStruktur; + + @Path("/items[at0054]") + private List multimedialeDarstellung; + + public void setNameDerKorperstelleValue(String nameDerKorperstelleValue) { + this.nameDerKorperstelleValue = nameDerKorperstelleValue; + } + + public String getNameDerKorperstelleValue() { + return this.nameDerKorperstelleValue ; + } + + public void setAlternativeStruktur(List alternativeStruktur) { + this.alternativeStruktur = alternativeStruktur; + } + + public List getAlternativeStruktur() { + return this.alternativeStruktur ; + } + + public void setMultimedialeDarstellung(List multimedialeDarstellung) { + this.multimedialeDarstellung = multimedialeDarstellung; + } + + public List getMultimedialeDarstellung() { + return this.multimedialeDarstellung ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationClusterContainment.java new file mode 100644 index 000000000..346c112b8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationClusterContainment.java @@ -0,0 +1,27 @@ +package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class AnatomischeLokalisationClusterContainment extends Containment { + public SelectAqlField ANATOMISCHE_LOKALISATION_CLUSTER = new AqlFieldImp(AnatomischeLokalisationCluster.class, "", "AnatomischeLokalisationCluster", AnatomischeLokalisationCluster.class, this); + + public SelectAqlField NAME_DER_KORPERSTELLE_VALUE = new AqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0001]/value|value", "nameDerKorperstelleValue", String.class, this); + + public ListSelectAqlField ALTERNATIVE_STRUKTUR = new ListAqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0053]", "alternativeStruktur", Cluster.class, this); + + public ListSelectAqlField MULTIMEDIALE_DARSTELLUNG = new ListAqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0054]", "multimedialeDarstellung", Cluster.class, this); + + private AnatomischeLokalisationClusterContainment() { + super("openEHR-EHR-CLUSTER.anatomical_location.v1"); + } + + public static AnatomischeLokalisationClusterContainment getInstance() { + return new AnatomischeLokalisationClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java new file mode 100644 index 000000000..b37f2e586 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java @@ -0,0 +1,19 @@ +package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class BefundAnforderungElement { + @Path("/value|value") + private String value; + + public void setValue(String value) { + this.value = value; + } + + public String getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java new file mode 100644 index 000000000..4e0044e03 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java @@ -0,0 +1,216 @@ +package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.DvIdentifier; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.laboratory_test_result.v1") +public class BefundObservation { + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value") + private String labortestBezeichnungValue; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.specimen.v1]") + private List probe; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_panel.v0 and name/value='Kultur']") + private List kultur; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0122]") + private List strukturierteTestdiagnostik; + + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0118]") + private List multimediaDarstellung; + + @Path("/data[at0001]/events[at0002]/state[at0112]/items[at0114]") + private List strukturierteErfassungDerStorfaktoren; + + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + @Path("/protocol[at0004]/items[openEHR-EHR-CLUSTER.location.v1 and name/value='Empfängerstandort']") + private EmpfangerstandortCluster empfangerstandort; + + @Path("/protocol[at0004]/items[at0094]/items[at0106 and name/value='Anforderung']") + private List anforderung; + + @Path("/protocol[at0004]/items[at0094]/items[at0062]/value") + private DvIdentifier auftragsIdDesAnforderndenEinsendendenSystems; + + @Path("/protocol[at0004]/items[at0094]/items[at0063]/value") + private DvIdentifier auftragsIdEmpfanger; + + @Path("/protocol[at0004]/items[at0094]/items[openEHR-EHR-CLUSTER.location.v1 and name/value='Einsenderstandort']") + private EinsenderstandortCluster einsenderstandort; + + @Path("/protocol[at0004]/items[at0094]/items[at0035]") + private List verteilerliste; + + @Path("/protocol[at0004]/items[at0110]") + private List testDetails; + + @Path("/protocol[at0004]/items[at0117]") + private List erweiterung; + + @Path("/subject") + private PartyProxy subject; + + @Path("/language") + private Language language; + + public void setLabortestBezeichnungValue(String labortestBezeichnungValue) { + this.labortestBezeichnungValue = labortestBezeichnungValue; + } + + public String getLabortestBezeichnungValue() { + return this.labortestBezeichnungValue ; + } + + public void setProbe(List probe) { + this.probe = probe; + } + + public List getProbe() { + return this.probe ; + } + + public void setKultur(List kultur) { + this.kultur = kultur; + } + + public List getKultur() { + return this.kultur ; + } + + public void setStrukturierteTestdiagnostik(List strukturierteTestdiagnostik) { + this.strukturierteTestdiagnostik = strukturierteTestdiagnostik; + } + + public List getStrukturierteTestdiagnostik() { + return this.strukturierteTestdiagnostik ; + } + + public void setMultimediaDarstellung(List multimediaDarstellung) { + this.multimediaDarstellung = multimediaDarstellung; + } + + public List getMultimediaDarstellung() { + return this.multimediaDarstellung ; + } + + public void setStrukturierteErfassungDerStorfaktoren( + List strukturierteErfassungDerStorfaktoren) { + this.strukturierteErfassungDerStorfaktoren = strukturierteErfassungDerStorfaktoren; + } + + public List getStrukturierteErfassungDerStorfaktoren() { + return this.strukturierteErfassungDerStorfaktoren ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setEmpfangerstandort(EmpfangerstandortCluster empfangerstandort) { + this.empfangerstandort = empfangerstandort; + } + + public EmpfangerstandortCluster getEmpfangerstandort() { + return this.empfangerstandort ; + } + + public void setAnforderung(List anforderung) { + this.anforderung = anforderung; + } + + public List getAnforderung() { + return this.anforderung ; + } + + public void setAuftragsIdDesAnforderndenEinsendendenSystems( + DvIdentifier auftragsIdDesAnforderndenEinsendendenSystems) { + this.auftragsIdDesAnforderndenEinsendendenSystems = auftragsIdDesAnforderndenEinsendendenSystems; + } + + public DvIdentifier getAuftragsIdDesAnforderndenEinsendendenSystems() { + return this.auftragsIdDesAnforderndenEinsendendenSystems ; + } + + public void setAuftragsIdEmpfanger(DvIdentifier auftragsIdEmpfanger) { + this.auftragsIdEmpfanger = auftragsIdEmpfanger; + } + + public DvIdentifier getAuftragsIdEmpfanger() { + return this.auftragsIdEmpfanger ; + } + + public void setEinsenderstandort(EinsenderstandortCluster einsenderstandort) { + this.einsenderstandort = einsenderstandort; + } + + public EinsenderstandortCluster getEinsenderstandort() { + return this.einsenderstandort ; + } + + public void setVerteilerliste(List verteilerliste) { + this.verteilerliste = verteilerliste; + } + + public List getVerteilerliste() { + return this.verteilerliste ; + } + + public void setTestDetails(List testDetails) { + this.testDetails = testDetails; + } + + public List getTestDetails() { + return this.testDetails ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservationContainment.java new file mode 100644 index 000000000..5aa5a3f8f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservationContainment.java @@ -0,0 +1,61 @@ +package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.DvIdentifier; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class BefundObservationContainment extends Containment { + public SelectAqlField BEFUND_OBSERVATION = new AqlFieldImp(BefundObservation.class, "", "BefundObservation", BefundObservation.class, this); + + public SelectAqlField LABORTEST_BEZEICHNUNG_VALUE = new AqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value", "labortestBezeichnungValue", String.class, this); + + public ListSelectAqlField PROBE = new ListAqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.specimen.v1]", "probe", ProbeCluster.class, this); + + public ListSelectAqlField KULTUR = new ListAqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_panel.v0]", "kultur", KulturCluster.class, this); + + public ListSelectAqlField STRUKTURIERTE_TESTDIAGNOSTIK = new ListAqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0122]", "strukturierteTestdiagnostik", Cluster.class, this); + + public ListSelectAqlField MULTIMEDIA_DARSTELLUNG = new ListAqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0118]", "multimediaDarstellung", Cluster.class, this); + + public ListSelectAqlField STRUKTURIERTE_ERFASSUNG_DER_STORFAKTOREN = new ListAqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/state[at0112]/items[at0114]", "strukturierteErfassungDerStorfaktoren", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(BefundObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(BefundObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public SelectAqlField EMPFANGERSTANDORT = new AqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[openEHR-EHR-CLUSTER.location.v1]", "empfangerstandort", EmpfangerstandortCluster.class, this); + + public ListSelectAqlField ANFORDERUNG = new ListAqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0094]/items[at0106]", "anforderung", BefundAnforderungElement.class, this); + + public SelectAqlField AUFTRAGS_ID_DES_ANFORDERNDEN_EINSENDENDEN_SYSTEMS = new AqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0094]/items[at0062]/value", "auftragsIdDesAnforderndenEinsendendenSystems", DvIdentifier.class, this); + + public SelectAqlField AUFTRAGS_ID_EMPFANGER = new AqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0094]/items[at0063]/value", "auftragsIdEmpfanger", DvIdentifier.class, this); + + public SelectAqlField EINSENDERSTANDORT = new AqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0094]/items[openEHR-EHR-CLUSTER.location.v1]", "einsenderstandort", EinsenderstandortCluster.class, this); + + public ListSelectAqlField VERTEILERLISTE = new ListAqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0094]/items[at0035]", "verteilerliste", Cluster.class, this); + + public ListSelectAqlField TEST_DETAILS = new ListAqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0110]", "testDetails", Cluster.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(BefundObservation.class, "/protocol[at0004]/items[at0117]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(BefundObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(BefundObservation.class, "/language", "language", Language.class, this); + + private BefundObservationContainment() { + super("openEHR-EHR-OBSERVATION.laboratory_test_result.v1"); + } + + public static BefundObservationContainment getInstance() { + return new BefundObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java new file mode 100644 index 000000000..43e628658 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java @@ -0,0 +1,56 @@ +package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.location.v1") +public class EinsenderstandortCluster { + @Path("/items[at0040]/value|value") + private String standorttypValue; + + @Path("/items[at0046]/value|value") + private String standortbeschreibungValue; + + @Path("/items[at0048]/value|value") + private String standortschlusselValue; + + @Path("/items[at0047]") + private List details; + + public void setStandorttypValue(String standorttypValue) { + this.standorttypValue = standorttypValue; + } + + public String getStandorttypValue() { + return this.standorttypValue ; + } + + public void setStandortbeschreibungValue(String standortbeschreibungValue) { + this.standortbeschreibungValue = standortbeschreibungValue; + } + + public String getStandortbeschreibungValue() { + return this.standortbeschreibungValue ; + } + + public void setStandortschlusselValue(String standortschlusselValue) { + this.standortschlusselValue = standortschlusselValue; + } + + public String getStandortschlusselValue() { + return this.standortschlusselValue ; + } + + public void setDetails(List details) { + this.details = details; + } + + public List getDetails() { + return this.details ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortClusterContainment.java new file mode 100644 index 000000000..febd0e937 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortClusterContainment.java @@ -0,0 +1,29 @@ +package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class EinsenderstandortClusterContainment extends Containment { + public SelectAqlField EINSENDERSTANDORT_CLUSTER = new AqlFieldImp(EinsenderstandortCluster.class, "", "EinsenderstandortCluster", EinsenderstandortCluster.class, this); + + public SelectAqlField STANDORTTYP_VALUE = new AqlFieldImp(EinsenderstandortCluster.class, "/items[at0040]/value|value", "standorttypValue", String.class, this); + + public SelectAqlField STANDORTBESCHREIBUNG_VALUE = new AqlFieldImp(EinsenderstandortCluster.class, "/items[at0046]/value|value", "standortbeschreibungValue", String.class, this); + + public SelectAqlField STANDORTSCHLUSSEL_VALUE = new AqlFieldImp(EinsenderstandortCluster.class, "/items[at0048]/value|value", "standortschlusselValue", String.class, this); + + public ListSelectAqlField DETAILS = new ListAqlFieldImp(EinsenderstandortCluster.class, "/items[at0047]", "details", Cluster.class, this); + + private EinsenderstandortClusterContainment() { + super("openEHR-EHR-CLUSTER.location.v1"); + } + + public static EinsenderstandortClusterContainment getInstance() { + return new EinsenderstandortClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java new file mode 100644 index 000000000..72ebb9d5c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java @@ -0,0 +1,56 @@ +package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.location.v1") +public class EmpfangerstandortCluster { + @Path("/items[at0040]/value|value") + private String standorttypValue; + + @Path("/items[at0046]/value|value") + private String standortbeschreibungValue; + + @Path("/items[at0048]/value|value") + private String standortschlusselValue; + + @Path("/items[at0047]") + private List details; + + public void setStandorttypValue(String standorttypValue) { + this.standorttypValue = standorttypValue; + } + + public String getStandorttypValue() { + return this.standorttypValue ; + } + + public void setStandortbeschreibungValue(String standortbeschreibungValue) { + this.standortbeschreibungValue = standortbeschreibungValue; + } + + public String getStandortbeschreibungValue() { + return this.standortbeschreibungValue ; + } + + public void setStandortschlusselValue(String standortschlusselValue) { + this.standortschlusselValue = standortschlusselValue; + } + + public String getStandortschlusselValue() { + return this.standortschlusselValue ; + } + + public void setDetails(List details) { + this.details = details; + } + + public List getDetails() { + return this.details ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortClusterContainment.java new file mode 100644 index 000000000..112508ffd --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortClusterContainment.java @@ -0,0 +1,29 @@ +package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class EmpfangerstandortClusterContainment extends Containment { + public SelectAqlField EMPFANGERSTANDORT_CLUSTER = new AqlFieldImp(EmpfangerstandortCluster.class, "", "EmpfangerstandortCluster", EmpfangerstandortCluster.class, this); + + public SelectAqlField STANDORTTYP_VALUE = new AqlFieldImp(EmpfangerstandortCluster.class, "/items[at0040]/value|value", "standorttypValue", String.class, this); + + public SelectAqlField STANDORTBESCHREIBUNG_VALUE = new AqlFieldImp(EmpfangerstandortCluster.class, "/items[at0046]/value|value", "standortbeschreibungValue", String.class, this); + + public SelectAqlField STANDORTSCHLUSSEL_VALUE = new AqlFieldImp(EmpfangerstandortCluster.class, "/items[at0048]/value|value", "standortschlusselValue", String.class, this); + + public ListSelectAqlField DETAILS = new ListAqlFieldImp(EmpfangerstandortCluster.class, "/items[at0047]", "details", Cluster.class, this); + + private EmpfangerstandortClusterContainment() { + super("openEHR-EHR-CLUSTER.location.v1"); + } + + public static EmpfangerstandortClusterContainment getInstance() { + return new EmpfangerstandortClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java new file mode 100644 index 000000000..6fefa5270 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.case_identification.v0") +public class FallidentifikationCluster { + @Path("/items[at0001]/value|value") + private String fallKennungValue; + + public void setFallKennungValue(String fallKennungValue) { + this.fallKennungValue = fallKennungValue; + } + + public String getFallKennungValue() { + return this.fallKennungValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationClusterContainment.java new file mode 100644 index 000000000..a34b7a70c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationClusterContainment.java @@ -0,0 +1,20 @@ +package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; + +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class FallidentifikationClusterContainment extends Containment { + public SelectAqlField FALLIDENTIFIKATION_CLUSTER = new AqlFieldImp(FallidentifikationCluster.class, "", "FallidentifikationCluster", FallidentifikationCluster.class, this); + + public SelectAqlField FALL_KENNUNG_VALUE = new AqlFieldImp(FallidentifikationCluster.class, "/items[at0001]/value|value", "fallKennungValue", String.class, this); + + private FallidentifikationClusterContainment() { + super("openEHR-EHR-CLUSTER.case_identification.v0"); + } + + public static FallidentifikationClusterContainment getInstance() { + return new FallidentifikationClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java new file mode 100644 index 000000000..d0d355f8f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; + +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.laboratory_test_panel.v0") +public class KulturCluster { + @Path("/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Pro Virus']") + private List proVirus; + + public void setProVirus(List proVirus) { + this.proVirus = proVirus; + } + + public List getProVirus() { + return this.proVirus ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturClusterContainment.java new file mode 100644 index 000000000..54b358bc0 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturClusterContainment.java @@ -0,0 +1,21 @@ +package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class KulturClusterContainment extends Containment { + public SelectAqlField KULTUR_CLUSTER = new AqlFieldImp(KulturCluster.class, "", "KulturCluster", KulturCluster.class, this); + + public ListSelectAqlField PRO_VIRUS = new ListAqlFieldImp(KulturCluster.class, "/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]", "proVirus", ProVirusCluster.class, this); + + private KulturClusterContainment() { + super("openEHR-EHR-CLUSTER.laboratory_test_panel.v0"); + } + + public static KulturClusterContainment getInstance() { + return new KulturClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java new file mode 100644 index 000000000..1f0903984 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java @@ -0,0 +1,103 @@ +package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.DvIdentifier; +import java.lang.Double; +import java.lang.Long; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") +public class ProVirusCluster { + @Path("/items[at0027]/value|magnitude") + private Long analyseergebnisReihenfolgeMagnitude; + + @Path("/items[at0024 and name/value='Virus']/value|value") + private String virusValue; + + @Path("/items[at0001 and name/value='Nachweis']/value|value") + private String nachweisValue; + + @Path("/items[at0001 and name/value='Viruslast (ct-Wert)']/value|magnitude") + private Double viruslastCtWertMagnitude; + + @Path("/items[at0001 and name/value='Viruslast (ct-Wert)']/value|units") + private String viruslastCtWertUnits; + + @Path("/items[at0014]") + private List analyseergebnisDetails; + + @Path("/items[at0026 and name/value='Zugehörige Laborprobe']/value") + private DvIdentifier zugehorigeLaborprobe; + + @Path("/items[at0003]/value|value") + private String kommentarValue; + + public void setAnalyseergebnisReihenfolgeMagnitude(Long analyseergebnisReihenfolgeMagnitude) { + this.analyseergebnisReihenfolgeMagnitude = analyseergebnisReihenfolgeMagnitude; + } + + public Long getAnalyseergebnisReihenfolgeMagnitude() { + return this.analyseergebnisReihenfolgeMagnitude ; + } + + public void setVirusValue(String virusValue) { + this.virusValue = virusValue; + } + + public String getVirusValue() { + return this.virusValue ; + } + + public void setNachweisValue(String nachweisValue) { + this.nachweisValue = nachweisValue; + } + + public String getNachweisValue() { + return this.nachweisValue ; + } + + public void setViruslastCtWertMagnitude(Double viruslastCtWertMagnitude) { + this.viruslastCtWertMagnitude = viruslastCtWertMagnitude; + } + + public Double getViruslastCtWertMagnitude() { + return this.viruslastCtWertMagnitude ; + } + + public void setViruslastCtWertUnits(String viruslastCtWertUnits) { + this.viruslastCtWertUnits = viruslastCtWertUnits; + } + + public String getViruslastCtWertUnits() { + return this.viruslastCtWertUnits ; + } + + public void setAnalyseergebnisDetails(List analyseergebnisDetails) { + this.analyseergebnisDetails = analyseergebnisDetails; + } + + public List getAnalyseergebnisDetails() { + return this.analyseergebnisDetails ; + } + + public void setZugehorigeLaborprobe(DvIdentifier zugehorigeLaborprobe) { + this.zugehorigeLaborprobe = zugehorigeLaborprobe; + } + + public DvIdentifier getZugehorigeLaborprobe() { + return this.zugehorigeLaborprobe ; + } + + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } + + public String getKommentarValue() { + return this.kommentarValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusClusterContainment.java new file mode 100644 index 000000000..d9c4b1f9b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusClusterContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.DvIdentifier; +import java.lang.Double; +import java.lang.Long; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class ProVirusClusterContainment extends Containment { + public SelectAqlField PRO_VIRUS_CLUSTER = new AqlFieldImp(ProVirusCluster.class, "", "ProVirusCluster", ProVirusCluster.class, this); + + public SelectAqlField ANALYSEERGEBNIS_REIHENFOLGE_MAGNITUDE = new AqlFieldImp(ProVirusCluster.class, "/items[at0027]/value|magnitude", "analyseergebnisReihenfolgeMagnitude", Long.class, this); + + public SelectAqlField VIRUS_VALUE = new AqlFieldImp(ProVirusCluster.class, "/items[at0024]/value|value", "virusValue", String.class, this); + + public SelectAqlField NACHWEIS_VALUE = new AqlFieldImp(ProVirusCluster.class, "/items[at0001]/value|value", "nachweisValue", String.class, this); + + public SelectAqlField VIRUSLAST_CT_WERT_MAGNITUDE = new AqlFieldImp(ProVirusCluster.class, "/items[at0001]/value|magnitude", "viruslastCtWertMagnitude", Double.class, this); + + public SelectAqlField VIRUSLAST_CT_WERT_UNITS = new AqlFieldImp(ProVirusCluster.class, "/items[at0001]/value|units", "viruslastCtWertUnits", String.class, this); + + public ListSelectAqlField ANALYSEERGEBNIS_DETAILS = new ListAqlFieldImp(ProVirusCluster.class, "/items[at0014]", "analyseergebnisDetails", Cluster.class, this); + + public SelectAqlField ZUGEHORIGE_LABORPROBE = new AqlFieldImp(ProVirusCluster.class, "/items[at0026]/value", "zugehorigeLaborprobe", DvIdentifier.class, this); + + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ProVirusCluster.class, "/items[at0003]/value|value", "kommentarValue", String.class, this); + + private ProVirusClusterContainment() { + super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); + } + + public static ProVirusClusterContainment getInstance() { + return new ProVirusClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java new file mode 100644 index 000000000..053662c81 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java @@ -0,0 +1,213 @@ +package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.DvIdentifier; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.specimen.v1") +public class ProbeCluster { + @Path("/items[at0029]/value|value") + private String probenartValue; + + @Path("/items[at0001]/value") + private DvIdentifier laborprobenidentifikator; + + @Path("/items[at0088]/value") + private DvIdentifier externerIdentifikator; + + @Path("/items[at0034]/value|value") + private TemporalAccessor zeitpunktDesProbeneingangsValue; + + @Path("/items[at0027]") + private List physischeEigenschaften; + + @Path("/items[at0079]/value|value") + private String kommentarDesProbennehmersValue; + + @Path("/items[at0087]/value|value") + private String probenentnahmestelleValue; + + @Path("/items[openEHR-EHR-CLUSTER.anatomical_location.v1]") + private AnatomischeLokalisationCluster anatomischeLokalisation; + + @Path("/items[at0015]/value|value") + private TemporalAccessor zeitpunktDerProbenentnahmeValue; + + @Path("/items[at0070]/value") + private DvIdentifier identifikatorDesProbennehmers; + + @Path("/items[at0071]") + private List angabenZumProbennehmer; + + @Path("/items[at0083]") + private List zusatzlicheAngabenZurProbennahme; + + @Path("/items[at0085]") + private List behalterDetails; + + @Path("/items[at0068]") + private List angabenZurVerarbeitung; + + @Path("/items[at0093]") + private List angabenZumTransport; + + @Path("/items[at0096]") + private List digitaleDarstellung; + + @Path("/items[at0003]/value") + private DvIdentifier identifikatorDerUbergeordnetenProbe; + + @Path("/items[at0045]/value|value") + private String kommentarValue; + + public void setProbenartValue(String probenartValue) { + this.probenartValue = probenartValue; + } + + public String getProbenartValue() { + return this.probenartValue ; + } + + public void setLaborprobenidentifikator(DvIdentifier laborprobenidentifikator) { + this.laborprobenidentifikator = laborprobenidentifikator; + } + + public DvIdentifier getLaborprobenidentifikator() { + return this.laborprobenidentifikator ; + } + + public void setExternerIdentifikator(DvIdentifier externerIdentifikator) { + this.externerIdentifikator = externerIdentifikator; + } + + public DvIdentifier getExternerIdentifikator() { + return this.externerIdentifikator ; + } + + public void setZeitpunktDesProbeneingangsValue(TemporalAccessor zeitpunktDesProbeneingangsValue) { + this.zeitpunktDesProbeneingangsValue = zeitpunktDesProbeneingangsValue; + } + + public TemporalAccessor getZeitpunktDesProbeneingangsValue() { + return this.zeitpunktDesProbeneingangsValue ; + } + + public void setPhysischeEigenschaften(List physischeEigenschaften) { + this.physischeEigenschaften = physischeEigenschaften; + } + + public List getPhysischeEigenschaften() { + return this.physischeEigenschaften ; + } + + public void setKommentarDesProbennehmersValue(String kommentarDesProbennehmersValue) { + this.kommentarDesProbennehmersValue = kommentarDesProbennehmersValue; + } + + public String getKommentarDesProbennehmersValue() { + return this.kommentarDesProbennehmersValue ; + } + + public void setProbenentnahmestelleValue(String probenentnahmestelleValue) { + this.probenentnahmestelleValue = probenentnahmestelleValue; + } + + public String getProbenentnahmestelleValue() { + return this.probenentnahmestelleValue ; + } + + public void setAnatomischeLokalisation(AnatomischeLokalisationCluster anatomischeLokalisation) { + this.anatomischeLokalisation = anatomischeLokalisation; + } + + public AnatomischeLokalisationCluster getAnatomischeLokalisation() { + return this.anatomischeLokalisation ; + } + + public void setZeitpunktDerProbenentnahmeValue(TemporalAccessor zeitpunktDerProbenentnahmeValue) { + this.zeitpunktDerProbenentnahmeValue = zeitpunktDerProbenentnahmeValue; + } + + public TemporalAccessor getZeitpunktDerProbenentnahmeValue() { + return this.zeitpunktDerProbenentnahmeValue ; + } + + public void setIdentifikatorDesProbennehmers(DvIdentifier identifikatorDesProbennehmers) { + this.identifikatorDesProbennehmers = identifikatorDesProbennehmers; + } + + public DvIdentifier getIdentifikatorDesProbennehmers() { + return this.identifikatorDesProbennehmers ; + } + + public void setAngabenZumProbennehmer(List angabenZumProbennehmer) { + this.angabenZumProbennehmer = angabenZumProbennehmer; + } + + public List getAngabenZumProbennehmer() { + return this.angabenZumProbennehmer ; + } + + public void setZusatzlicheAngabenZurProbennahme(List zusatzlicheAngabenZurProbennahme) { + this.zusatzlicheAngabenZurProbennahme = zusatzlicheAngabenZurProbennahme; + } + + public List getZusatzlicheAngabenZurProbennahme() { + return this.zusatzlicheAngabenZurProbennahme ; + } + + public void setBehalterDetails(List behalterDetails) { + this.behalterDetails = behalterDetails; + } + + public List getBehalterDetails() { + return this.behalterDetails ; + } + + public void setAngabenZurVerarbeitung(List angabenZurVerarbeitung) { + this.angabenZurVerarbeitung = angabenZurVerarbeitung; + } + + public List getAngabenZurVerarbeitung() { + return this.angabenZurVerarbeitung ; + } + + public void setAngabenZumTransport(List angabenZumTransport) { + this.angabenZumTransport = angabenZumTransport; + } + + public List getAngabenZumTransport() { + return this.angabenZumTransport ; + } + + public void setDigitaleDarstellung(List digitaleDarstellung) { + this.digitaleDarstellung = digitaleDarstellung; + } + + public List getDigitaleDarstellung() { + return this.digitaleDarstellung ; + } + + public void setIdentifikatorDerUbergeordnetenProbe( + DvIdentifier identifikatorDerUbergeordnetenProbe) { + this.identifikatorDerUbergeordnetenProbe = identifikatorDerUbergeordnetenProbe; + } + + public DvIdentifier getIdentifikatorDerUbergeordnetenProbe() { + return this.identifikatorDerUbergeordnetenProbe ; + } + + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } + + public String getKommentarValue() { + return this.kommentarValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeClusterContainment.java new file mode 100644 index 000000000..c8c87764e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeClusterContainment.java @@ -0,0 +1,59 @@ +package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.DvIdentifier; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class ProbeClusterContainment extends Containment { + public SelectAqlField PROBE_CLUSTER = new AqlFieldImp(ProbeCluster.class, "", "ProbeCluster", ProbeCluster.class, this); + + public SelectAqlField PROBENART_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0029]/value|value", "probenartValue", String.class, this); + + public SelectAqlField LABORPROBENIDENTIFIKATOR = new AqlFieldImp(ProbeCluster.class, "/items[at0001]/value", "laborprobenidentifikator", DvIdentifier.class, this); + + public SelectAqlField EXTERNER_IDENTIFIKATOR = new AqlFieldImp(ProbeCluster.class, "/items[at0088]/value", "externerIdentifikator", DvIdentifier.class, this); + + public SelectAqlField ZEITPUNKT_DES_PROBENEINGANGS_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0034]/value|value", "zeitpunktDesProbeneingangsValue", TemporalAccessor.class, this); + + public ListSelectAqlField PHYSISCHE_EIGENSCHAFTEN = new ListAqlFieldImp(ProbeCluster.class, "/items[at0027]", "physischeEigenschaften", Cluster.class, this); + + public SelectAqlField KOMMENTAR_DES_PROBENNEHMERS_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0079]/value|value", "kommentarDesProbennehmersValue", String.class, this); + + public SelectAqlField PROBENENTNAHMESTELLE_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0087]/value|value", "probenentnahmestelleValue", String.class, this); + + public SelectAqlField ANATOMISCHE_LOKALISATION = new AqlFieldImp(ProbeCluster.class, "/items[openEHR-EHR-CLUSTER.anatomical_location.v1]", "anatomischeLokalisation", AnatomischeLokalisationCluster.class, this); + + public SelectAqlField ZEITPUNKT_DER_PROBENENTNAHME_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0015]/value|value", "zeitpunktDerProbenentnahmeValue", TemporalAccessor.class, this); + + public SelectAqlField IDENTIFIKATOR_DES_PROBENNEHMERS = new AqlFieldImp(ProbeCluster.class, "/items[at0070]/value", "identifikatorDesProbennehmers", DvIdentifier.class, this); + + public ListSelectAqlField ANGABEN_ZUM_PROBENNEHMER = new ListAqlFieldImp(ProbeCluster.class, "/items[at0071]", "angabenZumProbennehmer", Cluster.class, this); + + public ListSelectAqlField ZUSATZLICHE_ANGABEN_ZUR_PROBENNAHME = new ListAqlFieldImp(ProbeCluster.class, "/items[at0083]", "zusatzlicheAngabenZurProbennahme", Cluster.class, this); + + public ListSelectAqlField BEHALTER_DETAILS = new ListAqlFieldImp(ProbeCluster.class, "/items[at0085]", "behalterDetails", Cluster.class, this); + + public ListSelectAqlField ANGABEN_ZUR_VERARBEITUNG = new ListAqlFieldImp(ProbeCluster.class, "/items[at0068]", "angabenZurVerarbeitung", Cluster.class, this); + + public ListSelectAqlField ANGABEN_ZUM_TRANSPORT = new ListAqlFieldImp(ProbeCluster.class, "/items[at0093]", "angabenZumTransport", Cluster.class, this); + + public ListSelectAqlField DIGITALE_DARSTELLUNG = new ListAqlFieldImp(ProbeCluster.class, "/items[at0096]", "digitaleDarstellung", Cluster.class, this); + + public SelectAqlField IDENTIFIKATOR_DER_UBERGEORDNETEN_PROBE = new AqlFieldImp(ProbeCluster.class, "/items[at0003]/value", "identifikatorDerUbergeordnetenProbe", DvIdentifier.class, this); + + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0045]/value|value", "kommentarValue", String.class, this); + + private ProbeClusterContainment() { + super("openEHR-EHR-CLUSTER.specimen.v1"); + } + + public static ProbeClusterContainment getInstance() { + return new ProbeClusterContainment(); + } +} From 1f855cad053c5f3ddb5d827ca31badc429033f9d Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Wed, 2 Dec 2020 11:10:21 +0100 Subject: [PATCH 23/54] fix handling of interval see https://github.com/ehrbase/project_management/issues/424 --- .../flattener/DtoFromCompositionWalker.java | 7 ++-- .../client/flattener/FlattenerTest.java | 1 - .../client/flattener/RoundTripTest.java | 4 +-- .../DefaultRestCompositionEndpointIT.java | 1 - .../classgenerator/ClassGeneratorTest.java | 2 +- .../serialisation/walker/RmBoolean.java | 35 +++++++++++++++++++ .../serialisation/walker/RmPrimitive.java | 25 +++++++++++++ .../serialisation/walker/RmString.java | 2 +- .../ehrbase/serialisation/walker/Walker.java | 13 ++++--- 9 files changed, 76 insertions(+), 14 deletions(-) create mode 100644 serialisation/src/main/java/org/ehrbase/serialisation/walker/RmBoolean.java create mode 100644 serialisation/src/main/java/org/ehrbase/serialisation/walker/RmPrimitive.java diff --git a/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java b/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java index af9c35025..0ade6ed02 100644 --- a/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java +++ b/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java @@ -35,6 +35,7 @@ import org.ehrbase.client.exception.ClientException; import org.ehrbase.serialisation.walker.Context; import org.ehrbase.serialisation.walker.FromCompositionWalker; +import org.ehrbase.serialisation.walker.RmPrimitive; import org.ehrbase.serialisation.walker.RmString; import org.ehrbase.util.exception.SdkException; import org.ehrbase.util.reflection.ReflectionHelper; @@ -158,8 +159,8 @@ private void writeField(Field field, Object dto, Object value) { .orElse(null); dtoList = enumValueSet; } - if (dtoList instanceof RmString){ - dtoList = ((RmString) dtoList).getValue(); + if (dtoList instanceof RmPrimitive){ + dtoList = ((RmPrimitive) dtoList).getValue(); } if (List.class.isAssignableFrom(field.getType())) { dtoList = propertyDescriptor.getReadMethod().invoke(dto); @@ -169,7 +170,7 @@ private void writeField(Field field, Object dto, Object value) { ((List) dtoList).add(value); } propertyDescriptor.getWriteMethod().invoke(dto, dtoList); - } catch (IllegalAccessException | InvocationTargetException | IntrospectionException e) { + } catch (IllegalAccessException | InvocationTargetException | IntrospectionException | IllegalArgumentException e) { throw new ClientException(e.getMessage(), e); } } diff --git a/client/src/test/java/org/ehrbase/client/flattener/FlattenerTest.java b/client/src/test/java/org/ehrbase/client/flattener/FlattenerTest.java index 125ee7df8..e49ccad53 100644 --- a/client/src/test/java/org/ehrbase/client/flattener/FlattenerTest.java +++ b/client/src/test/java/org/ehrbase/client/flattener/FlattenerTest.java @@ -182,7 +182,6 @@ public void testFlattenAltEvents() { } @Test - @Ignore public void testFlattenEpisodeOfCare() { Composition composition = (Composition) new Unflattener(new TestDataTemplateProvider()).unflatten(buildEpisodeOfCareComposition()); Flattener cut = new Flattener(new TestDataTemplateProvider()); diff --git a/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java b/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java index afc4d793a..a126ae54a 100644 --- a/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java +++ b/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java @@ -70,7 +70,7 @@ public TestCase( } @Test - @Ignore + public void testRoundTrip() throws IOException { List testCaseList = new ArrayList<>(); @@ -90,8 +90,6 @@ public void testRoundTrip() throws IOException { "Extra path: test_all_types/test_all_types:0/proportion_any|type, value: 1.0", "Extra path: test_all_types/test_all_types:0/coded_text|value, value: value1", "Extra path: test_all_types/test_all_types:0/coded_text_terminology|value, value: .HCXbqCyQtseLkDyKS,QLpOdDZxrEJ", - "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types:0/current_activity/timing, value: P1D", - "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types:0/current_activity/timing|formalism, value: ISO8601", "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types2:0/ism_transition/current_state|code, value: 526", "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types2:0/ism_transition/current_state|value, value: planned", "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types2:0/ism_transition/current_state|terminology, value: openehr", diff --git a/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestCompositionEndpointIT.java b/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestCompositionEndpointIT.java index 8b8083a13..ef6a7152f 100644 --- a/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestCompositionEndpointIT.java +++ b/client/src/test/java/org/ehrbase/client/openehrclient/defaultrestclient/DefaultRestCompositionEndpointIT.java @@ -153,7 +153,6 @@ public void testEhrbaseMultiOccurrenceDeV1() { } @Test - @Ignore public void testEpisodeOfCare() { UUID ehr = openEhrClient.ehrEndpoint().createEhr(); diff --git a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java index 2d86f4a8b..046cdd661 100644 --- a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java +++ b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java @@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat; -@Ignore + public class ClassGeneratorTest { public static final String PACKAGE_NAME = "org.ehrbase.client.classgenerator.examples"; diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/walker/RmBoolean.java b/serialisation/src/main/java/org/ehrbase/serialisation/walker/RmBoolean.java new file mode 100644 index 000000000..42e2d7350 --- /dev/null +++ b/serialisation/src/main/java/org/ehrbase/serialisation/walker/RmBoolean.java @@ -0,0 +1,35 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.serialisation.walker; + +import com.nedap.archie.rm.RMObject; + +public class RmBoolean extends RMObject implements RmPrimitive{ + + private final Boolean value; + + public RmBoolean(Boolean value) { + this.value = value; + } + + public Boolean getValue() { + return value; + } +} diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/walker/RmPrimitive.java b/serialisation/src/main/java/org/ehrbase/serialisation/walker/RmPrimitive.java new file mode 100644 index 000000000..992dd22ea --- /dev/null +++ b/serialisation/src/main/java/org/ehrbase/serialisation/walker/RmPrimitive.java @@ -0,0 +1,25 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.serialisation.walker; + +public interface RmPrimitive { + + T getValue(); +} diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/walker/RmString.java b/serialisation/src/main/java/org/ehrbase/serialisation/walker/RmString.java index 28b43fc73..91750f4ec 100644 --- a/serialisation/src/main/java/org/ehrbase/serialisation/walker/RmString.java +++ b/serialisation/src/main/java/org/ehrbase/serialisation/walker/RmString.java @@ -21,7 +21,7 @@ import com.nedap.archie.rm.RMObject; -public class RmString extends RMObject { +public class RmString extends RMObject implements RmPrimitive { final String value; public RmString(String value) { diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java b/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java index e8cfb0145..d5a04a6c1 100644 --- a/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java +++ b/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java @@ -267,10 +267,15 @@ public ItemExtractor invoke() { } parent = ((Pathable) currentRM).itemAtPath(parentAql); } else if (currentRM instanceof DvInterval) { - child = - relativeAql.contains("lower") - ? ((DvInterval) currentRM).getLower() - : ((DvInterval) currentRM).getUpper(); + if (relativeAql.contains("upper_included")) { + child = new RmBoolean(((DvInterval) currentRM).isUpperIncluded()); + } else if (relativeAql.contains("lower_included")) { + child = new RmBoolean(((DvInterval) currentRM).isLowerIncluded()); + } else if (relativeAql.contains("lower")) { + child = ((DvInterval) currentRM).getLower(); + } else if (relativeAql.contains("upper")) { + child = ((DvInterval) currentRM).getUpper(); + } parent = currentRM; } else { throw new SdkException( From 749718c1119c296fcf78a9d1a39b6ba6f2cca68c Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Wed, 2 Dec 2020 15:04:03 +0100 Subject: [PATCH 24/54] fix generation of DVCodedText see https://github.com/ehrbase/project_management/issues/424 --- .../shareddefinition/Transition.java | 76 +++++++++++++++++++ .../TestAllTypesEnV1Composition.java | 27 ++++--- ...estAllTypesEnV1CompositionContainment.java | 7 +- .../definition/TestAllTypesAction.java | 8 +- .../TestAllTypesActionContainment.java | 4 +- .../definition/TestAllTypesObservation.java | 26 +++---- .../TestAllTypesObservationContainment.java | 6 +- .../client/flattener/RoundTripTest.java | 4 - .../client/classgenerator/ClassGenerator.java | 20 ++++- .../client/classgenerator/FlattFilter.java | 1 + 10 files changed, 134 insertions(+), 45 deletions(-) create mode 100644 client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/Transition.java diff --git a/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/Transition.java b/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/Transition.java new file mode 100644 index 000000000..343951a47 --- /dev/null +++ b/client/src/main/java/org/ehrbase/client/classgenerator/shareddefinition/Transition.java @@ -0,0 +1,76 @@ +package org.ehrbase.client.classgenerator.shareddefinition; + +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum Transition implements EnumValueSet { + CANCEL("cancel", "cancel", "openehr", "166"), + + INITIATE("initiate", "initiate", "openehr", "535"), + + SUSPEND("suspend", "suspend", "openehr", "544"), + + SCHEDULED_STEP("scheduled step", "scheduled step", "openehr", "534"), + + RESTORE("restore", "restore", "openehr", "538"), + + POSTPONE("postpone", "postpone", "openehr", "537"), + + RESUME("resume", "resume", "openehr", "546"), + + SUSPENDED_STEP("suspended step", "suspended step", "openehr", "545"), + + NOTIFY_ABORTED("notify aborted", "notify aborted", "openehr", "550"), + + START("start", "start", "openehr", "540"), + + FINISH("finish", "finish", "openehr", "548"), + + SCHEDULE("schedule", "schedule", "openehr", "539"), + + NOTIFY_COMPLETED("notify completed", "notify completed", "openehr", "551"), + + ACTIVE_STEP("active step", "active step", "openehr", "543"), + + DO("do", "do", "openehr", "541"), + + PLAN_STEP("plan step", "plan step", "openehr", "536"), + + TIME_OUT("time out", "time out", "openehr", "549"), + + NOTIFY_CANCELLED("notify cancelled", "notify cancelled", "openehr", "552"), + + POSTPONED_STEP("postponed step", "postponed step", "openehr", "542"), + + ABORT("abort", "abort", "openehr", "547"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + Transition(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/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java index be6c11123..6707322e6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition; import com.nedap.archie.rm.archetyped.FeederAudit; +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; @@ -16,9 +17,7 @@ import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesEvaluation; import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesObservation; import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesSection; -import org.ehrbase.client.classgenerator.shareddefinition.Category; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; @@ -44,8 +43,8 @@ public class TestAllTypesEnV1Composition { @Path("/context/health_care_facility") private PartyIdentified healthCareFacility; - @Path("/context/setting|defining_code") - private Setting settingDefiningCode; + @Path("/context/setting") + private DvCodedText setting; @Path("/content[openEHR-EHR-OBSERVATION.test_all_types.v1]") private List testAllTypesTestAllTypes; @@ -65,8 +64,8 @@ public class TestAllTypesEnV1Composition { @Path("/feeder_audit") private FeederAudit feederAudit; - @Path("/category|defining_code") - private Category categoryDefiningCode; + @Path("/category") + private DvCodedText category; @Path("/territory") private Territory territory; @@ -123,12 +122,12 @@ public PartyIdentified getHealthCareFacility() { return this.healthCareFacility ; } - public void setSettingDefiningCode(Setting settingDefiningCode) { - this.settingDefiningCode = settingDefiningCode; + public void setSetting(DvCodedText setting) { + this.setting = setting; } - public Setting getSettingDefiningCode() { - return this.settingDefiningCode ; + public DvCodedText getSetting() { + return this.setting ; } public void setTestAllTypesTestAllTypes(List testAllTypesTestAllTypes) { @@ -179,12 +178,12 @@ public FeederAudit getFeederAudit() { return this.feederAudit ; } - public void setCategoryDefiningCode(Category categoryDefiningCode) { - this.categoryDefiningCode = categoryDefiningCode; + public void setCategory(DvCodedText category) { + this.category = category; } - public Category getCategoryDefiningCode() { - return this.categoryDefiningCode ; + public DvCodedText getCategory() { + return this.category ; } public void setTerritory(Territory territory) { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java index ddef03d1a..ad4f8547d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition; import com.nedap.archie.rm.archetyped.FeederAudit; +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; @@ -15,9 +16,7 @@ import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesEvaluation; import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesObservation; import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesSection; -import org.ehrbase.client.classgenerator.shareddefinition.Category; import org.ehrbase.client.classgenerator.shareddefinition.Language; -import org.ehrbase.client.classgenerator.shareddefinition.Setting; import org.ehrbase.client.classgenerator.shareddefinition.Territory; public class TestAllTypesEnV1CompositionContainment extends Containment { @@ -35,7 +34,7 @@ public class TestAllTypesEnV1CompositionContainment extends Containment { public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); + public SelectAqlField SETTING = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/setting", "setting", DvCodedText.class, this); public ListSelectAqlField TEST_ALL_TYPES_TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-OBSERVATION.test_all_types.v1]", "testAllTypesTestAllTypes", TestAllTypesObservation.class, this); @@ -49,7 +48,7 @@ public class TestAllTypesEnV1CompositionContainment extends Containment { public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); + public SelectAqlField CATEGORY = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/category", "category", DvCodedText.class, this); public SelectAqlField TERRITORY = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/territory", "territory", Territory.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java index 4c4853e97..7db6ecaf8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java @@ -1,6 +1,5 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; -import com.nedap.archie.rm.datatypes.CodePhrase; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -8,6 +7,7 @@ import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Transition; @Entity @Archetype("openEHR-EHR-ACTION.test_all_types.v1") @@ -31,7 +31,7 @@ public class TestAllTypesAction { private CurrentStateDefiningCode currentStateDefiningCode; @Path("/ism_transition/transition|defining_code") - private CodePhrase transitionDefiningCode; + private Transition transitionDefiningCode; public void setTestAllTypes(List testAllTypes) { this.testAllTypes = testAllTypes; @@ -81,11 +81,11 @@ public CurrentStateDefiningCode getCurrentStateDefiningCode() { return this.currentStateDefiningCode ; } - public void setTransitionDefiningCode(CodePhrase transitionDefiningCode) { + public void setTransitionDefiningCode(Transition transitionDefiningCode) { this.transitionDefiningCode = transitionDefiningCode; } - public CodePhrase getTransitionDefiningCode() { + public Transition getTransitionDefiningCode() { return this.transitionDefiningCode ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java index eddcd95e9..fa574922d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java @@ -1,6 +1,5 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; -import com.nedap.archie.rm.datatypes.CodePhrase; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; @@ -9,6 +8,7 @@ import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Transition; public class TestAllTypesActionContainment extends Containment { public SelectAqlField TEST_ALL_TYPES_ACTION = new AqlFieldImp(TestAllTypesAction.class, "", "TestAllTypesAction", TestAllTypesAction.class, this); @@ -25,7 +25,7 @@ public class TestAllTypesActionContainment extends Containment { public SelectAqlField CURRENT_STATE_DEFINING_CODE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition/current_state|defining_code", "currentStateDefiningCode", CurrentStateDefiningCode.class, this); - public SelectAqlField TRANSITION_DEFINING_CODE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition/transition|defining_code", "transitionDefiningCode", CodePhrase.class, this); + public SelectAqlField TRANSITION_DEFINING_CODE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition/transition|defining_code", "transitionDefiningCode", Transition.class, this); private TestAllTypesActionContainment() { super("openEHR-EHR-ACTION.test_all_types.v1"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java index e4751888a..0fd884e33 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java @@ -1,6 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; -import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.datavalues.DvCodedText; import com.nedap.archie.rm.datavalues.DvIdentifier; import com.nedap.archie.rm.datavalues.encapsulated.DvMultimedia; import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; @@ -25,11 +25,11 @@ public class TestAllTypesObservation { @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value") private String textValue; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|defining_code") - private CodePhrase codedTextDefiningCode; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value") + private DvCodedText codedText; - @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value|defining_code") - private CodePhrase codedTextTerminologyDefiningCode; + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value") + private DvCodedText codedTextTerminology; @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|magnitude") private Double quantityMagnitude; @@ -93,20 +93,20 @@ public String getTextValue() { return this.textValue ; } - public void setCodedTextDefiningCode(CodePhrase codedTextDefiningCode) { - this.codedTextDefiningCode = codedTextDefiningCode; + public void setCodedText(DvCodedText codedText) { + this.codedText = codedText; } - public CodePhrase getCodedTextDefiningCode() { - return this.codedTextDefiningCode ; + public DvCodedText getCodedText() { + return this.codedText ; } - public void setCodedTextTerminologyDefiningCode(CodePhrase codedTextTerminologyDefiningCode) { - this.codedTextTerminologyDefiningCode = codedTextTerminologyDefiningCode; + public void setCodedTextTerminology(DvCodedText codedTextTerminology) { + this.codedTextTerminology = codedTextTerminology; } - public CodePhrase getCodedTextTerminologyDefiningCode() { - return this.codedTextTerminologyDefiningCode ; + public DvCodedText getCodedTextTerminology() { + return this.codedTextTerminology ; } public void setQuantityMagnitude(Double quantityMagnitude) { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java index 96cf0c114..168c1f2dd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java @@ -1,6 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; -import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.datavalues.DvCodedText; import com.nedap.archie.rm.datavalues.DvIdentifier; import com.nedap.archie.rm.datavalues.encapsulated.DvMultimedia; import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; @@ -24,9 +24,9 @@ public class TestAllTypesObservationContainment extends Containment { public SelectAqlField TEXT_VALUE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value", "textValue", String.class, this); - public SelectAqlField CODED_TEXT_DEFINING_CODE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|defining_code", "codedTextDefiningCode", CodePhrase.class, this); + public SelectAqlField CODED_TEXT = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value", "codedText", DvCodedText.class, this); - public SelectAqlField CODED_TEXT_TERMINOLOGY_DEFINING_CODE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value|defining_code", "codedTextTerminologyDefiningCode", CodePhrase.class, this); + public SelectAqlField CODED_TEXT_TERMINOLOGY = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value", "codedTextTerminology", DvCodedText.class, this); public SelectAqlField QUANTITY_MAGNITUDE = new AqlFieldImp(TestAllTypesObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|magnitude", "quantityMagnitude", Double.class, this); diff --git a/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java b/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java index a126ae54a..f020c74f5 100644 --- a/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java +++ b/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java @@ -88,8 +88,6 @@ public void testRoundTrip() throws IOException { new String[] { "Extra path: test_all_types/test_all_types:0/identifier, value: 55175056", "Extra path: test_all_types/test_all_types:0/proportion_any|type, value: 1.0", - "Extra path: test_all_types/test_all_types:0/coded_text|value, value: value1", - "Extra path: test_all_types/test_all_types:0/coded_text_terminology|value, value: .HCXbqCyQtseLkDyKS,QLpOdDZxrEJ", "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types2:0/ism_transition/current_state|code, value: 526", "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types2:0/ism_transition/current_state|value, value: planned", "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types2:0/ism_transition/current_state|terminology, value: openehr", @@ -130,8 +128,6 @@ public void checkTestCase(TestCase testCase, SoftAssertions softly) throws IOExc testCase.missing ); - String[] extra = {"Extra path: test_all_types/test_all_types:0/identifier, value: 55175056", - "Extra path: test_all_types/test_all_types:0/proportion_any|type, value: 1.0"}; softly.assertThat(errors) .filteredOn(s -> s.startsWith("Extra")) .as("Test Case %s", testCase.id) diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java index cf5335fad..2ed25789f 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java @@ -46,6 +46,7 @@ import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; import org.ehrbase.client.classgenerator.shareddefinition.Setting; import org.ehrbase.client.classgenerator.shareddefinition.Territory; +import org.ehrbase.client.classgenerator.shareddefinition.Transition; import org.ehrbase.client.openehrclient.VersionUid; import org.ehrbase.serialisation.util.SnakeCase; import org.ehrbase.terminology.client.terminology.TermDefinition; @@ -363,7 +364,21 @@ private void addSimpleField( if (classGeneratorConfig == null && !clazz.getName().contains("java.lang")) { logger.debug("No ClassGenerator for {}", clazz); } - if (classGeneratorConfig == null || !classGeneratorConfig.isExpandField()) { + boolean expand = classGeneratorConfig != null && classGeneratorConfig.isExpandField(); + + if (endNode.getRmType().equals("DV_CODED_TEXT") && !endNode.getId().equals("transition")) { + expand = + expand + && endNode.getInputs().stream() + .filter(i -> i.getType().equals("CODED_TEXT")) + .map(WebTemplateInput::getList) + .flatMap(List::stream) + .findAny() + .isPresent(); + } + + + if (!expand) { TypeName className = ClassName.get(Optional.ofNullable(clazz).orElse(Object.class)); if (endNode.isMulti() && !context.nodeDeque.peek().getRmType().equals("ELEMENT")) { @@ -453,6 +468,9 @@ private void addField( case "math_function": className = ClassName.get(MathFunction.class); break; + case "transition": + className = ClassName.get(Transition.class); + break; default: if (CollectionUtils.isNotEmpty(valueSet.getTherms())) { diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java b/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java index bfdf5df13..84a140655 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java @@ -26,6 +26,7 @@ import org.ehrbase.util.reflection.ReflectionHelper; import org.ehrbase.webtemplate.filter.Filter; import org.ehrbase.webtemplate.model.WebTemplate; +import org.ehrbase.webtemplate.model.WebTemplateInput; import org.ehrbase.webtemplate.model.WebTemplateNode; import org.ehrbase.webtemplate.parser.config.RmIntrospectConfig; From 4166aeea6133be567a4c547df14618779b8ea91e Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Wed, 2 Dec 2020 15:33:10 +0100 Subject: [PATCH 25/54] fix generation of DVCodedText see https://github.com/ehrbase/project_management/issues/424 --- ...genZumMedikationsScreeningObservation.java | 15 +++++------ ...ationsScreeningObservationContainment.java | 4 +-- .../definition/AbdomenSymptomCluster.java | 14 +++++----- .../AbdomenSymptomClusterContainment.java | 4 +-- .../definition/ChestSymptomCluster.java | 14 +++++----- .../ChestSymptomClusterContainment.java | 4 +-- .../definition/FirstSymptomsCluster.java | 14 +++++----- .../FirstSymptomsClusterContainment.java | 4 +-- .../definition/KeyCovidSymptomCluster.java | 14 +++++----- .../KeyCovidSymptomClusterContainment.java | 4 +-- .../definition/NeuroSymptomCluster.java | 14 +++++----- .../NeuroSymptomClusterContainment.java | 4 +-- .../definition/ServiceAction.java | 21 ++++++++------- .../definition/ServiceActionContainment.java | 7 ++--- ...ServiceRequestCurrentActivityActivity.java | 14 +++++----- ...ServiceRequestReasonForRequestElement.java | 10 +++---- .../TestAllTypesEnV1Composition.java | 27 ++++++++++--------- ...estAllTypesEnV1CompositionContainment.java | 7 ++--- .../client/classgenerator/ClassGenerator.java | 2 +- 19 files changed, 100 insertions(+), 97 deletions(-) diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java index cf6442814..745a3d0b7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java @@ -1,7 +1,7 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.datavalues.DvCodedText; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; import java.time.temporal.TemporalAccessor; @@ -14,8 +14,8 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.medication_use.v0") public class FragebogenZumMedikationsScreeningObservation { - @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0027]/value|defining_code") - private CodePhrase medikamenteInVerwendungDefiningCode; + @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0027]/value") + private DvCodedText medikamenteInVerwendung; @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0002]/value|value") private String nameDerMedikamentenklasseValue; @@ -41,13 +41,12 @@ public class FragebogenZumMedikationsScreeningObservation { @Path("/language") private Language language; - public void setMedikamenteInVerwendungDefiningCode( - CodePhrase medikamenteInVerwendungDefiningCode) { - this.medikamenteInVerwendungDefiningCode = medikamenteInVerwendungDefiningCode; + public void setMedikamenteInVerwendung(DvCodedText medikamenteInVerwendung) { + this.medikamenteInVerwendung = medikamenteInVerwendung; } - public CodePhrase getMedikamenteInVerwendungDefiningCode() { - return this.medikamenteInVerwendungDefiningCode ; + public DvCodedText getMedikamenteInVerwendung() { + return this.medikamenteInVerwendung ; } public void setNameDerMedikamentenklasseValue(String nameDerMedikamentenklasseValue) { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java index 5a537f20f..4853ed137 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java @@ -1,7 +1,7 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.datavalues.DvCodedText; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; import java.time.temporal.TemporalAccessor; @@ -15,7 +15,7 @@ public class FragebogenZumMedikationsScreeningObservationContainment extends Containment { public SelectAqlField FRAGEBOGEN_ZUM_MEDIKATIONS_SCREENING_OBSERVATION = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "", "FragebogenZumMedikationsScreeningObservation", FragebogenZumMedikationsScreeningObservation.class, this); - public SelectAqlField MEDIKAMENTE_IN_VERWENDUNG_DEFINING_CODE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0027]/value|defining_code", "medikamenteInVerwendungDefiningCode", CodePhrase.class, this); + public SelectAqlField MEDIKAMENTE_IN_VERWENDUNG = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0027]/value", "medikamenteInVerwendung", DvCodedText.class, this); public SelectAqlField NAME_DER_MEDIKAMENTENKLASSE_VALUE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0002]/value|value", "nameDerMedikamentenklasseValue", String.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java index fa8789045..f63b405e0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java @@ -1,7 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.datavalues.DvCodedText; import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; @@ -10,8 +10,8 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") public class AbdomenSymptomCluster { - @Path("/items[at0001.1]/value|defining_code") - private CodePhrase symptomSignNameDefiningCode; + @Path("/items[at0001.1]/value") + private DvCodedText symptomSignName; @Path("/items[at0147]") private List structuredBodySite; @@ -28,12 +28,12 @@ public class AbdomenSymptomCluster { @Path("/items[at0.1 and name/value='Presence']/value|defining_code") private PresenceDefiningCode presenceDefiningCode; - public void setSymptomSignNameDefiningCode(CodePhrase symptomSignNameDefiningCode) { - this.symptomSignNameDefiningCode = symptomSignNameDefiningCode; + public void setSymptomSignName(DvCodedText symptomSignName) { + this.symptomSignName = symptomSignName; } - public CodePhrase getSymptomSignNameDefiningCode() { - return this.symptomSignNameDefiningCode ; + public DvCodedText getSymptomSignName() { + return this.symptomSignName ; } public void setStructuredBodySite(List structuredBodySite) { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomClusterContainment.java index 2b0da992d..806d86e34 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomClusterContainment.java @@ -1,7 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; +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; @@ -11,7 +11,7 @@ public class AbdomenSymptomClusterContainment extends Containment { public SelectAqlField ABDOMEN_SYMPTOM_CLUSTER = new AqlFieldImp(AbdomenSymptomCluster.class, "", "AbdomenSymptomCluster", AbdomenSymptomCluster.class, this); - public SelectAqlField SYMPTOM_SIGN_NAME_DEFINING_CODE = new AqlFieldImp(AbdomenSymptomCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningCode", CodePhrase.class, this); + public SelectAqlField SYMPTOM_SIGN_NAME = new AqlFieldImp(AbdomenSymptomCluster.class, "/items[at0001.1]/value", "symptomSignName", DvCodedText.class, this); public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(AbdomenSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java index 6a6405886..9c6694b03 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java @@ -1,7 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.datavalues.DvCodedText; import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; @@ -10,8 +10,8 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") public class ChestSymptomCluster { - @Path("/items[at0001.1]/value|defining_code") - private CodePhrase symptomSignNameDefiningCode; + @Path("/items[at0001.1]/value") + private DvCodedText symptomSignName; @Path("/items[at0147]") private List structuredBodySite; @@ -28,12 +28,12 @@ public class ChestSymptomCluster { @Path("/items[at0.1 and name/value='Presence']/value|defining_code") private PresenceDefiningCode presenceDefiningCode; - public void setSymptomSignNameDefiningCode(CodePhrase symptomSignNameDefiningCode) { - this.symptomSignNameDefiningCode = symptomSignNameDefiningCode; + public void setSymptomSignName(DvCodedText symptomSignName) { + this.symptomSignName = symptomSignName; } - public CodePhrase getSymptomSignNameDefiningCode() { - return this.symptomSignNameDefiningCode ; + public DvCodedText getSymptomSignName() { + return this.symptomSignName ; } public void setStructuredBodySite(List structuredBodySite) { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomClusterContainment.java index c899af271..b9276dc44 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomClusterContainment.java @@ -1,7 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; +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; @@ -11,7 +11,7 @@ public class ChestSymptomClusterContainment extends Containment { public SelectAqlField CHEST_SYMPTOM_CLUSTER = new AqlFieldImp(ChestSymptomCluster.class, "", "ChestSymptomCluster", ChestSymptomCluster.class, this); - public SelectAqlField SYMPTOM_SIGN_NAME_DEFINING_CODE = new AqlFieldImp(ChestSymptomCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningCode", CodePhrase.class, this); + public SelectAqlField SYMPTOM_SIGN_NAME = new AqlFieldImp(ChestSymptomCluster.class, "/items[at0001.1]/value", "symptomSignName", DvCodedText.class, this); public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(ChestSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java index ac608eb0c..96093e28d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java @@ -1,7 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.datavalues.DvCodedText; import java.lang.String; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; @@ -13,8 +13,8 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") public class FirstSymptomsCluster { - @Path("/items[at0001.1]/value|defining_code") - private CodePhrase symptomSignNameDefiningCode; + @Path("/items[at0001.1]/value") + private DvCodedText symptomSignName; @Path("/items[at0147]") private List structuredBodySite; @@ -43,12 +43,12 @@ public class FirstSymptomsCluster { @Path("/items[at0.1]/value|defining_code") private PresenceDefiningCode presenceDefiningCode; - public void setSymptomSignNameDefiningCode(CodePhrase symptomSignNameDefiningCode) { - this.symptomSignNameDefiningCode = symptomSignNameDefiningCode; + public void setSymptomSignName(DvCodedText symptomSignName) { + this.symptomSignName = symptomSignName; } - public CodePhrase getSymptomSignNameDefiningCode() { - return this.symptomSignNameDefiningCode ; + public DvCodedText getSymptomSignName() { + return this.symptomSignName ; } public void setStructuredBodySite(List structuredBodySite) { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java index dd6d4bbdf..7acf0e35c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java @@ -1,7 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.datavalues.DvCodedText; import java.lang.String; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; @@ -14,7 +14,7 @@ public class FirstSymptomsClusterContainment extends Containment { public SelectAqlField FIRST_SYMPTOMS_CLUSTER = new AqlFieldImp(FirstSymptomsCluster.class, "", "FirstSymptomsCluster", FirstSymptomsCluster.class, this); - public SelectAqlField SYMPTOM_SIGN_NAME_DEFINING_CODE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningCode", CodePhrase.class, this); + public SelectAqlField SYMPTOM_SIGN_NAME = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0001.1]/value", "symptomSignName", DvCodedText.class, this); public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(FirstSymptomsCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java index 42d83d5f2..899ba5eae 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java @@ -1,7 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.datavalues.DvCodedText; import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; @@ -10,8 +10,8 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") public class KeyCovidSymptomCluster { - @Path("/items[at0001.1]/value|defining_code") - private CodePhrase symptomSignNameDefiningCode; + @Path("/items[at0001.1]/value") + private DvCodedText symptomSignName; @Path("/items[at0147]") private List structuredBodySite; @@ -28,12 +28,12 @@ public class KeyCovidSymptomCluster { @Path("/items[at0.1 and name/value='Presence']/value|defining_code") private PresenceDefiningCode presenceDefiningCode; - public void setSymptomSignNameDefiningCode(CodePhrase symptomSignNameDefiningCode) { - this.symptomSignNameDefiningCode = symptomSignNameDefiningCode; + public void setSymptomSignName(DvCodedText symptomSignName) { + this.symptomSignName = symptomSignName; } - public CodePhrase getSymptomSignNameDefiningCode() { - return this.symptomSignNameDefiningCode ; + public DvCodedText getSymptomSignName() { + return this.symptomSignName ; } public void setStructuredBodySite(List structuredBodySite) { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomClusterContainment.java index f072031f2..8f97a9b77 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomClusterContainment.java @@ -1,7 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; +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; @@ -11,7 +11,7 @@ public class KeyCovidSymptomClusterContainment extends Containment { public SelectAqlField KEY_COVID_SYMPTOM_CLUSTER = new AqlFieldImp(KeyCovidSymptomCluster.class, "", "KeyCovidSymptomCluster", KeyCovidSymptomCluster.class, this); - public SelectAqlField SYMPTOM_SIGN_NAME_DEFINING_CODE = new AqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningCode", CodePhrase.class, this); + public SelectAqlField SYMPTOM_SIGN_NAME = new AqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0001.1]/value", "symptomSignName", DvCodedText.class, this); public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java index 41fdd3ada..f8d68e484 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java @@ -1,7 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.datavalues.DvCodedText; import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; @@ -10,8 +10,8 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") public class NeuroSymptomCluster { - @Path("/items[at0001.1]/value|defining_code") - private CodePhrase symptomSignNameDefiningCode; + @Path("/items[at0001.1]/value") + private DvCodedText symptomSignName; @Path("/items[at0147]") private List structuredBodySite; @@ -28,12 +28,12 @@ public class NeuroSymptomCluster { @Path("/items[at0.1 and name/value='Presence']/value|defining_code") private PresenceDefiningCode presenceDefiningCode; - public void setSymptomSignNameDefiningCode(CodePhrase symptomSignNameDefiningCode) { - this.symptomSignNameDefiningCode = symptomSignNameDefiningCode; + public void setSymptomSignName(DvCodedText symptomSignName) { + this.symptomSignName = symptomSignName; } - public CodePhrase getSymptomSignNameDefiningCode() { - return this.symptomSignNameDefiningCode ; + public DvCodedText getSymptomSignName() { + return this.symptomSignName ; } public void setStructuredBodySite(List structuredBodySite) { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomClusterContainment.java index f73d095b8..198ad488a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomClusterContainment.java @@ -1,7 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; +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; @@ -11,7 +11,7 @@ public class NeuroSymptomClusterContainment extends Containment { public SelectAqlField NEURO_SYMPTOM_CLUSTER = new AqlFieldImp(NeuroSymptomCluster.class, "", "NeuroSymptomCluster", NeuroSymptomCluster.class, this); - public SelectAqlField SYMPTOM_SIGN_NAME_DEFINING_CODE = new AqlFieldImp(NeuroSymptomCluster.class, "/items[at0001.1]/value|defining_code", "symptomSignNameDefiningCode", CodePhrase.class, this); + public SelectAqlField SYMPTOM_SIGN_NAME = new AqlFieldImp(NeuroSymptomCluster.class, "/items[at0001.1]/value", "symptomSignName", DvCodedText.class, this); public ListSelectAqlField STRUCTURED_BODY_SITE = new ListAqlFieldImp(NeuroSymptomCluster.class, "/items[at0147]", "structuredBodySite", Cluster.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java index 22433ab0d..ddfe88203 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java @@ -1,7 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.datavalues.DvCodedText; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; import java.time.temporal.TemporalAccessor; @@ -10,12 +10,13 @@ import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Transition; @Entity @Archetype("openEHR-EHR-ACTION.service.v0") public class ServiceAction { - @Path("/description[at0001]/items[at0011]/value|defining_code") - private CodePhrase serviceNameDefiningCode; + @Path("/description[at0001]/items[at0011]/value") + private DvCodedText serviceName; @Path("/description[at0001]/items[at0013]/value|value") private String descriptionValue; @@ -48,14 +49,14 @@ public class ServiceAction { private CurrentStateDefiningCode currentStateDefiningCode; @Path("/ism_transition/transition|defining_code") - private CodePhrase transitionDefiningCode; + private Transition transitionDefiningCode; - public void setServiceNameDefiningCode(CodePhrase serviceNameDefiningCode) { - this.serviceNameDefiningCode = serviceNameDefiningCode; + public void setServiceName(DvCodedText serviceName) { + this.serviceName = serviceName; } - public CodePhrase getServiceNameDefiningCode() { - return this.serviceNameDefiningCode ; + public DvCodedText getServiceName() { + return this.serviceName ; } public void setDescriptionValue(String descriptionValue) { @@ -138,11 +139,11 @@ public CurrentStateDefiningCode getCurrentStateDefiningCode() { return this.currentStateDefiningCode ; } - public void setTransitionDefiningCode(CodePhrase transitionDefiningCode) { + public void setTransitionDefiningCode(Transition transitionDefiningCode) { this.transitionDefiningCode = transitionDefiningCode; } - public CodePhrase getTransitionDefiningCode() { + public Transition getTransitionDefiningCode() { return this.transitionDefiningCode ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java index f5563384b..233da778c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java @@ -1,7 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.datavalues.DvCodedText; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; import java.time.temporal.TemporalAccessor; @@ -11,11 +11,12 @@ import org.ehrbase.client.aql.field.ListSelectAqlField; import org.ehrbase.client.aql.field.SelectAqlField; import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Transition; public class ServiceActionContainment extends Containment { public SelectAqlField SERVICE_ACTION = new AqlFieldImp(ServiceAction.class, "", "ServiceAction", ServiceAction.class, this); - public SelectAqlField SERVICE_NAME_DEFINING_CODE = new AqlFieldImp(ServiceAction.class, "/description[at0001]/items[at0011]/value|defining_code", "serviceNameDefiningCode", CodePhrase.class, this); + public SelectAqlField SERVICE_NAME = new AqlFieldImp(ServiceAction.class, "/description[at0001]/items[at0011]/value", "serviceName", DvCodedText.class, this); public SelectAqlField DESCRIPTION_VALUE = new AqlFieldImp(ServiceAction.class, "/description[at0001]/items[at0013]/value|value", "descriptionValue", String.class, this); @@ -37,7 +38,7 @@ public class ServiceActionContainment extends Containment { public SelectAqlField CURRENT_STATE_DEFINING_CODE = new AqlFieldImp(ServiceAction.class, "/ism_transition/current_state|defining_code", "currentStateDefiningCode", CurrentStateDefiningCode.class, this); - public SelectAqlField TRANSITION_DEFINING_CODE = new AqlFieldImp(ServiceAction.class, "/ism_transition/transition|defining_code", "transitionDefiningCode", CodePhrase.class, this); + public SelectAqlField TRANSITION_DEFINING_CODE = new AqlFieldImp(ServiceAction.class, "/ism_transition/transition|defining_code", "transitionDefiningCode", Transition.class, this); private ServiceActionContainment() { super("openEHR-EHR-ACTION.service.v0"); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java index ac2143f0a..f335e938d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java @@ -1,7 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.datastructures.Cluster; -import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.datavalues.DvCodedText; import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; import java.lang.String; import java.time.temporal.TemporalAccessor; @@ -11,8 +11,8 @@ @Entity public class ServiceRequestCurrentActivityActivity { - @Path("/description[at0009]/items[at0121]/value|defining_code") - private CodePhrase serviceNameDefiningCode; + @Path("/description[at0009]/items[at0121]/value") + private DvCodedText serviceName; @Path("/description[at0009]/items[at0062]") private List reasonForRequest; @@ -41,12 +41,12 @@ public class ServiceRequestCurrentActivityActivity { @Path("/timing") private DvParsable timing; - public void setServiceNameDefiningCode(CodePhrase serviceNameDefiningCode) { - this.serviceNameDefiningCode = serviceNameDefiningCode; + public void setServiceName(DvCodedText serviceName) { + this.serviceName = serviceName; } - public CodePhrase getServiceNameDefiningCode() { - return this.serviceNameDefiningCode ; + public DvCodedText getServiceName() { + return this.serviceName ; } public void setReasonForRequest(List reasonForRequest) { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java index 3db324ab5..9e32e9bea 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java @@ -1,19 +1,19 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; -import com.nedap.archie.rm.datatypes.CodePhrase; +import com.nedap.archie.rm.datavalues.DvCodedText; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @Entity public class ServiceRequestReasonForRequestElement { - @Path("/value|defining_code") - private CodePhrase value; + @Path("/value") + private DvCodedText value; - public void setValue(CodePhrase value) { + public void setValue(DvCodedText value) { this.value = value; } - public CodePhrase getValue() { + public DvCodedText getValue() { return this.value ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java index 6707322e6..be6c11123 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java @@ -1,7 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition; import com.nedap.archie.rm.archetyped.FeederAudit; -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; @@ -17,7 +16,9 @@ import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesEvaluation; import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesObservation; import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesSection; +import org.ehrbase.client.classgenerator.shareddefinition.Category; import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; @@ -43,8 +44,8 @@ public class TestAllTypesEnV1Composition { @Path("/context/health_care_facility") private PartyIdentified healthCareFacility; - @Path("/context/setting") - private DvCodedText setting; + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; @Path("/content[openEHR-EHR-OBSERVATION.test_all_types.v1]") private List testAllTypesTestAllTypes; @@ -64,8 +65,8 @@ public class TestAllTypesEnV1Composition { @Path("/feeder_audit") private FeederAudit feederAudit; - @Path("/category") - private DvCodedText category; + @Path("/category|defining_code") + private Category categoryDefiningCode; @Path("/territory") private Territory territory; @@ -122,12 +123,12 @@ public PartyIdentified getHealthCareFacility() { return this.healthCareFacility ; } - public void setSetting(DvCodedText setting) { - this.setting = setting; + public void setSettingDefiningCode(Setting settingDefiningCode) { + this.settingDefiningCode = settingDefiningCode; } - public DvCodedText getSetting() { - return this.setting ; + public Setting getSettingDefiningCode() { + return this.settingDefiningCode ; } public void setTestAllTypesTestAllTypes(List testAllTypesTestAllTypes) { @@ -178,12 +179,12 @@ public FeederAudit getFeederAudit() { return this.feederAudit ; } - public void setCategory(DvCodedText category) { - this.category = category; + public void setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; } - public DvCodedText getCategory() { - return this.category ; + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; } public void setTerritory(Territory territory) { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java index ad4f8547d..ddef03d1a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java @@ -1,7 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition; import com.nedap.archie.rm.archetyped.FeederAudit; -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; @@ -16,7 +15,9 @@ import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesEvaluation; import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesObservation; import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesSection; +import org.ehrbase.client.classgenerator.shareddefinition.Category; import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; import org.ehrbase.client.classgenerator.shareddefinition.Territory; public class TestAllTypesEnV1CompositionContainment extends Containment { @@ -34,7 +35,7 @@ public class TestAllTypesEnV1CompositionContainment extends Containment { public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); - public SelectAqlField SETTING = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/setting", "setting", DvCodedText.class, this); + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); public ListSelectAqlField TEST_ALL_TYPES_TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-OBSERVATION.test_all_types.v1]", "testAllTypesTestAllTypes", TestAllTypesObservation.class, this); @@ -48,7 +49,7 @@ public class TestAllTypesEnV1CompositionContainment extends Containment { public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); - public SelectAqlField CATEGORY = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/category", "category", DvCodedText.class, this); + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); public SelectAqlField TERRITORY = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/territory", "territory", Territory.class, this); diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java index 2ed25789f..70c65071c 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java @@ -366,7 +366,7 @@ private void addSimpleField( } boolean expand = classGeneratorConfig != null && classGeneratorConfig.isExpandField(); - if (endNode.getRmType().equals("DV_CODED_TEXT") && !endNode.getId().equals("transition")) { + if (endNode.getRmType().equals("DV_CODED_TEXT") && !List.of("transition","language","setting","category","territory","math_function").contains(endNode.getId(false))) { expand = expand && endNode.getInputs().stream() From 8df5a7abecbd9956291a2adae2ed2b71679c0169 Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Wed, 2 Dec 2020 15:51:32 +0100 Subject: [PATCH 26/54] fix handling of ism_transaction see https://github.com/ehrbase/project_management/issues/424 --- .../ehrbase/client/flattener/DtoFromCompositionWalker.java | 2 +- .../definition/CareflowStepDefiningCode.java | 2 +- .../definition/CurrentStateDefiningCode.java | 2 +- .../definition/CareflowStepDefiningCode.java | 6 +++--- .../definition/CurrentStateDefiningCode.java | 6 +++--- .../java/org/ehrbase/client/flattener/RoundTripTest.java | 5 +---- .../main/java/org/ehrbase/serialisation/walker/Walker.java | 4 +++- .../main/java/org/ehrbase/webtemplate/parser/OPTParser.java | 2 ++ 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java b/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java index 0ade6ed02..59c6a8d67 100644 --- a/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java +++ b/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java @@ -152,7 +152,7 @@ private void writeField(Field field, Object dto, Object value) { Optional.ofNullable(codePhrase.getTerminologyId()) .map(ObjectId::getValue) .orElse(null); - return v.getTerminologyId().equals(terminologyId); + return v.getTerminologyId().equals(terminologyId); }) .filter(v -> v.getCode().equals(codePhrase.getCodeString())) .findAny() diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CareflowStepDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CareflowStepDefiningCode.java index dc2e12890..3fc59682d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CareflowStepDefiningCode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CareflowStepDefiningCode.java @@ -4,7 +4,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; public enum CareflowStepDefiningCode implements EnumValueSet { - SERVICE_PLANNED("Service planned", "Service request to healthcare provider is planned.", null, "at0002"); + SERVICE_PLANNED("Service planned", "Service request to healthcare provider is planned.", "openehr", "at0002"); private String value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CurrentStateDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CurrentStateDefiningCode.java index 00ea91ce9..46e6f929e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CurrentStateDefiningCode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CurrentStateDefiningCode.java @@ -4,7 +4,7 @@ import org.ehrbase.client.classgenerator.EnumValueSet; public enum CurrentStateDefiningCode implements EnumValueSet { - PLANNED("planned", "planned", null, "526"); + PLANNED("planned", "planned", "openehr", "526"); private String value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CareflowStepDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CareflowStepDefiningCode.java index 9b86c5b65..5fc16198e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CareflowStepDefiningCode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CareflowStepDefiningCode.java @@ -4,11 +4,11 @@ import org.ehrbase.client.classgenerator.EnumValueSet; public enum CareflowStepDefiningCode implements EnumValueSet { - PLANNED("Planned", "*", null, "at0003"), + PLANNED("Planned", "*", "openehr", "at0003"), - ACTIVE("Active", "*", null, "at0004"), + ACTIVE("Active", "*", "openehr", "at0004"), - COMPLETED("Completed", "*", null, "at0005"); + COMPLETED("Completed", "*", "openehr", "at0005"); private String value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CurrentStateDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CurrentStateDefiningCode.java index 2615d9361..87df048ce 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CurrentStateDefiningCode.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/CurrentStateDefiningCode.java @@ -4,11 +4,11 @@ import org.ehrbase.client.classgenerator.EnumValueSet; public enum CurrentStateDefiningCode implements EnumValueSet { - COMPLETED("completed", "completed", null, "532"), + COMPLETED("completed", "completed", "openehr", "532"), - PLANNED("planned", "planned", null, "526"), + PLANNED("planned", "planned", "openehr", "526"), - ACTIVE("active", "active", null, "245"); + ACTIVE("active", "active", "openehr", "245"); private String value; diff --git a/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java b/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java index f020c74f5..00473c354 100644 --- a/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java +++ b/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java @@ -87,10 +87,7 @@ public void testRoundTrip() throws IOException { }, new String[] { "Extra path: test_all_types/test_all_types:0/identifier, value: 55175056", - "Extra path: test_all_types/test_all_types:0/proportion_any|type, value: 1.0", - "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types2:0/ism_transition/current_state|code, value: 526", - "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types2:0/ism_transition/current_state|value, value: planned", - "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types2:0/ism_transition/current_state|terminology, value: openehr", + "Extra path: test_all_types/test_all_types:0/proportion_any|type, value: 1.0" })); SoftAssertions softly = new SoftAssertions(); diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java b/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java index d5a04a6c1..2fa026f2d 100644 --- a/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java +++ b/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java @@ -24,6 +24,7 @@ import com.nedap.archie.rm.archetyped.Pathable; import com.nedap.archie.rm.composition.Composition; import com.nedap.archie.rm.composition.EventContext; +import com.nedap.archie.rm.composition.IsmTransition; import com.nedap.archie.rm.datastructures.Element; import com.nedap.archie.rm.datavalues.quantity.DvInterval; import com.nedap.archie.rminfo.ArchieRMInfoLookup; @@ -178,7 +179,8 @@ protected boolean visitChildren(WebTemplateNode node) { return typeInfo != null && (Locatable.class.isAssignableFrom(typeInfo.getJavaClass()) || EventContext.class.isAssignableFrom(typeInfo.getJavaClass()) - || DvInterval.class.isAssignableFrom(typeInfo.getJavaClass())); + || DvInterval.class.isAssignableFrom(typeInfo.getJavaClass()) + || IsmTransition.class.isAssignableFrom(typeInfo.getJavaClass())); } protected abstract T extract( diff --git a/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java b/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java index f4a40ac48..0f9eaa6e2 100644 --- a/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java +++ b/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java @@ -174,6 +174,7 @@ private WebTemplateNode parseCCOMPLEXOBJECT( WebTemplateInput code = new WebTemplateInput(); code.setSuffix("code"); code.setType("CODED_TEXT"); + code.setTerminology("openehr"); ismTransitionList.forEach( i -> { @@ -203,6 +204,7 @@ private WebTemplateNode parseCCOMPLEXOBJECT( WebTemplateInput code2 = new WebTemplateInput(); code2.setSuffix("code"); code2.setType("CODED_TEXT"); + code2.setTerminology("openehr"); code2 .getList() .addAll( From 6eea762f86342e5f1c496cdbca464373b5d543be Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Wed, 2 Dec 2020 15:55:54 +0100 Subject: [PATCH 27/54] fix handling of ism_transaction see https://github.com/ehrbase/project_management/issues/424 --- .../java/org/ehrbase/webtemplate/parser/OPTParserTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web-template/src/test/java/org/ehrbase/webtemplate/parser/OPTParserTest.java b/web-template/src/test/java/org/ehrbase/webtemplate/parser/OPTParserTest.java index f60ca1092..814b957ca 100644 --- a/web-template/src/test/java/org/ehrbase/webtemplate/parser/OPTParserTest.java +++ b/web-template/src/test/java/org/ehrbase/webtemplate/parser/OPTParserTest.java @@ -183,8 +183,8 @@ public void parseAllTypes() throws IOException, XmlException { new Tuple("local", "at0006:value1;at0007:value2;at0008:value3"), new Tuple("local", ""), new Tuple("SNOMED-CT", ""), - new Tuple(null, "at0003:Planned;at0004:Active;at0005:Completed"), - new Tuple(null, "526:planned;245:active;532:completed") + new Tuple("openehr", "at0003:Planned;at0004:Active;at0005:Completed"), + new Tuple("openehr", "526:planned;245:active;532:completed") ); List errors = compareWebTemplate(actual, expected); From def6eeb62672a2c18c24e2e60a4334b580cba1d5 Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Wed, 2 Dec 2020 16:00:59 +0100 Subject: [PATCH 28/54] fix handling of ism_transaction see https://github.com/ehrbase/project_management/issues/424 --- .../org/ehrbase/client/classgenerator/OldDtoModelTest.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/OldDtoModelTest.java b/client/src/test/java/org/ehrbase/client/classgenerator/OldDtoModelTest.java index b3f45d305..b1ba7e592 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/OldDtoModelTest.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/OldDtoModelTest.java @@ -100,9 +100,6 @@ public void testRoundTrip() throws IOException { "Extra path: test_all_types/test_all_types:0/coded_text_terminology|value, value: .HCXbqCyQtseLkDyKS,QLpOdDZxrEJ", "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types:0/current_activity/timing, value: P1D", "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types:0/current_activity/timing|formalism, value: ISO8601", - "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types2:0/ism_transition/current_state|code, value: 526", - "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types2:0/ism_transition/current_state|value, value: planned", - "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types2:0/ism_transition/current_state|terminology, value: openehr", })); SoftAssertions softly = new SoftAssertions(); From 5ad62b5b34cdcefaccf5756de62a6fab7cd0ee40 Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Thu, 3 Dec 2020 15:35:59 +0100 Subject: [PATCH 29/54] fix list order see https://github.com/ehrbase/project_management/issues/424 --- .../classgenerator/OldDtoModelTest.java | 14 ++- .../client/flattener/RoundTripTest.java | 113 +++++++++++++----- .../walker/ToCompositionWalker.java | 56 +++++---- .../ehrbase/serialisation/walker/Walker.java | 53 +++++--- 4 files changed, 164 insertions(+), 72 deletions(-) diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/OldDtoModelTest.java b/client/src/test/java/org/ehrbase/client/classgenerator/OldDtoModelTest.java index b1ba7e592..10c703b74 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/OldDtoModelTest.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/OldDtoModelTest.java @@ -31,6 +31,7 @@ import org.ehrbase.client.classgenerator.olddtoexamples.coronaanamnesecomposition.definition.VorhandenDefiningcode; import org.ehrbase.client.classgenerator.olddtoexamples.testalltypesenv1composition.TestAllTypesEnV1Composition; import org.ehrbase.client.flattener.Flattener; +import org.ehrbase.client.flattener.RoundTripTest; import org.ehrbase.client.flattener.Unflattener; import org.ehrbase.client.templateprovider.TestDataTemplateProvider; import org.ehrbase.serialisation.flatencoding.FlatFormat; @@ -101,6 +102,16 @@ public void testRoundTrip() throws IOException { "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types:0/current_activity/timing, value: P1D", "Extra path: test_all_types/test_all_types3:0/section_2/section_3/test_all_types:0/current_activity/timing|formalism, value: ISO8601", })); + testCaseList.add( + new TestCase( + 2, + CompositionTestDataSimSDTJson.CORONA, + "Corona_Anamnese", + CoronaAnamneseComposition.class, + new String[] { + }, + new String[] { + })); SoftAssertions softly = new SoftAssertions(); @@ -170,8 +181,7 @@ public void checkTestCase(TestCase testCase, SoftAssertions softly) throws IOExc testCase.missing ); - String[] extra = {"Extra path: test_all_types/test_all_types:0/identifier, value: 55175056", - "Extra path: test_all_types/test_all_types:0/proportion_any|type, value: 1.0"}; + softly.assertThat(errors) .filteredOn(s -> s.startsWith("Extra")) .as("Test Case %s", testCase.id) diff --git a/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java b/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java index 00473c354..6aa32c8f2 100644 --- a/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java +++ b/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java @@ -25,6 +25,9 @@ import com.nedap.archie.rm.composition.Composition; import org.apache.commons.io.IOUtils; import org.assertj.core.api.SoftAssertions; +import org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.AlternativeEventsComposition; +import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.CoronaAnamneseComposition; +import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.EhrbaseMultiOccurrenceDeV1Composition; import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.TestAllTypesEnV1Composition; import org.ehrbase.client.templateprovider.TestDataTemplateProvider; import org.ehrbase.serialisation.flatencoding.FlatFormat; @@ -32,7 +35,6 @@ import org.ehrbase.serialisation.flatencoding.FlatJson; import org.ehrbase.serialisation.jsonencoding.JacksonUtil; import org.ehrbase.test_data.composition.CompositionTestDataSimSDTJson; -import org.junit.Ignore; import org.junit.Test; import java.io.IOException; @@ -42,7 +44,6 @@ import static java.nio.charset.StandardCharsets.UTF_8; - public class RoundTripTest { class TestCase { @@ -70,7 +71,6 @@ public TestCase( } @Test - public void testRoundTrip() throws IOException { List testCaseList = new ArrayList<>(); @@ -86,8 +86,58 @@ public void testRoundTrip() throws IOException { "Missing path: test_all_types/test_all_types:0/proportion_any|type, value: 1" }, new String[] { - "Extra path: test_all_types/test_all_types:0/identifier, value: 55175056", - "Extra path: test_all_types/test_all_types:0/proportion_any|type, value: 1.0" + "Extra path: test_all_types/test_all_types:0/identifier, value: 55175056", + "Extra path: test_all_types/test_all_types:0/proportion_any|type, value: 1.0" + })); + + testCaseList.add( + new TestCase( + 2, + CompositionTestDataSimSDTJson.CORONA, + "Corona_Anamnese", + CoronaAnamneseComposition.class, + new String[] {}, + new String[] {})); + + testCaseList.add( + new TestCase( + 3, + CompositionTestDataSimSDTJson.ALTERNATIVE_EVENTS, + "AlternativeEvents", + AlternativeEventsComposition.class, + new String[] { + "Missing path: bericht/körpergewicht:0/birth_en/gewicht|magnitude, value: 30.0", + "Missing path: bericht/körpergewicht:0/any_event_en:1/gewicht|magnitude, value: 60.0", + "Missing path: bericht/körpergewicht:0/any_event_en:2/gewicht|magnitude, value: 61.0", + "Missing path: bericht/körpergewicht:0/any_event_en:0/gewicht|magnitude, value: 55.0", + "Missing path: bericht/körpergewicht:0/any_event_en:3/gewicht|magnitude, value: 62.0" + }, + new String[] { + "Extra path: bericht/körpergewicht:0/any_event_en:0/gewicht|magnitude, value: 55", + "Extra path: bericht/körpergewicht:0/any_event_en:1/gewicht|magnitude, value: 60", + "Extra path: bericht/körpergewicht:0/any_event_en:2/gewicht|magnitude, value: 61", + "Extra path: bericht/körpergewicht:0/any_event_en:3/gewicht|magnitude, value: 62", + "Extra path: bericht/körpergewicht:0/birth_en/gewicht|magnitude, value: 30" + })); + + testCaseList.add( + new TestCase( + 4, + CompositionTestDataSimSDTJson.MULTI_OCCURRENCE, + "ehrbase_multi_occurrence.de.v1", + EhrbaseMultiOccurrenceDeV1Composition.class, + new String[] { + "Missing path: encounter/body_temperature:0/any_event:0/temperature|magnitude, value: 22.0", + "Missing path: encounter/body_temperature:0/any_event:1/temperature|magnitude, value: 11.0", + "Missing path: encounter/body_temperature:1/any_event:0/temperature|magnitude, value: 22.0", + "Missing path: encounter/body_temperature:1/any_event:1/temperature|magnitude, value: 11.0" + }, + new String[] { + "Extra path: encounter/context/_end_time, value: 2020-10-06T13:30:34.317875+02:00", + "Extra path: encounter/body_temperature:0/any_event:0/temperature|magnitude, value: 22", + "Extra path: encounter/body_temperature:0/any_event:1/temperature|magnitude, value: 11", + "Extra path: encounter/body_temperature:1/any_event:0/temperature|magnitude, value: 22", + "Extra path: encounter/body_temperature:1/any_event:1/temperature|magnitude, value: 11" })); SoftAssertions softly = new SoftAssertions(); @@ -118,41 +168,40 @@ public void checkTestCase(TestCase testCase, SoftAssertions softly) throws IOExc List errors = compere(actualFlat, value); - softly.assertThat(errors) - .filteredOn(s -> s.startsWith("Missing")) - .as("Test Case %s", testCase.id) - .containsExactlyInAnyOrder( - testCase.missing - ); - - softly.assertThat(errors) - .filteredOn(s -> s.startsWith("Extra")) - .as("Test Case %s", testCase.id) - .containsExactlyInAnyOrder( - testCase.extra - ); - - + softly + .assertThat(errors) + .filteredOn(s -> s.startsWith("Missing")) + .as("Test Case %s", testCase.id) + .containsExactlyInAnyOrder(testCase.missing); + + softly + .assertThat(errors) + .filteredOn(s -> s.startsWith("Extra")) + .as("Test Case %s", testCase.id) + .containsExactlyInAnyOrder(testCase.extra); } - private static List compere(String actualJson, String expectedJson) throws JsonProcessingException { + private static List compere(String actualJson, String expectedJson) + throws JsonProcessingException { List errors = new ArrayList<>(); ObjectMapper objectMapper = JacksonUtil.getObjectMapper(); Map actual = objectMapper.readValue(actualJson, Map.class); Map expected = objectMapper.readValue(expectedJson, Map.class); - actual.forEach((key, value) -> { - if (!expected.containsKey(key) || !expected.get(key).equals(value)) { - errors.add(String.format("Missing path: %s, value: %s", key, value)); - } - }); - - expected.forEach((key, value) -> { - if (!actual.containsKey(key) || !actual.get(key).equals(value)) { - errors.add(String.format("Extra path: %s, value: %s", key, value)); - } - }); + actual.forEach( + (key, value) -> { + if (!expected.containsKey(key) || !expected.get(key).equals(value)) { + errors.add(String.format("Missing path: %s, value: %s", key, value)); + } + }); + + expected.forEach( + (key, value) -> { + if (!actual.containsKey(key) || !actual.get(key).equals(value)) { + errors.add(String.format("Extra path: %s, value: %s", key, value)); + } + }); return errors; } diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/walker/ToCompositionWalker.java b/serialisation/src/main/java/org/ehrbase/serialisation/walker/ToCompositionWalker.java index 1047ce669..621af037b 100644 --- a/serialisation/src/main/java/org/ehrbase/serialisation/walker/ToCompositionWalker.java +++ b/serialisation/src/main/java/org/ehrbase/serialisation/walker/ToCompositionWalker.java @@ -37,8 +37,10 @@ import org.slf4j.LoggerFactory; import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -47,6 +49,7 @@ public abstract class ToCompositionWalker extends Walker { private static final RMObjectCreator RM_OBJECT_CREATOR = new RMObjectCreator(ARCHIE_RM_INFO_LOOKUP); private final Logger log = LoggerFactory.getLogger(getClass()); + private final Map> cloneMap = new HashMap<>(); @Override protected Object extractRMChild(RMObject currentRM, WebTemplateNode currentNode, WebTemplateNode childNode, boolean isChoice, Integer count) { @@ -60,16 +63,25 @@ protected Object extractRMChild(RMObject currentRM, WebTemplateNode currentNode, if (count != null && child instanceof List) { RMObject currentChild; - List childList = (List) child; - if (count > 0) { - RMObject deepClone = deepClone(childList.get(0)); - childList.add(deepClone); + List childList; + + if (count == 0){ + childList = (List) child; + cloneMap.put(childNode.getAqlPath(),childList); + childList.forEach(c -> removeProto(count,c,parent,attributeName)); + }else{ + childList = cloneMap.get(childNode.getAqlPath());; + } + + + + RMObject proto = childList.get(0); + RMObject deepClone = deepClone(proto); + currentChild = deepClone; RM_OBJECT_CREATOR.addElementToListOrSetSingleValues(parent, attributeName, deepClone); - } else { - currentChild = childList.get(0); - } + child = currentChild; } String rmclass = childNode.getRmType(); @@ -98,21 +110,11 @@ protected Object extractRMChild(RMObject currentRM, WebTemplateNode currentNode, ((IntervalEvent) newEvent).setWidth(new DvDuration()); ((IntervalEvent) newEvent).setMathFunction(new DvCodedText()); } - - } - RMAttributeInfo attributeInfo = ARCHIE_RM_INFO_LOOKUP.getAttributeInfo(parent.getClass(), attributeName); - if (attributeInfo.isMultipleValued() && (count == null || count != 1)) { - try { - Object invoke = attributeInfo.getGetMethod().invoke(parent); - if (Collection.class.isAssignableFrom(invoke.getClass())) { - ((Collection) invoke).remove(child); - } - } catch (IllegalAccessException | InvocationTargetException e) { - log.warn(e.getMessage(), e); - } + removeProto(count, child, parent, attributeName); } - RM_OBJECT_CREATOR.addElementToListOrSetSingleValues(parent, attributeName, Collections.singletonList(newChild)); + + RM_OBJECT_CREATOR.addElementToListOrSetSingleValues(parent, attributeName, Collections.singletonList(newChild)); } catch (IllegalArgumentException e){ newChild = null; @@ -123,6 +125,20 @@ protected Object extractRMChild(RMObject currentRM, WebTemplateNode currentNode, return child; } + private void removeProto(Integer count, Object child, Object parent, String attributeName) { + RMAttributeInfo attributeInfo = ARCHIE_RM_INFO_LOOKUP.getAttributeInfo(parent.getClass(), attributeName); + if (attributeInfo.isMultipleValued() ) { + try { + Object invoke = attributeInfo.getGetMethod().invoke(parent); + if (ArrayList.class.isAssignableFrom(invoke.getClass())) { + ((List) invoke).remove(((ArrayList) invoke).lastIndexOf(child)); + } + } catch (IllegalAccessException | InvocationTargetException e) { + log.warn(e.getMessage(), e); + } + } + } + protected ImmutablePair extractPair(Context context, WebTemplateNode currentNode, Map> choices, WebTemplateNode childNode, Integer i) { RMObject currentChild = null; T childObject = null; diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java b/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java index 2fa026f2d..37f7d1924 100644 --- a/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java +++ b/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java @@ -31,7 +31,9 @@ import com.nedap.archie.rminfo.RMTypeInfo; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.ImmutableTriple; import org.apache.commons.lang3.tuple.Pair; +import org.apache.commons.lang3.tuple.Triple; import org.ehrbase.serialisation.jsonencoding.CanonicalJson; import org.ehrbase.util.exception.SdkException; import org.ehrbase.webtemplate.model.WebTemplate; @@ -40,6 +42,7 @@ import org.ehrbase.webtemplate.parser.FlatPath; import java.util.ArrayList; +import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -112,37 +115,51 @@ private void handle(Context context) { children.remove(event); } - for (WebTemplateNode childNode : children) { + Collection> childChoices = children.stream() + .collect(Collectors.groupingBy(WebTemplateNode::getAqlPath)) + .entrySet() + .stream() + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)) + .values(); - if (childNode.getMax() == 1) { + for (List choces : childChoices) { - ImmutablePair pair = - extractPair(context, currentNode, choices, childNode, null); - T childObject = pair.getLeft(); - Object child = pair.getRight(); + if (choces.stream().noneMatch(WebTemplateNode::isMulti)) { - if (child != null && childObject != null) { - context.getNodeDeque().push(childNode); - context.getObjectDeque().push(childObject); - context.getRmObjectDeque().push((RMObject) child); - handle(context); + for (WebTemplateNode childNode : choces) { + ImmutablePair pair = + extractPair(context, currentNode, choices, childNode, null); + T childObject = pair.getLeft(); + Object child = pair.getRight(); + + if (child != null && childObject != null) { + context.getNodeDeque().push(childNode); + context.getObjectDeque().push(childObject); + context.getRmObjectDeque().push((RMObject) child); + handle(context); + } } } else { - int size = calculateSize(context, childNode); + int size = calculateSize(context, choces.get(0)); - List> pairs = new ArrayList<>(); - for (int i = 0; i < size; i++) { - ImmutablePair pair = - extractPair(context, currentNode, choices, childNode, i); - pairs.add(pair); + List> pairs = new ArrayList<>(); + for (int i = 0; i < size; i++) { + for (WebTemplateNode childNode : choces) { + ImmutablePair pair = + extractPair(context, currentNode, choices, childNode, i); + if (pair.getLeft() != null && pair.getRight() != null) { + pairs.add(new ImmutableTriple<>(pair.getLeft(),pair.getRight(),childNode)); + } + } } for (int i = 0; i < size; i++) { RMObject currentChild = null; T childObject = null; childObject = pairs.get(i).getLeft(); - currentChild = pairs.get(i).getRight(); + currentChild = pairs.get(i).getMiddle(); + WebTemplateNode childNode = pairs.get(i).getRight(); if (currentChild != null && childObject != null) { context.getNodeDeque().push(childNode); context.getObjectDeque().push(childObject); From f614966181e007bcb21fa8f61053c353f087688c Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Thu, 3 Dec 2020 16:16:49 +0100 Subject: [PATCH 30/54] some code cleanup see https://github.com/ehrbase/project_management/issues/424 --- .../flattener/DtoToCompositionWalker.java | 12 +- .../client/flattener/ItemExtractor.java | 146 ---------------- .../client/flattener/ItemExtractorTest.java | 142 ---------------- .../client/classgenerator/ClassGenerator.java | 59 +++---- .../classgenerator/ClassGeneratorContext.java | 46 +++++ .../classgenerator/DefaultNamingStrategy.java | 42 ++--- .../client/classgenerator/FlattFilter.java | 7 +- .../client/classgenerator/NamingStrategy.java | 38 +++++ .../classgenerator/ClassGeneratorTest.java | 2 - .../serialisation/walker/ItemExtractor.java | 160 ++++++++++++++++++ .../walker/ToCompositionWalker.java | 1 - .../ehrbase/serialisation/walker/Walker.java | 126 -------------- .../ehrbase/webtemplate/parser/FlatPath.java | 4 + .../webtemplate/parser/FlatPathTest.java | 1 + 14 files changed, 307 insertions(+), 479 deletions(-) delete mode 100644 client/src/main/java/org/ehrbase/client/flattener/ItemExtractor.java delete mode 100644 client/src/test/java/org/ehrbase/client/flattener/ItemExtractorTest.java create mode 100644 generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorContext.java create mode 100644 generator/src/main/java/org/ehrbase/client/classgenerator/NamingStrategy.java create mode 100644 serialisation/src/main/java/org/ehrbase/serialisation/walker/ItemExtractor.java diff --git a/client/src/main/java/org/ehrbase/client/flattener/DtoToCompositionWalker.java b/client/src/main/java/org/ehrbase/client/flattener/DtoToCompositionWalker.java index e074a4e30..f4f6ed7d0 100644 --- a/client/src/main/java/org/ehrbase/client/flattener/DtoToCompositionWalker.java +++ b/client/src/main/java/org/ehrbase/client/flattener/DtoToCompositionWalker.java @@ -107,7 +107,7 @@ protected Map extract( } else { String path = subValues.keySet().stream().findAny().get(); if (value.getClass().isAnnotationPresent(Entity.class) - && new PathExtractor(path).getChildPath().equals("")) { + && new FlatPath(path).getPath().equals("")) { Map newValues = findEntity(value).entrySet().stream() @@ -163,16 +163,16 @@ protected void preHandle(Context> context) { for (Map.Entry objectEntry : values.entrySet()) { - PathExtractor extractor = new PathExtractor(objectEntry.getKey()); - if (StringUtils.isBlank(extractor.getChildPath())) { - if ("uuid".equals(extractor.getAttributeName())){ + FlatPath flatPath = new FlatPath(objectEntry.getKey()); + if (StringUtils.isBlank(flatPath.getPath())) { + if ("uuid".equals(flatPath.getAttributeName())){ System.out.println("d"); } else - if (StringUtils.isNotBlank(extractor.getAttributeName())) { + if (StringUtils.isNotBlank(flatPath.getAttributeName())) { handleSingleValue( objectEntry.getValue(), - extractor.getAttributeName(), + flatPath.getAttributeName(), null, context.getRmObjectDeque().peek()); } else { diff --git a/client/src/main/java/org/ehrbase/client/flattener/ItemExtractor.java b/client/src/main/java/org/ehrbase/client/flattener/ItemExtractor.java deleted file mode 100644 index d1a9c0488..000000000 --- a/client/src/main/java/org/ehrbase/client/flattener/ItemExtractor.java +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Copyright (c) 2019 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School - * This file is part of Project EHRbase - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ehrbase.client.flattener; - -import com.nedap.archie.rm.RMObject; -import com.nedap.archie.rm.archetyped.Locatable; -import com.nedap.archie.rm.datastructures.Element; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.text.CaseUtils; -import org.ehrbase.client.exception.ClientException; -import org.ehrbase.webtemplate.parser.FlatPath; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.beans.IntrospectionException; -import java.beans.PropertyDescriptor; -import java.lang.reflect.InvocationTargetException; -import java.util.List; -import java.util.stream.Collectors; - -public class ItemExtractor { - - private Logger logger = LoggerFactory.getLogger(ItemExtractor.class); - - private boolean multi; - - private RMObject rmObject; - private String path; - private String childName; - private Object child; - private Object parent; - - public ItemExtractor(RMObject rmObject, String path) { - this.rmObject = rmObject; - this.path = path; - this.multi = false; - invoke(); - } - - public ItemExtractor(RMObject rmObject, String path, boolean multi) { - this.rmObject = rmObject; - this.path = path; - this.multi = multi; - invoke(); - } - - public String getChildName() { - return childName; - } - - public Object getChild() { - return child; - } - - public Object getParent() { - return parent; - } - - private ItemExtractor invoke() { - FlatPath childPath; - String attributeName; - String parentPath; - if (Locatable.class.isAssignableFrom(rmObject.getClass())) { - PathExtractor pathExtractor = new PathExtractor(path); - - childPath = new FlatPath(pathExtractor.getChildPath()); - - - attributeName = pathExtractor.getAttributeName(); - - parentPath = pathExtractor.getParentPath(); - childName = pathExtractor.getChildName(); - } else { - parentPath = "/"; - childPath = new FlatPath(""); - attributeName = path.replace("/", "").replace("|", ""); - - } - - if (StringUtils.isNotBlank(childPath.format(false))) { - - //childPath not empty implies rmObject is Locatable - if (!Locatable.class.isAssignableFrom(rmObject.getClass())) { - throw new ClientException(String.format("Locatable not assignable from %s", rmObject.getClass())); - } - Locatable locatable = (Locatable) this.rmObject; - - child = locatable.itemsAtPath(childPath.format(false)); - - if (child == null || ((List) child).isEmpty()) { - child = locatable.itemAtPath(childPath.format(false)); - } - - FlatPath relativPath = new FlatPath(StringUtils.removeStart(childPath.format(true), parentPath)); - if (StringUtils.isNotBlank(relativPath.findOtherPredicate("name/value")) && child instanceof List) { - child = ((List) child).stream() - .filter(c -> relativPath.findOtherPredicate("name/value").equals(((Locatable) c).getNameAsString())) - .collect(Collectors.toList()); - // if name not found return null - if (((List) child).isEmpty()) { - child = null; - } - } - - if (!multi && child instanceof List ) { - child = ((List) child).stream().findAny().orElse(null); - } - - - if (child instanceof Element) { - child = ((Element) child).getValue(); - } - parent = locatable.itemAtPath(parentPath); - } else { - // already at the right position - child = rmObject; - } - - if (attributeName != null && child != null) { - try { - PropertyDescriptor propertyDescriptor = new PropertyDescriptor(CaseUtils.toCamelCase(attributeName, false, '_'), child.getClass(), "is" + Character.toUpperCase(attributeName.charAt(0)) + attributeName.substring(1), null); - parent = child; - childName = attributeName; - child = propertyDescriptor.getReadMethod().invoke(child); - } catch (IllegalAccessException | InvocationTargetException | IntrospectionException e) { - logger.warn(e.getMessage(), e); - } - } - return this; - } -} diff --git a/client/src/test/java/org/ehrbase/client/flattener/ItemExtractorTest.java b/client/src/test/java/org/ehrbase/client/flattener/ItemExtractorTest.java deleted file mode 100644 index 96635cff5..000000000 --- a/client/src/test/java/org/ehrbase/client/flattener/ItemExtractorTest.java +++ /dev/null @@ -1,142 +0,0 @@ -package org.ehrbase.client.flattener; - -import com.nedap.archie.rm.composition.Composition; -import com.nedap.archie.rm.composition.EventContext; -import com.nedap.archie.rm.composition.Observation; -import com.nedap.archie.rm.datastructures.Element; -import com.nedap.archie.rm.datastructures.ItemTree; -import com.nedap.archie.rm.datavalues.DvCodedText; -import com.nedap.archie.rm.datavalues.DvText; -import com.nedap.archie.rm.datavalues.quantity.DvCount; -import com.nedap.archie.rm.datavalues.quantity.datetime.DvDateTime; -import org.junit.Test; - -import java.time.LocalDateTime; -import java.time.Month; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; - -public class ItemExtractorTest { - - @Test - public void testItemExtractor() { - Composition composition = new Composition(); - EventContext eventContext = new EventContext(); - composition.setContext(eventContext); - LocalDateTime localDateTime = LocalDateTime.of(2014, Month.APRIL, 20, 13, 40); - DvDateTime endTime = new DvDateTime(localDateTime); - composition.getContext().setEndTime(endTime); - ItemExtractor cut = new ItemExtractor(composition, "/context/end_time|value"); - - assertThat(cut.getChildName()).isEqualTo("value"); - assertThat(cut.getChild()).isEqualTo(localDateTime); - assertThat(cut.getParent()).isEqualTo(endTime); - - } - - @Test - public void testItemExtractorWithName() { - Composition composition = new Composition(); - - Observation observation1 = new Observation(); - observation1.setName(new DvText("Name1")); - observation1.setArchetypeNodeId("openEHR-EHR-OBSERVATION.story.v1"); - - Observation observation2 = new Observation(); - observation2.setName(new DvText("Name2")); - observation2.setArchetypeNodeId("openEHR-EHR-OBSERVATION.story.v1"); - - composition.setContent(List.of(observation1, observation2)); - - - ItemExtractor cut = new ItemExtractor(composition, "/content[openEHR-EHR-OBSERVATION.story.v1 and name/value='Name2']"); - - assertThat(cut.getChild()).isNotNull(); - - Observation actual = (Observation) cut.getChild(); - assertThat(actual.getNameAsString()).isEqualTo("Name2"); - - - } - - @Test - public void testItemExtractorWithNameNotFound() { - Composition composition = new Composition(); - - Observation observation1 = new Observation(); - observation1.setName(new DvText("Name1")); - observation1.setArchetypeNodeId("openEHR-EHR-OBSERVATION.story.v1"); - - Observation observation2 = new Observation(); - observation2.setName(new DvText("Name2")); - observation2.setArchetypeNodeId("openEHR-EHR-OBSERVATION.story.v1"); - - composition.setContent(List.of(observation1, observation2)); - - - ItemExtractor cut = new ItemExtractor(composition, "/content[openEHR-EHR-OBSERVATION.story.v1 and name/value='Name3']"); - - assertThat(cut.getChild()).isNull(); - - - } - - @Test - public void testItemExtractorEmpty() { - Composition composition = new Composition(); - - ItemExtractor cut = new ItemExtractor(composition, "/context/end_time|value"); - - assertThat(cut.getChildName()).isEqualTo("end_time"); - assertThat(cut.getChild()).isNull(); - assertThat(cut.getParent()).isNull(); - - } - - @Test - public void testItemExtractorOnlyAttribut() { - DvCount dvCount = new DvCount(); - dvCount.setMagnitude(100L); - ItemExtractor cut = new ItemExtractor(dvCount, "|magnitude"); - - assertThat(cut.getChildName()).isEqualTo("magnitude"); - assertThat(cut.getChild()).isEqualTo(100L); - assertThat(cut.getParent()).isEqualTo(dvCount); - - } - - @Test - public void testItemExtractorWithoutAttribut() { - Composition composition = new Composition(); - EventContext eventContext = new EventContext(); - composition.setContext(eventContext); - LocalDateTime localDateTime = LocalDateTime.of(2014, Month.APRIL, 20, 13, 40); - DvDateTime endTime = new DvDateTime(localDateTime); - composition.getContext().setEndTime(endTime); - ItemExtractor cut = new ItemExtractor(composition, "/context/end_time"); - - assertThat(cut.getChildName()).isEqualTo("end_time"); - assertThat(cut.getChild()).isEqualTo(endTime); - assertThat(cut.getParent()).isEqualTo(eventContext); - - } - - @Test - public void testItemExtractorElement() { - Observation observation = new Observation(); - ItemTree itemTree = new ItemTree(); - observation.setProtocol(itemTree); - Element item = new Element(); - DvCodedText value = new DvCodedText(); - item.setValue(value); - itemTree.addItem(item); - ItemExtractor cut = new ItemExtractor(observation, "/protocol[at0020]/items"); - - assertThat(cut.getChildName()).isEqualTo("items"); - assertThat(cut.getChild()).isEqualTo(value); - assertThat(cut.getParent()).isEqualTo(itemTree); - } - - -} \ No newline at end of file diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java index 70c65071c..efdedf099 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java @@ -29,8 +29,6 @@ import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.MultiValuedMap; -import org.apache.commons.collections4.multimap.ArrayListValuedHashMap; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.reflect.FieldUtils; import org.ehrbase.client.annotations.Archetype; @@ -64,7 +62,6 @@ import javax.lang.model.element.Modifier; import java.lang.reflect.Field; -import java.util.ArrayDeque; import java.util.Arrays; import java.util.Collections; import java.util.Deque; @@ -82,34 +79,25 @@ public class ClassGenerator { public static final int CLASS_NAME_MAX_WIDTH = 80; private static final Map, RmClassGeneratorConfig> configMap = ReflectionHelper.buildMap(RmClassGeneratorConfig.class); - private final DefaultNamingStrategy defaultNamingStrategy = new DefaultNamingStrategy(); - - static class Context { - final MultiValuedMap classes = new ArrayListValuedHashMap<>(); - final Deque nodeDeque = new ArrayDeque<>(); - final Deque unFilteredNodeDeque = new ArrayDeque<>(); - final Map currentTypeSpec = new HashMap<>(); - String currentMainClass; - final Deque currentArchetypeName = new ArrayDeque<>(); - final Map currentClassNameMap = new HashMap<>(); - String currentPackageName; - final Map currentEnums = new HashMap<>(); - final Deque> currentFieldNameMap = new ArrayDeque<>(); - FilteredWebTemplate webTemplate; - } - private Logger logger = LoggerFactory.getLogger(this.getClass()); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final WebTemplateFilter filter; + private final NamingStrategy defaultNamingStrategy; + + public ClassGenerator(WebTemplateFilter filter, NamingStrategy defaultNamingStrategy) { + this.filter = filter; + this.defaultNamingStrategy = defaultNamingStrategy; + } public ClassGenerator(ClassGeneratorConfig config) { - filter = new FlattFilter(); + this(new FlattFilter(config), new DefaultNamingStrategy(config)); } public ClassGeneratorResult generate(String packageName, WebTemplate webTemplate) { - Context context = new Context(); + ClassGeneratorContext context = new ClassGeneratorContext(); context.currentPackageName = packageName; @@ -141,7 +129,7 @@ private void addVersionUid(TypeSpec.Builder classBuilder) { classBuilder.addMethod(buildSetter(versionUid)); } - private TypeSpec.Builder build(Context context, WebTemplateNode next) { + private TypeSpec.Builder build(ClassGeneratorContext context, WebTemplateNode next) { String className = defaultNamingStrategy.buildClassName(context, next, false, false); @@ -293,7 +281,8 @@ private TypeSpec.Builder build(Context context, WebTemplateNode next) { return classBuilder; } - private Deque pushToUnfiltered(Context context, WebTemplateNode node) { + private Deque pushToUnfiltered( + ClassGeneratorContext context, WebTemplateNode node) { Deque filtersNodes = context.webTemplate.findFiltersNodes(node); if (!CollectionUtils.isEmpty(filtersNodes)) { filtersNodes.descendingIterator().forEachRemaining(context.unFilteredNodeDeque::push); @@ -302,7 +291,10 @@ private Deque pushToUnfiltered(Context context, WebTemplateNode } private void addComplexField( - Context context, TypeSpec.Builder classBuilder, String path, WebTemplateNode node) { + ClassGeneratorContext context, + TypeSpec.Builder classBuilder, + String path, + WebTemplateNode node) { final TypeSpec subSpec; @@ -332,7 +324,7 @@ private void addComplexField( false); } - private WebTemplateNode buildRelativeNode(Context context, WebTemplateNode node) { + private WebTemplateNode buildRelativeNode(ClassGeneratorContext context, WebTemplateNode node) { WebTemplateNode relativeNode = new WebTemplateNode(node); List matching = relativeNode.findMatching(n -> true); @@ -350,7 +342,10 @@ private WebTemplateNode buildRelativeNode(Context context, WebTemplateNode node) } private void addSimpleField( - Context context, TypeSpec.Builder classBuilder, String path, WebTemplateNode endNode) { + ClassGeneratorContext context, + TypeSpec.Builder classBuilder, + String path, + WebTemplateNode endNode) { Class clazz = extractClass(endNode); if (clazz == null) { @@ -366,7 +361,9 @@ private void addSimpleField( } boolean expand = classGeneratorConfig != null && classGeneratorConfig.isExpandField(); - if (endNode.getRmType().equals("DV_CODED_TEXT") && !List.of("transition","language","setting","category","territory","math_function").contains(endNode.getId(false))) { + if (endNode.getRmType().equals("DV_CODED_TEXT") + && !List.of("transition", "language", "setting", "category", "territory", "math_function") + .contains(endNode.getId(false))) { expand = expand && endNode.getInputs().stream() @@ -375,8 +372,7 @@ private void addSimpleField( .flatMap(List::stream) .findAny() .isPresent(); - } - + } if (!expand) { @@ -443,7 +439,7 @@ private TermDefinition toTerm(WebTemplateInputValue t) { } private void addField( - Context context, + ClassGeneratorContext context, TypeSpec.Builder classBuilder, String path, WebTemplateNode node, @@ -507,7 +503,8 @@ private void addField( classBuilder.addMethod(buildGetter(fieldSpec)); } - private TypeSpec buildEnumValueSet(Context context, WebTemplateNode node, ValueSet valueSet) { + private TypeSpec buildEnumValueSet( + ClassGeneratorContext context, WebTemplateNode node, ValueSet valueSet) { TypeSpec.Builder enumBuilder = TypeSpec.enumBuilder(defaultNamingStrategy.buildClassName(context, node, false, true)) .addSuperinterface(EnumValueSet.class) diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorContext.java b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorContext.java new file mode 100644 index 000000000..22764e74c --- /dev/null +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorContext.java @@ -0,0 +1,46 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.client.classgenerator; + +import com.squareup.javapoet.TypeSpec; +import org.apache.commons.collections4.MultiValuedMap; +import org.apache.commons.collections4.multimap.ArrayListValuedHashMap; +import org.ehrbase.terminology.client.terminology.ValueSet; +import org.ehrbase.webtemplate.model.FilteredWebTemplate; +import org.ehrbase.webtemplate.model.WebTemplateNode; + +import java.util.ArrayDeque; +import java.util.Deque; +import java.util.HashMap; +import java.util.Map; + +class ClassGeneratorContext { + final MultiValuedMap classes = new ArrayListValuedHashMap<>(); + final Deque nodeDeque = new ArrayDeque<>(); + final Deque unFilteredNodeDeque = new ArrayDeque<>(); + final Map currentTypeSpec = new HashMap<>(); + String currentMainClass; + final Deque currentArchetypeName = new ArrayDeque<>(); + final Map currentClassNameMap = new HashMap<>(); + String currentPackageName; + final Map currentEnums = new HashMap<>(); + final Deque> currentFieldNameMap = new ArrayDeque<>(); + FilteredWebTemplate webTemplate; +} diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java b/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java index 7d6a1ccf8..412d6dd0e 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java @@ -28,18 +28,22 @@ import java.util.Deque; import java.util.Iterator; -import java.util.List; import java.util.Objects; import java.util.Optional; -public class DefaultNamingStrategy { +public class DefaultNamingStrategy implements NamingStrategy { public static final String TERM_DIVIDER = "_"; + private ClassGeneratorConfig config; - public DefaultNamingStrategy() {} + public DefaultNamingStrategy(ClassGeneratorConfig config) { - String buildClassName( - ClassGenerator.Context context, WebTemplateNode node, boolean isChoice, boolean isEnum) { + this.config = config; + } + + @Override + public String buildClassName( + ClassGeneratorContext context, WebTemplateNode node, boolean isChoice, boolean isEnum) { String name = replaceElementName(context, node); if (context.nodeDeque.isEmpty()) { @@ -74,7 +78,7 @@ String buildClassName( return fieldName; } - private String makeNameUnique(ClassGenerator.Context context, WebTemplateNode node) { + private String makeNameUnique(ClassGeneratorContext context, WebTemplateNode node) { WebTemplateNode parent = context.nodeDeque.peek(); String name = replaceElementName(context, node); @@ -98,7 +102,7 @@ private String makeNameUnique(ClassGenerator.Context context, WebTemplateNode no return name; } - private String replaceElementName(ClassGenerator.Context context, WebTemplateNode node) { + private String replaceElementName(ClassGeneratorContext context, WebTemplateNode node) { String name = node.getName(); WebTemplateNode trueParent = Optional.ofNullable(context.webTemplate.findFiltersNodes(node)) @@ -111,13 +115,7 @@ private String replaceElementName(ClassGenerator.Context context, WebTemplateNod return name; } - private boolean isInChoice(WebTemplateNode parent, WebTemplateNode node) { - return parent.getChoicesInChildren().values().stream() - .flatMap(List::stream) - .anyMatch(l -> l.equals(node)); - } - - String sanitizeNumber(String fieldName) { + private String sanitizeNumber(String fieldName) { if (!Character.isAlphabetic(fieldName.charAt(0))) { if (Character.isLowerCase(fieldName.charAt(0))) { fieldName = "n" + fieldName; @@ -128,7 +126,7 @@ String sanitizeNumber(String fieldName) { return fieldName; } - WebTemplateNode findLastArchetype(Deque nodeDeque) { + private WebTemplateNode findLastArchetype(Deque nodeDeque) { for (Iterator it = nodeDeque.iterator(); it.hasNext(); ) { WebTemplateNode node = it.next(); if (node.isArchetype()) { @@ -138,18 +136,14 @@ WebTemplateNode findLastArchetype(Deque nodeDeque) { return null; } - /** - * Manipulate the fieldName to remove or replace illegal characters - * - * @param fieldName - * @return normalized fieldName for Java naming convention - */ - String toEnumName(String fieldName) { + @Override + public String toEnumName(String fieldName) { fieldName = sanitizeNumber(fieldName); return new SnakeCase(normalise(fieldName, false)).camelToUpperSnake(); } - String buildFieldName(ClassGenerator.Context context, String path, WebTemplateNode node) { + @Override + public String buildFieldName(ClassGeneratorContext context, String path, WebTemplateNode node) { String name = node.getName(); String attributeName = new FlatPath(path).getLast().getAttributeName(); @@ -188,7 +182,7 @@ String buildFieldName(ClassGenerator.Context context, String path, WebTemplateNo return fieldName; } - private static String normalise(String name, boolean capitalizeFirstLetter) { + private String normalise(String name, boolean capitalizeFirstLetter) { if (StringUtils.isBlank(name) || name.equals("_")) { return RandomStringUtils.randomAlphabetic(10); } diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java b/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java index 84a140655..1f69379ff 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java @@ -26,7 +26,6 @@ import org.ehrbase.util.reflection.ReflectionHelper; import org.ehrbase.webtemplate.filter.Filter; import org.ehrbase.webtemplate.model.WebTemplate; -import org.ehrbase.webtemplate.model.WebTemplateInput; import org.ehrbase.webtemplate.model.WebTemplateNode; import org.ehrbase.webtemplate.parser.config.RmIntrospectConfig; @@ -40,6 +39,12 @@ public class FlattFilter extends Filter { private static final Map, RmIntrospectConfig> configMap = ReflectionHelper.buildMap(RmIntrospectConfig.class); + private ClassGeneratorConfig config; + + public FlattFilter(ClassGeneratorConfig config) { + + this.config = config; + } @Override protected boolean skip(WebTemplateNode node, WebTemplate context, WebTemplateNode parent) { diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/NamingStrategy.java b/generator/src/main/java/org/ehrbase/client/classgenerator/NamingStrategy.java new file mode 100644 index 000000000..97f2926f5 --- /dev/null +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/NamingStrategy.java @@ -0,0 +1,38 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.client.classgenerator; + +import org.ehrbase.webtemplate.model.WebTemplateNode; + +public interface NamingStrategy { + + String buildClassName( + ClassGeneratorContext context, WebTemplateNode node, boolean isChoice, boolean isEnum); + + /** + * Manipulate the fieldName to remove or replace illegal characters + * + * @param fieldName + * @return normalized fieldName for Java naming convention + */ + String toEnumName(String fieldName); + + String buildFieldName(ClassGeneratorContext context, String path, WebTemplateNode node); +} diff --git a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java index 046cdd661..3f9ddcc63 100644 --- a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java +++ b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java @@ -28,7 +28,6 @@ import org.ehrbase.test_data.operationaltemplate.OperationalTemplateTestData; import org.ehrbase.webtemplate.model.WebTemplate; import org.ehrbase.webtemplate.parser.OPTParser; -import org.junit.Ignore; import org.junit.Test; import org.openehr.schemas.v1.OPERATIONALTEMPLATE; import org.openehr.schemas.v1.TemplateDocument; @@ -44,7 +43,6 @@ import static org.assertj.core.api.Assertions.assertThat; - public class ClassGeneratorTest { public static final String PACKAGE_NAME = "org.ehrbase.client.classgenerator.examples"; diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/walker/ItemExtractor.java b/serialisation/src/main/java/org/ehrbase/serialisation/walker/ItemExtractor.java new file mode 100644 index 000000000..cf786cd0b --- /dev/null +++ b/serialisation/src/main/java/org/ehrbase/serialisation/walker/ItemExtractor.java @@ -0,0 +1,160 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.serialisation.walker; + +import com.nedap.archie.rm.RMObject; +import com.nedap.archie.rm.archetyped.Locatable; +import com.nedap.archie.rm.archetyped.Pathable; +import com.nedap.archie.rm.datastructures.Element; +import com.nedap.archie.rm.datavalues.quantity.DvInterval; +import org.apache.commons.lang3.StringUtils; +import org.ehrbase.util.exception.SdkException; +import org.ehrbase.webtemplate.model.WebTemplateNode; +import org.ehrbase.webtemplate.parser.FlatPath; + +import java.util.List; +import java.util.stream.Collectors; + +public class ItemExtractor { + private RMObject currentRM; + private WebTemplateNode currentNode; + private WebTemplateNode childNode; + private boolean isChoice; + private String relativeAql; + private Object child; + private String parentAql; + private Object parent; + + public ItemExtractor( + RMObject currentRM, + WebTemplateNode currentNode, + WebTemplateNode childNode, + boolean isChoice) { + this.currentRM = currentRM; + this.currentNode = currentNode; + this.childNode = childNode; + this.isChoice = isChoice; + } + + public FlatPath getRelativeAql() { + return new FlatPath(relativeAql); + } + + public Object getChild() { + return child; + } + + public ItemExtractor invoke() { + relativeAql = + StringUtils.removeEnd( + StringUtils.removeStart(childNode.getAqlPath(), currentNode.getAqlPath()), "/"); + FlatPath childPath = new FlatPath(relativeAql); + parentAql = + StringUtils.removeEnd( + childPath.format(false), + childPath.format(false).substring(childPath.format(false).lastIndexOf("/"))); + if (StringUtils.isBlank(parentAql)) { + parentAql = "/"; + } + + if (currentRM instanceof Pathable) { + try { + child = ((Pathable) currentRM).itemsAtPath(childPath.format(false)); + if (child == null || ((List) child).isEmpty()) { + child = ((Pathable) currentRM).itemAtPath(childPath.format(false)); + } + } catch (RuntimeException e) { + child = null; + } + parent = ((Pathable) currentRM).itemAtPath(parentAql); + } else if (currentRM instanceof DvInterval) { + if (relativeAql.contains("upper_included")) { + child = new RmBoolean(((DvInterval) currentRM).isUpperIncluded()); + } else if (relativeAql.contains("lower_included")) { + child = new RmBoolean(((DvInterval) currentRM).isLowerIncluded()); + } else if (relativeAql.contains("lower")) { + child = ((DvInterval) currentRM).getLower(); + } else if (relativeAql.contains("upper")) { + child = ((DvInterval) currentRM).getUpper(); + } + parent = currentRM; + } else { + throw new SdkException( + String.format("Can not extract from class %s", currentRM.getClass().getSimpleName())); + } + + if (StringUtils.isNotBlank(childPath.findOtherPredicate("name/value")) + && child instanceof List + && Locatable.class.isAssignableFrom( + Walker.ARCHIE_RM_INFO_LOOKUP.getClass(childNode.getRmType()))) { + child = + ((List) child) + .stream() + .filter( + c -> + childPath + .findOtherPredicate("name/value") + .equals(((Locatable) c).getNameAsString())) + .collect(Collectors.toList()); + // if name not found return null + if (((List) child).isEmpty()) { + child = null; + } + } + if (isChoice && child instanceof List) { + child = + ((List) child) + .stream() + .filter( + c -> + Walker.ARCHIE_RM_INFO_LOOKUP + .getTypeInfo(c.getClass()) + .getRmName() + .equals(childNode.getRmType())) + .collect(Collectors.toList()); + // if rmType not found return null + if (((List) child).isEmpty()) { + child = null; + } + } + + if (childNode.getMax() == 1 && child instanceof List) { + + if (((List) child).isEmpty()) { + child = null; + } else { + child = ((List) child).get(0); + } + } + + if (child instanceof Element && !childNode.getRmType().equals("ELEMENT")) { + child = ((Element) child).getValue(); + } + return this; + } + + public FlatPath getParentAql() { + return new FlatPath(parentAql); + } + + public Object getParent() { + return parent; + } +} diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/walker/ToCompositionWalker.java b/serialisation/src/main/java/org/ehrbase/serialisation/walker/ToCompositionWalker.java index 621af037b..d540619dc 100644 --- a/serialisation/src/main/java/org/ehrbase/serialisation/walker/ToCompositionWalker.java +++ b/serialisation/src/main/java/org/ehrbase/serialisation/walker/ToCompositionWalker.java @@ -38,7 +38,6 @@ import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java b/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java index 37f7d1924..4d94371f0 100644 --- a/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java +++ b/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java @@ -233,130 +233,4 @@ protected String buildNamePath(Context context) { return sb.toString(); } - protected class ItemExtractor { - private RMObject currentRM; - private WebTemplateNode currentNode; - private WebTemplateNode childNode; - private boolean isChoice; - private String relativeAql; - private Object child; - private String parentAql; - private Object parent; - - public ItemExtractor( - RMObject currentRM, - WebTemplateNode currentNode, - WebTemplateNode childNode, - boolean isChoice) { - this.currentRM = currentRM; - this.currentNode = currentNode; - this.childNode = childNode; - this.isChoice = isChoice; - } - - public FlatPath getRelativeAql() { - return new FlatPath(relativeAql); - } - - public Object getChild() { - return child; - } - - public ItemExtractor invoke() { - relativeAql = - StringUtils.removeEnd( - StringUtils.removeStart(childNode.getAqlPath(), currentNode.getAqlPath()), "/"); - FlatPath childPath = new FlatPath(relativeAql); - parentAql = - StringUtils.removeEnd( - childPath.format(false), - childPath.format(false).substring(childPath.format(false).lastIndexOf("/"))); - if (StringUtils.isBlank(parentAql)) { - parentAql = "/"; - } - - if (currentRM instanceof Pathable) { - try { - child = ((Pathable) currentRM).itemsAtPath(childPath.format(false)); - if (child == null || ((List) child).isEmpty()) { - child = ((Pathable) currentRM).itemAtPath(childPath.format(false)); - } - } catch (RuntimeException e) { - child = null; - } - parent = ((Pathable) currentRM).itemAtPath(parentAql); - } else if (currentRM instanceof DvInterval) { - if (relativeAql.contains("upper_included")) { - child = new RmBoolean(((DvInterval) currentRM).isUpperIncluded()); - } else if (relativeAql.contains("lower_included")) { - child = new RmBoolean(((DvInterval) currentRM).isLowerIncluded()); - } else if (relativeAql.contains("lower")) { - child = ((DvInterval) currentRM).getLower(); - } else if (relativeAql.contains("upper")) { - child = ((DvInterval) currentRM).getUpper(); - } - parent = currentRM; - } else { - throw new SdkException( - String.format("Can not extract from class %s", currentRM.getClass().getSimpleName())); - } - - if (StringUtils.isNotBlank(childPath.findOtherPredicate("name/value")) - && child instanceof List - && Locatable.class.isAssignableFrom( - ARCHIE_RM_INFO_LOOKUP.getClass(childNode.getRmType()))) { - child = - ((List) child) - .stream() - .filter( - c -> - childPath - .findOtherPredicate("name/value") - .equals(((Locatable) c).getNameAsString())) - .collect(Collectors.toList()); - // if name not found return null - if (((List) child).isEmpty()) { - child = null; - } - } - if (isChoice && child instanceof List) { - child = - ((List) child) - .stream() - .filter( - c -> - ARCHIE_RM_INFO_LOOKUP - .getTypeInfo(c.getClass()) - .getRmName() - .equals(childNode.getRmType())) - .collect(Collectors.toList()); - // if rmType not found return null - if (((List) child).isEmpty()) { - child = null; - } - } - - if (childNode.getMax() == 1 && child instanceof List) { - - if (((List) child).isEmpty()) { - child = null; - } else { - child = ((List) child).get(0); - } - } - - if (child instanceof Element && !childNode.getRmType().equals("ELEMENT")) { - child = ((Element) child).getValue(); - } - return this; - } - - public FlatPath getParentAql() { - return new FlatPath(parentAql); - } - - public Object getParent() { - return parent; - } - } } diff --git a/web-template/src/main/java/org/ehrbase/webtemplate/parser/FlatPath.java b/web-template/src/main/java/org/ehrbase/webtemplate/parser/FlatPath.java index 99a934e37..a83e72c34 100644 --- a/web-template/src/main/java/org/ehrbase/webtemplate/parser/FlatPath.java +++ b/web-template/src/main/java/org/ehrbase/webtemplate/parser/FlatPath.java @@ -116,6 +116,10 @@ public FlatPath getChild() { return child; } + public String getPath(){ + return StringUtils.removeEnd( toString(),"|"+getLast().getAttributeName()); + } + public String getAttributeName() { return attributeName; } diff --git a/web-template/src/test/java/org/ehrbase/webtemplate/parser/FlatPathTest.java b/web-template/src/test/java/org/ehrbase/webtemplate/parser/FlatPathTest.java index b79c103a5..18de13feb 100644 --- a/web-template/src/test/java/org/ehrbase/webtemplate/parser/FlatPathTest.java +++ b/web-template/src/test/java/org/ehrbase/webtemplate/parser/FlatPathTest.java @@ -109,6 +109,7 @@ public void testFlatPathAttributeAndAtCode() { assertThat(cut).isNotNull(); assertThat(cut.getAtCode()).isEqualTo("at0001"); assertThat(cut.getName()).isEqualTo("data"); + assertThat(cut.getPath()).isEqualTo("/data[at0001]/events[at0002]/data[at0003]/items[at0004]"); assertThat(cut.toString()).isEqualTo(path); } From 269e9c54a84d6215588f1ffff0444fbece88a5bc Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Fri, 4 Dec 2020 10:21:15 +0100 Subject: [PATCH 31/54] do not regenerate test data see https://github.com/ehrbase/project_management/issues/424 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 596c17c22..25802b310 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -637,7 +637,7 @@ jobs: keys: - ehrbasedb-dump-v7 # COMMENT: USE THE NEXT LINE ONLY TO FORCE TEST-DATA REGENERATION! Otherwise comment it out! - - run: echo "FORCE GENERATION OF TEST-DATA AND EXPECTED RESULTS!" > /tmp/DATA_CHANGED_NOTICE + # - run: echo "FORCE GENERATION OF TEST-DATA AND EXPECTED RESULTS!" > /tmp/DATA_CHANGED_NOTICE - run: name: CHECK IF EXPECTED-RESULT TEMPLATES HAVE CHANGED AND REGENERATE TEST-DATA IF NEEDED command: | From 7c409b09ef8db700351f13789430353659c930b9 Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Fri, 4 Dec 2020 10:42:53 +0100 Subject: [PATCH 32/54] add name path as javadoc to generated classes. see https://github.com/ehrbase/project_management/issues/424 --- .../AlternativeEventsComposition.java | 45 +++++++++++ .../KorpergewichtAnyEventEnIntervalEvent.java | 24 ++++++ .../KorpergewichtAnyEventEnPointEvent.java | 18 +++++ .../KorpergewichtBirthEnPointEvent.java | 18 +++++ ...pergewichtConfoundingFactorsEnElement.java | 3 + .../definition/KorpergewichtObservation.java | 21 +++++ .../BefundDerBlutgasanalyseComposition.java | 45 +++++++++++ .../KohlendioxidpartialdruckCluster.java | 15 ++++ .../definition/LaborergebnisObservation.java | 48 ++++++++++++ .../definition/PhWertCluster.java | 15 ++++ .../SauerstoffpartialdruckCluster.java | 15 ++++ .../SauerstoffsattigungCluster.java | 15 ++++ .../CoronaAnamneseComposition.java | 57 ++++++++++++++ .../definition/AdresseCluster.java | 6 ++ .../definition/AllgemeineAngabenSection.java | 27 +++++++ ...AndereAktuelleErkrankungenObservation.java | 24 ++++++ ...ltInGesundheitseinrichtungObservation.java | 30 +++++++ .../definition/BeschaftigungCluster.java | 9 +++ ...ertungDesGesundheitsrisikosEvaluation.java | 39 ++++++++++ .../ChronischeErkrankungenObservation.java | 24 ++++++ ...enstleistungAktuelleAktivitatActivity.java | 21 +++++ ...leistungGrundFurDieAnforderungElement.java | 3 + .../definition/DienstleistungInstruction.java | 27 +++++++ .../definition/DurchfallObservation.java | 24 ++++++ ...derErhohteKorpertemperaturObservation.java | 24 ++++++ ...genZumMedikationsScreeningObservation.java | 27 +++++++ ...creeningSpezifischeMedikamenteCluster.java | 6 ++ ...storieBeliebigesEreignisIntervalEvent.java | 15 ++++ ...eHistorieBeliebigesEreignisPointEvent.java | 9 +++ .../GeschichteHistorieGeschichteElement.java | 3 + .../GeschichteHistorieObservation.java | 15 ++++ .../GestorterGeruchssinnObservation.java | 24 ++++++ .../GestorterGeschmackssinnObservation.java | 24 ++++++ .../GesundheitsbezogenerBerufEvaluation.java | 18 +++++ .../definition/HeiserkeitObservation.java | 24 ++++++ .../HistorieDerReiseObservation.java | 24 ++++++ .../definition/HustenObservation.java | 24 ++++++ .../definition/KontaktSection.java | 6 ++ .../KorpertemperaturObservation.java | 36 +++++++++ .../KorpertemperaturStorfaktorenElement.java | 3 + .../definition/OrganisationCluster.java | 18 +++++ .../PersonenkontaktObservation.java | 30 +++++++ .../definition/ProblemDiagnoseEvaluation.java | 21 +++++ ...rusDiagnostischeSicherheitDvCodedText.java | 3 + ...onovirusDiagnostischeSicherheitDvText.java | 3 + .../ProblemDiganoseCoronovirusEvaluation.java | 30 +++++++ ...iebigesIntervallereignisIntervalEvent.java | 18 +++++ .../ReisefallBestimmteReiseCluster.java | 9 +++ .../ReisefallBestimmtesReisezielCluster.java | 15 ++++ .../definition/ReisefallObservation.java | 15 ++++ .../definition/RisikogebietSection.java | 6 ++ .../definition/SchnupfenObservation.java | 24 ++++++ .../definition/StandortCluster.java | 6 ++ .../definition/StatusCluster.java | 3 + .../definition/SymptomeSection.java | 27 +++++++ ...mptomeBeliebigesEreignisIntervalEvent.java | 12 +++ ...eSymptomeBeliebigesEreignisPointEvent.java | 6 ++ .../WeitereSymptomeObservation.java | 15 ++++ ...meSpezifischesSymptomAnzeichenCluster.java | 12 +++ .../definition/WohnsituationEvaluation.java | 18 +++++ .../definition/WohnstatteCluster.java | 6 ++ .../DiagnoseComposition.java | 42 ++++++++++ .../AnatomischeLokalisationCluster.java | 12 +++ ...thogeneseAtiologieDerKrankheitElement.java | 3 + ...eneseBeschreibungDesEntstehensElement.java | 3 + .../definition/AtiopathogeneseCluster.java | 6 ++ .../AtiopathogeneseValueDvCodedText.java | 3 + .../AtiopathogeneseValueDvText.java | 3 + .../definition/DiagnosedetailsCluster.java | 12 +++ .../definition/FallidentifikationCluster.java | 3 + ...oseDiagnostischeSicherheitDvCodedText.java | 3 + ...DiagnoseDiagnostischeSicherheitDvText.java | 3 + .../definition/ProblemDiagnoseEvaluation.java | 51 ++++++++++++ ...ProblemDiagnoseSchweregradDvCodedText.java | 3 + .../ProblemDiagnoseSchweregradDvText.java | 3 + ...aseBloodPressureSimpleDeV0Composition.java | 39 ++++++++++ ...loodPressureTrainingSampleObservation.java | 63 +++++++++++++++ .../DeviceDetailsTrainingSampleCluster.java | 27 +++++++ ...EhrbaseMultiOccurrenceDeV1Composition.java | 39 ++++++++++ .../BodyTemperatureAnyEventIntervalEvent.java | 30 +++++++ .../BodyTemperatureAnyEventPointEvent.java | 24 ++++++ ...odyTemperatureBodyExposureDvCodedText.java | 3 + .../BodyTemperatureBodyExposureDvText.java | 3 + ...atureLocationOfMeasurementDvCodedText.java | 3 + ...emperatureLocationOfMeasurementDvText.java | 3 + .../BodyTemperatureObservation.java | 24 ++++++ .../EpisodeOfCareComposition.java | 36 +++++++++ .../definition/EpisodeofcareAdminEntry.java | 39 ++++++++++ .../EpisodeofcareDiagnosisCluster.java | 9 +++ .../EpisodeofcareIdentifierElement.java | 3 + .../definition/EpisodeofcareTeamElement.java | 3 + .../OpenEREACTCareComposition.java | 48 ++++++++++++ .../definition/AbdomenSymptomCluster.java | 18 +++++ .../definition/AcvpuScaleObservation.java | 21 +++++ .../definition/AllergiesEvaluation.java | 12 +++ .../definition/AssessmentSection.java | 12 +++ .../definition/BackgroundSection.java | 18 +++++ .../definition/BloodPressureObservation.java | 36 +++++++++ .../definition/ChestSymptomCluster.java | 18 +++++ .../definition/Covid19ExposureEvaluation.java | 42 ++++++++++ .../definition/CovidNotesEvaluation.java | 12 +++ .../definition/CovidSection.java | 12 +++ .../definition/CovidSymptomsObservation.java | 36 +++++++++ .../DenwisAgitationIndicatorElement.java | 3 + .../DenwisBreathingIndicatorElement.java | 3 + .../DenwisCirculationIndicatorElement.java | 3 + .../DenwisMentationIndicatorElement.java | 3 + ...DenwisNurseSubjectiveIndicatorElement.java | 3 + .../definition/DenwisObservation.java | 78 +++++++++++++++++++ .../DenwisPainIndicatorElement.java | 3 + .../DenwisPatientIndicatorElement.java | 3 + .../DenwisTemperatureIndicatorElement.java | 3 + .../DenwisTrajectoryIndicatorElement.java | 3 + .../definition/DenwisValueDvCodedText.java | 3 + .../definition/DenwisValueDvCodedText2.java | 3 + .../definition/DenwisValueDvCodedText3.java | 3 + .../definition/DenwisValueDvCodedText4.java | 3 + .../definition/DenwisValueDvCodedText5.java | 3 + .../definition/DenwisValueDvCodedText6.java | 3 + .../definition/DenwisValueDvText.java | 3 + .../definition/DenwisValueDvText2.java | 3 + .../definition/DenwisValueDvText3.java | 3 + .../definition/DenwisValueDvText4.java | 3 + .../definition/DenwisValueDvText5.java | 3 + .../definition/DenwisValueDvText6.java | 3 + .../definition/FirstSymptomsCluster.java | 30 +++++++ .../definition/FrailtyObservation.java | 18 +++++ .../definition/HeightObservation.java | 27 +++++++ .../definition/KeyCovidSymptomCluster.java | 18 +++++ .../LatestCovid19TestObservation.java | 48 ++++++++++++ ...vid19TestOverallTestStatusDvCodedText.java | 3 + ...estCovid19TestOverallTestStatusDvText.java | 3 + ...tCovid19TestTestRequestDetailsCluster.java | 6 ++ .../definition/MedicationEvaluation.java | 12 +++ .../definition/NeuroSymptomCluster.java | 18 +++++ .../definition/News2ScoreObservation.java | 45 +++++++++++ .../definition/News2Section.java | 21 +++++ .../definition/OtherSymptomCluster.java | 18 +++++ .../definition/PastHistoryEvaluation.java | 12 +++ .../definition/PulseObservation.java | 27 +++++++ .../definition/PulseOximetryObservation.java | 33 ++++++++ .../definition/RecommendationEvaluation.java | 12 +++ .../RecommendationRecommendationElement.java | 3 + .../definition/RespirationsObservation.java | 27 +++++++ .../definition/ResponseSection.java | 9 +++ .../SepsisScreening999FlagElement.java | 3 + .../SepsisScreeningAmberFlagAcuteElement.java | 3 + ...reeningLikelySourceOfInfectionElement.java | 3 + .../SepsisScreeningObservation.java | 30 +++++++ .../SepsisScreeningRedFlagAcuteElement.java | 3 + ...sScreeningRiskFactorsForSepsisElement.java | 3 + .../SepsisScreeningValueDvCodedText.java | 3 + .../SepsisScreeningValueDvText.java | 3 + .../definition/SepsisSection.java | 3 + .../definition/ServiceAction.java | 36 +++++++++ ...ServiceRequestCurrentActivityActivity.java | 30 +++++++ .../definition/ServiceRequestInstruction.java | 27 +++++++ ...ServiceRequestReasonForRequestElement.java | 3 + .../definition/SituationSection.java | 3 + .../definition/StoryHistoryObservation.java | 24 ++++++ .../StoryHistorySoftSignsElement.java | 3 + .../definition/TemperatureObservation.java | 30 +++++++ .../definition/WeightObservation.java | 27 +++++++ .../PatientenaufenthaltComposition.java | 42 ++++++++++ .../definition/AbteilungsfallCluster.java | 3 + .../definition/DetailsZumBettCluster.java | 24 ++++++ .../definition/StandortCluster.java | 30 +++++++ .../definition/VersorgungsfallCluster.java | 3 + .../definition/VersorgungsortAdminEntry.java | 21 +++++ .../SchwangerschaftsstatusComposition.java | 45 +++++++++++ .../SchwangerschaftsstatusObservation.java | 18 +++++ .../SmICSBefundComposition.java | 45 +++++++++++ .../definition/AntibiogrammCluster.java | 3 + .../definition/ErregerdetailsCluster.java | 30 +++++++ .../ErregerdetailsKeimSubtypElement.java | 3 + ...gerdetailsResistenzmechanismusCluster.java | 3 + ...ertypisierungArtDerTypisierungElement.java | 3 + .../definition/ErregertypisierungCluster.java | 12 +++ .../ErregertypisierungErgebnisElement.java | 3 + ...EventsummaryBeteiligtePersonenCluster.java | 6 ++ .../definition/EventsummaryCluster.java | 15 ++++ .../EventsummaryIdDerPersonElement.java | 3 + .../EventsummaryValueDvIdentifier.java | 3 + .../definition/EventsummaryValueDvUri.java | 3 + .../LaboranalytResultatCluster.java | 18 +++++ ...ebnisAnzahlDerErregernachweiseElement.java | 3 + .../definition/SmicsErgebnisObservation.java | 63 +++++++++++++++ .../definition/StandortCluster.java | 18 +++++ ...StationarerVersorgungsfallComposition.java | 51 ++++++++++++ .../definition/AufnahmedatenAdminEntry.java | 21 +++++ .../EntlassungsdatenAdminEntry.java | 24 ++++++ .../TestAllTypesEnV1Composition.java | 45 +++++++++++ .../definition/TestAllTypesAction.java | 21 +++++ .../definition/TestAllTypesAdminEntry.java | 9 +++ .../definition/TestAllTypesChoiceDvCount.java | 3 + .../TestAllTypesChoiceDvQuantity.java | 6 ++ .../definition/TestAllTypesCluster.java | 3 + .../definition/TestAllTypesEvaluation.java | 57 ++++++++++++++ .../definition/TestAllTypesInstruction.java | 21 +++++ .../definition/TestAllTypesObservation.java | 63 +++++++++++++++ .../definition/TestAllTypesSection.java | 9 +++ .../VirologischerBefundComposition.java | 45 +++++++++++ .../AnatomischeLokalisationCluster.java | 9 +++ .../definition/BefundAnforderungElement.java | 3 + .../definition/BefundObservation.java | 54 +++++++++++++ .../definition/EinsenderstandortCluster.java | 12 +++ .../definition/EmpfangerstandortCluster.java | 12 +++ .../definition/FallidentifikationCluster.java | 3 + .../definition/KulturCluster.java | 3 + .../definition/ProVirusCluster.java | 24 ++++++ .../definition/ProbeCluster.java | 54 +++++++++++++ .../client/classgenerator/ClassGenerator.java | 26 ++++++- 212 files changed, 3700 insertions(+), 1 deletion(-) diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java index 6dc5ea259..5a4a2b726 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java @@ -24,48 +24,93 @@ @Archetype("openEHR-EHR-COMPOSITION.report.v1") @Template("AlternativeEvents") public class AlternativeEventsComposition { + /** + * Bericht/context/Bericht ID + */ @Path("/context/other_context[at0001]/items[at0002]/value|value") private String berichtIdValue; + /** + * Bericht/context/Status + */ @Path("/context/other_context[at0001]/items[at0005]/value|value") private String statusValue; + /** + * Bericht/context/Erweiterung + */ @Path("/context/other_context[at0001]/items[at0006]") private List erweiterung; + /** + * Bericht/context/start_time + */ @Path("/context/start_time|value") private TemporalAccessor startTimeValue; + /** + * Bericht/context/participations + */ @Path("/context/participations") private List participations; + /** + * Bericht/context/end_time + */ @Path("/context/end_time|value") private TemporalAccessor endTimeValue; + /** + * Bericht/context/location + */ @Path("/context/location") private String location; + /** + * Bericht/context/health_care_facility + */ @Path("/context/health_care_facility") private PartyIdentified healthCareFacility; + /** + * Bericht/context/setting + */ @Path("/context/setting|defining_code") private Setting settingDefiningCode; + /** + * Bericht/Körpergewicht + */ @Path("/content[openEHR-EHR-OBSERVATION.body_weight.v2]") private List korpergewicht; + /** + * Bericht/composer + */ @Path("/composer") private PartyProxy composer; + /** + * Bericht/language + */ @Path("/language") private Language language; + /** + * Bericht/feeder_audit + */ @Path("/feeder_audit") private FeederAudit feederAudit; + /** + * Bericht/category + */ @Path("/category|defining_code") private Category categoryDefiningCode; + /** + * Bericht/territory + */ @Path("/territory") private Territory territory; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java index 252ae7f8f..8980dad4f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java @@ -13,27 +13,51 @@ @Entity @OptionFor("INTERVAL_EVENT") public class KorpergewichtAnyEventEnIntervalEvent implements KorpergewichtAnyEventEnChoice { + /** + * Bericht/Körpergewicht/*Any event(en)/Gewicht + */ @Path("/data[at0001]/items[at0004]/value|magnitude") private Double gewichtMagnitude; + /** + * Bericht/Körpergewicht/*Any event(en)/Gewicht + */ @Path("/data[at0001]/items[at0004]/value|units") private String gewichtUnits; + /** + * Bericht/Körpergewicht/*Any event(en)/*Comment(en) + */ @Path("/data[at0001]/items[at0024]/value|value") private String commentEnValue; + /** + * Bericht/Körpergewicht/*Any event(en)/*State of dress(en) + */ @Path("/state[at0008]/items[at0009]/value|defining_code") private StateOfDressEnDefiningCode stateOfDressEnDefiningCode; + /** + * Bericht/Körpergewicht/*Any event(en)/*Confounding factors(en) + */ @Path("/state[at0008]/items[at0025]") private List confoundingFactorsEn; + /** + * Bericht/Körpergewicht/*Any event(en)/time + */ @Path("/time|value") private TemporalAccessor timeValue; + /** + * Bericht/Körpergewicht/*Any event(en)/width + */ @Path("/width|value") private TemporalAmount widthValue; + /** + * Bericht/Körpergewicht/*Any event(en)/math_function + */ @Path("/math_function|defining_code") private MathFunction mathFunctionDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java index 9150cef34..6fec062ec 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java @@ -11,21 +11,39 @@ @Entity @OptionFor("POINT_EVENT") public class KorpergewichtAnyEventEnPointEvent implements KorpergewichtAnyEventEnChoice { + /** + * Bericht/Körpergewicht/*Any event(en)/Gewicht + */ @Path("/data[at0001]/items[at0004]/value|magnitude") private Double gewichtMagnitude; + /** + * Bericht/Körpergewicht/*Any event(en)/Gewicht + */ @Path("/data[at0001]/items[at0004]/value|units") private String gewichtUnits; + /** + * Bericht/Körpergewicht/*Any event(en)/*Comment(en) + */ @Path("/data[at0001]/items[at0024]/value|value") private String commentEnValue; + /** + * Bericht/Körpergewicht/*Any event(en)/*State of dress(en) + */ @Path("/state[at0008]/items[at0009]/value|defining_code") private StateOfDressEnDefiningCode stateOfDressEnDefiningCode; + /** + * Bericht/Körpergewicht/*Any event(en)/*Confounding factors(en) + */ @Path("/state[at0008]/items[at0025]") private List confoundingFactorsEn; + /** + * Bericht/Körpergewicht/*Any event(en)/time + */ @Path("/time|value") private TemporalAccessor timeValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java index 01fdb2dbc..ac04d8480 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java @@ -9,21 +9,39 @@ @Entity public class KorpergewichtBirthEnPointEvent { + /** + * Bericht/Körpergewicht/*Birth(en)/Gewicht + */ @Path("/data[at0001]/items[at0004]/value|magnitude") private Double gewichtMagnitude; + /** + * Bericht/Körpergewicht/*Birth(en)/Gewicht + */ @Path("/data[at0001]/items[at0004]/value|units") private String gewichtUnits; + /** + * Bericht/Körpergewicht/*Birth(en)/*Comment(en) + */ @Path("/data[at0001]/items[at0024]/value|value") private String commentEnValue; + /** + * Bericht/Körpergewicht/*Birth(en)/*State of dress(en) + */ @Path("/state[at0008]/items[at0009]/value|defining_code") private StateOfDressEnDefiningCode stateOfDressEnDefiningCode; + /** + * Bericht/Körpergewicht/*Birth(en)/*Confounding factors(en) + */ @Path("/state[at0008]/items[at0025]") private List confoundingFactorsEn; + /** + * Bericht/Körpergewicht/*Birth(en)/time + */ @Path("/time|value") private TemporalAccessor timeValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java index 91525cbf1..6649dac6a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java @@ -6,6 +6,9 @@ @Entity public class KorpergewichtConfoundingFactorsEnElement { + /** + * Bericht/Körpergewicht/*Birth(en)/*Confounding factors(en) + */ @Path("/value|value") private String value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java index 4f644459e..fa6a93f40 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java @@ -13,24 +13,45 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.body_weight.v2") public class KorpergewichtObservation { + /** + * Bericht/Körpergewicht/*Birth(en) + */ @Path("/data[at0002]/events[at0026]") private KorpergewichtBirthEnPointEvent birthEn; + /** + * Bericht/Körpergewicht/origin + */ @Path("/data[at0002]/origin|value") private TemporalAccessor originValue; + /** + * Bericht/Körpergewicht/Gerät + */ @Path("/protocol[at0015]/items[at0020]") private Cluster gerat; + /** + * Bericht/Körpergewicht/*Extension(en) + */ @Path("/protocol[at0015]/items[at0027]") private List extensionEn; + /** + * Bericht/Körpergewicht/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Körpergewicht/language + */ @Path("/language") private Language language; + /** + * Bericht/Körpergewicht/*Any event(en) + */ @Path("/data[at0002]/events[at0003]") @Choice private List anyEventEn; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java index d431671b1..4cc48fe5e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java @@ -25,48 +25,93 @@ @Archetype("openEHR-EHR-COMPOSITION.registereintrag.v1") @Template("Befund der Blutgasanalyse") public class BefundDerBlutgasanalyseComposition { + /** + * Befund der Blutgasanalyse/context/Erweiterung + */ @Path("/context/other_context[at0001]/items[at0002]") private List erweiterung; + /** + * Befund der Blutgasanalyse/context/Status + */ @Path("/context/other_context[at0001]/items[at0004]/value|defining_code") private StatusDefiningCode statusDefiningCode; + /** + * Befund der Blutgasanalyse/context/Kategorie + */ @Path("/context/other_context[at0001]/items[at0005]/value|value") private String kategorieValue; + /** + * Befund der Blutgasanalyse/context/start_time + */ @Path("/context/start_time|value") private TemporalAccessor startTimeValue; + /** + * Befund der Blutgasanalyse/context/participations + */ @Path("/context/participations") private List participations; + /** + * Befund der Blutgasanalyse/context/end_time + */ @Path("/context/end_time|value") private TemporalAccessor endTimeValue; + /** + * Befund der Blutgasanalyse/context/location + */ @Path("/context/location") private String location; + /** + * Befund der Blutgasanalyse/context/health_care_facility + */ @Path("/context/health_care_facility") private PartyIdentified healthCareFacility; + /** + * Befund der Blutgasanalyse/context/setting + */ @Path("/context/setting|defining_code") private Setting settingDefiningCode; + /** + * Befund der Blutgasanalyse/Laborergebnis + */ @Path("/content[openEHR-EHR-OBSERVATION.laboratory_test_result.v1]") private LaborergebnisObservation laborergebnis; + /** + * Befund der Blutgasanalyse/composer + */ @Path("/composer") private PartyProxy composer; + /** + * Befund der Blutgasanalyse/language + */ @Path("/language") private Language language; + /** + * Befund der Blutgasanalyse/feeder_audit + */ @Path("/feeder_audit") private FeederAudit feederAudit; + /** + * Befund der Blutgasanalyse/category + */ @Path("/category|defining_code") private Category categoryDefiningCode; + /** + * Befund der Blutgasanalyse/territory + */ @Path("/territory") private Territory territory; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java index c7454a080..e9dfd5bd8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java @@ -11,18 +11,33 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") public class KohlendioxidpartialdruckCluster { + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Kohlendioxidpartialdruck/untersuchter Analyt + */ @Path("/items[at0024]/value|defining_code") private UntersuchterAnalytDefiningCode untersuchterAnalytDefiningCode; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Kohlendioxidpartialdruck/Analyt-Resultat + */ @Path("/items[at0001]/value|magnitude") private Double analytResultatMagnitude; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Kohlendioxidpartialdruck/Analyt-Resultat + */ @Path("/items[at0001]/value|units") private String analytResultatUnits; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Kohlendioxidpartialdruck/Analyseergebnis-Details + */ @Path("/items[at0014]") private List analyseergebnisDetails; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Kohlendioxidpartialdruck/Ergebnis-Status + */ @Path("/items[at0005]/value|value") private String ergebnisStatusValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java index c7aa42893..dc78665bd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java @@ -12,51 +12,99 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.laboratory_test_result.v1") public class LaborergebnisObservation { + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Labortest-Bezeichnung + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|defining_code") private LabortestBezeichnungDefiningCode labortestBezeichnungDefiningCode; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Probendetail + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0065]") private List probendetail; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Kohlendioxidpartialdruck + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Kohlendioxidpartialdruck']") private KohlendioxidpartialdruckCluster kohlendioxidpartialdruck; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Sauerstoffpartialdruck + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Sauerstoffpartialdruck']") private SauerstoffpartialdruckCluster sauerstoffpartialdruck; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/pH-Wert + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='pH-Wert']") private PhWertCluster phWert; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Sauerstoffsättigung + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Sauerstoffsättigung']") private SauerstoffsattigungCluster sauerstoffsattigung; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Strukturierte Testdiagnostik + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0122]") private List strukturierteTestdiagnostik; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Multimedia-Darstellung + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0118]") private List multimediaDarstellung; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Strukturierte Erfassung der Störfaktoren + */ @Path("/data[at0001]/events[at0002]/state[at0112]/items[at0114]") private List strukturierteErfassungDerStorfaktoren; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * Befund der Blutgasanalyse/Laborergebnis/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * Befund der Blutgasanalyse/Laborergebnis/Labor, welches den Untersuchungsauftrag annimmt + */ @Path("/protocol[at0004]/items[at0017]") private Cluster laborWelchesDenUntersuchungsauftragAnnimmt; + /** + * Befund der Blutgasanalyse/Laborergebnis/Test Details + */ @Path("/protocol[at0004]/items[at0110]") private List testDetails; + /** + * Befund der Blutgasanalyse/Laborergebnis/Erweiterung + */ @Path("/protocol[at0004]/items[at0117]") private List erweiterung; + /** + * Befund der Blutgasanalyse/Laborergebnis/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Befund der Blutgasanalyse/Laborergebnis/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java index 30121f0a5..122d725e0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java @@ -11,18 +11,33 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") public class PhWertCluster { + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/pH-Wert/untersuchter Analyt + */ @Path("/items[at0024]/value|defining_code") private UntersuchterAnalytDefiningCode3 untersuchterAnalytDefiningCode; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/pH-Wert/Analyt-Resultat + */ @Path("/items[at0001]/value|magnitude") private Double analytResultatMagnitude; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/pH-Wert/Analyt-Resultat + */ @Path("/items[at0001]/value|units") private String analytResultatUnits; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/pH-Wert/Analyseergebnis-Details + */ @Path("/items[at0014]") private List analyseergebnisDetails; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/pH-Wert/Ergebnis-Status + */ @Path("/items[at0005]/value|value") private String ergebnisStatusValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java index 02c783230..8da6dd59f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java @@ -11,18 +11,33 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") public class SauerstoffpartialdruckCluster { + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Sauerstoffpartialdruck/untersuchter Analyt + */ @Path("/items[at0024]/value|defining_code") private UntersuchterAnalytDefiningCode2 untersuchterAnalytDefiningCode; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Sauerstoffpartialdruck/Analyt-Resultat + */ @Path("/items[at0001]/value|magnitude") private Double analytResultatMagnitude; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Sauerstoffpartialdruck/Analyt-Resultat + */ @Path("/items[at0001]/value|units") private String analytResultatUnits; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Sauerstoffpartialdruck/Analyseergebnis-Details + */ @Path("/items[at0014]") private List analyseergebnisDetails; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Sauerstoffpartialdruck/Ergebnis-Status + */ @Path("/items[at0005]/value|value") private String ergebnisStatusValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java index 25eded4cd..994538039 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java @@ -11,18 +11,33 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") public class SauerstoffsattigungCluster { + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Sauerstoffsättigung/untersuchter Analyt + */ @Path("/items[at0024]/value|defining_code") private UntersuchterAnalytDefiningCode4 untersuchterAnalytDefiningCode; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Sauerstoffsättigung/Analyt-Resultat + */ @Path("/items[at0001]/value|magnitude") private Double analytResultatMagnitude; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Sauerstoffsättigung/Analyt-Resultat + */ @Path("/items[at0001]/value|units") private String analytResultatUnits; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Sauerstoffsättigung/Analyseergebnis-Details + */ @Path("/items[at0014]") private List analyseergebnisDetails; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Sauerstoffsättigung/Ergebnis-Status + */ @Path("/items[at0005]/value|value") private String ergebnisStatusValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java index e11fdfa4b..06d57cacb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java @@ -28,60 +28,117 @@ @Archetype("openEHR-EHR-COMPOSITION.report.v1") @Template("Corona_Anamnese") public class CoronaAnamneseComposition { + /** + * Bericht/context/Bericht ID + */ @Path("/context/other_context[at0001]/items[at0002]/value|value") private String berichtIdValue; + /** + * Bericht/context/Status + */ @Path("/context/other_context[at0001]/items[at0005]/value|value") private String statusValue; + /** + * Bericht/context/Erweiterung + */ @Path("/context/other_context[at0001]/items[at0006]") private List erweiterung; + /** + * Bericht/context/start_time + */ @Path("/context/start_time|value") private TemporalAccessor startTimeValue; + /** + * Bericht/context/participations + */ @Path("/context/participations") private List participations; + /** + * Bericht/context/end_time + */ @Path("/context/end_time|value") private TemporalAccessor endTimeValue; + /** + * Bericht/context/location + */ @Path("/context/location") private String location; + /** + * Bericht/context/health_care_facility + */ @Path("/context/health_care_facility") private PartyIdentified healthCareFacility; + /** + * Bericht/context/setting + */ @Path("/context/setting|defining_code") private Setting settingDefiningCode; + /** + * Bericht/Geschichte/Historie + */ @Path("/content[openEHR-EHR-OBSERVATION.story.v1]") private List geschichteHistorie; + /** + * Bericht/Symptome + */ @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']") private SymptomeSection symptome; + /** + * Bericht/Kontakt + */ @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']") private KontaktSection kontakt; + /** + * Bericht/Risikogebiet + */ @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Risikogebiet']") private RisikogebietSection risikogebiet; + /** + * Bericht/Allgemeine Angaben + */ @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']") private AllgemeineAngabenSection allgemeineAngaben; + /** + * Bericht/composer + */ @Path("/composer") private PartyProxy composer; + /** + * Bericht/language + */ @Path("/language") private Language language; + /** + * Bericht/feeder_audit + */ @Path("/feeder_audit") private FeederAudit feederAudit; + /** + * Bericht/category + */ @Path("/category|defining_code") private Category categoryDefiningCode; + /** + * Bericht/territory + */ @Path("/territory") private Territory territory; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java index da3ee2756..5a29ba5b1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java @@ -8,9 +8,15 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.address_cc.v0") public class AdresseCluster { + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Adresse/Stadt + */ @Path("/items[at0012]/value|value") private String stadtValue; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Adresse/Land + */ @Path("/items[at0015]/value|value") private String landValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java index 541fc885d..20b192bdf 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java @@ -8,30 +8,57 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class AllgemeineAngabenSection { + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen + */ @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Andere aktuelle Erkrankungen']") private AndereAktuelleErkrankungenObservation andereAktuelleErkrankungen; + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen + */ @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Chronische Erkrankungen']") private ChronischeErkrankungenObservation chronischeErkrankungen; + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose + */ @Path("/items[openEHR-EHR-EVALUATION.problem_diagnosis.v1]") private List problemDiagnose; + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening + */ @Path("/items[openEHR-EHR-OBSERVATION.medication_use.v0]") private FragebogenZumMedikationsScreeningObservation fragebogenZumMedikationsScreening; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf + */ @Path("/items[openEHR-EHR-EVALUATION.occupation_summary.v1 and name/value='Gesundheitsbezogener Beruf']") private GesundheitsbezogenerBerufEvaluation gesundheitsbezogenerBeruf; + /** + * Bericht/Allgemeine Angaben/Wohnsituation + */ @Path("/items[openEHR-EHR-EVALUATION.living_arrangement.v0]") private List wohnsituation; + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos + */ @Path("/items[openEHR-EHR-EVALUATION.health_risk.v1]") private List bewertungDesGesundheitsrisikos; + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus + */ @Path("/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1 and name/value='Problem/Diganose Coronovirus']") private ProblemDiganoseCoronovirusEvaluation problemDiganoseCoronovirus; + /** + * Bericht/Allgemeine Angaben/Dienstleistung + */ @Path("/items[openEHR-EHR-INSTRUCTION.service_request.v1]") private List dienstleistung; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java index 489ca877a..cd6051e8c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java @@ -13,27 +13,51 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class AndereAktuelleErkrankungenObservation { + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") private String bezeichnungDesSymptomsOderAnzeichensValue; + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") private VorhandenDefiningCode vorhandenDefiningCode; + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") private List detaillierteAngabenZumSymptomAnzeichen; + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/Beliebiges Ereignis/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/Erweiterung + */ @Path("/protocol[at0007]/items[at0021]") private List erweiterung; + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java index 21647db2e..352b7eee8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java @@ -13,33 +13,63 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.exposure_assessment.v0") public class AufenthaltInGesundheitseinrichtungObservation { + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Beliebiges Ereignis/*Agent (en) + */ @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value") private String agentEnValue; + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Beliebiges Ereignis/*Presence of any exposure? (en) + */ @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code") private PresenceOfAnyExposureEnDefiningCode presenceOfAnyExposureEnDefiningCode; + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Beliebiges Ereignis/*Specific exposure (en)/*Exposure (en) + */ @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value") private String exposureEnValue; + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Beliebiges Ereignis/*Specific exposure (en)/Vorhandensein + */ @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code") private VorhandenseinDefiningCode vorhandenseinDefiningCode; + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Beliebiges Ereignis/Kommentar + */ @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value") private String kommentarValue; + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Beliebiges Ereignis/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Erweiterung + */ @Path("/protocol[at0004]/items[at0056]") private List erweiterung; + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java index f012cc41c..554405ca2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java @@ -10,12 +10,21 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.occupation_record.v1") public class BeschaftigungCluster { + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Berufsbezeichnung/Rolle + */ @Path("/items[at0005]/value|value") private String berufsbezeichnungRolleValue; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation + */ @Path("/items[openEHR-EHR-CLUSTER.organisation_cc.v0]") private List organisation; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Zusätzliche Angaben + */ @Path("/items[at0018]") private List zusatzlicheAngaben; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java index 32426fdf3..4e4df8843 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java @@ -13,42 +13,81 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.health_risk.v1") public class BewertungDesGesundheitsrisikosEvaluation { + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Gesundheitsrisiko + */ @Path("/data[at0001]/items[at0002]/value|value") private String gesundheitsrisikoValue; + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Spezifischer Risikofaktor/Risikofaktor + */ @Path("/data[at0001]/items[at0016 and name/value='Spezifischer Risikofaktor']/items[at0013]/value|value") private String spezifischerRisikofaktorRisikofaktorValue; + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Spezifischer Risikofaktor/Vorhandensein + */ @Path("/data[at0001]/items[at0016 and name/value='Spezifischer Risikofaktor']/items[at0017]/value|defining_code") private VorhandenseinDefiningCode2 vorhandenseinDefiningCode; + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Spezifischer Risikofaktor/Details + */ @Path("/data[at0001]/items[at0016 and name/value='Spezifischer Risikofaktor']/items[at0027]") private List spezifischerRisikofaktorDetails; + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Andere Risikofaktoren/Risikofaktor + */ @Path("/data[at0001]/items[at0016 and name/value='Andere Risikofaktoren']/items[at0013]/value|value") private String andereRisikofaktorenRisikofaktorValue; + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Andere Risikofaktoren/Vorhandensein + */ @Path("/data[at0001]/items[at0016 and name/value='Andere Risikofaktoren']/items[at0017]/value|defining_code") private VorhandenseinDefiningCode2 vorhandenseinDefiningCode2; + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Andere Risikofaktoren/Details + */ @Path("/data[at0001]/items[at0016 and name/value='Andere Risikofaktoren']/items[at0027]") private List andereRisikofaktorenDetails; + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Risikobewertung + */ @Path("/data[at0001]/items[at0003]/value|value") private String risikobewertungValue; + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Letzte Aktualisierung + */ @Path("/protocol[at0010]/items[at0024]/value|value") private TemporalAccessor letzteAktualisierungValue; + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Bewertungsmethode + */ @Path("/protocol[at0010]/items[at0025]/value|value") private String bewertungsmethodeValue; + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Erweiterung + */ @Path("/protocol[at0010]/items[at0011]") private List erweiterung; + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java index c0c1c15cf..5acfec869 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java @@ -13,27 +13,51 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class ChronischeErkrankungenObservation { + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") private String bezeichnungDesSymptomsOderAnzeichensValue; + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") private VorhandenDefiningCode vorhandenDefiningCode; + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") private List detaillierteAngabenZumSymptomAnzeichen; + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/Beliebiges Ereignis/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/Erweiterung + */ @Path("/protocol[at0007]/items[at0021]") private List erweiterung; + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java index 0b6dccd7f..ec45b5b18 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java @@ -9,24 +9,45 @@ @Entity public class DienstleistungAktuelleAktivitatActivity { + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Name der Dienstleistung + */ @Path("/description[at0009]/items[at0121]/value|value") private String nameDerDienstleistungValue; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Grund für die Anforderung + */ @Path("/description[at0009]/items[at0062]") private List grundFurDieAnforderung; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Komplexe Zeitplanung + */ @Path("/description[at0009]/items[at0151]") private List komplexeZeitplanung; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Spezifische Details + */ @Path("/description[at0009]/items[at0132]") private List spezifischeDetails; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Unterstützende Informationen + */ @Path("/description[at0009]/items[at0149]") private List unterstutzendeInformationen; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Anforderungen an Patienten + */ @Path("/description[at0009]/items[at0116]") private List anforderungenAnPatienten; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/timing + */ @Path("/timing") private DvParsable timing; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java index ae73ac04b..2b77f9b6d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java @@ -6,6 +6,9 @@ @Entity public class DienstleistungGrundFurDieAnforderungElement { + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Grund für die Anforderung + */ @Path("/value|value") private String value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java index a8bea456d..9d2c77b18 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java @@ -13,30 +13,57 @@ @Entity @Archetype("openEHR-EHR-INSTRUCTION.service_request.v1") public class DienstleistungInstruction { + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität + */ @Path("/activities[at0001]") private List aktuelleAktivitat; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Einsender + */ @Path("/protocol[at0008]/items[at0141]") private Cluster einsender; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Empfänger + */ @Path("/protocol[at0008]/items[at0142]") private Cluster empfanger; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Verteilerliste + */ @Path("/protocol[at0008]/items[at0128]") private List verteilerliste; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Erweiterung + */ @Path("/protocol[at0008]/items[at0112]") private List erweiterung; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/narrative + */ @Path("/narrative|value") private String narrativeValue; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/language + */ @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/expiry_time + */ @Path("/expiry_time|value") private TemporalAccessor expiryTimeValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java index 5f99f53a8..207ffdd1b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java @@ -13,27 +13,51 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class DurchfallObservation { + /** + * Bericht/Symptome/Durchfall/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") private String bezeichnungDesSymptomsOderAnzeichensValue; + /** + * Bericht/Symptome/Durchfall/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") private VorhandenDefiningCode vorhandenDefiningCode; + /** + * Bericht/Symptome/Durchfall/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") private List detaillierteAngabenZumSymptomAnzeichen; + /** + * Bericht/Symptome/Durchfall/Beliebiges Ereignis/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * Bericht/Symptome/Durchfall/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * Bericht/Symptome/Durchfall/Erweiterung + */ @Path("/protocol[at0007]/items[at0021]") private List erweiterung; + /** + * Bericht/Symptome/Durchfall/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Symptome/Durchfall/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java index 1d3b2ecd7..7448dcbd3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java @@ -13,27 +13,51 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class FieberOderErhohteKorpertemperaturObservation { + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") private String bezeichnungDesSymptomsOderAnzeichensValue; + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") private VorhandenDefiningCode vorhandenDefiningCode; + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") private List detaillierteAngabenZumSymptomAnzeichen; + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/Beliebiges Ereignis/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/Erweiterung + */ @Path("/protocol[at0007]/items[at0021]") private List erweiterung; + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java index 745a3d0b7..97fadc4bd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java @@ -14,30 +14,57 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.medication_use.v0") public class FragebogenZumMedikationsScreeningObservation { + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Medikamente in Verwendung? + */ @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0027]/value") private DvCodedText medikamenteInVerwendung; + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Name der Medikamentenklasse + */ @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0002]/value|value") private String nameDerMedikamentenklasseValue; + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Medikamentenklasse in Verwendung? + */ @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0003]/value|defining_code") private MedikamentenklasseInVerwendungDefiningCode medikamentenklasseInVerwendungDefiningCode; + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Spezifische Medikamente + */ @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0008]") private List spezifischeMedikamente; + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/time + */ @Path("/data[at0022]/events[at0023]/time|value") private TemporalAccessor timeValue; + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/origin + */ @Path("/data[at0022]/origin|value") private TemporalAccessor originValue; + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Erweiterung + */ @Path("/protocol[at0005]/items[at0019]") private List erweiterung; + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java index 583b84a2d..058ba2b9d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java @@ -6,9 +6,15 @@ @Entity public class FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster { + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Spezifische Medikamente/Name des Medikaments + */ @Path("/items[at0021]/value|value") private String nameDesMedikamentsValue; + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Spezifische Medikamente/Medikament in Verwendung? + */ @Path("/items[at0024]/value|defining_code") private MedikamentInVerwendungDefiningCode medikamentInVerwendungDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java index d36fb3102..3a557bda7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java @@ -12,18 +12,33 @@ @Entity @OptionFor("INTERVAL_EVENT") public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements GeschichteHistorieBeliebigesEreignisChoice { + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/Geschichte + */ @Path("/data[at0003]/items[at0004]") private List geschichte; + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/Strukturierte Angabe + */ @Path("/data[at0003]/items[at0006]") private List strukturierteAngabe; + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/time + */ @Path("/time|value") private TemporalAccessor timeValue; + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/width + */ @Path("/width|value") private TemporalAmount widthValue; + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/math_function + */ @Path("/math_function|defining_code") private MathFunction mathFunctionDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java index 5a425fc26..15a3f94cd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java @@ -10,12 +10,21 @@ @Entity @OptionFor("POINT_EVENT") public class GeschichteHistorieBeliebigesEreignisPointEvent implements GeschichteHistorieBeliebigesEreignisChoice { + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/Geschichte + */ @Path("/data[at0003]/items[at0004]") private List geschichte; + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/Strukturierte Angabe + */ @Path("/data[at0003]/items[at0006]") private List strukturierteAngabe; + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/time + */ @Path("/time|value") private TemporalAccessor timeValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java index 68c3c7c45..1949eea1d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java @@ -6,6 +6,9 @@ @Entity public class GeschichteHistorieGeschichteElement { + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/Geschichte + */ @Path("/value|value") private String value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java index caa66e1d6..84735903e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java @@ -13,18 +13,33 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.story.v1") public class GeschichteHistorieObservation { + /** + * Bericht/Geschichte/Historie/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * Bericht/Geschichte/Historie/Erweiterung + */ @Path("/protocol[at0007]/items[at0008]") private List erweiterung; + /** + * Bericht/Geschichte/Historie/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Geschichte/Historie/language + */ @Path("/language") private Language language; + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis + */ @Path("/data[at0001]/events[at0002]") @Choice private List beliebigesEreignis; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java index 190420e6d..0263e4855 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java @@ -13,27 +13,51 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class GestorterGeruchssinnObservation { + /** + * Bericht/Symptome/Gestörter Geruchssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") private String bezeichnungDesSymptomsOderAnzeichensValue; + /** + * Bericht/Symptome/Gestörter Geruchssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") private VorhandenDefiningCode vorhandenDefiningCode; + /** + * Bericht/Symptome/Gestörter Geruchssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") private List detaillierteAngabenZumSymptomAnzeichen; + /** + * Bericht/Symptome/Gestörter Geruchssinn/Beliebiges Ereignis/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * Bericht/Symptome/Gestörter Geruchssinn/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * Bericht/Symptome/Gestörter Geruchssinn/Erweiterung + */ @Path("/protocol[at0007]/items[at0021]") private List erweiterung; + /** + * Bericht/Symptome/Gestörter Geruchssinn/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Symptome/Gestörter Geruchssinn/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java index 58fcd7d49..17e6cebdb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java @@ -13,27 +13,51 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class GestorterGeschmackssinnObservation { + /** + * Bericht/Symptome/Gestörter Geschmackssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") private String bezeichnungDesSymptomsOderAnzeichensValue; + /** + * Bericht/Symptome/Gestörter Geschmackssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") private VorhandenDefiningCode vorhandenDefiningCode; + /** + * Bericht/Symptome/Gestörter Geschmackssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") private List detaillierteAngabenZumSymptomAnzeichen; + /** + * Bericht/Symptome/Gestörter Geschmackssinn/Beliebiges Ereignis/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * Bericht/Symptome/Gestörter Geschmackssinn/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * Bericht/Symptome/Gestörter Geschmackssinn/Erweiterung + */ @Path("/protocol[at0007]/items[at0021]") private List erweiterung; + /** + * Bericht/Symptome/Gestörter Geschmackssinn/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Symptome/Gestörter Geschmackssinn/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java index 82d2577b4..db7427df5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java @@ -12,21 +12,39 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.occupation_summary.v1") public class GesundheitsbezogenerBerufEvaluation { + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigungsstatus + */ @Path("/data[at0001]/items[at0004]/value|value") private String beschaftigungsstatusValue; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung + */ @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.occupation_record.v1]") private List beschaftigung; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Zusätzliche Angaben + */ @Path("/data[at0001]/items[at0005]") private List zusatzlicheAngaben; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Erweiterung + */ @Path("/protocol[at0007]/items[at0008]") private List erweiterung; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java index d217a6390..2a5814d8d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java @@ -13,27 +13,51 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class HeiserkeitObservation { + /** + * Bericht/Symptome/Heiserkeit/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") private String bezeichnungDesSymptomsOderAnzeichensValue; + /** + * Bericht/Symptome/Heiserkeit/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") private VorhandenDefiningCode vorhandenDefiningCode; + /** + * Bericht/Symptome/Heiserkeit/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") private List detaillierteAngabenZumSymptomAnzeichen; + /** + * Bericht/Symptome/Heiserkeit/Beliebiges Ereignis/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * Bericht/Symptome/Heiserkeit/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * Bericht/Symptome/Heiserkeit/Erweiterung + */ @Path("/protocol[at0007]/items[at0021]") private List erweiterung; + /** + * Bericht/Symptome/Heiserkeit/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Symptome/Heiserkeit/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java index d8c6ea951..c5cddf593 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java @@ -12,27 +12,51 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.travel_history.v0") public class HistorieDerReiseObservation { + /** + * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Aufenthalt in den letzten 14 Tage in einem der Risikogebiete für Coronainfektion oder Kontakt zu Menschen, die dort waren + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0111 and name/value='Aufenthalt in den letzten 14 Tage in einem der Risikogebiete für Coronainfektion oder Kontakt zu Menschen, die dort waren']/value|defining_code") private AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode; + /** + * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Ortsbeschreibung/Standort + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0134]/items[openEHR-EHR-CLUSTER.location.v1]") private StandortCluster standort; + /** + * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Detaillierte Angaben zur Exposition + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0109]") private List detaillierteAngabenZurExposition; + /** + * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * Bericht/Risikogebiet/Historie der Reise/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * Bericht/Risikogebiet/Historie der Reise/*Extension(en) + */ @Path("/protocol[at0100]/items[at0101]") private List extensionEn; + /** + * Bericht/Risikogebiet/Historie der Reise/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Risikogebiet/Historie der Reise/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java index e6c6e3b03..5486742aa 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java @@ -13,27 +13,51 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class HustenObservation { + /** + * Bericht/Symptome/Husten/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") private String bezeichnungDesSymptomsOderAnzeichensValue; + /** + * Bericht/Symptome/Husten/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") private VorhandenDefiningCode vorhandenDefiningCode; + /** + * Bericht/Symptome/Husten/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") private List detaillierteAngabenZumSymptomAnzeichen; + /** + * Bericht/Symptome/Husten/Beliebiges Ereignis/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * Bericht/Symptome/Husten/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * Bericht/Symptome/Husten/Erweiterung + */ @Path("/protocol[at0007]/items[at0021]") private List erweiterung; + /** + * Bericht/Symptome/Husten/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Symptome/Husten/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java index faf97531b..f4037a912 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java @@ -7,9 +7,15 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class KontaktSection { + /** + * Bericht/Kontakt/Personenkontakt + */ @Path("/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Personenkontakt']") private PersonenkontaktObservation personenkontakt; + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung + */ @Path("/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Aufenthalt in Gesundheitseinrichtung']") private AufenthaltInGesundheitseinrichtungObservation aufenthaltInGesundheitseinrichtung; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java index bcad74060..5b4eb4425 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java @@ -14,39 +14,75 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.body_temperature.v2") public class KorpertemperaturObservation { + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Temperatur + */ @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude") private Double temperaturMagnitude; + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Temperatur + */ @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units") private String temperaturUnits; + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Störfaktoren + */ @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0066]") private List storfaktoren; + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Umgebungsbedingungen + */ @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0056]") private List umgebungsbedingungen; + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Betätigung + */ @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0057]") private Cluster betatigung; + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/time + */ @Path("/data[at0002]/events[at0003]/time|value") private TemporalAccessor timeValue; + /** + * Bericht/Symptome/Körpertemperatur/origin + */ @Path("/data[at0002]/origin|value") private TemporalAccessor originValue; + /** + * Bericht/Symptome/Körpertemperatur/Strukturierte Lokalisation der Messung + */ @Path("/protocol[at0020]/items[at0064]") private List strukturierteLokalisationDerMessung; + /** + * Bericht/Symptome/Körpertemperatur/Gerät + */ @Path("/protocol[at0020]/items[at0059]") private Cluster gerat; + /** + * Bericht/Symptome/Körpertemperatur/Erweiterung + */ @Path("/protocol[at0020]/items[at0062]") private List erweiterung; + /** + * Bericht/Symptome/Körpertemperatur/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Symptome/Körpertemperatur/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java index b20737943..2c1f79c2b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java @@ -6,6 +6,9 @@ @Entity public class KorpertemperaturStorfaktorenElement { + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Störfaktoren + */ @Path("/value|value") private String value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java index 8b3363d47..8449f4698 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java @@ -10,21 +10,39 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.organisation_cc.v0") public class OrganisationCluster { + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Identifier + */ @Path("/items[at0018]") private List identifier; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Name der Einrichtung + */ @Path("/items[at0012 and name/value='Name der Einrichtung']/value|value") private String nameDerEinrichtungValue; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Telefon + */ @Path("/items[at0014]") private List telefon; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Adresse + */ @Path("/items[openEHR-EHR-CLUSTER.address_cc.v0]") private List adresse; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Teil von + */ @Path("/items[at0017]") private List teilVon; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Kontakt + */ @Path("/items[at0016]") private List kontakt; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java index b69ccd489..dd3748be5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java @@ -13,33 +13,63 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.exposure_assessment.v0") public class PersonenkontaktObservation { + /** + * Bericht/Kontakt/Personenkontakt/Beliebiges Ereignis/*Agent (en) + */ @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value") private String agentEnValue; + /** + * Bericht/Kontakt/Personenkontakt/Beliebiges Ereignis/*Presence of any exposure? (en) + */ @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code") private PresenceOfAnyExposureEnDefiningCode presenceOfAnyExposureEnDefiningCode; + /** + * Bericht/Kontakt/Personenkontakt/Beliebiges Ereignis/*Specific exposure (en)/*Exposure (en) + */ @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value") private String exposureEnValue; + /** + * Bericht/Kontakt/Personenkontakt/Beliebiges Ereignis/*Specific exposure (en)/Vorhandensein + */ @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code") private VorhandenseinDefiningCode vorhandenseinDefiningCode; + /** + * Bericht/Kontakt/Personenkontakt/Beliebiges Ereignis/Kommentar + */ @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value") private String kommentarValue; + /** + * Bericht/Kontakt/Personenkontakt/Beliebiges Ereignis/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * Bericht/Kontakt/Personenkontakt/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * Bericht/Kontakt/Personenkontakt/Erweiterung + */ @Path("/protocol[at0004]/items[at0056]") private List erweiterung; + /** + * Bericht/Kontakt/Personenkontakt/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Kontakt/Personenkontakt/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java index 395f5dc60..feb999272 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java @@ -12,24 +12,45 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.problem_diagnosis.v1") public class ProblemDiagnoseEvaluation { + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/Name des Problems/ der Diagnose + */ @Path("/data[at0001]/items[at0002]/value|value") private String nameDesProblemsDerDiagnoseValue; + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/Anatomische Stelle (strukturiert) + */ @Path("/data[at0001]/items[at0039]") private List anatomischeStelleStrukturiert; + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/Spezifische Angaben + */ @Path("/data[at0001]/items[at0043]") private List spezifischeAngaben; + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/Status + */ @Path("/data[at0001]/items[at0046]") private List status; + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/Erweiterung + */ @Path("/protocol[at0032]/items[at0071]") private List erweiterung; + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java index e3cf68796..03952da5d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java @@ -7,6 +7,9 @@ @Entity @OptionFor("DV_CODED_TEXT") public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText implements ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/value/value + */ @Path("|defining_code") private DiagnostischeSicherheitDefiningCode diagnostischeSicherheitDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java index 036e0b57a..af04cb668 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java @@ -8,6 +8,9 @@ @Entity @OptionFor("DV_TEXT") public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText implements ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/value/value + */ @Path("|value") private String diagnostischeSicherheitValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java index 73f92c3b9..b3f138278 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java @@ -14,33 +14,63 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1") public class ProblemDiganoseCoronovirusEvaluation { + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Name des Problems/ der Diagnose + */ @Path("/data[at0001]/items[at0002]/value|value") private String nameDesProblemsDerDiagnoseValue; + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Anatomische Stelle (strukturiert) + */ @Path("/data[at0001]/items[at0039]") private List anatomischeStelleStrukturiert; + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Spezifische Angaben + */ @Path("/data[at0001]/items[at0043]") private List spezifischeAngaben; + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Status + */ @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.problem_qualifier.v1 and name/value='Status']") private StatusCluster status; + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Kommentar + */ @Path("/data[at0001]/items[at0069]/value|value") private String kommentarValue; + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Zuletzt aktualisiert + */ @Path("/protocol[at0032]/items[at0070]/value|value") private TemporalAccessor zuletztAktualisiertValue; + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Erweiterung + */ @Path("/protocol[at0032]/items[at0071]") private List erweiterung; + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/language + */ @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/value + */ @Path("/data[at0001]/items[at0073]/value") @Choice private ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice diagnostischeSicherheit; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java index 6801442c8..ffd5a1cdb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java @@ -9,21 +9,39 @@ @Entity public class ReisefallBeliebigesIntervallereignisIntervalEvent { + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Letzte Reise? + */ @Path("/data[at0003]/items[at0004 and name/value='Letzte Reise?']/value|defining_code") private LetzteReiseDefiningCode letzteReiseDefiningCode; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Inland/Ausland + */ @Path("/data[at0003]/items[at0026]/value|defining_code") private InlandAuslandDefiningCode inlandAuslandDefiningCode; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise + */ @Path("/data[at0003]/items[at0008]") private List bestimmteReise; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/math_function + */ @Path("/math_function|defining_code") private MathFunction mathFunctionDefiningCode; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/width + */ @Path("/width|value") private TemporalAmount widthValue; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/time + */ @Path("/time|value") private TemporalAccessor timeValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java index ac6312008..75e698e71 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java @@ -8,12 +8,21 @@ @Entity public class ReisefallBestimmteReiseCluster { + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel + */ @Path("/items[at0010]") private List bestimmtesReiseziel; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Zusätzliche Reisedetails + */ @Path("/items[at0025]") private List zusatzlicheReisedetails; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Rückreisedatum + */ @Path("/items[at0019]/value|value") private TemporalAccessor ruckreisedatumValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java index 28a423b7a..1949b5d3b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java @@ -8,18 +8,33 @@ @Entity public class ReisefallBestimmtesReisezielCluster { + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/Land + */ @Path("/items[at0011]/value|value") private String landValue; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/Bundesland / Region + */ @Path("/items[at0012]/value|value") private String bundeslandRegionValue; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/Stadt + */ @Path("/items[at0013]/value|value") private String stadtValue; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/Bestimmte Gegend + */ @Path("/items[at0031]/value|value") private String bestimmteGegendValue; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/Zusätzliche Angaben zum Zielort + */ @Path("/items[at0024]") private List zusatzlicheAngabenZumZielort; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java index 39d049e3f..5a9bfb44b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java @@ -12,18 +12,33 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.travel_event.v0") public class ReisefallObservation { + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis + */ @Path("/data[at0001]/events[at0002]") private List beliebigesIntervallereignis; + /** + * Bericht/Risikogebiet/Reisefall/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * Bericht/Risikogebiet/Reisefall/Erweiterung + */ @Path("/protocol[at0007]/items[at0021]") private List erweiterung; + /** + * Bericht/Risikogebiet/Reisefall/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Risikogebiet/Reisefall/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java index 0498d6306..a4cb420ae 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java @@ -8,9 +8,15 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class RisikogebietSection { + /** + * Bericht/Risikogebiet/Historie der Reise + */ @Path("/items[openEHR-EHR-OBSERVATION.travel_history.v0]") private List historieDerReise; + /** + * Bericht/Risikogebiet/Reisefall + */ @Path("/items[openEHR-EHR-OBSERVATION.travel_event.v0]") private List reisefall; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java index ff4c107ca..ad7192538 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java @@ -13,27 +13,51 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class SchnupfenObservation { + /** + * Bericht/Symptome/Schnupfen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") private String bezeichnungDesSymptomsOderAnzeichensValue; + /** + * Bericht/Symptome/Schnupfen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") private VorhandenDefiningCode vorhandenDefiningCode; + /** + * Bericht/Symptome/Schnupfen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") private List detaillierteAngabenZumSymptomAnzeichen; + /** + * Bericht/Symptome/Schnupfen/Beliebiges Ereignis/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * Bericht/Symptome/Schnupfen/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * Bericht/Symptome/Schnupfen/Erweiterung + */ @Path("/protocol[at0007]/items[at0021]") private List erweiterung; + /** + * Bericht/Symptome/Schnupfen/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Symptome/Schnupfen/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java index 5a9148200..931051903 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java @@ -10,9 +10,15 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") public class StandortCluster { + /** + * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Ortsbeschreibung/Standort/Standortbeschreibung + */ @Path("/items[at0046]/value|value") private String standortbeschreibungValue; + /** + * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Ortsbeschreibung/Standort/Details + */ @Path("/items[at0047]") private List details; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java index 08efbfbde..877b6ae68 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java @@ -7,6 +7,9 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.problem_qualifier.v1") public class StatusCluster { + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Status/Diagnosestatus + */ @Path("/items[at0004]/value|defining_code") private DiagnosestatusDefiningCode diagnosestatusDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java index ff5650378..b8bac2c91 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java @@ -7,30 +7,57 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class SymptomeSection { + /** + * Bericht/Symptome/Husten + */ @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Husten']") private HustenObservation husten; + /** + * Bericht/Symptome/Schnupfen + */ @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Schnupfen']") private SchnupfenObservation schnupfen; + /** + * Bericht/Symptome/Heiserkeit + */ @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Heiserkeit']") private HeiserkeitObservation heiserkeit; + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur + */ @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Fieber oder erhöhte Körpertemperatur']") private FieberOderErhohteKorpertemperaturObservation fieberOderErhohteKorpertemperatur; + /** + * Bericht/Symptome/Körpertemperatur + */ @Path("/items[openEHR-EHR-OBSERVATION.body_temperature.v2]") private KorpertemperaturObservation korpertemperatur; + /** + * Bericht/Symptome/Gestörter Geruchssinn + */ @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geruchssinn']") private GestorterGeruchssinnObservation gestorterGeruchssinn; + /** + * Bericht/Symptome/Gestörter Geschmackssinn + */ @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geschmackssinn']") private GestorterGeschmackssinnObservation gestorterGeschmackssinn; + /** + * Bericht/Symptome/Durchfall + */ @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Durchfall']") private DurchfallObservation durchfall; + /** + * Bericht/Symptome/Weitere Symptome + */ @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Weitere Symptome']") private WeitereSymptomeObservation weitereSymptome; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java index 4028f35a0..716b4f5a9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java @@ -11,15 +11,27 @@ @Entity @OptionFor("INTERVAL_EVENT") public class WeitereSymptomeBeliebigesEreignisIntervalEvent implements WeitereSymptomeBeliebigesEreignisChoice { + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen + */ @Path("/data[at0003]/items[at0022]") private List spezifischesSymptomAnzeichen; + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/time + */ @Path("/time|value") private TemporalAccessor timeValue; + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/width + */ @Path("/width|value") private TemporalAmount widthValue; + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/math_function + */ @Path("/math_function|defining_code") private MathFunction mathFunctionDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java index 7ea76b09c..4cb671bc9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java @@ -9,9 +9,15 @@ @Entity @OptionFor("POINT_EVENT") public class WeitereSymptomeBeliebigesEreignisPointEvent implements WeitereSymptomeBeliebigesEreignisChoice { + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen + */ @Path("/data[at0003]/items[at0022]") private List spezifischesSymptomAnzeichen; + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/time + */ @Path("/time|value") private TemporalAccessor timeValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java index 4269af5d5..370eeae5e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java @@ -13,18 +13,33 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") public class WeitereSymptomeObservation { + /** + * Bericht/Symptome/Weitere Symptome/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * Bericht/Symptome/Weitere Symptome/Erweiterung + */ @Path("/protocol[at0007]/items[at0021]") private List erweiterung; + /** + * Bericht/Symptome/Weitere Symptome/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Symptome/Weitere Symptome/language + */ @Path("/language") private Language language; + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis + */ @Path("/data[at0001]/events[at0002]") @Choice private List beliebigesEreignis; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java index 60bcd238b..acb9adcd7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java @@ -8,15 +8,27 @@ @Entity public class WeitereSymptomeSpezifischesSymptomAnzeichenCluster { + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ @Path("/items[at0004]/value|value") private String bezeichnungDesSymptomsOderAnzeichensValue; + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ @Path("/items[at0005]/value|defining_code") private VorhandenDefiningCode2 vorhandenDefiningCode; + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ @Path("/items[at0026]") private List detaillierteAngabenZumSymptomAnzeichen; + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Kommentar + */ @Path("/items[at0035]/value|value") private String kommentarValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java index cf669e5af..7ff36433a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java @@ -13,21 +13,39 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.living_arrangement.v0") public class WohnsituationEvaluation { + /** + * Bericht/Allgemeine Angaben/Wohnsituation/Beschreibung + */ @Path("/data[at0001]/items[at0003]/value|value") private String beschreibungValue; + /** + * Bericht/Allgemeine Angaben/Wohnsituation/Anzahl der Haushaltsmitglieder + */ @Path("/data[at0001]/items[at0007]/value|magnitude") private Long anzahlDerHaushaltsmitgliederMagnitude; + /** + * Bericht/Allgemeine Angaben/Wohnsituation/Wohnstätte + */ @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.dwelling.v0]") private List wohnstatte; + /** + * Bericht/Allgemeine Angaben/Wohnsituation/Erweiterung + */ @Path("/protocol[at0002]/items[at0011]") private List erweiterung; + /** + * Bericht/Allgemeine Angaben/Wohnsituation/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Bericht/Allgemeine Angaben/Wohnsituation/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java index fc9502ecc..09ecff954 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java @@ -10,9 +10,15 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.dwelling.v0") public class WohnstatteCluster { + /** + * Bericht/Allgemeine Angaben/Wohnsituation/Wohnstätte/Anzahl der Schlafzimmer + */ @Path("/items[at0028]/value|magnitude") private Long anzahlDerSchlafzimmerMagnitude; + /** + * Bericht/Allgemeine Angaben/Wohnsituation/Wohnstätte/Ergänzende Details + */ @Path("/items[at0003]") private List erganzendeDetails; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java index b336bb511..ba4abc458 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java @@ -24,45 +24,87 @@ @Archetype("openEHR-EHR-COMPOSITION.report.v1") @Template("Diagnose") public class DiagnoseComposition { + /** + * COVID-19-Diagnose/context/Bericht ID + */ @Path("/context/other_context[at0001]/items[at0002]/value|value") private String berichtIdValue; + /** + * COVID-19-Diagnose/context/Fallidentifikation + */ @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]") private FallidentifikationCluster fallidentifikation; + /** + * COVID-19-Diagnose/context/start_time + */ @Path("/context/start_time|value") private TemporalAccessor startTimeValue; + /** + * COVID-19-Diagnose/context/participations + */ @Path("/context/participations") private List participations; + /** + * COVID-19-Diagnose/context/end_time + */ @Path("/context/end_time|value") private TemporalAccessor endTimeValue; + /** + * COVID-19-Diagnose/context/location + */ @Path("/context/location") private String location; + /** + * COVID-19-Diagnose/context/health_care_facility + */ @Path("/context/health_care_facility") private PartyIdentified healthCareFacility; + /** + * COVID-19-Diagnose/context/setting + */ @Path("/context/setting|defining_code") private Setting settingDefiningCode; + /** + * COVID-19-Diagnose/Problem/Diagnose + */ @Path("/content[openEHR-EHR-EVALUATION.problem_diagnosis.v1]") private ProblemDiagnoseEvaluation problemDiagnose; + /** + * COVID-19-Diagnose/composer + */ @Path("/composer") private PartyProxy composer; + /** + * COVID-19-Diagnose/language + */ @Path("/language") private Language language; + /** + * COVID-19-Diagnose/feeder_audit + */ @Path("/feeder_audit") private FeederAudit feederAudit; + /** + * COVID-19-Diagnose/category + */ @Path("/category|defining_code") private Category categoryDefiningCode; + /** + * COVID-19-Diagnose/territory + */ @Path("/territory") private Territory territory; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java index 0b1d9dc89..1cdff1c0e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java @@ -10,15 +10,27 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.anatomical_location.v1") public class AnatomischeLokalisationCluster { + /** + * COVID-19-Diagnose/Problem/Diagnose/Anatomische Lokalisation/Name der Körperstelle + */ @Path("/items[at0001]/value|value") private String nameDerKorperstelleValue; + /** + * COVID-19-Diagnose/Problem/Diagnose/Anatomische Lokalisation/Lateralität + */ @Path("/items[at0002]/value|defining_code") private LateralitatDefiningCode lateralitatDefiningCode; + /** + * COVID-19-Diagnose/Problem/Diagnose/Anatomische Lokalisation/Alternative Struktur + */ @Path("/items[at0053]") private List alternativeStruktur; + /** + * COVID-19-Diagnose/Problem/Diagnose/Anatomische Lokalisation/Multimediale Darstellung + */ @Path("/items[at0054]") private List multimedialeDarstellung; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java index f0ca7cbe2..99b22db4d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java @@ -6,6 +6,9 @@ @Entity public class AtiopathogeneseAtiologieDerKrankheitElement { + /** + * COVID-19-Diagnose/Problem/Diagnose/Ätiopathogenese/value + */ @Path("/value") @Choice private AtiopathogeneseValueChoice value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java index f366a1d19..f3b1fea14 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java @@ -6,6 +6,9 @@ @Entity public class AtiopathogeneseBeschreibungDesEntstehensElement { + /** + * COVID-19-Diagnose/Problem/Diagnose/Ätiopathogenese/Beschreibung des Entstehens + */ @Path("/value|value") private String value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java index 3c6220c13..4c06fefb8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java @@ -8,9 +8,15 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.etiology.v1") public class AtiopathogeneseCluster { + /** + * COVID-19-Diagnose/Problem/Diagnose/Ätiopathogenese/Ätiologie der Krankheit + */ @Path("/items[at0001]") private List atiologieDerKrankheit; + /** + * COVID-19-Diagnose/Problem/Diagnose/Ätiopathogenese/Beschreibung des Entstehens + */ @Path("/items[at0017]") private List beschreibungDesEntstehens; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java index eae7a5b08..9350c5b03 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java @@ -7,6 +7,9 @@ @Entity @OptionFor("DV_CODED_TEXT") public class AtiopathogeneseValueDvCodedText implements AtiopathogeneseValueChoice { + /** + * COVID-19-Diagnose/Problem/Diagnose/Ätiopathogenese/value/value + */ @Path("|defining_code") private ValueDefiningCode valueDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java index a949ba251..5717310b4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java @@ -8,6 +8,9 @@ @Entity @OptionFor("DV_TEXT") public class AtiopathogeneseValueDvText implements AtiopathogeneseValueChoice { + /** + * COVID-19-Diagnose/Problem/Diagnose/Ätiopathogenese/value/value + */ @Path("|value") private String valueValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java index f2a27f682..c9d6cc4de 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java @@ -9,15 +9,27 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.diagnose_details.v0") public class DiagnosedetailsCluster { + /** + * COVID-19-Diagnose/Problem/Diagnose/Diagnosedetails/Begründung von Ausnahmen + */ @Path("/items[at0001]/value|value") private String begrundungVonAusnahmenValue; + /** + * COVID-19-Diagnose/Problem/Diagnose/Diagnosedetails/Diagnosetyp + */ @Path("/items[at0002]/value|value") private String diagnosetypValue; + /** + * COVID-19-Diagnose/Problem/Diagnose/Diagnosedetails/Vorhanden bei Aufnahme + */ @Path("/items[at0016]/value|value") private Boolean vorhandenBeiAufnahmeValue; + /** + * COVID-19-Diagnose/Problem/Diagnose/Diagnosedetails/Vorhanden bei Entlassung + */ @Path("/items[at0017]/value|value") private Boolean vorhandenBeiEntlassungValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java index a4a8fe88f..46103794b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java @@ -8,6 +8,9 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.case_identification.v0") public class FallidentifikationCluster { + /** + * COVID-19-Diagnose/context/Fallidentifikation/Fall-Kennung + */ @Path("/items[at0001]/value|value") private String fallKennungValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java index 914e22dd8..1e2bf0f09 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java @@ -7,6 +7,9 @@ @Entity @OptionFor("DV_CODED_TEXT") public class ProblemDiagnoseDiagnostischeSicherheitDvCodedText implements ProblemDiagnoseDiagnostischeSicherheitChoice { + /** + * COVID-19-Diagnose/Problem/Diagnose/value/value + */ @Path("|defining_code") private DiagnostischeSicherheitDefiningCode diagnostischeSicherheitDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java index c5c0ef601..8b131aae1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java @@ -8,6 +8,9 @@ @Entity @OptionFor("DV_TEXT") public class ProblemDiagnoseDiagnostischeSicherheitDvText implements ProblemDiagnoseDiagnostischeSicherheitChoice { + /** + * COVID-19-Diagnose/Problem/Diagnose/value/value + */ @Path("|value") private String diagnostischeSicherheitValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java index 9c34f3cd1..3a25c4e21 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java @@ -14,55 +14,106 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.problem_diagnosis.v1") public class ProblemDiagnoseEvaluation { + /** + * COVID-19-Diagnose/Problem/Diagnose/Name des Problems/ der Diagnose + */ @Path("/data[at0001]/items[at0002]/value|defining_code") private NameDesProblemsDerDiagnoseDefiningCode nameDesProblemsDerDiagnoseDefiningCode; + /** + * COVID-19-Diagnose/Problem/Diagnose/Freitextbeschreibung + */ @Path("/data[at0001]/items[at0009 and name/value='Freitextbeschreibung']/value|value") private String freitextbeschreibungValue; + /** + * COVID-19-Diagnose/Problem/Diagnose/Lokalisation + */ @Path("/data[at0001]/items[at0012 and name/value='Lokalisation']/value|value") private String lokalisationValue; + /** + * COVID-19-Diagnose/Problem/Diagnose/Anatomische Lokalisation + */ @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.anatomical_location.v1]") private List anatomischeLokalisation; + /** + * COVID-19-Diagnose/Problem/Diagnose/Datum des Auftretens/der Erstdiagnose + */ @Path("/data[at0001]/items[at0077 and name/value='Datum des Auftretens/der Erstdiagnose']/value|value") private TemporalAccessor datumDesAuftretensDerErstdiagnoseValue; + /** + * COVID-19-Diagnose/Problem/Diagnose/Feststellungsdatum + */ @Path("/data[at0001]/items[at0003 and name/value='Feststellungsdatum']/value|value") private TemporalAccessor feststellungsdatumValue; + /** + * COVID-19-Diagnose/Problem/Diagnose/Diagnosedetails + */ @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.diagnose_details.v0]") private DiagnosedetailsCluster diagnosedetails; + /** + * COVID-19-Diagnose/Problem/Diagnose/Ätiopathogenese + */ @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.etiology.v1]") private AtiopathogeneseCluster atiopathogenese; + /** + * COVID-19-Diagnose/Problem/Diagnose/Datum/Zeitpunkt der Genesung + */ @Path("/data[at0001]/items[at0030]/value|value") private TemporalAccessor datumZeitpunktDerGenesungValue; + /** + * COVID-19-Diagnose/Problem/Diagnose/Status + */ @Path("/data[at0001]/items[at0046]") private List status; + /** + * COVID-19-Diagnose/Problem/Diagnose/Diagnoseerläuterung + */ @Path("/data[at0001]/items[at0069 and name/value='Diagnoseerläuterung']/value|value") private String diagnoseerlauterungValue; + /** + * COVID-19-Diagnose/Problem/Diagnose/Letztes Dokumentationsdatum + */ @Path("/protocol[at0032]/items[at0070 and name/value='Letztes Dokumentationsdatum']/value|value") private TemporalAccessor letztesDokumentationsdatumValue; + /** + * COVID-19-Diagnose/Problem/Diagnose/Erweiterung + */ @Path("/protocol[at0032]/items[at0071]") private List erweiterung; + /** + * COVID-19-Diagnose/Problem/Diagnose/subject + */ @Path("/subject") private PartyProxy subject; + /** + * COVID-19-Diagnose/Problem/Diagnose/language + */ @Path("/language") private Language language; + /** + * COVID-19-Diagnose/Problem/Diagnose/value + */ @Path("/data[at0001]/items[at0073]/value") @Choice private ProblemDiagnoseDiagnostischeSicherheitChoice diagnostischeSicherheit; + /** + * COVID-19-Diagnose/Problem/Diagnose/value + */ @Path("/data[at0001]/items[at0005]/value") @Choice private ProblemDiagnoseSchweregradChoice schweregrad; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java index 2cd7ab223..2043b3bf4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java @@ -7,6 +7,9 @@ @Entity @OptionFor("DV_CODED_TEXT") public class ProblemDiagnoseSchweregradDvCodedText implements ProblemDiagnoseSchweregradChoice { + /** + * COVID-19-Diagnose/Problem/Diagnose/value/value + */ @Path("|defining_code") private SchweregradDefiningCode schweregradDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java index 40ca76c9f..153c60eae 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java @@ -8,6 +8,9 @@ @Entity @OptionFor("DV_TEXT") public class ProblemDiagnoseSchweregradDvText implements ProblemDiagnoseSchweregradChoice { + /** + * COVID-19-Diagnose/Problem/Diagnose/value/value + */ @Path("|value") private String schweregradValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java index b71f402dc..71ba25c7e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java @@ -24,42 +24,81 @@ @Archetype("openEHR-EHR-COMPOSITION.sample_encounter.v1") @Template("ehrbase_blood_pressure_simple.de.v0") public class EhrbaseBloodPressureSimpleDeV0Composition { + /** + * Encounter (training sample)/context/Admin detail/Device details (training sample) + */ @Path("/context/other_context[at0001]/items[at0006]/items[openEHR-EHR-CLUSTER.sample_device.v1]") private List deviceDetailsTrainingSample; + /** + * Encounter (training sample)/context/start_time + */ @Path("/context/start_time|value") private TemporalAccessor startTimeValue; + /** + * Encounter (training sample)/context/participations + */ @Path("/context/participations") private List participations; + /** + * Encounter (training sample)/context/end_time + */ @Path("/context/end_time|value") private TemporalAccessor endTimeValue; + /** + * Encounter (training sample)/context/location + */ @Path("/context/location") private String location; + /** + * Encounter (training sample)/context/health_care_facility + */ @Path("/context/health_care_facility") private PartyIdentified healthCareFacility; + /** + * Encounter (training sample)/context/setting + */ @Path("/context/setting|defining_code") private Setting settingDefiningCode; + /** + * Encounter (training sample)/Blood pressure (Training sample) + */ @Path("/content[openEHR-EHR-OBSERVATION.sample_blood_pressure.v1]") private List bloodPressureTrainingSample; + /** + * Encounter (training sample)/composer + */ @Path("/composer") private PartyProxy composer; + /** + * Encounter (training sample)/language + */ @Path("/language") private Language language; + /** + * Encounter (training sample)/feeder_audit + */ @Path("/feeder_audit") private FeederAudit feederAudit; + /** + * Encounter (training sample)/category + */ @Path("/category|defining_code") private Category categoryDefiningCode; + /** + * Encounter (training sample)/territory + */ @Path("/territory") private Territory territory; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java index 84af6356c..3f77b440d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java @@ -14,66 +14,129 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.sample_blood_pressure.v1") public class BloodPressureTrainingSampleObservation { + /** + * Encounter (training sample)/Blood pressure (Training sample)/Baseline reading/Systolic + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude") private Double systolicMagnitude; + /** + * Encounter (training sample)/Blood pressure (Training sample)/Baseline reading/Systolic + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units") private String systolicUnits; + /** + * Encounter (training sample)/Blood pressure (Training sample)/Baseline reading/Diastolic + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|magnitude") private Double diastolicMagnitude; + /** + * Encounter (training sample)/Blood pressure (Training sample)/Baseline reading/Diastolic + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|units") private String diastolicUnits; + /** + * Encounter (training sample)/Blood pressure (Training sample)/Baseline reading/Mean Arterial Pressure + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|magnitude") private Double meanArterialPressureMagnitude; + /** + * Encounter (training sample)/Blood pressure (Training sample)/Baseline reading/Mean Arterial Pressure + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1006]/value|units") private String meanArterialPressureUnits; + /** + * Encounter (training sample)/Blood pressure (Training sample)/Baseline reading/Pulse Pressure + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|magnitude") private Double pulsePressureMagnitude; + /** + * Encounter (training sample)/Blood pressure (Training sample)/Baseline reading/Pulse Pressure + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at1007]/value|units") private String pulsePressureUnits; + /** + * Encounter (training sample)/Blood pressure (Training sample)/Baseline reading/Comment + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0033]/value|value") private String commentValue; + /** + * Encounter (training sample)/Blood pressure (Training sample)/Baseline reading/Position + */ @Path("/data[at0001]/events[at0002]/state[at0007]/items[at0008]/value|defining_code") private PositionDefiningCode positionDefiningCode; + /** + * Encounter (training sample)/Blood pressure (Training sample)/Baseline reading/Level of Exertion + */ @Path("/data[at0001]/events[at0002]/state[at0007]/items[at1030]") private List levelOfExertion; + /** + * Encounter (training sample)/Blood pressure (Training sample)/Baseline reading/Tilt + */ @Path("/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|magnitude") private Double tiltMagnitude; + /** + * Encounter (training sample)/Blood pressure (Training sample)/Baseline reading/Tilt + */ @Path("/data[at0001]/events[at0002]/state[at0007]/items[at1005]/value|units") private String tiltUnits; + /** + * Encounter (training sample)/Blood pressure (Training sample)/Baseline reading/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * Encounter (training sample)/Blood pressure (Training sample)/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * Encounter (training sample)/Blood pressure (Training sample)/Cuff size + */ @Path("/protocol[at0011]/items[at0013]/value|defining_code") private CuffSizeDefiningCode cuffSizeDefiningCode; + /** + * Encounter (training sample)/Blood pressure (Training sample)/Location of measurement + */ @Path("/protocol[at0011]/items[at0014]/value|defining_code") private LocationOfMeasurementDefiningCode locationOfMeasurementDefiningCode; + /** + * Encounter (training sample)/Blood pressure (Training sample)/Korotkoff sounds + */ @Path("/protocol[at0011]/items[at1010]/value|defining_code") private KorotkoffSoundsDefiningCode korotkoffSoundsDefiningCode; + /** + * Encounter (training sample)/Blood pressure (Training sample)/Device + */ @Path("/protocol[at0011]/items[at1025]") private List device; + /** + * Encounter (training sample)/Blood pressure (Training sample)/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Encounter (training sample)/Blood pressure (Training sample)/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java index 75d4972c0..77b271519 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java @@ -10,30 +10,57 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.sample_device.v1") public class DeviceDetailsTrainingSampleCluster { + /** + * Encounter (training sample)/context/Admin detail/Device details (training sample)/Name + */ @Path("/items[at0001]/value|value") private String nameValue; + /** + * Encounter (training sample)/context/Admin detail/Device details (training sample)/Description + */ @Path("/items[at0002]/value|value") private String descriptionValue; + /** + * Encounter (training sample)/context/Admin detail/Device details (training sample)/Manufacturer details/Manufacturer + */ @Path("/items[at0004]/items[at0003]/value|value") private String manufacturerValue; + /** + * Encounter (training sample)/context/Admin detail/Device details (training sample)/Manufacturer details/Model + */ @Path("/items[at0004]/items[at0005]/value|value") private String modelValue; + /** + * Encounter (training sample)/context/Admin detail/Device details (training sample)/Manufacturer details/Serial number + */ @Path("/items[at0004]/items[at0006]/value|value") private String serialNumberValue; + /** + * Encounter (training sample)/context/Admin detail/Device details (training sample)/Components + */ @Path("/items[at0007]") private Cluster components; + /** + * Encounter (training sample)/context/Admin detail/Device details (training sample)/Servicing/Date last serviced + */ @Path("/items[at0008]/items[at0009]/value|value") private TemporalAccessor dateLastServicedValue; + /** + * Encounter (training sample)/context/Admin detail/Device details (training sample)/Servicing/Date last calibration + */ @Path("/items[at0008]/items[at0010]/value|value") private TemporalAccessor dateLastCalibrationValue; + /** + * Encounter (training sample)/context/Admin detail/Device details (training sample)/Servicing/Serviced by + */ @Path("/items[at0008]/items[at0011]/value|value") private String servicedByValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java index b48942342..696f59437 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java @@ -24,42 +24,81 @@ @Archetype("openEHR-EHR-COMPOSITION.encounter.v1") @Template("ehrbase_multi_occurrence.de.v1") public class EhrbaseMultiOccurrenceDeV1Composition { + /** + * Encounter/context/Extension + */ @Path("/context/other_context[at0001]/items[at0002]") private List extension; + /** + * Encounter/context/start_time + */ @Path("/context/start_time|value") private TemporalAccessor startTimeValue; + /** + * Encounter/context/participations + */ @Path("/context/participations") private List participations; + /** + * Encounter/context/end_time + */ @Path("/context/end_time|value") private TemporalAccessor endTimeValue; + /** + * Encounter/context/location + */ @Path("/context/location") private String location; + /** + * Encounter/context/health_care_facility + */ @Path("/context/health_care_facility") private PartyIdentified healthCareFacility; + /** + * Encounter/context/setting + */ @Path("/context/setting|defining_code") private Setting settingDefiningCode; + /** + * Encounter/Body temperature + */ @Path("/content[openEHR-EHR-OBSERVATION.body_temperature.v2]") private List bodyTemperature; + /** + * Encounter/composer + */ @Path("/composer") private PartyProxy composer; + /** + * Encounter/language + */ @Path("/language") private Language language; + /** + * Encounter/feeder_audit + */ @Path("/feeder_audit") private FeederAudit feederAudit; + /** + * Encounter/category + */ @Path("/category|defining_code") private Category categoryDefiningCode; + /** + * Encounter/territory + */ @Path("/territory") private Territory territory; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java index a1b9c83a7..0ada3cd0f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java @@ -16,33 +16,63 @@ @Entity @OptionFor("INTERVAL_EVENT") public class BodyTemperatureAnyEventIntervalEvent implements BodyTemperatureAnyEventChoice { + /** + * Encounter/Body temperature/Any event/Temperature + */ @Path("/data[at0001]/items[at0004]/value|magnitude") private Double temperatureMagnitude; + /** + * Encounter/Body temperature/Any event/Temperature + */ @Path("/data[at0001]/items[at0004]/value|units") private String temperatureUnits; + /** + * Encounter/Body temperature/Any event/Description of thermal stress + */ @Path("/state[at0029]/items[at0041]/value|value") private String descriptionOfThermalStressValue; + /** + * Encounter/Body temperature/Any event/Current day of menstrual cycle + */ @Path("/state[at0029]/items[at0065]/value|magnitude") private Long currentDayOfMenstrualCycleMagnitude; + /** + * Encounter/Body temperature/Any event/Environmental conditions + */ @Path("/state[at0029]/items[at0056]") private List environmentalConditions; + /** + * Encounter/Body temperature/Any event/Exertion + */ @Path("/state[at0029]/items[at0057]") private Cluster exertion; + /** + * Encounter/Body temperature/Any event/time + */ @Path("/time|value") private TemporalAccessor timeValue; + /** + * Encounter/Body temperature/Any event/width + */ @Path("/width|value") private TemporalAmount widthValue; + /** + * Encounter/Body temperature/Any event/math_function + */ @Path("/math_function|defining_code") private MathFunction mathFunctionDefiningCode; + /** + * Encounter/Body temperature/Any event/value + */ @Path("/state[at0029]/items[at0030]/value") @Choice private BodyTemperatureBodyExposureChoice bodyExposure; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java index 505a566e2..25a6579c7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java @@ -14,27 +14,51 @@ @Entity @OptionFor("POINT_EVENT") public class BodyTemperatureAnyEventPointEvent implements BodyTemperatureAnyEventChoice { + /** + * Encounter/Body temperature/Any event/Temperature + */ @Path("/data[at0001]/items[at0004]/value|magnitude") private Double temperatureMagnitude; + /** + * Encounter/Body temperature/Any event/Temperature + */ @Path("/data[at0001]/items[at0004]/value|units") private String temperatureUnits; + /** + * Encounter/Body temperature/Any event/Description of thermal stress + */ @Path("/state[at0029]/items[at0041]/value|value") private String descriptionOfThermalStressValue; + /** + * Encounter/Body temperature/Any event/Current day of menstrual cycle + */ @Path("/state[at0029]/items[at0065]/value|magnitude") private Long currentDayOfMenstrualCycleMagnitude; + /** + * Encounter/Body temperature/Any event/Environmental conditions + */ @Path("/state[at0029]/items[at0056]") private List environmentalConditions; + /** + * Encounter/Body temperature/Any event/Exertion + */ @Path("/state[at0029]/items[at0057]") private Cluster exertion; + /** + * Encounter/Body temperature/Any event/time + */ @Path("/time|value") private TemporalAccessor timeValue; + /** + * Encounter/Body temperature/Any event/value + */ @Path("/state[at0029]/items[at0030]/value") @Choice private BodyTemperatureBodyExposureChoice bodyExposure; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvCodedText.java index cd68266c2..0ae1366d9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvCodedText.java @@ -7,6 +7,9 @@ @Entity @OptionFor("DV_CODED_TEXT") public class BodyTemperatureBodyExposureDvCodedText implements BodyTemperatureBodyExposureChoice { + /** + * Encounter/Body temperature/Any event/value/value + */ @Path("|defining_code") private BodyExposureDefiningCode bodyExposureDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java index 9a914dd21..9a21d32f4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java @@ -8,6 +8,9 @@ @Entity @OptionFor("DV_TEXT") public class BodyTemperatureBodyExposureDvText implements BodyTemperatureBodyExposureChoice { + /** + * Encounter/Body temperature/Any event/value/value + */ @Path("|value") private String bodyExposureValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvCodedText.java index dace78986..502e0fd1c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvCodedText.java @@ -7,6 +7,9 @@ @Entity @OptionFor("DV_CODED_TEXT") public class BodyTemperatureLocationOfMeasurementDvCodedText implements BodyTemperatureLocationOfMeasurementChoice { + /** + * Encounter/Body temperature/value/value + */ @Path("|defining_code") private LocationOfMeasurementDefiningCode locationOfMeasurementDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java index 2ec7ca97a..7d6296b22 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java @@ -8,6 +8,9 @@ @Entity @OptionFor("DV_TEXT") public class BodyTemperatureLocationOfMeasurementDvText implements BodyTemperatureLocationOfMeasurementChoice { + /** + * Encounter/Body temperature/value/value + */ @Path("|value") private String locationOfMeasurementValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java index 11a8519c4..a6de3ad23 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java @@ -13,28 +13,52 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.body_temperature.v2") public class BodyTemperatureObservation { + /** + * Encounter/Body temperature/origin + */ @Path("/data[at0002]/origin|value") private TemporalAccessor originValue; + /** + * Encounter/Body temperature/Structured measurement location + */ @Path("/protocol[at0020]/items[at0064]") private List structuredMeasurementLocation; + /** + * Encounter/Body temperature/Device + */ @Path("/protocol[at0020]/items[at0059]") private Cluster device; + /** + * Encounter/Body temperature/Extension + */ @Path("/protocol[at0020]/items[at0062]") private List extension; + /** + * Encounter/Body temperature/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Encounter/Body temperature/language + */ @Path("/language") private Language language; + /** + * Encounter/Body temperature/value + */ @Path("/protocol[at0020]/items[at0021]/value") @Choice private BodyTemperatureLocationOfMeasurementChoice locationOfMeasurement; + /** + * Encounter/Body temperature/Any event + */ @Path("/data[at0002]/events[at0003]") @Choice private List anyEvent; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java index abd114203..fdbfb0bdf 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java @@ -23,39 +23,75 @@ @Archetype("openEHR-EHR-COMPOSITION.versorgungsfall.v0") @Template("EpisodeOfCare") public class EpisodeOfCareComposition { + /** + * EpisodeOfCare/Episodeofcare + */ @Path("/content[openEHR-EHR-ADMIN_ENTRY.episodeofcare.v0]") private List episodeofcare; + /** + * EpisodeOfCare/composer + */ @Path("/composer") private PartyProxy composer; + /** + * EpisodeOfCare/language + */ @Path("/language") private Language language; + /** + * EpisodeOfCare/context/start_time + */ @Path("/context/start_time|value") private TemporalAccessor startTimeValue; + /** + * EpisodeOfCare/context/participations + */ @Path("/context/participations") private List participations; + /** + * EpisodeOfCare/context/end_time + */ @Path("/context/end_time|value") private TemporalAccessor endTimeValue; + /** + * EpisodeOfCare/context/location + */ @Path("/context/location") private String location; + /** + * EpisodeOfCare/context/health_care_facility + */ @Path("/context/health_care_facility") private PartyIdentified healthCareFacility; + /** + * EpisodeOfCare/context/setting + */ @Path("/context/setting|defining_code") private Setting settingDefiningCode; + /** + * EpisodeOfCare/feeder_audit + */ @Path("/feeder_audit") private FeederAudit feederAudit; + /** + * EpisodeOfCare/category + */ @Path("/category|defining_code") private Category categoryDefiningCode; + /** + * EpisodeOfCare/territory + */ @Path("/territory") private Territory territory; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java index d8ec76761..8f86d50d9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java @@ -14,42 +14,81 @@ @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.episodeofcare.v0") public class EpisodeofcareAdminEntry { + /** + * EpisodeOfCare/Episodeofcare/identifier + */ @Path("/data[at0001]/items[at0002]") private List identifier; + /** + * EpisodeOfCare/Episodeofcare/status + */ @Path("/data[at0001]/items[at0003]/value|defining_code") private StatusDefiningCode statusDefiningCode; + /** + * EpisodeOfCare/Episodeofcare/type + */ @Path("/data[at0001]/items[at0011]/value|value") private String typeValue; + /** + * EpisodeOfCare/Episodeofcare/period/upper + */ @Path("/data[at0001]/items[at0014]/value/upper|value") private TemporalAccessor upperValue; + /** + * EpisodeOfCare/Episodeofcare/period/lower + */ @Path("/data[at0001]/items[at0014]/value/lower|value") private TemporalAccessor lowerValue; + /** + * EpisodeOfCare/Episodeofcare/period/lower_included + */ @Path("/data[at0001]/items[at0014]/value/lower_included") private Boolean lowerIncluded; + /** + * EpisodeOfCare/Episodeofcare/period/upper_included + */ @Path("/data[at0001]/items[at0014]/value/upper_included") private Boolean upperIncluded; + /** + * EpisodeOfCare/Episodeofcare/diagnosis + */ @Path("/data[at0001]/items[at0018]") private List diagnosis; + /** + * EpisodeOfCare/Episodeofcare/care manager + */ @Path("/data[at0001]/items[at0012]/value|value") private URI careManagerValue; + /** + * EpisodeOfCare/Episodeofcare/managing organization + */ @Path("/data[at0001]/items[at0017]/value|value") private URI managingOrganizationValue; + /** + * EpisodeOfCare/Episodeofcare/team + */ @Path("/data[at0001]/items[at0013]") private List team; + /** + * EpisodeOfCare/Episodeofcare/subject + */ @Path("/subject") private PartyProxy subject; + /** + * EpisodeOfCare/Episodeofcare/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java index 169f6025b..45ce44de3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java @@ -8,12 +8,21 @@ @Entity public class EpisodeofcareDiagnosisCluster { + /** + * EpisodeOfCare/Episodeofcare/diagnosis/diagnosis entry + */ @Path("/items[at0019]/value") private DvEHRURI diagnosisEntry; + /** + * EpisodeOfCare/Episodeofcare/diagnosis/role + */ @Path("/items[at0020]/value|value") private String roleValue; + /** + * EpisodeOfCare/Episodeofcare/diagnosis/rank + */ @Path("/items[at0021]/value|magnitude") private Long rankMagnitude; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java index ec1c16347..76bde24a1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java @@ -6,6 +6,9 @@ @Entity public class EpisodeofcareIdentifierElement { + /** + * EpisodeOfCare/Episodeofcare/identifier + */ @Path("/value") private DvIdentifier value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java index 3fe2d4a99..45567e9e6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java @@ -6,6 +6,9 @@ @Entity public class EpisodeofcareTeamElement { + /** + * EpisodeOfCare/Episodeofcare/team + */ @Path("/value|value") private URI value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java index 53e115edc..77227faa7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java @@ -27,51 +27,99 @@ @Archetype("openEHR-EHR-COMPOSITION.encounter.v1") @Template("open_eREACT-Care") public class OpenEREACTCareComposition { + /** + * open_eREACT-Care/context/Extension + */ @Path("/context/other_context[at0001]/items[at0002]") private List extension; + /** + * open_eREACT-Care/context/start_time + */ @Path("/context/start_time|value") private TemporalAccessor startTimeValue; + /** + * open_eREACT-Care/context/participations + */ @Path("/context/participations") private List participations; + /** + * open_eREACT-Care/context/end_time + */ @Path("/context/end_time|value") private TemporalAccessor endTimeValue; + /** + * open_eREACT-Care/context/location + */ @Path("/context/location") private String location; + /** + * open_eREACT-Care/context/health_care_facility + */ @Path("/context/health_care_facility") private PartyIdentified healthCareFacility; + /** + * open_eREACT-Care/context/setting + */ @Path("/context/setting|defining_code") private Setting settingDefiningCode; + /** + * open_eREACT-Care/Situation + */ @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Situation']") private SituationSection situation; + /** + * open_eREACT-Care/Background + */ @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Background']") private BackgroundSection background; + /** + * open_eREACT-Care/Assessment + */ @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Assessment']") private AssessmentSection assessment; + /** + * open_eREACT-Care/Response + */ @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Response']") private ResponseSection response; + /** + * open_eREACT-Care/composer + */ @Path("/composer") private PartyProxy composer; + /** + * open_eREACT-Care/language + */ @Path("/language") private Language language; + /** + * open_eREACT-Care/feeder_audit + */ @Path("/feeder_audit") private FeederAudit feederAudit; + /** + * open_eREACT-Care/category + */ @Path("/category|defining_code") private Category categoryDefiningCode; + /** + * open_eREACT-Care/territory + */ @Path("/territory") private Territory territory; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java index f63b405e0..a8eaadf04 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java @@ -10,21 +10,39 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") public class AbdomenSymptomCluster { + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Abdomen symptom/Symptom/Sign name + */ @Path("/items[at0001.1]/value") private DvCodedText symptomSignName; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Abdomen symptom/Structured body site + */ @Path("/items[at0147]") private List structuredBodySite; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Abdomen symptom/Specific details + */ @Path("/items[at0153]") private List specificDetails; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Abdomen symptom/Previous episodes + */ @Path("/items[at0146]") private List previousEpisodes; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Abdomen symptom/Associated symptom/sign + */ @Path("/items[at0063]") private List associatedSymptomSign; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Abdomen symptom/Presence + */ @Path("/items[at0.1 and name/value='Presence']/value|defining_code") private PresenceDefiningCode presenceDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java index 53b2f3fd9..997ee7d76 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java @@ -13,24 +13,45 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.acvpu.v0") public class AcvpuScaleObservation { + /** + * open_eREACT-Care/Assessment/NEWS2/ACVPU scale/Any point in time event/ACVPU + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|defining_code") private AcvpuDefiningCode acvpuDefiningCode; + /** + * open_eREACT-Care/Assessment/NEWS2/ACVPU scale/Any point in time event/Tree + */ @Path("/data[at0001]/events[at0002]/state[at0013]") private ItemTree tree; + /** + * open_eREACT-Care/Assessment/NEWS2/ACVPU scale/Any point in time event/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * open_eREACT-Care/Assessment/NEWS2/ACVPU scale/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * open_eREACT-Care/Assessment/NEWS2/ACVPU scale/Extension + */ @Path("/protocol[at0009]/items[at0011]") private List extension; + /** + * open_eREACT-Care/Assessment/NEWS2/ACVPU scale/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Assessment/NEWS2/ACVPU scale/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java index d5c906fa7..96bd2f8a9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java @@ -12,15 +12,27 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") public class AllergiesEvaluation { + /** + * open_eREACT-Care/Background/Allergies/Synopsis + */ @Path("/data[at0001]/items[at0002]/value|value") private String synopsisValue; + /** + * open_eREACT-Care/Background/Allergies/Extension + */ @Path("/protocol[at0003]/items[at0004]") private List extension; + /** + * open_eREACT-Care/Background/Allergies/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Background/Allergies/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java index 2a36077f6..9699a1681 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java @@ -7,15 +7,27 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class AssessmentSection { + /** + * open_eREACT-Care/Assessment/DENWIS + */ @Path("/items[openEHR-EHR-OBSERVATION.denwis.v0]") private DenwisObservation denwis; + /** + * open_eREACT-Care/Assessment/Sepsis + */ @Path("/items[openEHR-EHR-SECTION.adhoc.v1 and name/value='Sepsis']") private SepsisSection sepsis; + /** + * open_eREACT-Care/Assessment/Covid + */ @Path("/items[openEHR-EHR-SECTION.adhoc.v1 and name/value='Covid']") private CovidSection covid; + /** + * open_eREACT-Care/Assessment/NEWS2 + */ @Path("/items[openEHR-EHR-SECTION.adhoc.v1 and name/value='NEWS2']") private News2Section news2; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java index 7799a5574..3dbf7d5cc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java @@ -7,21 +7,39 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class BackgroundSection { + /** + * open_eREACT-Care/Background/Height + */ @Path("/items[openEHR-EHR-OBSERVATION.height.v2 and name/value='Height']") private HeightObservation height; + /** + * open_eREACT-Care/Background/Weight + */ @Path("/items[openEHR-EHR-OBSERVATION.body_weight.v2 and name/value='Weight']") private WeightObservation weight; + /** + * open_eREACT-Care/Background/Frailty + */ @Path("/items[openEHR-EHR-OBSERVATION.clinical_frailty_scale.v1 and name/value='Frailty']") private FrailtyObservation frailty; + /** + * open_eREACT-Care/Background/Past history + */ @Path("/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Past history']") private PastHistoryEvaluation pastHistory; + /** + * open_eREACT-Care/Background/Medication + */ @Path("/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Medication']") private MedicationEvaluation medication; + /** + * open_eREACT-Care/Background/Allergies + */ @Path("/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Allergies']") private AllergiesEvaluation allergies; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java index 621f13f4e..1a6d4cee4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java @@ -14,39 +14,75 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.blood_pressure.v2") public class BloodPressureObservation { + /** + * open_eREACT-Care/Assessment/NEWS2/Blood pressure/Any event/Systolic + */ @Path("/data[at0001]/events[at0006]/data[at0003]/items[at0004]/value|magnitude") private Double systolicMagnitude; + /** + * open_eREACT-Care/Assessment/NEWS2/Blood pressure/Any event/Systolic + */ @Path("/data[at0001]/events[at0006]/data[at0003]/items[at0004]/value|units") private String systolicUnits; + /** + * open_eREACT-Care/Assessment/NEWS2/Blood pressure/Any event/Diastolic + */ @Path("/data[at0001]/events[at0006]/data[at0003]/items[at0005]/value|magnitude") private Double diastolicMagnitude; + /** + * open_eREACT-Care/Assessment/NEWS2/Blood pressure/Any event/Diastolic + */ @Path("/data[at0001]/events[at0006]/data[at0003]/items[at0005]/value|units") private String diastolicUnits; + /** + * open_eREACT-Care/Assessment/NEWS2/Blood pressure/Any event/Exertion + */ @Path("/data[at0001]/events[at0006]/state[at0007]/items[at1030]") private Cluster exertion; + /** + * open_eREACT-Care/Assessment/NEWS2/Blood pressure/Any event/time + */ @Path("/data[at0001]/events[at0006]/time|value") private TemporalAccessor timeValue; + /** + * open_eREACT-Care/Assessment/NEWS2/Blood pressure/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * open_eREACT-Care/Assessment/NEWS2/Blood pressure/Structured measurement location + */ @Path("/protocol[at0011]/items[at1057]") private List structuredMeasurementLocation; + /** + * open_eREACT-Care/Assessment/NEWS2/Blood pressure/Device + */ @Path("/protocol[at0011]/items[at1025]") private Cluster device; + /** + * open_eREACT-Care/Assessment/NEWS2/Blood pressure/Extension + */ @Path("/protocol[at0011]/items[at1058]") private List extension; + /** + * open_eREACT-Care/Assessment/NEWS2/Blood pressure/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Assessment/NEWS2/Blood pressure/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java index 9c6694b03..6bd179bae 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java @@ -10,21 +10,39 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") public class ChestSymptomCluster { + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Chest symptom/Symptom/Sign name + */ @Path("/items[at0001.1]/value") private DvCodedText symptomSignName; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Chest symptom/Structured body site + */ @Path("/items[at0147]") private List structuredBodySite; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Chest symptom/Specific details + */ @Path("/items[at0153]") private List specificDetails; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Chest symptom/Previous episodes + */ @Path("/items[at0146]") private List previousEpisodes; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Chest symptom/Associated symptom/sign + */ @Path("/items[at0063]") private List associatedSymptomSign; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Chest symptom/Presence + */ @Path("/items[at0.1 and name/value='Presence']/value|defining_code") private PresenceDefiningCode presenceDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java index 074b2354a..2f27488b7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java @@ -11,45 +11,87 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.health_risk-covid.v0") public class Covid19ExposureEvaluation { + /** + * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Health risk + */ @Path("/data[at0001]/items[at0002.1]/value|defining_code") private HealthRiskDefiningCode healthRiskDefiningCode; + /** + * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Care home has suspected/confirmed Covid-19/Risk factor + */ @Path("/data[at0001]/items[at0016 and name/value='Care home has suspected/confirmed Covid-19']/items[at0013.1]/value|defining_code") private RiskFactorDefiningCode riskFactorDefiningCode; + /** + * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Care home has suspected/confirmed Covid-19/Presence + */ @Path("/data[at0001]/items[at0016 and name/value='Care home has suspected/confirmed Covid-19']/items[at0017.1]/value|defining_code") private PresenceDefiningCode2 presenceDefiningCode; + /** + * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Care home has suspected/confirmed Covid-19/Detail + */ @Path("/data[at0001]/items[at0016 and name/value='Care home has suspected/confirmed Covid-19']/items[at0027.1]") private List careHomeHasSuspectedConfirmedCovid19Detail; + /** + * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Contact with confirmed case/Risk factor + */ @Path("/data[at0001]/items[at0016 and name/value='Contact with confirmed case']/items[at0013.1]/value|defining_code") private RiskFactorDefiningCode2 riskFactorDefiningCode2; + /** + * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Contact with confirmed case/Presence + */ @Path("/data[at0001]/items[at0016 and name/value='Contact with confirmed case']/items[at0017.1]/value|defining_code") private PresenceDefiningCode2 presenceDefiningCode2; + /** + * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Contact with confirmed case/Detail + */ @Path("/data[at0001]/items[at0016 and name/value='Contact with confirmed case']/items[at0027.1]") private List contactWithConfirmedCaseDetail; + /** + * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Other residents/household members unwell/Risk factor + */ @Path("/data[at0001]/items[at0016 and name/value='Other residents/household members unwell']/items[at0013.1]/value|defining_code") private RiskFactorDefiningCode3 riskFactorDefiningCode3; + /** + * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Other residents/household members unwell/Presence + */ @Path("/data[at0001]/items[at0016 and name/value='Other residents/household members unwell']/items[at0017.1]/value|defining_code") private PresenceDefiningCode2 presenceDefiningCode3; + /** + * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Other residents/household members unwell/Detail + */ @Path("/data[at0001]/items[at0016 and name/value='Other residents/household members unwell']/items[at0027.1]") private List otherResidentsHouseholdMembersUnwellDetail; + /** + * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Risk assessment + */ @Path("/data[at0001]/items[at0003.1]/value|defining_code") private RiskAssessmentDefiningCode riskAssessmentDefiningCode; + /** + * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Extension + */ @Path("/protocol[at0010]/items[at0011]") private List extension; + /** + * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java index 1f5f03c16..247d7138b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java @@ -12,15 +12,27 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") public class CovidNotesEvaluation { + /** + * open_eREACT-Care/Assessment/Covid/Covid notes/Synopsis + */ @Path("/data[at0001]/items[at0002]/value|value") private String synopsisValue; + /** + * open_eREACT-Care/Assessment/Covid/Covid notes/Extension + */ @Path("/protocol[at0003]/items[at0004]") private List extension; + /** + * open_eREACT-Care/Assessment/Covid/Covid notes/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Assessment/Covid/Covid notes/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java index da4c76b4a..fd4b566c6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java @@ -7,15 +7,27 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class CovidSection { + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms + */ @Path("/items[openEHR-EHR-OBSERVATION.story.v1 and name/value='Covid symptoms']") private CovidSymptomsObservation covidSymptoms; + /** + * open_eREACT-Care/Assessment/Covid/Covid-19 exposure + */ @Path("/items[openEHR-EHR-EVALUATION.health_risk-covid.v0 and name/value='Covid-19 exposure']") private Covid19ExposureEvaluation covid19Exposure; + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test + */ @Path("/items[openEHR-EHR-OBSERVATION.laboratory_test_result.v1 and name/value='Latest Covid-19 test']") private LatestCovid19TestObservation latestCovid19Test; + /** + * open_eREACT-Care/Assessment/Covid/Covid notes + */ @Path("/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Covid notes']") private CovidNotesEvaluation covidNotes; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java index 33e9050d5..70e85a210 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java @@ -13,39 +13,75 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.story.v1") public class CovidSymptomsObservation { + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Story + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value") private String storyValue; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/First symptoms + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='First symptoms']") private FirstSymptomsCluster firstSymptoms; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Key Covid symptom + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Key Covid symptom']") private List keyCovidSymptom; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Chest symptom + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Chest symptom']") private List chestSymptom; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Abdomen symptom + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Abdomen symptom']") private List abdomenSymptom; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Neuro symptom + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Neuro symptom']") private List neuroSymptom; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Other symptom + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.symptom_sign-cvid.v0 and name/value='Other symptom']") private List otherSymptom; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Extension + */ @Path("/protocol[at0007]/items[at0008]") private List extension; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java index 8a0fbe296..c8e5f1318 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java @@ -6,6 +6,9 @@ @Entity public class DenwisAgitationIndicatorElement { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/value + */ @Path("/value") @Choice private DenwisValueChoice2 value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java index 196ef822a..7ad74c1c4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java @@ -5,6 +5,9 @@ @Entity public class DenwisBreathingIndicatorElement { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Breathing indicator + */ @Path("/value|defining_code") private BreathingIndicatorDefiningCode value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java index 4f9dd4bd5..26e80539f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java @@ -5,6 +5,9 @@ @Entity public class DenwisCirculationIndicatorElement { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Circulation indicator + */ @Path("/value|defining_code") private CirculationIndicatorDefiningCode value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java index d363466c0..84c8f55f6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java @@ -6,6 +6,9 @@ @Entity public class DenwisMentationIndicatorElement { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/value + */ @Path("/value") @Choice private DenwisValueChoice2 value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java index a1a43f8f3..c360decb7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java @@ -6,6 +6,9 @@ @Entity public class DenwisNurseSubjectiveIndicatorElement { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/value + */ @Path("/value") @Choice private DenwisValueChoice6 value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java index c72f3b9f3..367dee31e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java @@ -16,81 +16,159 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.denwis.v0") public class DenwisObservation { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Q1 Breathing + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0028]/value") private DvOrdinal q1Breathing; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Breathing indicator + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0062]") private List breathingIndicator; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Q2 Circulation + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0033]/value") private DvOrdinal q2Circulation; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Circulation indicator + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0071]") private List circulationIndicator; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Q3 Temperature + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0038]/value") private DvOrdinal q3Temperature; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Temperature indicator + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0076]") private List temperatureIndicator; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Q4 Mentation + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0043]/value") private DvOrdinal q4Mentation; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Mentation indicator + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0078]") private List mentationIndicator; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Q5 Agitation + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0047]/value") private DvOrdinal q5Agitation; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Agitation indicator + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0081]") private List agitationIndicator; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Q6 Pain + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0050]/value") private DvOrdinal q6Pain; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Pain indicator + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0084]") private List painIndicator; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Q7 Trajectory + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0053]/value") private DvOrdinal q7Trajectory; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Trajectory indicator + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0087]") private List trajectoryIndicator; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Q8 Patient subjective + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0056]/value") private DvOrdinal q8PatientSubjective; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Patient indicator + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0090]") private List patientIndicator; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Q9 Nurse subjective + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0059]/value") private DvOrdinal q9NurseSubjective; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Nurse subjective indicator + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0093]") private List nurseSubjectiveIndicator; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Q 10 Other comment + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0027]/value|value") private String q10OtherCommentValue; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Total score + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|magnitude") private Long totalScoreMagnitude; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/Tree + */ @Path("/data[at0001]/events[at0002]/state[at0006]") private ItemTree tree; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * open_eREACT-Care/Assessment/DENWIS/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * open_eREACT-Care/Assessment/DENWIS/Extension + */ @Path("/protocol[at0004]/items[at0005]") private List extension; + /** + * open_eREACT-Care/Assessment/DENWIS/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Assessment/DENWIS/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java index 9957e73d7..2045adb66 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java @@ -6,6 +6,9 @@ @Entity public class DenwisPainIndicatorElement { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/value + */ @Path("/value") @Choice private DenwisValueChoice3 value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java index 7db2a5e7f..e685db4da 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java @@ -6,6 +6,9 @@ @Entity public class DenwisPatientIndicatorElement { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/value + */ @Path("/value") @Choice private DenwisValueChoice5 value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java index 1546423c3..4ce30a77a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java @@ -6,6 +6,9 @@ @Entity public class DenwisTemperatureIndicatorElement { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/value + */ @Path("/value") @Choice private DenwisValueChoice value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java index a786771a8..0c70baa8d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java @@ -6,6 +6,9 @@ @Entity public class DenwisTrajectoryIndicatorElement { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/value + */ @Path("/value") @Choice private DenwisValueChoice4 value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java index ebe18d0cb..7130a5ff3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java @@ -7,6 +7,9 @@ @Entity @OptionFor("DV_CODED_TEXT") public class DenwisValueDvCodedText implements DenwisValueChoice { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value + */ @Path("|defining_code") private ValueDefiningCode valueDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java index 1621d836e..d02ada70e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java @@ -7,6 +7,9 @@ @Entity @OptionFor("DV_CODED_TEXT") public class DenwisValueDvCodedText2 implements DenwisValueChoice2 { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value + */ @Path("|defining_code") private ValueDefiningCode2 valueDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java index 0be21a1ac..73050fbc7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java @@ -7,6 +7,9 @@ @Entity @OptionFor("DV_CODED_TEXT") public class DenwisValueDvCodedText3 implements DenwisValueChoice3 { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value + */ @Path("|defining_code") private ValueDefiningCode3 valueDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java index ceec297ae..905cb4515 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java @@ -7,6 +7,9 @@ @Entity @OptionFor("DV_CODED_TEXT") public class DenwisValueDvCodedText4 implements DenwisValueChoice4 { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value + */ @Path("|defining_code") private ValueDefiningCode4 valueDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java index 45d52851d..83f99aca8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java @@ -7,6 +7,9 @@ @Entity @OptionFor("DV_CODED_TEXT") public class DenwisValueDvCodedText5 implements DenwisValueChoice5 { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value + */ @Path("|defining_code") private ValueDefiningCode5 valueDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java index b8ec39f42..c35a151f2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java @@ -7,6 +7,9 @@ @Entity @OptionFor("DV_CODED_TEXT") public class DenwisValueDvCodedText6 implements DenwisValueChoice6 { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value + */ @Path("|defining_code") private ValueDefiningCode6 valueDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java index 113be1a3c..6b7c6a8fc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java @@ -8,6 +8,9 @@ @Entity @OptionFor("DV_TEXT") public class DenwisValueDvText implements DenwisValueChoice { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value + */ @Path("|value") private String valueValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java index db19ab582..111e22d17 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java @@ -8,6 +8,9 @@ @Entity @OptionFor("DV_TEXT") public class DenwisValueDvText2 implements DenwisValueChoice2 { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value + */ @Path("|value") private String valueValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java index fb3622e75..bbf382bf4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java @@ -8,6 +8,9 @@ @Entity @OptionFor("DV_TEXT") public class DenwisValueDvText3 implements DenwisValueChoice3 { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value + */ @Path("|value") private String valueValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java index d1c2cf438..a7483b555 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java @@ -8,6 +8,9 @@ @Entity @OptionFor("DV_TEXT") public class DenwisValueDvText4 implements DenwisValueChoice4 { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value + */ @Path("|value") private String valueValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java index ea8124987..1a856a235 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java @@ -8,6 +8,9 @@ @Entity @OptionFor("DV_TEXT") public class DenwisValueDvText5 implements DenwisValueChoice5 { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value + */ @Path("|value") private String valueValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java index a3dd218c3..a768a4299 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java @@ -8,6 +8,9 @@ @Entity @OptionFor("DV_TEXT") public class DenwisValueDvText6 implements DenwisValueChoice6 { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value + */ @Path("|value") private String valueValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java index 96093e28d..3959d4c04 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java @@ -13,33 +13,63 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") public class FirstSymptomsCluster { + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/First symptoms/Symptom/Sign name + */ @Path("/items[at0001.1]/value") private DvCodedText symptomSignName; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/First symptoms/Structured body site + */ @Path("/items[at0147]") private List structuredBodySite; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/First symptoms/Date of onset of first symptoms + */ @Path("/items[at0152 and name/value='Date of onset of first symptoms']/value|value") private TemporalAccessor dateOfOnsetOfFirstSymptomsValue; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/First symptoms/Duration + */ @Path("/items[at0028]/value|value") private TemporalAmount durationValue; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/First symptoms/Trend + */ @Path("/items[at0180 and name/value='Trend']/value|defining_code") private TrendDefiningCode trendDefiningCode; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/First symptoms/Impact + */ @Path("/items[at0155]/value|value") private String impactValue; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/First symptoms/Specific details + */ @Path("/items[at0153]") private List specificDetails; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/First symptoms/Previous episodes + */ @Path("/items[at0146]") private List previousEpisodes; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/First symptoms/Associated symptom/sign + */ @Path("/items[at0063]") private List associatedSymptomSign; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/First symptoms/Presence + */ @Path("/items[at0.1]/value|defining_code") private PresenceDefiningCode presenceDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java index f4af802a0..a827f1d67 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java @@ -13,21 +13,39 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.clinical_frailty_scale.v1") public class FrailtyObservation { + /** + * open_eREACT-Care/Background/Frailty/Any point in time event/Assessment + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value") private DvOrdinal assessment; + /** + * open_eREACT-Care/Background/Frailty/Any point in time event/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * open_eREACT-Care/Background/Frailty/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * open_eREACT-Care/Background/Frailty/Extension + */ @Path("/protocol[at0014]/items[at0015]") private List extension; + /** + * open_eREACT-Care/Background/Frailty/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Background/Frailty/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java index 932ecf48c..e5a2d7226 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java @@ -15,30 +15,57 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.height.v2") public class HeightObservation { + /** + * open_eREACT-Care/Background/Height/Any event/Height/Length + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude") private Double heightLengthMagnitude; + /** + * open_eREACT-Care/Background/Height/Any event/Height/Length + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units") private String heightLengthUnits; + /** + * open_eREACT-Care/Background/Height/Any event/Tree + */ @Path("/data[at0001]/events[at0002]/state[at0013]") private ItemTree tree; + /** + * open_eREACT-Care/Background/Height/Any event/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * open_eREACT-Care/Background/Height/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * open_eREACT-Care/Background/Height/Device + */ @Path("/protocol[at0007]/items[at0011]") private Cluster device; + /** + * open_eREACT-Care/Background/Height/Extension + */ @Path("/protocol[at0007]/items[at0022]") private List extension; + /** + * open_eREACT-Care/Background/Height/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Background/Height/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java index 899ba5eae..764b121d4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java @@ -10,21 +10,39 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") public class KeyCovidSymptomCluster { + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Key Covid symptom/Symptom/Sign name + */ @Path("/items[at0001.1]/value") private DvCodedText symptomSignName; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Key Covid symptom/Structured body site + */ @Path("/items[at0147]") private List structuredBodySite; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Key Covid symptom/Specific details + */ @Path("/items[at0153]") private List specificDetails; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Key Covid symptom/Previous episodes + */ @Path("/items[at0146]") private List previousEpisodes; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Key Covid symptom/Associated symptom/sign + */ @Path("/items[at0063]") private List associatedSymptomSign; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Key Covid symptom/Presence + */ @Path("/items[at0.1 and name/value='Presence']/value|defining_code") private PresenceDefiningCode presenceDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java index 017957406..1e14e47dc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java @@ -14,51 +14,99 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.laboratory_test_result.v1") public class LatestCovid19TestObservation { + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Any event/Test name + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value") private String testNameValue; + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Any event/Specimen detail + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0065]") private List specimenDetail; + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Any event/Test result + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0097]") private List testResult; + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Any event/Test diagnosis + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0098]/value|value") private String testDiagnosisValue; + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Any event/Structured test diagnosis + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0122]") private List structuredTestDiagnosis; + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Any event/Multimedia representation + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0118]") private List multimediaRepresentation; + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Any event/Structured confounding factors + */ @Path("/data[at0001]/events[at0002]/state[at0112]/items[at0114]") private List structuredConfoundingFactors; + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Any event/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Receiving laboratory + */ @Path("/protocol[at0004]/items[at0017]") private Cluster receivingLaboratory; + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Test request details + */ @Path("/protocol[at0004]/items[at0094]") private List testRequestDetails; + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Testing details + */ @Path("/protocol[at0004]/items[at0110]") private List testingDetails; + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Extension + */ @Path("/protocol[at0004]/items[at0117]") private List extension; + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/language + */ @Path("/language") private Language language; + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Any event/value + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0073]/value") @Choice private LatestCovid19TestOverallTestStatusChoice overallTestStatus; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvCodedText.java index 22c633880..d8cf5e406 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvCodedText.java @@ -7,6 +7,9 @@ @Entity @OptionFor("DV_CODED_TEXT") public class LatestCovid19TestOverallTestStatusDvCodedText implements LatestCovid19TestOverallTestStatusChoice { + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Any event/value/value + */ @Path("|defining_code") private OverallTestStatusDefiningCode overallTestStatusDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java index ffa8a2859..e27ef3d7b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java @@ -8,6 +8,9 @@ @Entity @OptionFor("DV_TEXT") public class LatestCovid19TestOverallTestStatusDvText implements LatestCovid19TestOverallTestStatusChoice { + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Any event/value/value + */ @Path("|value") private String overallTestStatusValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java index af4946d03..d7de1b867 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java @@ -7,9 +7,15 @@ @Entity public class LatestCovid19TestTestRequestDetailsCluster { + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Test request details/Requester + */ @Path("/items[at0090]") private Cluster requester; + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Test request details/Distribution list + */ @Path("/items[at0035]") private List distributionList; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java index 984525739..6bee3e49e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java @@ -12,15 +12,27 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") public class MedicationEvaluation { + /** + * open_eREACT-Care/Background/Medication/Synopsis + */ @Path("/data[at0001]/items[at0002]/value|value") private String synopsisValue; + /** + * open_eREACT-Care/Background/Medication/Extension + */ @Path("/protocol[at0003]/items[at0004]") private List extension; + /** + * open_eREACT-Care/Background/Medication/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Background/Medication/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java index f8d68e484..54b5ef07d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java @@ -10,21 +10,39 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") public class NeuroSymptomCluster { + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Neuro symptom/Symptom/Sign name + */ @Path("/items[at0001.1]/value") private DvCodedText symptomSignName; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Neuro symptom/Structured body site + */ @Path("/items[at0147]") private List structuredBodySite; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Neuro symptom/Specific details + */ @Path("/items[at0153]") private List specificDetails; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Neuro symptom/Previous episodes + */ @Path("/items[at0146]") private List previousEpisodes; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Neuro symptom/Associated symptom/sign + */ @Path("/items[at0063]") private List associatedSymptomSign; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Neuro symptom/Presence + */ @Path("/items[at0.1 and name/value='Presence']/value|defining_code") private PresenceDefiningCode presenceDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java index 01a94a542..99f16f22a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java @@ -14,48 +14,93 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.news2.v1") public class News2ScoreObservation { + /** + * open_eREACT-Care/Assessment/NEWS2/NEWS2 Score/Any point in time event/Respiration rate + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value") private DvOrdinal respirationRate; + /** + * open_eREACT-Care/Assessment/NEWS2/NEWS2 Score/Any point in time event/SpO₂ Scale 1 + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0029]/value") private DvOrdinal spoScale1; + /** + * open_eREACT-Care/Assessment/NEWS2/NEWS2 Score/Any point in time event/SpO₂ Scale 2 + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0047]/value") private DvOrdinal spoScale2; + /** + * open_eREACT-Care/Assessment/NEWS2/NEWS2 Score/Any point in time event/Air or oxygen? + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0034]/value") private DvOrdinal airOrOxygen; + /** + * open_eREACT-Care/Assessment/NEWS2/NEWS2 Score/Any point in time event/Systolic blood pressure + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value") private DvOrdinal systolicBloodPressure; + /** + * open_eREACT-Care/Assessment/NEWS2/NEWS2 Score/Any point in time event/Pulse + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value") private DvOrdinal pulse; + /** + * open_eREACT-Care/Assessment/NEWS2/NEWS2 Score/Any point in time event/Consciousness + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value") private DvOrdinal consciousness; + /** + * open_eREACT-Care/Assessment/NEWS2/NEWS2 Score/Any point in time event/Temperature + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value") private DvOrdinal temperature; + /** + * open_eREACT-Care/Assessment/NEWS2/NEWS2 Score/Any point in time event/Total score + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0028]/value|magnitude") private Long totalScoreMagnitude; + /** + * open_eREACT-Care/Assessment/NEWS2/NEWS2 Score/Any point in time event/Clinical risk category + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0056]/value|defining_code") private ClinicalRiskCategoryDefiningCode clinicalRiskCategoryDefiningCode; + /** + * open_eREACT-Care/Assessment/NEWS2/NEWS2 Score/Any point in time event/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * open_eREACT-Care/Assessment/NEWS2/NEWS2 Score/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * open_eREACT-Care/Assessment/NEWS2/NEWS2 Score/Extension + */ @Path("/protocol[at0045]/items[at0046]") private List extension; + /** + * open_eREACT-Care/Assessment/NEWS2/NEWS2 Score/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Assessment/NEWS2/NEWS2 Score/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java index ff28009d6..e2fa3c652 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java @@ -7,24 +7,45 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class News2Section { + /** + * open_eREACT-Care/Assessment/NEWS2/Temperature + */ @Path("/items[openEHR-EHR-OBSERVATION.body_temperature.v1 and name/value='Temperature']") private TemperatureObservation temperature; + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse oximetry + */ @Path("/items[openEHR-EHR-OBSERVATION.pulse_oximetry.v1]") private PulseOximetryObservation pulseOximetry; + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse + */ @Path("/items[openEHR-EHR-OBSERVATION.pulse.v1 and name/value='Pulse']") private PulseObservation pulse; + /** + * open_eREACT-Care/Assessment/NEWS2/Respirations + */ @Path("/items[openEHR-EHR-OBSERVATION.respiration.v1]") private RespirationsObservation respirations; + /** + * open_eREACT-Care/Assessment/NEWS2/ACVPU scale + */ @Path("/items[openEHR-EHR-OBSERVATION.acvpu.v0]") private AcvpuScaleObservation acvpuScale; + /** + * open_eREACT-Care/Assessment/NEWS2/Blood pressure + */ @Path("/items[openEHR-EHR-OBSERVATION.blood_pressure.v2]") private BloodPressureObservation bloodPressure; + /** + * open_eREACT-Care/Assessment/NEWS2/NEWS2 Score + */ @Path("/items[openEHR-EHR-OBSERVATION.news2.v1]") private News2ScoreObservation news2Score; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java index 74673cd18..dcdbae453 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java @@ -10,21 +10,39 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") public class OtherSymptomCluster { + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Other symptom/Symptom/Sign name + */ @Path("/items[at0001.1]/value|value") private String symptomSignNameValue; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Other symptom/Structured body site + */ @Path("/items[at0147]") private List structuredBodySite; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Other symptom/Specific details + */ @Path("/items[at0153]") private List specificDetails; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Other symptom/Previous episodes + */ @Path("/items[at0146]") private List previousEpisodes; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Other symptom/Associated symptom/sign + */ @Path("/items[at0063]") private List associatedSymptomSign; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Other symptom/Presence + */ @Path("/items[at0.1 and name/value='Presence']/value|defining_code") private PresenceDefiningCode presenceDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java index dafd48f9f..a4aed6fe4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java @@ -12,15 +12,27 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") public class PastHistoryEvaluation { + /** + * open_eREACT-Care/Background/Past history/Synopsis + */ @Path("/data[at0001]/items[at0002]/value|value") private String synopsisValue; + /** + * open_eREACT-Care/Background/Past history/Extension + */ @Path("/protocol[at0003]/items[at0004]") private List extension; + /** + * open_eREACT-Care/Background/Past history/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Background/Past history/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java index 3da25bd7a..43498f62c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java @@ -14,30 +14,57 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.pulse.v1") public class PulseObservation { + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse/Any event/Pulse Rate + */ @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004 and name/value='Pulse Rate']/value|magnitude") private Double pulseRateMagnitude; + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse/Any event/Pulse Rate + */ @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004 and name/value='Pulse Rate']/value|units") private String pulseRateUnits; + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse/Any event/Exertion + */ @Path("/data[at0002]/events[at0003]/state[at0012]/items[at1017]") private List exertion; + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse/Any event/time + */ @Path("/data[at0002]/events[at0003]/time|value") private TemporalAccessor timeValue; + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse/origin + */ @Path("/data[at0002]/origin|value") private TemporalAccessor originValue; + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse/Device + */ @Path("/protocol[at0010]/items[at1013]") private Cluster device; + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse/Extension + */ @Path("/protocol[at0010]/items[at1056]") private List extension; + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java index dcd5e5a51..9abd3d6a3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java @@ -13,36 +13,69 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.pulse_oximetry.v1") public class PulseOximetryObservation { + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse oximetry/Any event/SpO₂ + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value") private DvProportion spo; + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse oximetry/Any event/Waveform + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0054]") private List waveform; + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse oximetry/Any event/Multimedia image + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0060]") private List multimediaImage; + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse oximetry/Any event/Exertion + */ @Path("/data[at0001]/events[at0002]/state[at0014]/items[at0034]") private Cluster exertion; + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse oximetry/Any event/Inspired oxygen + */ @Path("/data[at0001]/events[at0002]/state[at0014]/items[at0015]") private Cluster inspiredOxygen; + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse oximetry/Any event/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse oximetry/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse oximetry/Oximetry device + */ @Path("/protocol[at0007]/items[at0018]") private Cluster oximetryDevice; + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse oximetry/Extension + */ @Path("/protocol[at0007]/items[at0059]") private List extension; + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse oximetry/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse oximetry/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java index e94af5370..271f76038 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java @@ -11,15 +11,27 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.recommendation.v1") public class RecommendationEvaluation { + /** + * open_eREACT-Care/Response/Recommendation/Recommendation + */ @Path("/data[at0001]/items[at0002]") private List recommendation; + /** + * open_eREACT-Care/Response/Recommendation/Extension + */ @Path("/protocol[at0004]/items[at0005]") private List extension; + /** + * open_eREACT-Care/Response/Recommendation/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Response/Recommendation/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java index 1dbefb506..aad1a8d6f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java @@ -6,6 +6,9 @@ @Entity public class RecommendationRecommendationElement { + /** + * open_eREACT-Care/Response/Recommendation/Recommendation + */ @Path("/value|value") private String value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java index e368e07f0..50691ad33 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java @@ -14,30 +14,57 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.respiration.v1") public class RespirationsObservation { + /** + * open_eREACT-Care/Assessment/NEWS2/Respirations/Any event/Rate + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|magnitude") private Double rateMagnitude; + /** + * open_eREACT-Care/Assessment/NEWS2/Respirations/Any event/Rate + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|units") private String rateUnits; + /** + * open_eREACT-Care/Assessment/NEWS2/Respirations/Any event/Inspired oxygen + */ @Path("/data[at0001]/events[at0002]/state[at0022]/items[at0055]") private Cluster inspiredOxygen; + /** + * open_eREACT-Care/Assessment/NEWS2/Respirations/Any event/Exertion + */ @Path("/data[at0001]/events[at0002]/state[at0022]/items[at0037]") private Cluster exertion; + /** + * open_eREACT-Care/Assessment/NEWS2/Respirations/Any event/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * open_eREACT-Care/Assessment/NEWS2/Respirations/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * open_eREACT-Care/Assessment/NEWS2/Respirations/Extension + */ @Path("/protocol[at0057]/items[at0058]") private List extension; + /** + * open_eREACT-Care/Assessment/NEWS2/Respirations/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Assessment/NEWS2/Respirations/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java index bddc3f7fc..543aaf4d0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java @@ -8,12 +8,21 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class ResponseSection { + /** + * open_eREACT-Care/Response/Recommendation + */ @Path("/items[openEHR-EHR-EVALUATION.recommendation.v1]") private RecommendationEvaluation recommendation; + /** + * open_eREACT-Care/Response/Service request + */ @Path("/items[openEHR-EHR-INSTRUCTION.service_request.v1]") private List serviceRequest; + /** + * open_eREACT-Care/Response/Service + */ @Path("/items[openEHR-EHR-ACTION.service.v0]") private List service; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java index f05d2a319..a3b6aef6d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java @@ -5,6 +5,9 @@ @Entity public class SepsisScreening999FlagElement { + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/999 Flag + */ @Path("/value|defining_code") private N999FlagDefiningCode value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java index bc2f981b2..fe7c6704e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java @@ -5,6 +5,9 @@ @Entity public class SepsisScreeningAmberFlagAcuteElement { + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/Amber flag (acute) + */ @Path("/value|defining_code") private AmberFlagAcuteDefiningCode value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java index 58bbab93c..43d8ee998 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java @@ -6,6 +6,9 @@ @Entity public class SepsisScreeningLikelySourceOfInfectionElement { + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/value + */ @Path("/value") @Choice private SepsisScreeningValueChoice value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java index 3287b4621..100c49eb1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java @@ -12,33 +12,63 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.sepsis_screening_tool.v0") public class SepsisScreeningObservation { + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/Risk factors for sepsis + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]") private List riskFactorsForSepsis; + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/Likely source of infection + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0011]") private List likelySourceOfInfection; + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/Red flag (acute) + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0058]") private List redFlagAcute; + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/Amber flag (acute) + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0083]") private List amberFlagAcute; + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/999 Flag + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0036]") private List N999Flag; + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Extension + */ @Path("/protocol[at0004]/items[at0005]") private List extension; + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java index 1bd91c293..35f727326 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java @@ -5,6 +5,9 @@ @Entity public class SepsisScreeningRedFlagAcuteElement { + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/Red flag (acute) + */ @Path("/value|defining_code") private RedFlagAcuteDefiningCode value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java index 48134e9c0..e06f630b9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java @@ -5,6 +5,9 @@ @Entity public class SepsisScreeningRiskFactorsForSepsisElement { + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/Risk factors for sepsis + */ @Path("/value|defining_code") private RiskFactorsForSepsisDefiningCode value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java index d33a51fe8..ec8f3f96a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java @@ -7,6 +7,9 @@ @Entity @OptionFor("DV_CODED_TEXT") public class SepsisScreeningValueDvCodedText implements SepsisScreeningValueChoice { + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/value/value + */ @Path("|defining_code") private ValueDefiningCode7 valueDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java index 63fe4b3e7..9beedc211 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java @@ -8,6 +8,9 @@ @Entity @OptionFor("DV_TEXT") public class SepsisScreeningValueDvText implements SepsisScreeningValueChoice { + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/value/value + */ @Path("|value") private String valueValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java index 86eb4cb31..f68e5b12c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java @@ -7,6 +7,9 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class SepsisSection { + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening + */ @Path("/items[openEHR-EHR-OBSERVATION.sepsis_screening_tool.v0 and name/value='Sepsis screening']") private SepsisScreeningObservation sepsisScreening; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java index ddfe88203..105b12aa9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java @@ -15,39 +15,75 @@ @Entity @Archetype("openEHR-EHR-ACTION.service.v0") public class ServiceAction { + /** + * open_eREACT-Care/Response/Service/Service name + */ @Path("/description[at0001]/items[at0011]/value") private DvCodedText serviceName; + /** + * open_eREACT-Care/Response/Service/Description + */ @Path("/description[at0001]/items[at0013]/value|value") private String descriptionValue; + /** + * open_eREACT-Care/Response/Service/Service detail + */ @Path("/description[at0001]/items[at0027]") private List serviceDetail; + /** + * open_eREACT-Care/Response/Service/Multimedia + */ @Path("/description[at0001]/items[at0029]") private List multimedia; + /** + * open_eREACT-Care/Response/Service/Requestor + */ @Path("/protocol[at0015]/items[at0017]") private List requestor; + /** + * open_eREACT-Care/Response/Service/Receiver + */ @Path("/protocol[at0015]/items[at0019]") private List receiver; + /** + * open_eREACT-Care/Response/Service/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Response/Service/language + */ @Path("/language") private Language language; + /** + * open_eREACT-Care/Response/Service/time + */ @Path("/time|value") private TemporalAccessor timeValue; + /** + * open_eREACT-Care/Response/Service/ism_transition/Careflow_step + */ @Path("/ism_transition/careflow_step|defining_code") private CareflowStepDefiningCode careflowStepDefiningCode; + /** + * open_eREACT-Care/Response/Service/ism_transition/Current_state + */ @Path("/ism_transition/current_state|defining_code") private CurrentStateDefiningCode currentStateDefiningCode; + /** + * open_eREACT-Care/Response/Service/ism_transition/transition + */ @Path("/ism_transition/transition|defining_code") private Transition transitionDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java index f335e938d..b770f13c9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java @@ -11,33 +11,63 @@ @Entity public class ServiceRequestCurrentActivityActivity { + /** + * open_eREACT-Care/Response/Service request/Current Activity/Service name + */ @Path("/description[at0009]/items[at0121]/value") private DvCodedText serviceName; + /** + * open_eREACT-Care/Response/Service request/Current Activity/Reason for request + */ @Path("/description[at0009]/items[at0062]") private List reasonForRequest; + /** + * open_eREACT-Care/Response/Service request/Current Activity/Reason for isolation + */ @Path("/description[at0009]/items[at0064 and name/value='Reason for isolation']/value|value") private String reasonForIsolationValue; + /** + * open_eREACT-Care/Response/Service request/Current Activity/Complex timing + */ @Path("/description[at0009]/items[at0151]") private List complexTiming; + /** + * open_eREACT-Care/Response/Service request/Current Activity/Date isolation due to start + */ @Path("/description[at0009]/items[at0145 and name/value='Date isolation due to start']/value|value") private TemporalAccessor dateIsolationDueToStartValue; + /** + * open_eREACT-Care/Response/Service request/Current Activity/Date isolation due to end + */ @Path("/description[at0009]/items[at0144 and name/value='Date isolation due to end']/value|value") private TemporalAccessor dateIsolationDueToEndValue; + /** + * open_eREACT-Care/Response/Service request/Current Activity/Specific details + */ @Path("/description[at0009]/items[at0132]") private List specificDetails; + /** + * open_eREACT-Care/Response/Service request/Current Activity/Supporting information + */ @Path("/description[at0009]/items[at0149]") private List supportingInformation; + /** + * open_eREACT-Care/Response/Service request/Current Activity/Patient requirements + */ @Path("/description[at0009]/items[at0116]") private List patientRequirements; + /** + * open_eREACT-Care/Response/Service request/Current Activity/timing + */ @Path("/timing") private DvParsable timing; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java index e8b2f0d05..397102251 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java @@ -13,30 +13,57 @@ @Entity @Archetype("openEHR-EHR-INSTRUCTION.service_request.v1") public class ServiceRequestInstruction { + /** + * open_eREACT-Care/Response/Service request/Current Activity + */ @Path("/activities[at0001]") private List currentActivity; + /** + * open_eREACT-Care/Response/Service request/Requester + */ @Path("/protocol[at0008]/items[at0141]") private Cluster requester; + /** + * open_eREACT-Care/Response/Service request/Receiver + */ @Path("/protocol[at0008]/items[at0142]") private Cluster receiver; + /** + * open_eREACT-Care/Response/Service request/Distribution list + */ @Path("/protocol[at0008]/items[at0128]") private List distributionList; + /** + * open_eREACT-Care/Response/Service request/Extension + */ @Path("/protocol[at0008]/items[at0112]") private List extension; + /** + * open_eREACT-Care/Response/Service request/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Response/Service request/narrative + */ @Path("/narrative|value") private String narrativeValue; + /** + * open_eREACT-Care/Response/Service request/language + */ @Path("/language") private Language language; + /** + * open_eREACT-Care/Response/Service request/expiry_time + */ @Path("/expiry_time|value") private TemporalAccessor expiryTimeValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java index 9e32e9bea..bee4e2dc4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java @@ -6,6 +6,9 @@ @Entity public class ServiceRequestReasonForRequestElement { + /** + * open_eREACT-Care/Response/Service request/Current Activity/Reason for request + */ @Path("/value") private DvCodedText value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java index 299642f88..4a2d11476 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java @@ -7,6 +7,9 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") public class SituationSection { + /** + * open_eREACT-Care/Situation/Story/History + */ @Path("/items[openEHR-EHR-OBSERVATION.story.v1]") private StoryHistoryObservation storyHistory; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java index 23bcdf0d0..0092e932f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java @@ -13,27 +13,51 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.story.v1") public class StoryHistoryObservation { + /** + * open_eREACT-Care/Situation/Story/History/Any event/Soft signs + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004 and name/value='Soft signs']") private List softSigns; + /** + * open_eREACT-Care/Situation/Story/History/Any event/Notes + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004 and name/value='Notes']/value|value") private String notesValue; + /** + * open_eREACT-Care/Situation/Story/History/Any event/Structured detail + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]") private List structuredDetail; + /** + * open_eREACT-Care/Situation/Story/History/Any event/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * open_eREACT-Care/Situation/Story/History/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * open_eREACT-Care/Situation/Story/History/Extension + */ @Path("/protocol[at0007]/items[at0008]") private List extension; + /** + * open_eREACT-Care/Situation/Story/History/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Situation/Story/History/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java index 15eb48c4a..eba99cc51 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java @@ -6,6 +6,9 @@ @Entity public class StoryHistorySoftSignsElement { + /** + * open_eREACT-Care/Situation/Story/History/Any event/Soft signs + */ @Path("/value|value") private String value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java index e07b98ba6..77e9c23f6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java @@ -14,33 +14,63 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.body_temperature.v1") public class TemperatureObservation { + /** + * open_eREACT-Care/Assessment/NEWS2/Temperature/Any event/Temperature + */ @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude") private Double temperatureMagnitude; + /** + * open_eREACT-Care/Assessment/NEWS2/Temperature/Any event/Temperature + */ @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units") private String temperatureUnits; + /** + * open_eREACT-Care/Assessment/NEWS2/Temperature/Any event/Environmental Conditions + */ @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0056]") private Cluster environmentalConditions; + /** + * open_eREACT-Care/Assessment/NEWS2/Temperature/Any event/Exertion + */ @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0057]") private Cluster exertion; + /** + * open_eREACT-Care/Assessment/NEWS2/Temperature/Any event/Menstrual Cycle + */ @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0058]") private Element menstrualCycle; + /** + * open_eREACT-Care/Assessment/NEWS2/Temperature/Any event/time + */ @Path("/data[at0002]/events[at0003]/time|value") private TemporalAccessor timeValue; + /** + * open_eREACT-Care/Assessment/NEWS2/Temperature/origin + */ @Path("/data[at0002]/origin|value") private TemporalAccessor originValue; + /** + * open_eREACT-Care/Assessment/NEWS2/Temperature/Device + */ @Path("/protocol[at0020]/items[at0059]") private Cluster device; + /** + * open_eREACT-Care/Assessment/NEWS2/Temperature/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Assessment/NEWS2/Temperature/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java index d0cdf2597..b4eaffb7f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java @@ -15,30 +15,57 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.body_weight.v2") public class WeightObservation { + /** + * open_eREACT-Care/Background/Weight/Any event/Weight + */ @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude") private Double weightMagnitude; + /** + * open_eREACT-Care/Background/Weight/Any event/Weight + */ @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units") private String weightUnits; + /** + * open_eREACT-Care/Background/Weight/Any event/state structure + */ @Path("/data[at0002]/events[at0003]/state[at0008]") private ItemTree stateStructure; + /** + * open_eREACT-Care/Background/Weight/Any event/time + */ @Path("/data[at0002]/events[at0003]/time|value") private TemporalAccessor timeValue; + /** + * open_eREACT-Care/Background/Weight/origin + */ @Path("/data[at0002]/origin|value") private TemporalAccessor originValue; + /** + * open_eREACT-Care/Background/Weight/Device + */ @Path("/protocol[at0015]/items[at0020]") private Cluster device; + /** + * open_eREACT-Care/Background/Weight/Extension + */ @Path("/protocol[at0015]/items[at0027]") private List extension; + /** + * open_eREACT-Care/Background/Weight/subject + */ @Path("/subject") private PartyProxy subject; + /** + * open_eREACT-Care/Background/Weight/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java index 2bd930c05..9c457c5b0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java @@ -25,45 +25,87 @@ @Archetype("openEHR-EHR-COMPOSITION.event_summary.v0") @Template("Patientenaufenthalt") public class PatientenaufenthaltComposition { + /** + * Patientenaufenthalt/context/Versorgungsfall + */ @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0 and name/value='Versorgungsfall']") private VersorgungsfallCluster versorgungsfall; + /** + * Patientenaufenthalt/context/Abteilungsfall + */ @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0 and name/value='Abteilungsfall']") private AbteilungsfallCluster abteilungsfall; + /** + * Patientenaufenthalt/context/start_time + */ @Path("/context/start_time|value") private TemporalAccessor startTimeValue; + /** + * Patientenaufenthalt/context/participations + */ @Path("/context/participations") private List participations; + /** + * Patientenaufenthalt/context/end_time + */ @Path("/context/end_time|value") private TemporalAccessor endTimeValue; + /** + * Patientenaufenthalt/context/location + */ @Path("/context/location") private String location; + /** + * Patientenaufenthalt/context/health_care_facility + */ @Path("/context/health_care_facility") private PartyIdentified healthCareFacility; + /** + * Patientenaufenthalt/context/setting + */ @Path("/context/setting|defining_code") private Setting settingDefiningCode; + /** + * Patientenaufenthalt/Versorgungsort + */ @Path("/content[openEHR-EHR-ADMIN_ENTRY.hospitalization.v0 and name/value='Versorgungsort']") private VersorgungsortAdminEntry versorgungsort; + /** + * Patientenaufenthalt/composer + */ @Path("/composer") private PartyProxy composer; + /** + * Patientenaufenthalt/language + */ @Path("/language") private Language language; + /** + * Patientenaufenthalt/feeder_audit + */ @Path("/feeder_audit") private FeederAudit feederAudit; + /** + * Patientenaufenthalt/category + */ @Path("/category|defining_code") private Category categoryDefiningCode; + /** + * Patientenaufenthalt/territory + */ @Path("/territory") private Territory territory; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java index e062578bf..02607b646 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java @@ -8,6 +8,9 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.case_identification.v0") public class AbteilungsfallCluster { + /** + * Patientenaufenthalt/context/Abteilungsfall/Zugehörige Abteilungsfall-Kennung + */ @Path("/items[at0001 and name/value='Zugehörige Abteilungsfall-Kennung']/value|value") private String zugehorigeAbteilungsfallKennungValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java index 16b35ec32..3922b5ec7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java @@ -11,27 +11,51 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.device.v1") public class DetailsZumBettCluster { + /** + * Patientenaufenthalt/Versorgungsort/Standort/Details zum Bett/Gerätename + */ @Path("/items[at0001]/value|value") private String geratenameValue; + /** + * Patientenaufenthalt/Versorgungsort/Standort/Details zum Bett/Gerätetyp + */ @Path("/items[at0003]/value|value") private String geratetypValue; + /** + * Patientenaufenthalt/Versorgungsort/Standort/Details zum Bett/Eigenschaften + */ @Path("/items[at0009]") private List eigenschaften; + /** + * Patientenaufenthalt/Versorgungsort/Standort/Details zum Bett/Eindeutige Identifikationsnummer (ID) + */ @Path("/items[at0021]/value") private DvIdentifier eindeutigeIdentifikationsnummerId; + /** + * Patientenaufenthalt/Versorgungsort/Standort/Details zum Bett/Geräteverwaltung + */ @Path("/items[at0019]") private List gerateverwaltung; + /** + * Patientenaufenthalt/Versorgungsort/Standort/Details zum Bett/Komponenten + */ @Path("/items[at0018]") private List komponenten; + /** + * Patientenaufenthalt/Versorgungsort/Standort/Details zum Bett/Erweiterung + */ @Path("/items[at0026]") private List erweiterung; + /** + * Patientenaufenthalt/Versorgungsort/Standort/Details zum Bett/Multimedia + */ @Path("/items[at0027]") private List multimedia; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java index 296a0609b..23463c016 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java @@ -8,33 +8,63 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") public class StandortCluster { + /** + * Patientenaufenthalt/Versorgungsort/Standort/Standorttyp + */ @Path("/items[at0040]/value|value") private String standorttypValue; + /** + * Patientenaufenthalt/Versorgungsort/Standort/Standortbeschreibung + */ @Path("/items[at0046]/value|value") private String standortbeschreibungValue; + /** + * Patientenaufenthalt/Versorgungsort/Standort/Standortschlüssel + */ @Path("/items[at0048]/value|defining_code") private StandortschlusselDefiningCode standortschlusselDefiningCode; + /** + * Patientenaufenthalt/Versorgungsort/Standort/Campus + */ @Path("/items[at0024]/value|value") private String campusValue; + /** + * Patientenaufenthalt/Versorgungsort/Standort/Gebäudegruppe + */ @Path("/items[at0025]/value|value") private String gebaudegruppeValue; + /** + * Patientenaufenthalt/Versorgungsort/Standort/Ebene + */ @Path("/items[at0028]/value|value") private String ebeneValue; + /** + * Patientenaufenthalt/Versorgungsort/Standort/Stationskennung + */ @Path("/items[at0027 and name/value='Stationskennung']/value|value") private String stationskennungValue; + /** + * Patientenaufenthalt/Versorgungsort/Standort/Zimmerkennung + */ @Path("/items[at0029 and name/value='Zimmerkennung']/value|value") private String zimmerkennungValue; + /** + * Patientenaufenthalt/Versorgungsort/Standort/Bettplatzkennung + */ @Path("/items[at0034 and name/value='Bettplatzkennung']/value|value") private String bettplatzkennungValue; + /** + * Patientenaufenthalt/Versorgungsort/Standort/Details zum Bett + */ @Path("/items[openEHR-EHR-CLUSTER.device.v1 and name/value='Details zum Bett']") private DetailsZumBettCluster detailsZumBett; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java index b1d7b54e5..1cfd56038 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java @@ -8,6 +8,9 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.case_identification.v0") public class VersorgungsfallCluster { + /** + * Patientenaufenthalt/context/Versorgungsfall/Zugehörige Versorgungsfall-Kennung + */ @Path("/items[at0001 and name/value='Zugehörige Versorgungsfall-Kennung']/value|value") private String zugehorigeVersorgungsfallKennungValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java index ae32fd27b..21034307e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java @@ -11,24 +11,45 @@ @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.hospitalization.v0") public class VersorgungsortAdminEntry { + /** + * Patientenaufenthalt/Versorgungsort/Beginn + */ @Path("/data[at0001]/items[at0004]/value|value") private TemporalAccessor beginnValue; + /** + * Patientenaufenthalt/Versorgungsort/Ende + */ @Path("/data[at0001]/items[at0005]/value|value") private TemporalAccessor endeValue; + /** + * Patientenaufenthalt/Versorgungsort/Grund des Aufenthaltes + */ @Path("/data[at0001]/items[at0006]/value|value") private String grundDesAufenthaltesValue; + /** + * Patientenaufenthalt/Versorgungsort/Standort + */ @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.location.v1]") private StandortCluster standort; + /** + * Patientenaufenthalt/Versorgungsort/Kommentar + */ @Path("/data[at0001]/items[at0009]/value|value") private String kommentarValue; + /** + * Patientenaufenthalt/Versorgungsort/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Patientenaufenthalt/Versorgungsort/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java index 047b47d88..d8fdb71c6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java @@ -25,48 +25,93 @@ @Archetype("openEHR-EHR-COMPOSITION.registereintrag.v1") @Template("Schwangerschaftsstatus") public class SchwangerschaftsstatusComposition { + /** + * Schwangerschaftsstatus/context/Erweiterung + */ @Path("/context/other_context[at0001]/items[at0002]") private List erweiterung; + /** + * Schwangerschaftsstatus/context/Status + */ @Path("/context/other_context[at0001]/items[at0004]/value|defining_code") private StatusDefiningCode statusDefiningCode; + /** + * Schwangerschaftsstatus/context/Kategorie + */ @Path("/context/other_context[at0001]/items[at0005]/value|value") private String kategorieValue; + /** + * Schwangerschaftsstatus/context/start_time + */ @Path("/context/start_time|value") private TemporalAccessor startTimeValue; + /** + * Schwangerschaftsstatus/context/participations + */ @Path("/context/participations") private List participations; + /** + * Schwangerschaftsstatus/context/end_time + */ @Path("/context/end_time|value") private TemporalAccessor endTimeValue; + /** + * Schwangerschaftsstatus/context/location + */ @Path("/context/location") private String location; + /** + * Schwangerschaftsstatus/context/health_care_facility + */ @Path("/context/health_care_facility") private PartyIdentified healthCareFacility; + /** + * Schwangerschaftsstatus/context/setting + */ @Path("/context/setting|defining_code") private Setting settingDefiningCode; + /** + * Schwangerschaftsstatus/Schwangerschaftsstatus + */ @Path("/content[openEHR-EHR-OBSERVATION.pregnancy_status.v0]") private SchwangerschaftsstatusObservation schwangerschaftsstatus; + /** + * Schwangerschaftsstatus/composer + */ @Path("/composer") private PartyProxy composer; + /** + * Schwangerschaftsstatus/language + */ @Path("/language") private Language language; + /** + * Schwangerschaftsstatus/feeder_audit + */ @Path("/feeder_audit") private FeederAudit feederAudit; + /** + * Schwangerschaftsstatus/category + */ @Path("/category|defining_code") private Category categoryDefiningCode; + /** + * Schwangerschaftsstatus/territory + */ @Path("/territory") private Territory territory; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java index 1e84831b4..e81adaae0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java @@ -12,21 +12,39 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.pregnancy_status.v0") public class SchwangerschaftsstatusObservation { + /** + * Schwangerschaftsstatus/Schwangerschaftsstatus/Beliebiges Ereignis/Status + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|defining_code") private StatusDefiningCode2 statusDefiningCode; + /** + * Schwangerschaftsstatus/Schwangerschaftsstatus/Beliebiges Ereignis/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * Schwangerschaftsstatus/Schwangerschaftsstatus/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * Schwangerschaftsstatus/Schwangerschaftsstatus/Erweiterungen + */ @Path("/protocol[at0021]/items[at0022]") private List erweiterungen; + /** + * Schwangerschaftsstatus/Schwangerschaftsstatus/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Schwangerschaftsstatus/Schwangerschaftsstatus/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java index 881c2ecc4..bdb6183ab 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java @@ -24,48 +24,93 @@ @Archetype("openEHR-EHR-COMPOSITION.report.v1") @Template("SmICS-Befund") public class SmICSBefundComposition { + /** + * SmICS Befund/context/Bericht ID + */ @Path("/context/other_context[at0001]/items[at0002]/value|value") private String berichtIdValue; + /** + * SmICS Befund/context/Status + */ @Path("/context/other_context[at0001]/items[at0005]/value|value") private String statusValue; + /** + * SmICS Befund/context/Eventsummary + */ @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.eventsummary.v0]") private List eventsummary; + /** + * SmICS Befund/context/start_time + */ @Path("/context/start_time|value") private TemporalAccessor startTimeValue; + /** + * SmICS Befund/context/participations + */ @Path("/context/participations") private List participations; + /** + * SmICS Befund/context/end_time + */ @Path("/context/end_time|value") private TemporalAccessor endTimeValue; + /** + * SmICS Befund/context/location + */ @Path("/context/location") private String location; + /** + * SmICS Befund/context/health_care_facility + */ @Path("/context/health_care_facility") private PartyIdentified healthCareFacility; + /** + * SmICS Befund/context/setting + */ @Path("/context/setting|defining_code") private Setting settingDefiningCode; + /** + * SmICS Befund/SmICS-Ergebnis + */ @Path("/content[openEHR-EHR-OBSERVATION.smics_befund.v1]") private SmicsErgebnisObservation smicsErgebnis; + /** + * SmICS Befund/composer + */ @Path("/composer") private PartyProxy composer; + /** + * SmICS Befund/language + */ @Path("/language") private Language language; + /** + * SmICS Befund/feeder_audit + */ @Path("/feeder_audit") private FeederAudit feederAudit; + /** + * SmICS Befund/category + */ @Path("/category|defining_code") private Category categoryDefiningCode; + /** + * SmICS Befund/territory + */ @Path("/territory") private Territory territory; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java index 97e79b29a..d6fa69e30 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java @@ -8,6 +8,9 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_panel.v0") public class AntibiogrammCluster { + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Antibiogramm/Laboranalyt-Resultat + */ @Path("/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]") private List laboranalytResultat; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java index 99e030a1c..9a2c9f545 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java @@ -12,33 +12,63 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.erregerdetails.v1") public class ErregerdetailsCluster { + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Keim Subtyp + */ @Path("/items[at0047]") private List keimSubtyp; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/value + */ @Path("/items[at0035]/value|magnitude") private Double keimzahlMagnitude; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/value + */ @Path("/items[at0035]/value|units") private String keimzahlUnits; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Häufigkeit + */ @Path("/items[at0003]/value") private DvOrdinal haufigkeit; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Virulenzfaktor + */ @Path("/items[at0016]/value|value") private String virulenzfaktorValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Antibiogramm + */ @Path("/items[openEHR-EHR-CLUSTER.laboratory_test_panel.v0 and name/value='Antibiogramm']") private AntibiogrammCluster antibiogramm; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Resistenzmechanismus + */ @Path("/items[at0057]") private List resistenzmechanismus; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/MRE Klasse + */ @Path("/items[at0018]/value|defining_code") private MreKlasseDefiningCode mreKlasseDefiningCode; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Kommentar + */ @Path("/items[at0062]/value|value") private String kommentarValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Weitere Ergänzungen + */ @Path("/items[at0059]") private List weitereErganzungen; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java index a8d8b678d..29717e567 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java @@ -6,6 +6,9 @@ @Entity public class ErregerdetailsKeimSubtypElement { + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Keim Subtyp + */ @Path("/value|value") private String value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java index 4ebee1e08..8fff07812 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java @@ -6,6 +6,9 @@ @Entity public class ErregerdetailsResistenzmechanismusCluster { + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Resistenzmechanismus/Resistenzmechanismus Bezeichnung + */ @Path("/items[at0017]/value|value") private String resistenzmechanismusBezeichnungValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java index 6c64a33d7..b7ae8683f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java @@ -5,6 +5,9 @@ @Entity public class ErregertypisierungArtDerTypisierungElement { + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregertypisierung/Art der Typisierung + */ @Path("/value|defining_code") private ArtDerTypisierungDefiningCode value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java index c78413728..2f43aa75f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java @@ -9,15 +9,27 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.molekulare_typisierung.v0") public class ErregertypisierungCluster { + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregertypisierung/Art der Typisierung + */ @Path("/items[at0001]") private List artDerTypisierung; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregertypisierung/Ergebnis + */ @Path("/items[at0008]") private List ergebnis; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregertypisierung/Bewertung + */ @Path("/items[at0009]/value|value") private String bewertungValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregertypisierung/Kommentar + */ @Path("/items[at0002]/value|value") private String kommentarValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java index 7b8e76802..f4a1d5c7c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java @@ -6,6 +6,9 @@ @Entity public class ErregertypisierungErgebnisElement { + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregertypisierung/Ergebnis + */ @Path("/value") private DvMultimedia value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java index 5445e4645..d42c85396 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java @@ -7,9 +7,15 @@ @Entity public class EventsummaryBeteiligtePersonenCluster { + /** + * SmICS Befund/context/Eventsummary/Beteiligte Personen/Art der Person + */ @Path("/items[at0011]/value|value") private String artDerPersonValue; + /** + * SmICS Befund/context/Eventsummary/Beteiligte Personen/ID der Person + */ @Path("/items[at0010]") private List idDerPerson; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java index ca4c70342..45b605e33 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java @@ -9,18 +9,33 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.eventsummary.v0") public class EventsummaryCluster { + /** + * SmICS Befund/context/Eventsummary/Fallidentifikation + */ @Path("/items[at0001 and name/value='Fallidentifikation']/value|value") private String fallidentifikationValue; + /** + * SmICS Befund/context/Eventsummary/Fall-Art + */ @Path("/items[at0002 and name/value='Fall-Art']/value|value") private String fallArtValue; + /** + * SmICS Befund/context/Eventsummary/Beteiligte Personen + */ @Path("/items[at0007]") private List beteiligtePersonen; + /** + * SmICS Befund/context/Eventsummary/Fall-Kategorie + */ @Path("/items[at0004 and name/value='Fall-Kategorie']/value|value") private String fallKategorieValue; + /** + * SmICS Befund/context/Eventsummary/Kommentar + */ @Path("/items[at0006]/value|value") private String kommentarValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java index 5e5d43887..5fa86d6df 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java @@ -6,6 +6,9 @@ @Entity public class EventsummaryIdDerPersonElement { + /** + * SmICS Befund/context/Eventsummary/Beteiligte Personen/value + */ @Path("/value") @Choice private EventsummaryValueChoice value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java index 8caf0e5b8..e02f56f93 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java @@ -8,6 +8,9 @@ @Entity @OptionFor("DV_IDENTIFIER") public class EventsummaryValueDvIdentifier implements EventsummaryValueChoice { + /** + * SmICS Befund/context/Eventsummary/Beteiligte Personen/value/value + */ @Path("") private DvIdentifier value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java index ae6e20aa2..ee9625cdd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java @@ -8,6 +8,9 @@ @Entity @OptionFor("DV_URI") public class EventsummaryValueDvUri implements EventsummaryValueChoice { + /** + * SmICS Befund/context/Eventsummary/Beteiligte Personen/value/value + */ @Path("|value") private URI valueValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java index e60df6216..239a55d7d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java @@ -11,21 +11,39 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") public class LaboranalytResultatCluster { + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Antibiogramm/Laboranalyt-Resultat/Antibiotikum + */ @Path("/items[at0024 and name/value='Antibiotikum']/value|defining_code") private AntibiotikumDefiningCode antibiotikumDefiningCode; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Antibiogramm/Laboranalyt-Resultat/Minimale Hemmkonzentration + */ @Path("/items[at0001 and name/value='Minimale Hemmkonzentration']/value|magnitude") private Double minimaleHemmkonzentrationMagnitude; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Antibiogramm/Laboranalyt-Resultat/Minimale Hemmkonzentration + */ @Path("/items[at0001 and name/value='Minimale Hemmkonzentration']/value|units") private String minimaleHemmkonzentrationUnits; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Antibiogramm/Laboranalyt-Resultat/Analyseergebnis-Details + */ @Path("/items[at0014]") private List analyseergebnisDetails; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Antibiogramm/Laboranalyt-Resultat/Resistenz + */ @Path("/items[at0004 and name/value='Resistenz']/value|value") private String resistenzValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Antibiogramm/Laboranalyt-Resultat/Kommentar + */ @Path("/items[at0003]/value|value") private String kommentarValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java index a3a5bb9b4..1c644c026 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java @@ -6,6 +6,9 @@ @Entity public class SmicsErgebnisAnzahlDerErregernachweiseElement { + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Anzahl der Erregernachweise + */ @Path("/value|magnitude") private Long value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java index 1f27a1768..ad515b26f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java @@ -14,66 +14,129 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.smics_befund.v1") public class SmicsErgebnisObservation { + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/SmICS Ergebniskategorie + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|defining_code") private SmicsErgebniskategorieDefiningCode smicsErgebniskategorieDefiningCode; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Multispezies + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value") private Boolean multispeziesValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Beginn + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value|value") private TemporalAccessor beginnValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Beginn der Untersuchung + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|value") private TemporalAccessor beginnDerUntersuchungValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Ende + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|value") private TemporalAccessor endeValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Dauer + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0009]/value|value") private TemporalAmount dauerValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Standort + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.location.v1]") private List standort; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Kommentar + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|value") private String baumKommentarValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Art der Übertragung/Übertragungsweg + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0014]/value|value") private String ubertragungswegValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Art der Übertragung/Transmissionsweg + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0013]/value|value") private String transmissionswegValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Art der Übertragung/Kommentar + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0012]/items[at0038]/value|value") private String artDerUbertragungKommentarValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregername + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0016]/value|defining_code") private ErregernameDefiningCode erregernameDefiningCode; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Anzahl der Erregernachweise + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0037]") private List anzahlDerErregernachweise; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[openEHR-EHR-CLUSTER.erregerdetails.v1]") private ErregerdetailsCluster erregerdetails; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregertypisierung + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[openEHR-EHR-CLUSTER.molekulare_typisierung.v0 and name/value='Erregertypisierung']") private ErregertypisierungCluster erregertypisierung; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Zeitpunkt des ersten Erregernachweises + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0021]/value|value") private TemporalAccessor zeitpunktDesErstenErregernachweisesValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Zeitpunkt des letzten Erregernachweises + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0015]/items[at0020]/value|value") private TemporalAccessor zeitpunktDesLetztenErregernachweisesValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * SmICS Befund/SmICS-Ergebnis/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * SmICS Befund/SmICS-Ergebnis/subject + */ @Path("/subject") private PartyProxy subject; + /** + * SmICS Befund/SmICS-Ergebnis/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java index 5aaa3e5bb..31bb030b6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java @@ -10,21 +10,39 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") public class StandortCluster { + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Standort/Standorttyp + */ @Path("/items[at0040]/value|value") private String standorttypValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Standort/Standortbeschreibung + */ @Path("/items[at0046]/value|value") private String standortbeschreibungValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Standort/Standortschlüssel + */ @Path("/items[at0048]/value|value") private String standortschlusselValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Standort/Station + */ @Path("/items[at0027]/value|value") private String stationValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Standort/Zimmer + */ @Path("/items[at0029]/value|value") private String zimmerValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Standort/Details + */ @Path("/items[at0047]") private List details; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java index 7a478e58e..b913801af 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java @@ -26,54 +26,105 @@ @Archetype("openEHR-EHR-COMPOSITION.fall.v0") @Template("Stationärer Versorgungsfall") public class StationarerVersorgungsfallComposition { + /** + * Stationärer Versorgungsfall/context/Falltyp + */ @Path("/context/other_context[at0001]/items[at0005]/value|defining_code") private FalltypDefiningCode falltypDefiningCode; + /** + * Stationärer Versorgungsfall/context/Fallklasse + */ @Path("/context/other_context[at0001]/items[at0004]/value|value") private String fallklasseValue; + /** + * Stationärer Versorgungsfall/context/Fall-Kennung + */ @Path("/context/other_context[at0001]/items[at0003 and name/value='Fall-Kennung']/value|value") private String fallKennungValue; + /** + * Stationärer Versorgungsfall/context/Erweiterung + */ @Path("/context/other_context[at0001]/items[at0002]") private List erweiterung; + /** + * Stationärer Versorgungsfall/context/start_time + */ @Path("/context/start_time|value") private TemporalAccessor startTimeValue; + /** + * Stationärer Versorgungsfall/context/participations + */ @Path("/context/participations") private List participations; + /** + * Stationärer Versorgungsfall/context/end_time + */ @Path("/context/end_time|value") private TemporalAccessor endTimeValue; + /** + * Stationärer Versorgungsfall/context/location + */ @Path("/context/location") private String location; + /** + * Stationärer Versorgungsfall/context/health_care_facility + */ @Path("/context/health_care_facility") private PartyIdentified healthCareFacility; + /** + * Stationärer Versorgungsfall/context/setting + */ @Path("/context/setting|defining_code") private Setting settingDefiningCode; + /** + * Stationärer Versorgungsfall/Aufnahmedaten + */ @Path("/content[openEHR-EHR-ADMIN_ENTRY.admission.v0 and name/value='Aufnahmedaten']") private AufnahmedatenAdminEntry aufnahmedaten; + /** + * Stationärer Versorgungsfall/Entlassungsdaten + */ @Path("/content[openEHR-EHR-ADMIN_ENTRY.discharge_summary.v0]") private EntlassungsdatenAdminEntry entlassungsdaten; + /** + * Stationärer Versorgungsfall/composer + */ @Path("/composer") private PartyProxy composer; + /** + * Stationärer Versorgungsfall/language + */ @Path("/language") private Language language; + /** + * Stationärer Versorgungsfall/feeder_audit + */ @Path("/feeder_audit") private FeederAudit feederAudit; + /** + * Stationärer Versorgungsfall/category + */ @Path("/category|defining_code") private Category categoryDefiningCode; + /** + * Stationärer Versorgungsfall/territory + */ @Path("/territory") private Territory territory; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java index 7b2e44001..b5fc22641 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java @@ -13,24 +13,45 @@ @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.admission.v0") public class AufnahmedatenAdminEntry { + /** + * Stationärer Versorgungsfall/Aufnahmedaten/Versorgungsfallgrund + */ @Path("/data[at0001]/items[at0013 and name/value='Versorgungsfallgrund']/value|value") private String versorgungsfallgrundValue; + /** + * Stationärer Versorgungsfall/Aufnahmedaten/Art der Aufnahme + */ @Path("/data[at0001]/items[at0049]/value|value") private String artDerAufnahmeValue; + /** + * Stationärer Versorgungsfall/Aufnahmedaten/Datum/Uhrzeit der Aufnahme + */ @Path("/data[at0001]/items[at0071]/value|value") private TemporalAccessor datumUhrzeitDerAufnahmeValue; + /** + * Stationärer Versorgungsfall/Aufnahmedaten/Zugewiesener Patientenstandort + */ @Path("/data[at0001]/items[at0131]") private List zugewiesenerPatientenstandort; + /** + * Stationärer Versorgungsfall/Aufnahmedaten/Vorheriger Patientenstandort + */ @Path("/data[at0001]/items[at0132]") private List vorherigerPatientenstandort; + /** + * Stationärer Versorgungsfall/Aufnahmedaten/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Stationärer Versorgungsfall/Aufnahmedaten/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java index 7e975ea23..4d043fa4a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java @@ -13,27 +13,51 @@ @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.discharge_summary.v0") public class EntlassungsdatenAdminEntry { + /** + * Stationärer Versorgungsfall/Entlassungsdaten/Art der Entlassung + */ @Path("/data[at0001]/items[at0040]/value|value") private String artDerEntlassungValue; + /** + * Stationärer Versorgungsfall/Entlassungsdaten/Klinischer Zustand des Patienten + */ @Path("/data[at0001]/items[at0002]/value|defining_code") private KlinischerZustandDesPatientenDefiningCode klinischerZustandDesPatientenDefiningCode; + /** + * Stationärer Versorgungsfall/Entlassungsdaten/Datum/Uhrzeit der Entlassung + */ @Path("/data[at0001]/items[at0011 and name/value='Datum/Uhrzeit der Entlassung']/value|value") private TemporalAccessor datumUhrzeitDerEntlassungValue; + /** + * Stationärer Versorgungsfall/Entlassungsdaten/Zusätzliche Informationen + */ @Path("/data[at0001]/items[at0050]/value|value") private String zusatzlicheInformationenValue; + /** + * Stationärer Versorgungsfall/Entlassungsdaten/Letzter Patientenstandort + */ @Path("/data[at0001]/items[at0066]") private List letzterPatientenstandort; + /** + * Stationärer Versorgungsfall/Entlassungsdaten/Zugewiesener Patientenstandort + */ @Path("/data[at0001]/items[at0067]") private List zugewiesenerPatientenstandort; + /** + * Stationärer Versorgungsfall/Entlassungsdaten/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Stationärer Versorgungsfall/Entlassungsdaten/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java index be6c11123..c04ca25d6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java @@ -26,48 +26,93 @@ @Archetype("openEHR-EHR-COMPOSITION.test_all_types.v1") @Template("test_all_types.en.v1") public class TestAllTypesEnV1Composition { + /** + * Test all types/context/context coded text + */ @Path("/context/other_context[at0004]/item[at0005]/value|defining_code") private ContextCodedTextDefiningCode contextCodedTextDefiningCode; + /** + * Test all types/context/start_time + */ @Path("/context/start_time|value") private TemporalAccessor startTimeValue; + /** + * Test all types/context/participations + */ @Path("/context/participations") private List participations; + /** + * Test all types/context/end_time + */ @Path("/context/end_time|value") private TemporalAccessor endTimeValue; + /** + * Test all types/context/location + */ @Path("/context/location") private String location; + /** + * Test all types/context/health_care_facility + */ @Path("/context/health_care_facility") private PartyIdentified healthCareFacility; + /** + * Test all types/context/setting + */ @Path("/context/setting|defining_code") private Setting settingDefiningCode; + /** + * Test all types/Test all types + */ @Path("/content[openEHR-EHR-OBSERVATION.test_all_types.v1]") private List testAllTypesTestAllTypes; + /** + * Test all types/Test all types + */ @Path("/content[openEHR-EHR-EVALUATION.test_all_types.v1]") private List testAllTypesTestAllTypes2; + /** + * Test all types/Test all types + */ @Path("/content[openEHR-EHR-SECTION.test_all_types.v1]") private List testAllTypesTestAllTypes3; + /** + * Test all types/composer + */ @Path("/composer") private PartyProxy composer; + /** + * Test all types/language + */ @Path("/language") private Language language; + /** + * Test all types/feeder_audit + */ @Path("/feeder_audit") private FeederAudit feederAudit; + /** + * Test all types/category + */ @Path("/category|defining_code") private Category categoryDefiningCode; + /** + * Test all types/territory + */ @Path("/territory") private Territory territory; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java index 7db6ecaf8..09517700b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java @@ -12,24 +12,45 @@ @Entity @Archetype("openEHR-EHR-ACTION.test_all_types.v1") public class TestAllTypesAction { + /** + * Test all types/Test all types/section 2/section 3/Test all types/Test all types + */ @Path("/description[at0001]/items[openEHR-EHR-CLUSTER.test_all_types.v1]") private List testAllTypes; + /** + * Test all types/Test all types/section 2/section 3/Test all types/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Test all types/Test all types/section 2/section 3/Test all types/language + */ @Path("/language") private Language language; + /** + * Test all types/Test all types/section 2/section 3/Test all types/time + */ @Path("/time|value") private TemporalAccessor timeValue; + /** + * Test all types/Test all types/section 2/section 3/Test all types/ism_transition/Careflow_step + */ @Path("/ism_transition/careflow_step|defining_code") private CareflowStepDefiningCode careflowStepDefiningCode; + /** + * Test all types/Test all types/section 2/section 3/Test all types/ism_transition/Current_state + */ @Path("/ism_transition/current_state|defining_code") private CurrentStateDefiningCode currentStateDefiningCode; + /** + * Test all types/Test all types/section 2/section 3/Test all types/ism_transition/transition + */ @Path("/ism_transition/transition|defining_code") private Transition transitionDefiningCode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java index 79bfc0b9a..2a0d19273 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java @@ -10,12 +10,21 @@ @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.test_all_types.v1") public class TestAllTypesAdminEntry { + /** + * Test all types/Test all types/section 2/Test all types/count 3 + */ @Path("/data[at0001]/item[at0002]/value|magnitude") private Long count3Magnitude; + /** + * Test all types/Test all types/section 2/Test all types/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Test all types/Test all types/section 2/Test all types/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java index b2e1a971b..9691511e7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java @@ -8,6 +8,9 @@ @Entity @OptionFor("DV_COUNT") public class TestAllTypesChoiceDvCount implements TestAllTypesChoiceChoice { + /** + * Test all types/Test all types/value/value + */ @Path("|magnitude") private Long choiceMagnitude; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java index 65c47bd21..69d0750f9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java @@ -9,9 +9,15 @@ @Entity @OptionFor("DV_QUANTITY") public class TestAllTypesChoiceDvQuantity implements TestAllTypesChoiceChoice { + /** + * Test all types/Test all types/value/value + */ @Path("|magnitude") private Double choiceMagnitude; + /** + * Test all types/Test all types/value/value + */ @Path("|units") private String choiceUnits; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java index 760d6fca3..c610d8fa3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java @@ -8,6 +8,9 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.test_all_types.v1") public class TestAllTypesCluster { + /** + * Test all types/Test all types/section 2/section 3/Test all types/Test all types/cluster 5/cluster 6/boolean 2 + */ @Path("/items[at0001]/items[at0002]/items[at0003]/value|value") private Boolean boolean2Value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java index 0bd143a90..b6b432174 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java @@ -16,60 +16,117 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.test_all_types.v1") public class TestAllTypesEvaluation { + /** + * Test all types/Test all types/uri + */ @Path("/data[at0001]/items[at0002]/value|value") private URI uriValue; + /** + * Test all types/Test all types/interval count/upper + */ @Path("/data[at0001]/items[at0003]/value/upper|magnitude") private Long upperMagnitude; + /** + * Test all types/Test all types/interval count/lower + */ @Path("/data[at0001]/items[at0003]/value/lower|magnitude") private Long lowerMagnitude; + /** + * Test all types/Test all types/interval count/lower_included + */ @Path("/data[at0001]/items[at0003]/value/lower_included") private Boolean intervalCountLowerIncluded; + /** + * Test all types/Test all types/interval count/upper_included + */ @Path("/data[at0001]/items[at0003]/value/upper_included") private Boolean intervalCountUpperIncluded; + /** + * Test all types/Test all types/interval quantity/upper + */ @Path("/data[at0001]/items[at0004]/value/upper|magnitude") private Double upperMagnitude2; + /** + * Test all types/Test all types/interval quantity/upper + */ @Path("/data[at0001]/items[at0004]/value/upper|units") private String upperUnits; + /** + * Test all types/Test all types/interval quantity/lower + */ @Path("/data[at0001]/items[at0004]/value/lower|magnitude") private Double lowerMagnitude2; + /** + * Test all types/Test all types/interval quantity/lower + */ @Path("/data[at0001]/items[at0004]/value/lower|units") private String lowerUnits; + /** + * Test all types/Test all types/interval quantity/lower_included + */ @Path("/data[at0001]/items[at0004]/value/lower_included") private Boolean intervalQuantityLowerIncluded; + /** + * Test all types/Test all types/interval quantity/upper_included + */ @Path("/data[at0001]/items[at0004]/value/upper_included") private Boolean intervalQuantityUpperIncluded; + /** + * Test all types/Test all types/interval datetime/upper + */ @Path("/data[at0001]/items[at0005]/value/upper|value") private TemporalAccessor intervalDatetimeUpperValue; + /** + * Test all types/Test all types/interval datetime/lower + */ @Path("/data[at0001]/items[at0005]/value/lower|value") private TemporalAccessor intervalDatetimeLowerValue; + /** + * Test all types/Test all types/interval datetime/lower_included + */ @Path("/data[at0001]/items[at0005]/value/lower_included") private Boolean intervalDatetimeLowerIncluded; + /** + * Test all types/Test all types/interval datetime/upper_included + */ @Path("/data[at0001]/items[at0005]/value/upper_included") private Boolean intervalDatetimeUpperIncluded; + /** + * Test all types/Test all types/cluster 1/cluster 2/cluster 3/text 2 + */ @Path("/data[at0001]/items[at0006]/items[at0007]/items[at0008]/items[at0010]/value|value") private String text2Value; + /** + * Test all types/Test all types/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Test all types/Test all types/language + */ @Path("/language") private Language language; + /** + * Test all types/Test all types/value + */ @Path("/data[at0001]/items[at0009]/value") @Choice private TestAllTypesChoiceChoice choice; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java index 493a5fe03..1b666206d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java @@ -13,24 +13,45 @@ @Entity @Archetype("openEHR-EHR-INSTRUCTION.test_all_types.v1") public class TestAllTypesInstruction { + /** + * Test all types/Test all types/section 2/section 3/Test all types/Current Activity/partial date + */ @Path("/activities[at0001]/description[at0002]/items[at0003]/value|value") private Temporal partialDateValue; + /** + * Test all types/Test all types/section 2/section 3/Test all types/Current Activity/partial datetime + */ @Path("/activities[at0001]/description[at0002]/items[at0004]/value|value") private TemporalAccessor partialDatetimeValue; + /** + * Test all types/Test all types/section 2/section 3/Test all types/Current Activity/timing + */ @Path("/activities[at0001]/timing") private DvParsable timing; + /** + * Test all types/Test all types/section 2/section 3/Test all types/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Test all types/Test all types/section 2/section 3/Test all types/narrative + */ @Path("/narrative|value") private String narrativeValue; + /** + * Test all types/Test all types/section 2/section 3/Test all types/language + */ @Path("/language") private Language language; + /** + * Test all types/Test all types/section 2/section 3/Test all types/expiry_time + */ @Path("/expiry_time|value") private TemporalAccessor expiryTimeValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java index 0fd884e33..bbc02351c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java @@ -22,66 +22,129 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.test_all_types.v1") public class TestAllTypesObservation { + /** + * Test all types/Test all types/Cualquier evento/text + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0004]/value|value") private String textValue; + /** + * Test all types/Test all types/Cualquier evento/coded text + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value") private DvCodedText codedText; + /** + * Test all types/Test all types/Cualquier evento/coded text terminology + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0006]/value") private DvCodedText codedTextTerminology; + /** + * Test all types/Test all types/Cualquier evento/quantity + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|magnitude") private Double quantityMagnitude; + /** + * Test all types/Test all types/Cualquier evento/quantity + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0007]/value|units") private String quantityUnits; + /** + * Test all types/Test all types/Cualquier evento/count + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0008]/value|magnitude") private Long countMagnitude; + /** + * Test all types/Test all types/Cualquier evento/date + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0009]/value|value") private Temporal dateValue; + /** + * Test all types/Test all types/Cualquier evento/datetime + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0010]/value|value") private TemporalAccessor datetimeValue; + /** + * Test all types/Test all types/Cualquier evento/datetime any + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0011]/value|value") private TemporalAccessor datetimeAnyValue; + /** + * Test all types/Test all types/Cualquier evento/time + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0012]/value|value") private TemporalAccessor arbolTimeValue; + /** + * Test all types/Test all types/Cualquier evento/ordinal + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0013]/value") private DvOrdinal ordinal; + /** + * Test all types/Test all types/Cualquier evento/boolean + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0017]/value|value") private Boolean booleanValue; + /** + * Test all types/Test all types/Cualquier evento/duration any + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0018]/value|value") private TemporalAmount durationAnyValue; + /** + * Test all types/Test all types/Cualquier evento/multimedia any + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0019]/value") private DvMultimedia multimediaAny; + /** + * Test all types/Test all types/Cualquier evento/parsable any + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0020]/value") private DvParsable parsableAny; + /** + * Test all types/Test all types/Cualquier evento/identifier + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0021]/value") private DvIdentifier identifier; + /** + * Test all types/Test all types/Cualquier evento/proportion any + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/value") private DvProportion proportionAny; + /** + * Test all types/Test all types/Cualquier evento/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor cualquierEventoTimeValue; + /** + * Test all types/Test all types/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * Test all types/Test all types/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Test all types/Test all types/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java index abea012f5..7a426646f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java @@ -8,12 +8,21 @@ @Entity @Archetype("openEHR-EHR-SECTION.test_all_types.v1") public class TestAllTypesSection { + /** + * Test all types/Test all types/section 2/section 3/Test all types + */ @Path("/items[at0001]/items[at0002]/items[openEHR-EHR-INSTRUCTION.test_all_types.v1]") private List section3TestAllTypes; + /** + * Test all types/Test all types/section 2/section 3/Test all types + */ @Path("/items[at0001]/items[at0002]/items[openEHR-EHR-ACTION.test_all_types.v1]") private List section3TestAllTypes2; + /** + * Test all types/Test all types/section 2/Test all types + */ @Path("/items[at0001]/items[openEHR-EHR-ADMIN_ENTRY.test_all_types.v1]") private List section2TestAllTypes; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java index 273136c2f..530c3b0e2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java @@ -24,48 +24,93 @@ @Archetype("openEHR-EHR-COMPOSITION.report-result.v1") @Template("Virologischer Befund") public class VirologischerBefundComposition { + /** + * Virologischer Befund/context/Bericht-ID + */ @Path("/context/other_context[at0001]/items[at0002]/value|value") private String berichtIdValue; + /** + * Virologischer Befund/context/Status + */ @Path("/context/other_context[at0001]/items[at0005]/value|value") private String statusValue; + /** + * Virologischer Befund/context/Fallidentifikation + */ @Path("/context/other_context[at0001]/items[openEHR-EHR-CLUSTER.case_identification.v0]") private FallidentifikationCluster fallidentifikation; + /** + * Virologischer Befund/context/start_time + */ @Path("/context/start_time|value") private TemporalAccessor startTimeValue; + /** + * Virologischer Befund/context/participations + */ @Path("/context/participations") private List participations; + /** + * Virologischer Befund/context/end_time + */ @Path("/context/end_time|value") private TemporalAccessor endTimeValue; + /** + * Virologischer Befund/context/location + */ @Path("/context/location") private String location; + /** + * Virologischer Befund/context/health_care_facility + */ @Path("/context/health_care_facility") private PartyIdentified healthCareFacility; + /** + * Virologischer Befund/context/setting + */ @Path("/context/setting|defining_code") private Setting settingDefiningCode; + /** + * Virologischer Befund/Befund + */ @Path("/content[openEHR-EHR-OBSERVATION.laboratory_test_result.v1 and name/value='Befund']") private BefundObservation befund; + /** + * Virologischer Befund/composer + */ @Path("/composer") private PartyProxy composer; + /** + * Virologischer Befund/language + */ @Path("/language") private Language language; + /** + * Virologischer Befund/feeder_audit + */ @Path("/feeder_audit") private FeederAudit feederAudit; + /** + * Virologischer Befund/category + */ @Path("/category|defining_code") private Category categoryDefiningCode; + /** + * Virologischer Befund/territory + */ @Path("/territory") private Territory territory; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java index de73ea967..8ed9b07ca 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java @@ -10,12 +10,21 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.anatomical_location.v1") public class AnatomischeLokalisationCluster { + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/Anatomische Lokalisation/Name der Körperstelle + */ @Path("/items[at0001]/value|value") private String nameDerKorperstelleValue; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/Anatomische Lokalisation/Alternative Struktur + */ @Path("/items[at0053]") private List alternativeStruktur; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/Anatomische Lokalisation/Multimediale Darstellung + */ @Path("/items[at0054]") private List multimedialeDarstellung; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java index b37f2e586..d5e09406a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java @@ -6,6 +6,9 @@ @Entity public class BefundAnforderungElement { + /** + * Virologischer Befund/Befund/Details der Testanforderung/Anforderung + */ @Path("/value|value") private String value; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java index 4e0044e03..3eed12b9a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java @@ -14,57 +14,111 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.laboratory_test_result.v1") public class BefundObservation { + /** + * Virologischer Befund/Befund/Jedes Ereignis/Labortest-Bezeichnung + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0005]/value|value") private String labortestBezeichnungValue; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.specimen.v1]") private List probe; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Kultur + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[openEHR-EHR-CLUSTER.laboratory_test_panel.v0 and name/value='Kultur']") private List kultur; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Strukturierte Testdiagnostik + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0122]") private List strukturierteTestdiagnostik; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Multimedia-Darstellung + */ @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0118]") private List multimediaDarstellung; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Strukturierte Erfassung der Störfaktoren + */ @Path("/data[at0001]/events[at0002]/state[at0112]/items[at0114]") private List strukturierteErfassungDerStorfaktoren; + /** + * Virologischer Befund/Befund/Jedes Ereignis/time + */ @Path("/data[at0001]/events[at0002]/time|value") private TemporalAccessor timeValue; + /** + * Virologischer Befund/Befund/origin + */ @Path("/data[at0001]/origin|value") private TemporalAccessor originValue; + /** + * Virologischer Befund/Befund/Empfängerstandort + */ @Path("/protocol[at0004]/items[openEHR-EHR-CLUSTER.location.v1 and name/value='Empfängerstandort']") private EmpfangerstandortCluster empfangerstandort; + /** + * Virologischer Befund/Befund/Details der Testanforderung/Anforderung + */ @Path("/protocol[at0004]/items[at0094]/items[at0106 and name/value='Anforderung']") private List anforderung; + /** + * Virologischer Befund/Befund/Details der Testanforderung/Auftrags-ID des anfordernden/einsendenden Systems + */ @Path("/protocol[at0004]/items[at0094]/items[at0062]/value") private DvIdentifier auftragsIdDesAnforderndenEinsendendenSystems; + /** + * Virologischer Befund/Befund/Details der Testanforderung/Auftrags-ID (Empfänger) + */ @Path("/protocol[at0004]/items[at0094]/items[at0063]/value") private DvIdentifier auftragsIdEmpfanger; + /** + * Virologischer Befund/Befund/Details der Testanforderung/Einsenderstandort + */ @Path("/protocol[at0004]/items[at0094]/items[openEHR-EHR-CLUSTER.location.v1 and name/value='Einsenderstandort']") private EinsenderstandortCluster einsenderstandort; + /** + * Virologischer Befund/Befund/Details der Testanforderung/Verteilerliste + */ @Path("/protocol[at0004]/items[at0094]/items[at0035]") private List verteilerliste; + /** + * Virologischer Befund/Befund/Test Details + */ @Path("/protocol[at0004]/items[at0110]") private List testDetails; + /** + * Virologischer Befund/Befund/Erweiterung + */ @Path("/protocol[at0004]/items[at0117]") private List erweiterung; + /** + * Virologischer Befund/Befund/subject + */ @Path("/subject") private PartyProxy subject; + /** + * Virologischer Befund/Befund/language + */ @Path("/language") private Language language; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java index 43e628658..53e4cb42d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java @@ -10,15 +10,27 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") public class EinsenderstandortCluster { + /** + * Virologischer Befund/Befund/Details der Testanforderung/Einsenderstandort/Standorttyp + */ @Path("/items[at0040]/value|value") private String standorttypValue; + /** + * Virologischer Befund/Befund/Details der Testanforderung/Einsenderstandort/Standortbeschreibung + */ @Path("/items[at0046]/value|value") private String standortbeschreibungValue; + /** + * Virologischer Befund/Befund/Details der Testanforderung/Einsenderstandort/Standortschlüssel + */ @Path("/items[at0048]/value|value") private String standortschlusselValue; + /** + * Virologischer Befund/Befund/Details der Testanforderung/Einsenderstandort/Details + */ @Path("/items[at0047]") private List details; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java index 72ebb9d5c..3da962ea0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java @@ -10,15 +10,27 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") public class EmpfangerstandortCluster { + /** + * Virologischer Befund/Befund/Empfängerstandort/Standorttyp + */ @Path("/items[at0040]/value|value") private String standorttypValue; + /** + * Virologischer Befund/Befund/Empfängerstandort/Standortbeschreibung + */ @Path("/items[at0046]/value|value") private String standortbeschreibungValue; + /** + * Virologischer Befund/Befund/Empfängerstandort/Standortschlüssel + */ @Path("/items[at0048]/value|value") private String standortschlusselValue; + /** + * Virologischer Befund/Befund/Empfängerstandort/Details + */ @Path("/items[at0047]") private List details; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java index 6fefa5270..b397992a9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java @@ -8,6 +8,9 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.case_identification.v0") public class FallidentifikationCluster { + /** + * Virologischer Befund/context/Fallidentifikation/Fall-Kennung + */ @Path("/items[at0001]/value|value") private String fallKennungValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java index d0d355f8f..8a2fca9ba 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java @@ -8,6 +8,9 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_panel.v0") public class KulturCluster { + /** + * Virologischer Befund/Befund/Jedes Ereignis/Kultur/Pro Virus + */ @Path("/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Pro Virus']") private List proVirus; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java index 1f0903984..ed6179180 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java @@ -13,27 +13,51 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") public class ProVirusCluster { + /** + * Virologischer Befund/Befund/Jedes Ereignis/Kultur/Pro Virus/Analyseergebnis-Reihenfolge + */ @Path("/items[at0027]/value|magnitude") private Long analyseergebnisReihenfolgeMagnitude; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Kultur/Pro Virus/Virus + */ @Path("/items[at0024 and name/value='Virus']/value|value") private String virusValue; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Kultur/Pro Virus/Nachweis + */ @Path("/items[at0001 and name/value='Nachweis']/value|value") private String nachweisValue; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Kultur/Pro Virus/Viruslast (ct-Wert) + */ @Path("/items[at0001 and name/value='Viruslast (ct-Wert)']/value|magnitude") private Double viruslastCtWertMagnitude; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Kultur/Pro Virus/Viruslast (ct-Wert) + */ @Path("/items[at0001 and name/value='Viruslast (ct-Wert)']/value|units") private String viruslastCtWertUnits; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Kultur/Pro Virus/Analyseergebnis-Details + */ @Path("/items[at0014]") private List analyseergebnisDetails; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Kultur/Pro Virus/Zugehörige Laborprobe + */ @Path("/items[at0026 and name/value='Zugehörige Laborprobe']/value") private DvIdentifier zugehorigeLaborprobe; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Kultur/Pro Virus/Kommentar + */ @Path("/items[at0003]/value|value") private String kommentarValue; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java index 053662c81..fb8bd869e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java @@ -12,57 +12,111 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.specimen.v1") public class ProbeCluster { + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/Probenart + */ @Path("/items[at0029]/value|value") private String probenartValue; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/Laborprobenidentifikator + */ @Path("/items[at0001]/value") private DvIdentifier laborprobenidentifikator; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/Externer Identifikator + */ @Path("/items[at0088]/value") private DvIdentifier externerIdentifikator; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/Zeitpunkt des Probeneingangs + */ @Path("/items[at0034]/value|value") private TemporalAccessor zeitpunktDesProbeneingangsValue; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/Physische Eigenschaften + */ @Path("/items[at0027]") private List physischeEigenschaften; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/Kommentar des Probennehmers + */ @Path("/items[at0079]/value|value") private String kommentarDesProbennehmersValue; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/Probenentnahmestelle + */ @Path("/items[at0087]/value|value") private String probenentnahmestelleValue; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/Anatomische Lokalisation + */ @Path("/items[openEHR-EHR-CLUSTER.anatomical_location.v1]") private AnatomischeLokalisationCluster anatomischeLokalisation; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/Zeitpunkt der Probenentnahme + */ @Path("/items[at0015]/value|value") private TemporalAccessor zeitpunktDerProbenentnahmeValue; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/Identifikator des Probennehmers + */ @Path("/items[at0070]/value") private DvIdentifier identifikatorDesProbennehmers; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/Angaben zum Probennehmer + */ @Path("/items[at0071]") private List angabenZumProbennehmer; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/Zusätzliche Angaben zur Probennahme + */ @Path("/items[at0083]") private List zusatzlicheAngabenZurProbennahme; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/Behälter Details + */ @Path("/items[at0085]") private List behalterDetails; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/Angaben zur Verarbeitung + */ @Path("/items[at0068]") private List angabenZurVerarbeitung; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/Angaben zum Transport + */ @Path("/items[at0093]") private List angabenZumTransport; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/Digitale Darstellung + */ @Path("/items[at0096]") private List digitaleDarstellung; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/Identifikator der übergeordneten Probe + */ @Path("/items[at0003]/value") private DvIdentifier identifikatorDerUbergeordnetenProbe; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/Kommentar + */ @Path("/items[at0045]/value|value") private String kommentarValue; diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java index efdedf099..772d0484b 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java @@ -66,10 +66,12 @@ import java.util.Collections; import java.util.Deque; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.StringJoiner; import java.util.stream.Collectors; public class ClassGenerator { @@ -490,7 +492,9 @@ private void addField( FieldSpec.builder(className, fieldName) .addAnnotation( AnnotationSpec.builder(Path.class).addMember(Path.VALUE, "$S", path).build()) - .addModifiers(Modifier.PRIVATE); + .addModifiers(Modifier.PRIVATE) + .addJavadoc( + buildFieldJavadoc(context, node)); if (addChoiceAnnotation) { builder.addAnnotation(Choice.class); @@ -503,6 +507,26 @@ private void addField( classBuilder.addMethod(buildGetter(fieldSpec)); } + private String buildFieldJavadoc(ClassGeneratorContext context, WebTemplateNode node) { + StringJoiner joiner = new StringJoiner("/"); + for (Iterator it = context.unFilteredNodeDeque.descendingIterator(); it.hasNext(); ) { + WebTemplateNode n = it.next(); + if (!List.of( + "HISTORY", + "ITEM_TREE", + "ITEM_LIST", + "ITEM_SINGLE", + "ITEM_TABLE", + "ITEM_STRUCTURE", + "ELEMENT") + .contains(n.getRmType())) { + joiner.add(n.getName()); + } + } + joiner.add(node.getName()); + return joiner.toString(); + } + private TypeSpec buildEnumValueSet( ClassGeneratorContext context, WebTemplateNode node, ValueSet valueSet) { TypeSpec.Builder enumBuilder = From 59c30fed85c0692a8494e81f72942f2a0ee43dae Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Fri, 4 Dec 2020 15:12:30 +0100 Subject: [PATCH 33/54] new OptimizerSetting for generator see https://github.com/ehrbase/project_management/issues/424 --- .../CoronaAnamneseComposition.java | 2298 +++++++++++++++++ .../CoronaAnamneseCompositionContainment.java | 359 +++ .../definition/AdresseCluster.java | 38 + .../definition/AdresseClusterContainment.java | 22 + ...ogebieteFurCoronainfektionOderKontak_.java | 42 + .../BerichtBeliebigesEreignisChoice.java | 4 + ...erichtBeliebigesEreignisIntervalEvent.java | 70 + .../BerichtBeliebigesEreignisPointEvent.java | 40 + ...htSpezifischesSymptomAnzeichenCluster.java | 68 + .../definition/BeschaftigungCluster.java | 54 + .../BeschaftigungClusterContainment.java | 27 + ...ertungDesGesundheitsrisikosEvaluation.java | 203 ++ ...sundheitsrisikosEvaluationContainment.java | 50 + .../DiagnosestatusDefiningCode.java | 39 + .../DiagnostischeSicherheitDefiningCode.java | 44 + ...enstleistungAktuelleAktivitatActivity.java | 110 + ...leistungGrundFurDieAnforderungElement.java | 22 + .../definition/DienstleistungInstruction.java | 142 + .../DienstleistungInstructionContainment.java | 42 + ...creeningSpezifischeMedikamenteCluster.java | 37 + ...ichteHistorieBeliebigesEreignisChoice.java | 4 + ...storieBeliebigesEreignisIntervalEvent.java | 84 + ...eHistorieBeliebigesEreignisPointEvent.java | 54 + .../GeschichteHistorieGeschichteElement.java | 22 + .../GeschichteHistorieObservation.java | 87 + ...chichteHistorieObservationContainment.java | 33 + .../HistorieDerReiseObservation.java | 143 + ...istorieDerReiseObservationContainment.java | 42 + .../definition/InlandAuslandDefiningCode.java | 43 + .../KorpertemperaturStorfaktorenElement.java | 22 + .../definition/LetzteReiseDefiningCode.java | 43 + .../MedikamentInVerwendungDefiningCode.java | 44 + ...amentenklasseInVerwendungDefiningCode.java | 44 + .../definition/OrganisationCluster.java | 96 + .../OrganisationClusterContainment.java | 33 + .../PresenceOfAnyExposureEnDefiningCode.java | 44 + .../definition/ProblemDiagnoseEvaluation.java | 112 + .../ProblemDiagnoseEvaluationContainment.java | 37 + ...onovirusDiagnostischeSicherheitChoice.java | 4 + ...rusDiagnostischeSicherheitDvCodedText.java | 24 + ...onovirusDiagnostischeSicherheitDvText.java | 24 + ...iebigesIntervallereignisIntervalEvent.java | 95 + .../ReisefallBestimmteReiseCluster.java | 53 + .../ReisefallBestimmtesReisezielCluster.java | 80 + .../definition/ReisefallObservation.java | 85 + .../ReisefallObservationContainment.java | 33 + .../definition/VorhandenDefiningCode.java | 41 + .../definition/VorhandenDefiningCode2.java | 43 + .../definition/VorhandenseinDefiningCode.java | 41 + .../VorhandenseinDefiningCode2.java | 43 + .../definition/WohnsituationEvaluation.java | 99 + .../WohnsituationEvaluationContainment.java | 36 + .../definition/WohnstatteCluster.java | 40 + .../WohnstatteClusterContainment.java | 25 + .../CoronaAnamneseComposition.java | 585 +++++ .../CoronaAnamneseCompositionContainment.java | 127 + .../definition/AdresseCluster.java | 38 + .../definition/AdresseClusterContainment.java | 22 + ...AndereAktuelleErkrankungenObservation.java | 129 + ...lleErkrankungenObservationContainment.java | 40 + ...ogebieteFurCoronainfektionOderKontak_.java | 42 + ...ltInGesundheitseinrichtungObservation.java | 156 ++ ...eitseinrichtungObservationContainment.java | 44 + .../definition/BeschaftigungCluster.java | 54 + .../BeschaftigungClusterContainment.java | 27 + ...ertungDesGesundheitsrisikosEvaluation.java | 201 ++ ...sundheitsrisikosEvaluationContainment.java | 50 + .../ChronischeErkrankungenObservation.java | 129 + ...cheErkrankungenObservationContainment.java | 40 + .../DiagnosestatusDefiningCode.java | 39 + .../DiagnostischeSicherheitDefiningCode.java | 44 + ...enstleistungAktuelleAktivitatActivity.java | 110 + ...leistungGrundFurDieAnforderungElement.java | 22 + .../definition/DienstleistungInstruction.java | 142 + .../DienstleistungInstructionContainment.java | 42 + .../definition/DurchfallObservation.java | 129 + .../DurchfallObservationContainment.java | 40 + ...derErhohteKorpertemperaturObservation.java | 129 + ...orpertemperaturObservationContainment.java | 40 + ...genZumMedikationsScreeningObservation.java | 146 ++ ...ationsScreeningObservationContainment.java | 43 + ...creeningSpezifischeMedikamenteCluster.java | 37 + ...ichteHistorieBeliebigesEreignisChoice.java | 4 + ...storieBeliebigesEreignisIntervalEvent.java | 84 + ...eHistorieBeliebigesEreignisPointEvent.java | 54 + .../GeschichteHistorieGeschichteElement.java | 22 + .../GeschichteHistorieObservation.java | 87 + ...chichteHistorieObservationContainment.java | 33 + .../GestorterGeruchssinnObservation.java | 129 + ...rterGeruchssinnObservationContainment.java | 40 + .../GestorterGeschmackssinnObservation.java | 129 + ...rGeschmackssinnObservationContainment.java | 40 + .../GesundheitsbezogenerBerufEvaluation.java | 98 + ...tsbezogenerBerufEvaluationContainment.java | 35 + .../definition/HeiserkeitObservation.java | 129 + .../HeiserkeitObservationContainment.java | 40 + .../HistorieDerReiseObservation.java | 128 + ...istorieDerReiseObservationContainment.java | 39 + .../definition/HustenObservation.java | 129 + .../HustenObservationContainment.java | 40 + .../definition/InlandAuslandDefiningCode.java | 43 + .../KorpertemperaturObservation.java | 185 ++ ...orpertemperaturObservationContainment.java | 49 + .../KorpertemperaturStorfaktorenElement.java | 22 + .../definition/LetzteReiseDefiningCode.java | 43 + .../MedikamentInVerwendungDefiningCode.java | 44 + ...amentenklasseInVerwendungDefiningCode.java | 44 + .../definition/OrganisationCluster.java | 96 + .../OrganisationClusterContainment.java | 33 + .../PersonenkontaktObservation.java | 156 ++ ...PersonenkontaktObservationContainment.java | 44 + .../PresenceOfAnyExposureEnDefiningCode.java | 44 + .../definition/ProblemDiagnoseEvaluation.java | 112 + .../ProblemDiagnoseEvaluationContainment.java | 37 + ...onovirusDiagnostischeSicherheitChoice.java | 4 + ...rusDiagnostischeSicherheitDvCodedText.java | 24 + ...onovirusDiagnostischeSicherheitDvText.java | 24 + .../ProblemDiganoseCoronovirusEvaluation.java | 158 ++ ...anoseCoronovirusEvaluationContainment.java | 44 + ...iebigesIntervallereignisIntervalEvent.java | 95 + .../ReisefallBestimmteReiseCluster.java | 53 + .../ReisefallBestimmtesReisezielCluster.java | 80 + .../definition/ReisefallObservation.java | 85 + .../ReisefallObservationContainment.java | 33 + .../definition/SchnupfenObservation.java | 129 + .../SchnupfenObservationContainment.java | 40 + .../definition/StandortCluster.java | 40 + .../StandortClusterContainment.java | 25 + .../definition/StatusCluster.java | 23 + .../definition/StatusClusterContainment.java | 19 + .../definition/VorhandenDefiningCode.java | 41 + .../definition/VorhandenDefiningCode2.java | 43 + .../definition/VorhandenseinDefiningCode.java | 41 + .../VorhandenseinDefiningCode2.java | 43 + ...itereSymptomeBeliebigesEreignisChoice.java | 4 + ...mptomeBeliebigesEreignisIntervalEvent.java | 71 + ...eSymptomeBeliebigesEreignisPointEvent.java | 41 + .../WeitereSymptomeObservation.java | 87 + ...WeitereSymptomeObservationContainment.java | 33 + ...meSpezifischesSymptomAnzeichenCluster.java | 68 + .../definition/WohnsituationEvaluation.java | 99 + .../WohnsituationEvaluationContainment.java | 36 + .../definition/WohnstatteCluster.java | 40 + .../WohnstatteClusterContainment.java | 25 + ...ertungDesGesundheitsrisikosEvaluation.java | 22 +- ...sundheitsrisikosEvaluationContainment.java | 4 +- .../definition/Covid19ExposureEvaluation.java | 66 +- .../Covid19ExposureEvaluationContainment.java | 12 +- .../client/flattener/RoundTripTest.java | 18 + .../client/classgenerator/ClassGenerator.java | 1 + .../classgenerator/ClassGeneratorConfig.java | 13 +- .../classgenerator/DefaultNamingStrategy.java | 24 +- .../client/classgenerator/FlattFilter.java | 26 +- .../classgenerator/OptimizerSetting.java | 26 + .../classgenerator/ClassGeneratorTest.java | 52 + .../ehrbase/webtemplate/filter/Filter.java | 10 +- .../model/FilteredWebTemplate.java | 10 +- .../webtemplate/parser/OPTParserTest.java | 1 + 158 files changed, 12089 insertions(+), 67 deletions(-) create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/CoronaAnamneseComposition.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisIntervalEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisPointEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtSpezifischesSymptomAnzeichenCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DiagnosestatusDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstruction.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/InlandAuslandDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/LetzteReiseDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/VorhandenDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/VorhandenDefiningCode2.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/VorhandenseinDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/CoronaAnamneseComposition.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DiagnosestatusDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstruction.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/InlandAuslandDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/LetzteReiseDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusClusterContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/VorhandenDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/VorhandenDefiningCode2.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/VorhandenseinDefiningCode.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluation.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteCluster.java create mode 100644 client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java create mode 100644 generator/src/main/java/org/ehrbase/client/classgenerator/OptimizerSetting.java diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/CoronaAnamneseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/CoronaAnamneseComposition.java new file mode 100644 index 000000000..681f0606a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/CoronaAnamneseComposition.java @@ -0,0 +1,2298 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition; + +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.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Choice; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Id; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.annotations.Template; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.BerichtBeliebigesEreignisChoice; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.BeschaftigungCluster; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.BewertungDesGesundheitsrisikosEvaluation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.DiagnosestatusDefiningCode; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.DienstleistungInstruction; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.GeschichteHistorieObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.HistorieDerReiseObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.KorpertemperaturStorfaktorenElement; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.MedikamentenklasseInVerwendungDefiningCode; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.PresenceOfAnyExposureEnDefiningCode; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.ProblemDiagnoseEvaluation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.ReisefallObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.VorhandenDefiningCode; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.VorhandenseinDefiningCode; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.WohnsituationEvaluation; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; +import org.ehrbase.client.openehrclient.VersionUid; + +@Entity +@Archetype("openEHR-EHR-COMPOSITION.report.v1") +@Template("Corona_Anamnese") +public class CoronaAnamneseComposition { + /** + * Bericht/context/Bericht ID + */ + @Path("/context/other_context[at0001]/items[at0002]/value|value") + private String berichtIdValue; + + /** + * Bericht/context/Status + */ + @Path("/context/other_context[at0001]/items[at0005]/value|value") + private String statusValue; + + /** + * Bericht/context/Erweiterung + */ + @Path("/context/other_context[at0001]/items[at0006]") + private List berichtErweiterung; + + /** + * Bericht/context/start_time + */ + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; + + /** + * Bericht/context/participations + */ + @Path("/context/participations") + private List participations; + + /** + * Bericht/context/end_time + */ + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + /** + * Bericht/context/location + */ + @Path("/context/location") + private String location; + + /** + * Bericht/context/health_care_facility + */ + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; + + /** + * Bericht/context/setting + */ + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; + + /** + * Bericht/Geschichte/Historie + */ + @Path("/content[openEHR-EHR-OBSERVATION.story.v1]") + private List geschichteHistorie; + + /** + * Bericht/Symptome/Husten/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Husten']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String hustenBezeichnungDesSymptomsOderAnzeichensValue; + + /** + * Bericht/Symptome/Husten/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Husten']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode hustenVorhandenDefiningCode; + + /** + * Bericht/Symptome/Husten/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Husten']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List hustenDetaillierteAngabenZumSymptomAnzeichen; + + /** + * Bericht/Symptome/Husten/Beliebiges Ereignis/time + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Husten']/data[at0001]/events[at0002]/time|value") + private TemporalAccessor hustenTimeValue; + + /** + * Bericht/Symptome/Husten/origin + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Husten']/data[at0001]/origin|value") + private TemporalAccessor hustenOriginValue; + + /** + * Bericht/Symptome/Husten/Erweiterung + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Husten']/protocol[at0007]/items[at0021]") + private List hustenErweiterung; + + /** + * Bericht/Symptome/Husten/subject + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Husten']/subject") + private PartyProxy hustenSubject; + + /** + * Bericht/Symptome/Husten/language + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Husten']/language") + private Language hustenLanguage; + + /** + * Bericht/Symptome/Schnupfen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Schnupfen']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String schnupfenBezeichnungDesSymptomsOderAnzeichensValue; + + /** + * Bericht/Symptome/Schnupfen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Schnupfen']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode schnupfenVorhandenDefiningCode; + + /** + * Bericht/Symptome/Schnupfen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Schnupfen']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List schnupfenDetaillierteAngabenZumSymptomAnzeichen; + + /** + * Bericht/Symptome/Schnupfen/Beliebiges Ereignis/time + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Schnupfen']/data[at0001]/events[at0002]/time|value") + private TemporalAccessor schnupfenTimeValue; + + /** + * Bericht/Symptome/Schnupfen/origin + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Schnupfen']/data[at0001]/origin|value") + private TemporalAccessor schnupfenOriginValue; + + /** + * Bericht/Symptome/Schnupfen/Erweiterung + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Schnupfen']/protocol[at0007]/items[at0021]") + private List schnupfenErweiterung; + + /** + * Bericht/Symptome/Schnupfen/subject + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Schnupfen']/subject") + private PartyProxy schnupfenSubject; + + /** + * Bericht/Symptome/Schnupfen/language + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Schnupfen']/language") + private Language schnupfenLanguage; + + /** + * Bericht/Symptome/Heiserkeit/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Heiserkeit']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String heiserkeitBezeichnungDesSymptomsOderAnzeichensValue; + + /** + * Bericht/Symptome/Heiserkeit/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Heiserkeit']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode heiserkeitVorhandenDefiningCode; + + /** + * Bericht/Symptome/Heiserkeit/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Heiserkeit']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List heiserkeitDetaillierteAngabenZumSymptomAnzeichen; + + /** + * Bericht/Symptome/Heiserkeit/Beliebiges Ereignis/time + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Heiserkeit']/data[at0001]/events[at0002]/time|value") + private TemporalAccessor heiserkeitTimeValue; + + /** + * Bericht/Symptome/Heiserkeit/origin + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Heiserkeit']/data[at0001]/origin|value") + private TemporalAccessor heiserkeitOriginValue; + + /** + * Bericht/Symptome/Heiserkeit/Erweiterung + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Heiserkeit']/protocol[at0007]/items[at0021]") + private List heiserkeitErweiterung; + + /** + * Bericht/Symptome/Heiserkeit/subject + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Heiserkeit']/subject") + private PartyProxy heiserkeitSubject; + + /** + * Bericht/Symptome/Heiserkeit/language + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Heiserkeit']/language") + private Language heiserkeitLanguage; + + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Fieber oder erhöhte Körpertemperatur']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String fieberOderErhohteKorpertemperaturBezeichnungDesSymptomsOderAnzeichensValue; + + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Fieber oder erhöhte Körpertemperatur']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode fieberOderErhohteKorpertemperaturVorhandenDefiningCode; + + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Fieber oder erhöhte Körpertemperatur']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List fieberOderErhohteKorpertemperaturDetaillierteAngabenZumSymptomAnzeichen; + + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/Beliebiges Ereignis/time + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Fieber oder erhöhte Körpertemperatur']/data[at0001]/events[at0002]/time|value") + private TemporalAccessor fieberOderErhohteKorpertemperaturTimeValue; + + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/origin + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Fieber oder erhöhte Körpertemperatur']/data[at0001]/origin|value") + private TemporalAccessor fieberOderErhohteKorpertemperaturOriginValue; + + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/Erweiterung + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Fieber oder erhöhte Körpertemperatur']/protocol[at0007]/items[at0021]") + private List fieberOderErhohteKorpertemperaturErweiterung; + + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/subject + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Fieber oder erhöhte Körpertemperatur']/subject") + private PartyProxy fieberOderErhohteKorpertemperaturSubject; + + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/language + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Fieber oder erhöhte Körpertemperatur']/language") + private Language fieberOderErhohteKorpertemperaturLanguage; + + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Temperatur + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude") + private Double temperaturMagnitude; + + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Temperatur + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units") + private String temperaturUnits; + + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Störfaktoren + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/data[at0002]/events[at0003]/state[at0029]/items[at0066]") + private List storfaktoren; + + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Umgebungsbedingungen + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/data[at0002]/events[at0003]/state[at0029]/items[at0056]") + private List umgebungsbedingungen; + + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Betätigung + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/data[at0002]/events[at0003]/state[at0029]/items[at0057]") + private Cluster betatigung; + + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/time + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/data[at0002]/events[at0003]/time|value") + private TemporalAccessor korpertemperaturTimeValue; + + /** + * Bericht/Symptome/Körpertemperatur/origin + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/data[at0002]/origin|value") + private TemporalAccessor korpertemperaturOriginValue; + + /** + * Bericht/Symptome/Körpertemperatur/Strukturierte Lokalisation der Messung + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/protocol[at0020]/items[at0064]") + private List strukturierteLokalisationDerMessung; + + /** + * Bericht/Symptome/Körpertemperatur/Gerät + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/protocol[at0020]/items[at0059]") + private Cluster gerat; + + /** + * Bericht/Symptome/Körpertemperatur/Erweiterung + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/protocol[at0020]/items[at0062]") + private List korpertemperaturErweiterung; + + /** + * Bericht/Symptome/Körpertemperatur/subject + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/subject") + private PartyProxy korpertemperaturSubject; + + /** + * Bericht/Symptome/Körpertemperatur/language + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/language") + private Language korpertemperaturLanguage; + + /** + * Bericht/Symptome/Gestörter Geruchssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geruchssinn']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String gestorterGeruchssinnBezeichnungDesSymptomsOderAnzeichensValue; + + /** + * Bericht/Symptome/Gestörter Geruchssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geruchssinn']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode gestorterGeruchssinnVorhandenDefiningCode; + + /** + * Bericht/Symptome/Gestörter Geruchssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geruchssinn']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List gestorterGeruchssinnDetaillierteAngabenZumSymptomAnzeichen; + + /** + * Bericht/Symptome/Gestörter Geruchssinn/Beliebiges Ereignis/time + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geruchssinn']/data[at0001]/events[at0002]/time|value") + private TemporalAccessor gestorterGeruchssinnTimeValue; + + /** + * Bericht/Symptome/Gestörter Geruchssinn/origin + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geruchssinn']/data[at0001]/origin|value") + private TemporalAccessor gestorterGeruchssinnOriginValue; + + /** + * Bericht/Symptome/Gestörter Geruchssinn/Erweiterung + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geruchssinn']/protocol[at0007]/items[at0021]") + private List gestorterGeruchssinnErweiterung; + + /** + * Bericht/Symptome/Gestörter Geruchssinn/subject + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geruchssinn']/subject") + private PartyProxy gestorterGeruchssinnSubject; + + /** + * Bericht/Symptome/Gestörter Geruchssinn/language + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geruchssinn']/language") + private Language gestorterGeruchssinnLanguage; + + /** + * Bericht/Symptome/Gestörter Geschmackssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geschmackssinn']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String gestorterGeschmackssinnBezeichnungDesSymptomsOderAnzeichensValue; + + /** + * Bericht/Symptome/Gestörter Geschmackssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geschmackssinn']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode gestorterGeschmackssinnVorhandenDefiningCode; + + /** + * Bericht/Symptome/Gestörter Geschmackssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geschmackssinn']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List gestorterGeschmackssinnDetaillierteAngabenZumSymptomAnzeichen; + + /** + * Bericht/Symptome/Gestörter Geschmackssinn/Beliebiges Ereignis/time + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geschmackssinn']/data[at0001]/events[at0002]/time|value") + private TemporalAccessor gestorterGeschmackssinnTimeValue; + + /** + * Bericht/Symptome/Gestörter Geschmackssinn/origin + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geschmackssinn']/data[at0001]/origin|value") + private TemporalAccessor gestorterGeschmackssinnOriginValue; + + /** + * Bericht/Symptome/Gestörter Geschmackssinn/Erweiterung + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geschmackssinn']/protocol[at0007]/items[at0021]") + private List gestorterGeschmackssinnErweiterung; + + /** + * Bericht/Symptome/Gestörter Geschmackssinn/subject + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geschmackssinn']/subject") + private PartyProxy gestorterGeschmackssinnSubject; + + /** + * Bericht/Symptome/Gestörter Geschmackssinn/language + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geschmackssinn']/language") + private Language gestorterGeschmackssinnLanguage; + + /** + * Bericht/Symptome/Durchfall/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Durchfall']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String durchfallBezeichnungDesSymptomsOderAnzeichensValue; + + /** + * Bericht/Symptome/Durchfall/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Durchfall']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode durchfallVorhandenDefiningCode; + + /** + * Bericht/Symptome/Durchfall/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Durchfall']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List durchfallDetaillierteAngabenZumSymptomAnzeichen; + + /** + * Bericht/Symptome/Durchfall/Beliebiges Ereignis/time + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Durchfall']/data[at0001]/events[at0002]/time|value") + private TemporalAccessor durchfallTimeValue; + + /** + * Bericht/Symptome/Durchfall/origin + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Durchfall']/data[at0001]/origin|value") + private TemporalAccessor durchfallOriginValue; + + /** + * Bericht/Symptome/Durchfall/Erweiterung + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Durchfall']/protocol[at0007]/items[at0021]") + private List durchfallErweiterung; + + /** + * Bericht/Symptome/Durchfall/subject + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Durchfall']/subject") + private PartyProxy durchfallSubject; + + /** + * Bericht/Symptome/Durchfall/language + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Durchfall']/language") + private Language durchfallLanguage; + + /** + * Bericht/Symptome/Weitere Symptome/origin + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Weitere Symptome']/data[at0001]/origin|value") + private TemporalAccessor weitereSymptomeOriginValue; + + /** + * Bericht/Symptome/Weitere Symptome/Erweiterung + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Weitere Symptome']/protocol[at0007]/items[at0021]") + private List weitereSymptomeErweiterung; + + /** + * Bericht/Symptome/Weitere Symptome/subject + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Weitere Symptome']/subject") + private PartyProxy weitereSymptomeSubject; + + /** + * Bericht/Symptome/Weitere Symptome/language + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Weitere Symptome']/language") + private Language weitereSymptomeLanguage; + + /** + * Bericht/Kontakt/Personenkontakt/Beliebiges Ereignis/*Agent (en) + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Personenkontakt']/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value") + private String personenkontaktAgentEnValue; + + /** + * Bericht/Kontakt/Personenkontakt/Beliebiges Ereignis/*Presence of any exposure? (en) + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Personenkontakt']/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code") + private PresenceOfAnyExposureEnDefiningCode personenkontaktPresenceOfAnyExposureEnDefiningCode; + + /** + * Bericht/Kontakt/Personenkontakt/Beliebiges Ereignis/*Specific exposure (en)/*Exposure (en) + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Personenkontakt']/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value") + private String personenkontaktExposureEnValue; + + /** + * Bericht/Kontakt/Personenkontakt/Beliebiges Ereignis/*Specific exposure (en)/Vorhandensein + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Personenkontakt']/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code") + private VorhandenseinDefiningCode personenkontaktVorhandenseinDefiningCode; + + /** + * Bericht/Kontakt/Personenkontakt/Beliebiges Ereignis/Kommentar + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Personenkontakt']/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value") + private String personenkontaktKommentarValue; + + /** + * Bericht/Kontakt/Personenkontakt/Beliebiges Ereignis/time + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Personenkontakt']/data[at0001]/events[at0002]/time|value") + private TemporalAccessor personenkontaktTimeValue; + + /** + * Bericht/Kontakt/Personenkontakt/origin + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Personenkontakt']/data[at0001]/origin|value") + private TemporalAccessor personenkontaktOriginValue; + + /** + * Bericht/Kontakt/Personenkontakt/Erweiterung + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Personenkontakt']/protocol[at0004]/items[at0056]") + private List personenkontaktErweiterung; + + /** + * Bericht/Kontakt/Personenkontakt/subject + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Personenkontakt']/subject") + private PartyProxy personenkontaktSubject; + + /** + * Bericht/Kontakt/Personenkontakt/language + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Personenkontakt']/language") + private Language personenkontaktLanguage; + + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Beliebiges Ereignis/*Agent (en) + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Aufenthalt in Gesundheitseinrichtung']/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value") + private String aufenthaltInGesundheitseinrichtungAgentEnValue; + + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Beliebiges Ereignis/*Presence of any exposure? (en) + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Aufenthalt in Gesundheitseinrichtung']/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code") + private PresenceOfAnyExposureEnDefiningCode aufenthaltInGesundheitseinrichtungPresenceOfAnyExposureEnDefiningCode; + + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Beliebiges Ereignis/*Specific exposure (en)/*Exposure (en) + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Aufenthalt in Gesundheitseinrichtung']/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value") + private String aufenthaltInGesundheitseinrichtungExposureEnValue; + + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Beliebiges Ereignis/*Specific exposure (en)/Vorhandensein + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Aufenthalt in Gesundheitseinrichtung']/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code") + private VorhandenseinDefiningCode aufenthaltInGesundheitseinrichtungVorhandenseinDefiningCode; + + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Beliebiges Ereignis/Kommentar + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Aufenthalt in Gesundheitseinrichtung']/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value") + private String aufenthaltInGesundheitseinrichtungKommentarValue; + + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Beliebiges Ereignis/time + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Aufenthalt in Gesundheitseinrichtung']/data[at0001]/events[at0002]/time|value") + private TemporalAccessor aufenthaltInGesundheitseinrichtungTimeValue; + + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/origin + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Aufenthalt in Gesundheitseinrichtung']/data[at0001]/origin|value") + private TemporalAccessor aufenthaltInGesundheitseinrichtungOriginValue; + + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Erweiterung + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Aufenthalt in Gesundheitseinrichtung']/protocol[at0004]/items[at0056]") + private List aufenthaltInGesundheitseinrichtungErweiterung; + + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/subject + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Aufenthalt in Gesundheitseinrichtung']/subject") + private PartyProxy aufenthaltInGesundheitseinrichtungSubject; + + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/language + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Aufenthalt in Gesundheitseinrichtung']/language") + private Language aufenthaltInGesundheitseinrichtungLanguage; + + /** + * Bericht/Risikogebiet/Historie der Reise + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Risikogebiet']/items[openEHR-EHR-OBSERVATION.travel_history.v0]") + private List historieDerReise; + + /** + * Bericht/Risikogebiet/Reisefall + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Risikogebiet']/items[openEHR-EHR-OBSERVATION.travel_event.v0]") + private List reisefall; + + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Andere aktuelle Erkrankungen']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String andereAktuelleErkrankungenBezeichnungDesSymptomsOderAnzeichensValue; + + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Andere aktuelle Erkrankungen']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode andereAktuelleErkrankungenVorhandenDefiningCode; + + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Andere aktuelle Erkrankungen']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List andereAktuelleErkrankungenDetaillierteAngabenZumSymptomAnzeichen; + + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/Beliebiges Ereignis/time + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Andere aktuelle Erkrankungen']/data[at0001]/events[at0002]/time|value") + private TemporalAccessor andereAktuelleErkrankungenTimeValue; + + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/origin + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Andere aktuelle Erkrankungen']/data[at0001]/origin|value") + private TemporalAccessor andereAktuelleErkrankungenOriginValue; + + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/Erweiterung + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Andere aktuelle Erkrankungen']/protocol[at0007]/items[at0021]") + private List andereAktuelleErkrankungenErweiterung; + + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/subject + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Andere aktuelle Erkrankungen']/subject") + private PartyProxy andereAktuelleErkrankungenSubject; + + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/language + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Andere aktuelle Erkrankungen']/language") + private Language andereAktuelleErkrankungenLanguage; + + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Chronische Erkrankungen']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String chronischeErkrankungenBezeichnungDesSymptomsOderAnzeichensValue; + + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Chronische Erkrankungen']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode chronischeErkrankungenVorhandenDefiningCode; + + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Chronische Erkrankungen']/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List chronischeErkrankungenDetaillierteAngabenZumSymptomAnzeichen; + + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/Beliebiges Ereignis/time + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Chronische Erkrankungen']/data[at0001]/events[at0002]/time|value") + private TemporalAccessor chronischeErkrankungenTimeValue; + + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/origin + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Chronische Erkrankungen']/data[at0001]/origin|value") + private TemporalAccessor chronischeErkrankungenOriginValue; + + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/Erweiterung + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Chronische Erkrankungen']/protocol[at0007]/items[at0021]") + private List chronischeErkrankungenErweiterung; + + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/subject + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Chronische Erkrankungen']/subject") + private PartyProxy chronischeErkrankungenSubject; + + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/language + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Chronische Erkrankungen']/language") + private Language chronischeErkrankungenLanguage; + + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.problem_diagnosis.v1]") + private List problemDiagnose; + + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Medikamente in Verwendung? + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.medication_use.v0]/data[at0022]/events[at0023]/data[at0001]/items[at0027]/value") + private DvCodedText medikamenteInVerwendung; + + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Name der Medikamentenklasse + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.medication_use.v0]/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0002]/value|value") + private String nameDerMedikamentenklasseValue; + + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Medikamentenklasse in Verwendung? + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.medication_use.v0]/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0003]/value|defining_code") + private MedikamentenklasseInVerwendungDefiningCode medikamentenklasseInVerwendungDefiningCode; + + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Spezifische Medikamente + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.medication_use.v0]/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0008]") + private List spezifischeMedikamente; + + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/time + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.medication_use.v0]/data[at0022]/events[at0023]/time|value") + private TemporalAccessor fragebogenZumMedikationsScreeningTimeValue; + + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/origin + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.medication_use.v0]/data[at0022]/origin|value") + private TemporalAccessor fragebogenZumMedikationsScreeningOriginValue; + + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Erweiterung + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.medication_use.v0]/protocol[at0005]/items[at0019]") + private List fragebogenZumMedikationsScreeningErweiterung; + + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/subject + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.medication_use.v0]/subject") + private PartyProxy fragebogenZumMedikationsScreeningSubject; + + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/language + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.medication_use.v0]/language") + private Language fragebogenZumMedikationsScreeningLanguage; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigungsstatus + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.occupation_summary.v1 and name/value='Gesundheitsbezogener Beruf']/data[at0001]/items[at0004]/value|value") + private String beschaftigungsstatusValue; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.occupation_summary.v1 and name/value='Gesundheitsbezogener Beruf']/data[at0001]/items[openEHR-EHR-CLUSTER.occupation_record.v1]") + private List beschaftigung; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Zusätzliche Angaben + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.occupation_summary.v1 and name/value='Gesundheitsbezogener Beruf']/data[at0001]/items[at0005]") + private List zusatzlicheAngaben; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Erweiterung + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.occupation_summary.v1 and name/value='Gesundheitsbezogener Beruf']/protocol[at0007]/items[at0008]") + private List gesundheitsbezogenerBerufErweiterung; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/subject + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.occupation_summary.v1 and name/value='Gesundheitsbezogener Beruf']/subject") + private PartyProxy gesundheitsbezogenerBerufSubject; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/language + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.occupation_summary.v1 and name/value='Gesundheitsbezogener Beruf']/language") + private Language gesundheitsbezogenerBerufLanguage; + + /** + * Bericht/Allgemeine Angaben/Wohnsituation + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.living_arrangement.v0]") + private List wohnsituation; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.health_risk.v1]") + private List bewertungDesGesundheitsrisikos; + + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Name des Problems/ der Diagnose + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1 and name/value='Problem/Diganose Coronovirus']/data[at0001]/items[at0002]/value|value") + private String nameDesProblemsDerDiagnoseValue; + + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Anatomische Stelle (strukturiert) + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1 and name/value='Problem/Diganose Coronovirus']/data[at0001]/items[at0039]") + private List anatomischeStelleStrukturiert; + + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Spezifische Angaben + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1 and name/value='Problem/Diganose Coronovirus']/data[at0001]/items[at0043]") + private List spezifischeAngaben; + + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Status/Diagnosestatus + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1 and name/value='Problem/Diganose Coronovirus']/data[at0001]/items[openEHR-EHR-CLUSTER.problem_qualifier.v1 and name/value='Status']/items[at0004]/value|defining_code") + private DiagnosestatusDefiningCode diagnosestatusDefiningCode; + + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Kommentar + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1 and name/value='Problem/Diganose Coronovirus']/data[at0001]/items[at0069]/value|value") + private String problemDiganoseCoronovirusKommentarValue; + + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Zuletzt aktualisiert + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1 and name/value='Problem/Diganose Coronovirus']/protocol[at0032]/items[at0070]/value|value") + private TemporalAccessor zuletztAktualisiertValue; + + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Erweiterung + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1 and name/value='Problem/Diganose Coronovirus']/protocol[at0032]/items[at0071]") + private List problemDiganoseCoronovirusErweiterung; + + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/subject + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1 and name/value='Problem/Diganose Coronovirus']/subject") + private PartyProxy problemDiganoseCoronovirusSubject; + + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/language + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1 and name/value='Problem/Diganose Coronovirus']/language") + private Language problemDiganoseCoronovirusLanguage; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-INSTRUCTION.service_request.v1]") + private List dienstleistung; + + /** + * Bericht/composer + */ + @Path("/composer") + private PartyProxy composer; + + /** + * Bericht/language + */ + @Path("/language") + private Language berichtLanguage; + + /** + * Bericht/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + + /** + * Bericht/category + */ + @Path("/category|defining_code") + private Category categoryDefiningCode; + + /** + * Bericht/territory + */ + @Path("/territory") + private Territory territory; + + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/value + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1 and name/value='Problem/Diganose Coronovirus']/data[at0001]/items[at0073]/value") + @Choice + private ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice diagnostischeSicherheit; + + /** + * Bericht/Beliebiges Ereignis + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Weitere Symptome']/data[at0001]/events[at0002]") + @Choice + private List beliebigesEreignis; + + @Id + private VersionUid versionUid; + + public void setBerichtIdValue(String berichtIdValue) { + this.berichtIdValue = berichtIdValue; + } + + public String getBerichtIdValue() { + return this.berichtIdValue ; + } + + public void setStatusValue(String statusValue) { + this.statusValue = statusValue; + } + + public String getStatusValue() { + return this.statusValue ; + } + + public void setBerichtErweiterung(List berichtErweiterung) { + this.berichtErweiterung = berichtErweiterung; + } + + public List getBerichtErweiterung() { + return this.berichtErweiterung ; + } + + 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 setGeschichteHistorie(List geschichteHistorie) { + this.geschichteHistorie = geschichteHistorie; + } + + public List getGeschichteHistorie() { + return this.geschichteHistorie ; + } + + public void setHustenBezeichnungDesSymptomsOderAnzeichensValue( + String hustenBezeichnungDesSymptomsOderAnzeichensValue) { + this.hustenBezeichnungDesSymptomsOderAnzeichensValue = hustenBezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getHustenBezeichnungDesSymptomsOderAnzeichensValue() { + return this.hustenBezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setHustenVorhandenDefiningCode(VorhandenDefiningCode hustenVorhandenDefiningCode) { + this.hustenVorhandenDefiningCode = hustenVorhandenDefiningCode; + } + + public VorhandenDefiningCode getHustenVorhandenDefiningCode() { + return this.hustenVorhandenDefiningCode ; + } + + public void setHustenDetaillierteAngabenZumSymptomAnzeichen( + List hustenDetaillierteAngabenZumSymptomAnzeichen) { + this.hustenDetaillierteAngabenZumSymptomAnzeichen = hustenDetaillierteAngabenZumSymptomAnzeichen; + } + + public List getHustenDetaillierteAngabenZumSymptomAnzeichen() { + return this.hustenDetaillierteAngabenZumSymptomAnzeichen ; + } + + public void setHustenTimeValue(TemporalAccessor hustenTimeValue) { + this.hustenTimeValue = hustenTimeValue; + } + + public TemporalAccessor getHustenTimeValue() { + return this.hustenTimeValue ; + } + + public void setHustenOriginValue(TemporalAccessor hustenOriginValue) { + this.hustenOriginValue = hustenOriginValue; + } + + public TemporalAccessor getHustenOriginValue() { + return this.hustenOriginValue ; + } + + public void setHustenErweiterung(List hustenErweiterung) { + this.hustenErweiterung = hustenErweiterung; + } + + public List getHustenErweiterung() { + return this.hustenErweiterung ; + } + + public void setHustenSubject(PartyProxy hustenSubject) { + this.hustenSubject = hustenSubject; + } + + public PartyProxy getHustenSubject() { + return this.hustenSubject ; + } + + public void setHustenLanguage(Language hustenLanguage) { + this.hustenLanguage = hustenLanguage; + } + + public Language getHustenLanguage() { + return this.hustenLanguage ; + } + + public void setSchnupfenBezeichnungDesSymptomsOderAnzeichensValue( + String schnupfenBezeichnungDesSymptomsOderAnzeichensValue) { + this.schnupfenBezeichnungDesSymptomsOderAnzeichensValue = schnupfenBezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getSchnupfenBezeichnungDesSymptomsOderAnzeichensValue() { + return this.schnupfenBezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setSchnupfenVorhandenDefiningCode( + VorhandenDefiningCode schnupfenVorhandenDefiningCode) { + this.schnupfenVorhandenDefiningCode = schnupfenVorhandenDefiningCode; + } + + public VorhandenDefiningCode getSchnupfenVorhandenDefiningCode() { + return this.schnupfenVorhandenDefiningCode ; + } + + public void setSchnupfenDetaillierteAngabenZumSymptomAnzeichen( + List schnupfenDetaillierteAngabenZumSymptomAnzeichen) { + this.schnupfenDetaillierteAngabenZumSymptomAnzeichen = schnupfenDetaillierteAngabenZumSymptomAnzeichen; + } + + public List getSchnupfenDetaillierteAngabenZumSymptomAnzeichen() { + return this.schnupfenDetaillierteAngabenZumSymptomAnzeichen ; + } + + public void setSchnupfenTimeValue(TemporalAccessor schnupfenTimeValue) { + this.schnupfenTimeValue = schnupfenTimeValue; + } + + public TemporalAccessor getSchnupfenTimeValue() { + return this.schnupfenTimeValue ; + } + + public void setSchnupfenOriginValue(TemporalAccessor schnupfenOriginValue) { + this.schnupfenOriginValue = schnupfenOriginValue; + } + + public TemporalAccessor getSchnupfenOriginValue() { + return this.schnupfenOriginValue ; + } + + public void setSchnupfenErweiterung(List schnupfenErweiterung) { + this.schnupfenErweiterung = schnupfenErweiterung; + } + + public List getSchnupfenErweiterung() { + return this.schnupfenErweiterung ; + } + + public void setSchnupfenSubject(PartyProxy schnupfenSubject) { + this.schnupfenSubject = schnupfenSubject; + } + + public PartyProxy getSchnupfenSubject() { + return this.schnupfenSubject ; + } + + public void setSchnupfenLanguage(Language schnupfenLanguage) { + this.schnupfenLanguage = schnupfenLanguage; + } + + public Language getSchnupfenLanguage() { + return this.schnupfenLanguage ; + } + + public void setHeiserkeitBezeichnungDesSymptomsOderAnzeichensValue( + String heiserkeitBezeichnungDesSymptomsOderAnzeichensValue) { + this.heiserkeitBezeichnungDesSymptomsOderAnzeichensValue = heiserkeitBezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getHeiserkeitBezeichnungDesSymptomsOderAnzeichensValue() { + return this.heiserkeitBezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setHeiserkeitVorhandenDefiningCode( + VorhandenDefiningCode heiserkeitVorhandenDefiningCode) { + this.heiserkeitVorhandenDefiningCode = heiserkeitVorhandenDefiningCode; + } + + public VorhandenDefiningCode getHeiserkeitVorhandenDefiningCode() { + return this.heiserkeitVorhandenDefiningCode ; + } + + public void setHeiserkeitDetaillierteAngabenZumSymptomAnzeichen( + List heiserkeitDetaillierteAngabenZumSymptomAnzeichen) { + this.heiserkeitDetaillierteAngabenZumSymptomAnzeichen = heiserkeitDetaillierteAngabenZumSymptomAnzeichen; + } + + public List getHeiserkeitDetaillierteAngabenZumSymptomAnzeichen() { + return this.heiserkeitDetaillierteAngabenZumSymptomAnzeichen ; + } + + public void setHeiserkeitTimeValue(TemporalAccessor heiserkeitTimeValue) { + this.heiserkeitTimeValue = heiserkeitTimeValue; + } + + public TemporalAccessor getHeiserkeitTimeValue() { + return this.heiserkeitTimeValue ; + } + + public void setHeiserkeitOriginValue(TemporalAccessor heiserkeitOriginValue) { + this.heiserkeitOriginValue = heiserkeitOriginValue; + } + + public TemporalAccessor getHeiserkeitOriginValue() { + return this.heiserkeitOriginValue ; + } + + public void setHeiserkeitErweiterung(List heiserkeitErweiterung) { + this.heiserkeitErweiterung = heiserkeitErweiterung; + } + + public List getHeiserkeitErweiterung() { + return this.heiserkeitErweiterung ; + } + + public void setHeiserkeitSubject(PartyProxy heiserkeitSubject) { + this.heiserkeitSubject = heiserkeitSubject; + } + + public PartyProxy getHeiserkeitSubject() { + return this.heiserkeitSubject ; + } + + public void setHeiserkeitLanguage(Language heiserkeitLanguage) { + this.heiserkeitLanguage = heiserkeitLanguage; + } + + public Language getHeiserkeitLanguage() { + return this.heiserkeitLanguage ; + } + + public void setFieberOderErhohteKorpertemperaturBezeichnungDesSymptomsOderAnzeichensValue( + String fieberOderErhohteKorpertemperaturBezeichnungDesSymptomsOderAnzeichensValue) { + this.fieberOderErhohteKorpertemperaturBezeichnungDesSymptomsOderAnzeichensValue = fieberOderErhohteKorpertemperaturBezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getFieberOderErhohteKorpertemperaturBezeichnungDesSymptomsOderAnzeichensValue() { + return this.fieberOderErhohteKorpertemperaturBezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setFieberOderErhohteKorpertemperaturVorhandenDefiningCode( + VorhandenDefiningCode fieberOderErhohteKorpertemperaturVorhandenDefiningCode) { + this.fieberOderErhohteKorpertemperaturVorhandenDefiningCode = fieberOderErhohteKorpertemperaturVorhandenDefiningCode; + } + + public VorhandenDefiningCode getFieberOderErhohteKorpertemperaturVorhandenDefiningCode() { + return this.fieberOderErhohteKorpertemperaturVorhandenDefiningCode ; + } + + public void setFieberOderErhohteKorpertemperaturDetaillierteAngabenZumSymptomAnzeichen( + List fieberOderErhohteKorpertemperaturDetaillierteAngabenZumSymptomAnzeichen) { + this.fieberOderErhohteKorpertemperaturDetaillierteAngabenZumSymptomAnzeichen = fieberOderErhohteKorpertemperaturDetaillierteAngabenZumSymptomAnzeichen; + } + + public List getFieberOderErhohteKorpertemperaturDetaillierteAngabenZumSymptomAnzeichen( + ) { + return this.fieberOderErhohteKorpertemperaturDetaillierteAngabenZumSymptomAnzeichen ; + } + + public void setFieberOderErhohteKorpertemperaturTimeValue( + TemporalAccessor fieberOderErhohteKorpertemperaturTimeValue) { + this.fieberOderErhohteKorpertemperaturTimeValue = fieberOderErhohteKorpertemperaturTimeValue; + } + + public TemporalAccessor getFieberOderErhohteKorpertemperaturTimeValue() { + return this.fieberOderErhohteKorpertemperaturTimeValue ; + } + + public void setFieberOderErhohteKorpertemperaturOriginValue( + TemporalAccessor fieberOderErhohteKorpertemperaturOriginValue) { + this.fieberOderErhohteKorpertemperaturOriginValue = fieberOderErhohteKorpertemperaturOriginValue; + } + + public TemporalAccessor getFieberOderErhohteKorpertemperaturOriginValue() { + return this.fieberOderErhohteKorpertemperaturOriginValue ; + } + + public void setFieberOderErhohteKorpertemperaturErweiterung( + List fieberOderErhohteKorpertemperaturErweiterung) { + this.fieberOderErhohteKorpertemperaturErweiterung = fieberOderErhohteKorpertemperaturErweiterung; + } + + public List getFieberOderErhohteKorpertemperaturErweiterung() { + return this.fieberOderErhohteKorpertemperaturErweiterung ; + } + + public void setFieberOderErhohteKorpertemperaturSubject( + PartyProxy fieberOderErhohteKorpertemperaturSubject) { + this.fieberOderErhohteKorpertemperaturSubject = fieberOderErhohteKorpertemperaturSubject; + } + + public PartyProxy getFieberOderErhohteKorpertemperaturSubject() { + return this.fieberOderErhohteKorpertemperaturSubject ; + } + + public void setFieberOderErhohteKorpertemperaturLanguage( + Language fieberOderErhohteKorpertemperaturLanguage) { + this.fieberOderErhohteKorpertemperaturLanguage = fieberOderErhohteKorpertemperaturLanguage; + } + + public Language getFieberOderErhohteKorpertemperaturLanguage() { + return this.fieberOderErhohteKorpertemperaturLanguage ; + } + + public void setTemperaturMagnitude(Double temperaturMagnitude) { + this.temperaturMagnitude = temperaturMagnitude; + } + + public Double getTemperaturMagnitude() { + return this.temperaturMagnitude ; + } + + public void setTemperaturUnits(String temperaturUnits) { + this.temperaturUnits = temperaturUnits; + } + + public String getTemperaturUnits() { + return this.temperaturUnits ; + } + + public void setStorfaktoren(List storfaktoren) { + this.storfaktoren = storfaktoren; + } + + public List getStorfaktoren() { + return this.storfaktoren ; + } + + public void setUmgebungsbedingungen(List umgebungsbedingungen) { + this.umgebungsbedingungen = umgebungsbedingungen; + } + + public List getUmgebungsbedingungen() { + return this.umgebungsbedingungen ; + } + + public void setBetatigung(Cluster betatigung) { + this.betatigung = betatigung; + } + + public Cluster getBetatigung() { + return this.betatigung ; + } + + public void setKorpertemperaturTimeValue(TemporalAccessor korpertemperaturTimeValue) { + this.korpertemperaturTimeValue = korpertemperaturTimeValue; + } + + public TemporalAccessor getKorpertemperaturTimeValue() { + return this.korpertemperaturTimeValue ; + } + + public void setKorpertemperaturOriginValue(TemporalAccessor korpertemperaturOriginValue) { + this.korpertemperaturOriginValue = korpertemperaturOriginValue; + } + + public TemporalAccessor getKorpertemperaturOriginValue() { + return this.korpertemperaturOriginValue ; + } + + public void setStrukturierteLokalisationDerMessung( + List strukturierteLokalisationDerMessung) { + this.strukturierteLokalisationDerMessung = strukturierteLokalisationDerMessung; + } + + public List getStrukturierteLokalisationDerMessung() { + return this.strukturierteLokalisationDerMessung ; + } + + public void setGerat(Cluster gerat) { + this.gerat = gerat; + } + + public Cluster getGerat() { + return this.gerat ; + } + + public void setKorpertemperaturErweiterung(List korpertemperaturErweiterung) { + this.korpertemperaturErweiterung = korpertemperaturErweiterung; + } + + public List getKorpertemperaturErweiterung() { + return this.korpertemperaturErweiterung ; + } + + public void setKorpertemperaturSubject(PartyProxy korpertemperaturSubject) { + this.korpertemperaturSubject = korpertemperaturSubject; + } + + public PartyProxy getKorpertemperaturSubject() { + return this.korpertemperaturSubject ; + } + + public void setKorpertemperaturLanguage(Language korpertemperaturLanguage) { + this.korpertemperaturLanguage = korpertemperaturLanguage; + } + + public Language getKorpertemperaturLanguage() { + return this.korpertemperaturLanguage ; + } + + public void setGestorterGeruchssinnBezeichnungDesSymptomsOderAnzeichensValue( + String gestorterGeruchssinnBezeichnungDesSymptomsOderAnzeichensValue) { + this.gestorterGeruchssinnBezeichnungDesSymptomsOderAnzeichensValue = gestorterGeruchssinnBezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getGestorterGeruchssinnBezeichnungDesSymptomsOderAnzeichensValue() { + return this.gestorterGeruchssinnBezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setGestorterGeruchssinnVorhandenDefiningCode( + VorhandenDefiningCode gestorterGeruchssinnVorhandenDefiningCode) { + this.gestorterGeruchssinnVorhandenDefiningCode = gestorterGeruchssinnVorhandenDefiningCode; + } + + public VorhandenDefiningCode getGestorterGeruchssinnVorhandenDefiningCode() { + return this.gestorterGeruchssinnVorhandenDefiningCode ; + } + + public void setGestorterGeruchssinnDetaillierteAngabenZumSymptomAnzeichen( + List gestorterGeruchssinnDetaillierteAngabenZumSymptomAnzeichen) { + this.gestorterGeruchssinnDetaillierteAngabenZumSymptomAnzeichen = gestorterGeruchssinnDetaillierteAngabenZumSymptomAnzeichen; + } + + public List getGestorterGeruchssinnDetaillierteAngabenZumSymptomAnzeichen() { + return this.gestorterGeruchssinnDetaillierteAngabenZumSymptomAnzeichen ; + } + + public void setGestorterGeruchssinnTimeValue(TemporalAccessor gestorterGeruchssinnTimeValue) { + this.gestorterGeruchssinnTimeValue = gestorterGeruchssinnTimeValue; + } + + public TemporalAccessor getGestorterGeruchssinnTimeValue() { + return this.gestorterGeruchssinnTimeValue ; + } + + public void setGestorterGeruchssinnOriginValue(TemporalAccessor gestorterGeruchssinnOriginValue) { + this.gestorterGeruchssinnOriginValue = gestorterGeruchssinnOriginValue; + } + + public TemporalAccessor getGestorterGeruchssinnOriginValue() { + return this.gestorterGeruchssinnOriginValue ; + } + + public void setGestorterGeruchssinnErweiterung(List gestorterGeruchssinnErweiterung) { + this.gestorterGeruchssinnErweiterung = gestorterGeruchssinnErweiterung; + } + + public List getGestorterGeruchssinnErweiterung() { + return this.gestorterGeruchssinnErweiterung ; + } + + public void setGestorterGeruchssinnSubject(PartyProxy gestorterGeruchssinnSubject) { + this.gestorterGeruchssinnSubject = gestorterGeruchssinnSubject; + } + + public PartyProxy getGestorterGeruchssinnSubject() { + return this.gestorterGeruchssinnSubject ; + } + + public void setGestorterGeruchssinnLanguage(Language gestorterGeruchssinnLanguage) { + this.gestorterGeruchssinnLanguage = gestorterGeruchssinnLanguage; + } + + public Language getGestorterGeruchssinnLanguage() { + return this.gestorterGeruchssinnLanguage ; + } + + public void setGestorterGeschmackssinnBezeichnungDesSymptomsOderAnzeichensValue( + String gestorterGeschmackssinnBezeichnungDesSymptomsOderAnzeichensValue) { + this.gestorterGeschmackssinnBezeichnungDesSymptomsOderAnzeichensValue = gestorterGeschmackssinnBezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getGestorterGeschmackssinnBezeichnungDesSymptomsOderAnzeichensValue() { + return this.gestorterGeschmackssinnBezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setGestorterGeschmackssinnVorhandenDefiningCode( + VorhandenDefiningCode gestorterGeschmackssinnVorhandenDefiningCode) { + this.gestorterGeschmackssinnVorhandenDefiningCode = gestorterGeschmackssinnVorhandenDefiningCode; + } + + public VorhandenDefiningCode getGestorterGeschmackssinnVorhandenDefiningCode() { + return this.gestorterGeschmackssinnVorhandenDefiningCode ; + } + + public void setGestorterGeschmackssinnDetaillierteAngabenZumSymptomAnzeichen( + List gestorterGeschmackssinnDetaillierteAngabenZumSymptomAnzeichen) { + this.gestorterGeschmackssinnDetaillierteAngabenZumSymptomAnzeichen = gestorterGeschmackssinnDetaillierteAngabenZumSymptomAnzeichen; + } + + public List getGestorterGeschmackssinnDetaillierteAngabenZumSymptomAnzeichen() { + return this.gestorterGeschmackssinnDetaillierteAngabenZumSymptomAnzeichen ; + } + + public void setGestorterGeschmackssinnTimeValue( + TemporalAccessor gestorterGeschmackssinnTimeValue) { + this.gestorterGeschmackssinnTimeValue = gestorterGeschmackssinnTimeValue; + } + + public TemporalAccessor getGestorterGeschmackssinnTimeValue() { + return this.gestorterGeschmackssinnTimeValue ; + } + + public void setGestorterGeschmackssinnOriginValue( + TemporalAccessor gestorterGeschmackssinnOriginValue) { + this.gestorterGeschmackssinnOriginValue = gestorterGeschmackssinnOriginValue; + } + + public TemporalAccessor getGestorterGeschmackssinnOriginValue() { + return this.gestorterGeschmackssinnOriginValue ; + } + + public void setGestorterGeschmackssinnErweiterung( + List gestorterGeschmackssinnErweiterung) { + this.gestorterGeschmackssinnErweiterung = gestorterGeschmackssinnErweiterung; + } + + public List getGestorterGeschmackssinnErweiterung() { + return this.gestorterGeschmackssinnErweiterung ; + } + + public void setGestorterGeschmackssinnSubject(PartyProxy gestorterGeschmackssinnSubject) { + this.gestorterGeschmackssinnSubject = gestorterGeschmackssinnSubject; + } + + public PartyProxy getGestorterGeschmackssinnSubject() { + return this.gestorterGeschmackssinnSubject ; + } + + public void setGestorterGeschmackssinnLanguage(Language gestorterGeschmackssinnLanguage) { + this.gestorterGeschmackssinnLanguage = gestorterGeschmackssinnLanguage; + } + + public Language getGestorterGeschmackssinnLanguage() { + return this.gestorterGeschmackssinnLanguage ; + } + + public void setDurchfallBezeichnungDesSymptomsOderAnzeichensValue( + String durchfallBezeichnungDesSymptomsOderAnzeichensValue) { + this.durchfallBezeichnungDesSymptomsOderAnzeichensValue = durchfallBezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getDurchfallBezeichnungDesSymptomsOderAnzeichensValue() { + return this.durchfallBezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setDurchfallVorhandenDefiningCode( + VorhandenDefiningCode durchfallVorhandenDefiningCode) { + this.durchfallVorhandenDefiningCode = durchfallVorhandenDefiningCode; + } + + public VorhandenDefiningCode getDurchfallVorhandenDefiningCode() { + return this.durchfallVorhandenDefiningCode ; + } + + public void setDurchfallDetaillierteAngabenZumSymptomAnzeichen( + List durchfallDetaillierteAngabenZumSymptomAnzeichen) { + this.durchfallDetaillierteAngabenZumSymptomAnzeichen = durchfallDetaillierteAngabenZumSymptomAnzeichen; + } + + public List getDurchfallDetaillierteAngabenZumSymptomAnzeichen() { + return this.durchfallDetaillierteAngabenZumSymptomAnzeichen ; + } + + public void setDurchfallTimeValue(TemporalAccessor durchfallTimeValue) { + this.durchfallTimeValue = durchfallTimeValue; + } + + public TemporalAccessor getDurchfallTimeValue() { + return this.durchfallTimeValue ; + } + + public void setDurchfallOriginValue(TemporalAccessor durchfallOriginValue) { + this.durchfallOriginValue = durchfallOriginValue; + } + + public TemporalAccessor getDurchfallOriginValue() { + return this.durchfallOriginValue ; + } + + public void setDurchfallErweiterung(List durchfallErweiterung) { + this.durchfallErweiterung = durchfallErweiterung; + } + + public List getDurchfallErweiterung() { + return this.durchfallErweiterung ; + } + + public void setDurchfallSubject(PartyProxy durchfallSubject) { + this.durchfallSubject = durchfallSubject; + } + + public PartyProxy getDurchfallSubject() { + return this.durchfallSubject ; + } + + public void setDurchfallLanguage(Language durchfallLanguage) { + this.durchfallLanguage = durchfallLanguage; + } + + public Language getDurchfallLanguage() { + return this.durchfallLanguage ; + } + + public void setWeitereSymptomeOriginValue(TemporalAccessor weitereSymptomeOriginValue) { + this.weitereSymptomeOriginValue = weitereSymptomeOriginValue; + } + + public TemporalAccessor getWeitereSymptomeOriginValue() { + return this.weitereSymptomeOriginValue ; + } + + public void setWeitereSymptomeErweiterung(List weitereSymptomeErweiterung) { + this.weitereSymptomeErweiterung = weitereSymptomeErweiterung; + } + + public List getWeitereSymptomeErweiterung() { + return this.weitereSymptomeErweiterung ; + } + + public void setWeitereSymptomeSubject(PartyProxy weitereSymptomeSubject) { + this.weitereSymptomeSubject = weitereSymptomeSubject; + } + + public PartyProxy getWeitereSymptomeSubject() { + return this.weitereSymptomeSubject ; + } + + public void setWeitereSymptomeLanguage(Language weitereSymptomeLanguage) { + this.weitereSymptomeLanguage = weitereSymptomeLanguage; + } + + public Language getWeitereSymptomeLanguage() { + return this.weitereSymptomeLanguage ; + } + + public void setPersonenkontaktAgentEnValue(String personenkontaktAgentEnValue) { + this.personenkontaktAgentEnValue = personenkontaktAgentEnValue; + } + + public String getPersonenkontaktAgentEnValue() { + return this.personenkontaktAgentEnValue ; + } + + public void setPersonenkontaktPresenceOfAnyExposureEnDefiningCode( + PresenceOfAnyExposureEnDefiningCode personenkontaktPresenceOfAnyExposureEnDefiningCode) { + this.personenkontaktPresenceOfAnyExposureEnDefiningCode = personenkontaktPresenceOfAnyExposureEnDefiningCode; + } + + public PresenceOfAnyExposureEnDefiningCode getPersonenkontaktPresenceOfAnyExposureEnDefiningCode( + ) { + return this.personenkontaktPresenceOfAnyExposureEnDefiningCode ; + } + + public void setPersonenkontaktExposureEnValue(String personenkontaktExposureEnValue) { + this.personenkontaktExposureEnValue = personenkontaktExposureEnValue; + } + + public String getPersonenkontaktExposureEnValue() { + return this.personenkontaktExposureEnValue ; + } + + public void setPersonenkontaktVorhandenseinDefiningCode( + VorhandenseinDefiningCode personenkontaktVorhandenseinDefiningCode) { + this.personenkontaktVorhandenseinDefiningCode = personenkontaktVorhandenseinDefiningCode; + } + + public VorhandenseinDefiningCode getPersonenkontaktVorhandenseinDefiningCode() { + return this.personenkontaktVorhandenseinDefiningCode ; + } + + public void setPersonenkontaktKommentarValue(String personenkontaktKommentarValue) { + this.personenkontaktKommentarValue = personenkontaktKommentarValue; + } + + public String getPersonenkontaktKommentarValue() { + return this.personenkontaktKommentarValue ; + } + + public void setPersonenkontaktTimeValue(TemporalAccessor personenkontaktTimeValue) { + this.personenkontaktTimeValue = personenkontaktTimeValue; + } + + public TemporalAccessor getPersonenkontaktTimeValue() { + return this.personenkontaktTimeValue ; + } + + public void setPersonenkontaktOriginValue(TemporalAccessor personenkontaktOriginValue) { + this.personenkontaktOriginValue = personenkontaktOriginValue; + } + + public TemporalAccessor getPersonenkontaktOriginValue() { + return this.personenkontaktOriginValue ; + } + + public void setPersonenkontaktErweiterung(List personenkontaktErweiterung) { + this.personenkontaktErweiterung = personenkontaktErweiterung; + } + + public List getPersonenkontaktErweiterung() { + return this.personenkontaktErweiterung ; + } + + public void setPersonenkontaktSubject(PartyProxy personenkontaktSubject) { + this.personenkontaktSubject = personenkontaktSubject; + } + + public PartyProxy getPersonenkontaktSubject() { + return this.personenkontaktSubject ; + } + + public void setPersonenkontaktLanguage(Language personenkontaktLanguage) { + this.personenkontaktLanguage = personenkontaktLanguage; + } + + public Language getPersonenkontaktLanguage() { + return this.personenkontaktLanguage ; + } + + public void setAufenthaltInGesundheitseinrichtungAgentEnValue( + String aufenthaltInGesundheitseinrichtungAgentEnValue) { + this.aufenthaltInGesundheitseinrichtungAgentEnValue = aufenthaltInGesundheitseinrichtungAgentEnValue; + } + + public String getAufenthaltInGesundheitseinrichtungAgentEnValue() { + return this.aufenthaltInGesundheitseinrichtungAgentEnValue ; + } + + public void setAufenthaltInGesundheitseinrichtungPresenceOfAnyExposureEnDefiningCode( + PresenceOfAnyExposureEnDefiningCode aufenthaltInGesundheitseinrichtungPresenceOfAnyExposureEnDefiningCode) { + this.aufenthaltInGesundheitseinrichtungPresenceOfAnyExposureEnDefiningCode = aufenthaltInGesundheitseinrichtungPresenceOfAnyExposureEnDefiningCode; + } + + public PresenceOfAnyExposureEnDefiningCode getAufenthaltInGesundheitseinrichtungPresenceOfAnyExposureEnDefiningCode( + ) { + return this.aufenthaltInGesundheitseinrichtungPresenceOfAnyExposureEnDefiningCode ; + } + + public void setAufenthaltInGesundheitseinrichtungExposureEnValue( + String aufenthaltInGesundheitseinrichtungExposureEnValue) { + this.aufenthaltInGesundheitseinrichtungExposureEnValue = aufenthaltInGesundheitseinrichtungExposureEnValue; + } + + public String getAufenthaltInGesundheitseinrichtungExposureEnValue() { + return this.aufenthaltInGesundheitseinrichtungExposureEnValue ; + } + + public void setAufenthaltInGesundheitseinrichtungVorhandenseinDefiningCode( + VorhandenseinDefiningCode aufenthaltInGesundheitseinrichtungVorhandenseinDefiningCode) { + this.aufenthaltInGesundheitseinrichtungVorhandenseinDefiningCode = aufenthaltInGesundheitseinrichtungVorhandenseinDefiningCode; + } + + public VorhandenseinDefiningCode getAufenthaltInGesundheitseinrichtungVorhandenseinDefiningCode( + ) { + return this.aufenthaltInGesundheitseinrichtungVorhandenseinDefiningCode ; + } + + public void setAufenthaltInGesundheitseinrichtungKommentarValue( + String aufenthaltInGesundheitseinrichtungKommentarValue) { + this.aufenthaltInGesundheitseinrichtungKommentarValue = aufenthaltInGesundheitseinrichtungKommentarValue; + } + + public String getAufenthaltInGesundheitseinrichtungKommentarValue() { + return this.aufenthaltInGesundheitseinrichtungKommentarValue ; + } + + public void setAufenthaltInGesundheitseinrichtungTimeValue( + TemporalAccessor aufenthaltInGesundheitseinrichtungTimeValue) { + this.aufenthaltInGesundheitseinrichtungTimeValue = aufenthaltInGesundheitseinrichtungTimeValue; + } + + public TemporalAccessor getAufenthaltInGesundheitseinrichtungTimeValue() { + return this.aufenthaltInGesundheitseinrichtungTimeValue ; + } + + public void setAufenthaltInGesundheitseinrichtungOriginValue( + TemporalAccessor aufenthaltInGesundheitseinrichtungOriginValue) { + this.aufenthaltInGesundheitseinrichtungOriginValue = aufenthaltInGesundheitseinrichtungOriginValue; + } + + public TemporalAccessor getAufenthaltInGesundheitseinrichtungOriginValue() { + return this.aufenthaltInGesundheitseinrichtungOriginValue ; + } + + public void setAufenthaltInGesundheitseinrichtungErweiterung( + List aufenthaltInGesundheitseinrichtungErweiterung) { + this.aufenthaltInGesundheitseinrichtungErweiterung = aufenthaltInGesundheitseinrichtungErweiterung; + } + + public List getAufenthaltInGesundheitseinrichtungErweiterung() { + return this.aufenthaltInGesundheitseinrichtungErweiterung ; + } + + public void setAufenthaltInGesundheitseinrichtungSubject( + PartyProxy aufenthaltInGesundheitseinrichtungSubject) { + this.aufenthaltInGesundheitseinrichtungSubject = aufenthaltInGesundheitseinrichtungSubject; + } + + public PartyProxy getAufenthaltInGesundheitseinrichtungSubject() { + return this.aufenthaltInGesundheitseinrichtungSubject ; + } + + public void setAufenthaltInGesundheitseinrichtungLanguage( + Language aufenthaltInGesundheitseinrichtungLanguage) { + this.aufenthaltInGesundheitseinrichtungLanguage = aufenthaltInGesundheitseinrichtungLanguage; + } + + public Language getAufenthaltInGesundheitseinrichtungLanguage() { + return this.aufenthaltInGesundheitseinrichtungLanguage ; + } + + public void setHistorieDerReise(List historieDerReise) { + this.historieDerReise = historieDerReise; + } + + public List getHistorieDerReise() { + return this.historieDerReise ; + } + + public void setReisefall(List reisefall) { + this.reisefall = reisefall; + } + + public List getReisefall() { + return this.reisefall ; + } + + public void setAndereAktuelleErkrankungenBezeichnungDesSymptomsOderAnzeichensValue( + String andereAktuelleErkrankungenBezeichnungDesSymptomsOderAnzeichensValue) { + this.andereAktuelleErkrankungenBezeichnungDesSymptomsOderAnzeichensValue = andereAktuelleErkrankungenBezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getAndereAktuelleErkrankungenBezeichnungDesSymptomsOderAnzeichensValue() { + return this.andereAktuelleErkrankungenBezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setAndereAktuelleErkrankungenVorhandenDefiningCode( + VorhandenDefiningCode andereAktuelleErkrankungenVorhandenDefiningCode) { + this.andereAktuelleErkrankungenVorhandenDefiningCode = andereAktuelleErkrankungenVorhandenDefiningCode; + } + + public VorhandenDefiningCode getAndereAktuelleErkrankungenVorhandenDefiningCode() { + return this.andereAktuelleErkrankungenVorhandenDefiningCode ; + } + + public void setAndereAktuelleErkrankungenDetaillierteAngabenZumSymptomAnzeichen( + List andereAktuelleErkrankungenDetaillierteAngabenZumSymptomAnzeichen) { + this.andereAktuelleErkrankungenDetaillierteAngabenZumSymptomAnzeichen = andereAktuelleErkrankungenDetaillierteAngabenZumSymptomAnzeichen; + } + + public List getAndereAktuelleErkrankungenDetaillierteAngabenZumSymptomAnzeichen() { + return this.andereAktuelleErkrankungenDetaillierteAngabenZumSymptomAnzeichen ; + } + + public void setAndereAktuelleErkrankungenTimeValue( + TemporalAccessor andereAktuelleErkrankungenTimeValue) { + this.andereAktuelleErkrankungenTimeValue = andereAktuelleErkrankungenTimeValue; + } + + public TemporalAccessor getAndereAktuelleErkrankungenTimeValue() { + return this.andereAktuelleErkrankungenTimeValue ; + } + + public void setAndereAktuelleErkrankungenOriginValue( + TemporalAccessor andereAktuelleErkrankungenOriginValue) { + this.andereAktuelleErkrankungenOriginValue = andereAktuelleErkrankungenOriginValue; + } + + public TemporalAccessor getAndereAktuelleErkrankungenOriginValue() { + return this.andereAktuelleErkrankungenOriginValue ; + } + + public void setAndereAktuelleErkrankungenErweiterung( + List andereAktuelleErkrankungenErweiterung) { + this.andereAktuelleErkrankungenErweiterung = andereAktuelleErkrankungenErweiterung; + } + + public List getAndereAktuelleErkrankungenErweiterung() { + return this.andereAktuelleErkrankungenErweiterung ; + } + + public void setAndereAktuelleErkrankungenSubject(PartyProxy andereAktuelleErkrankungenSubject) { + this.andereAktuelleErkrankungenSubject = andereAktuelleErkrankungenSubject; + } + + public PartyProxy getAndereAktuelleErkrankungenSubject() { + return this.andereAktuelleErkrankungenSubject ; + } + + public void setAndereAktuelleErkrankungenLanguage(Language andereAktuelleErkrankungenLanguage) { + this.andereAktuelleErkrankungenLanguage = andereAktuelleErkrankungenLanguage; + } + + public Language getAndereAktuelleErkrankungenLanguage() { + return this.andereAktuelleErkrankungenLanguage ; + } + + public void setChronischeErkrankungenBezeichnungDesSymptomsOderAnzeichensValue( + String chronischeErkrankungenBezeichnungDesSymptomsOderAnzeichensValue) { + this.chronischeErkrankungenBezeichnungDesSymptomsOderAnzeichensValue = chronischeErkrankungenBezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getChronischeErkrankungenBezeichnungDesSymptomsOderAnzeichensValue() { + return this.chronischeErkrankungenBezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setChronischeErkrankungenVorhandenDefiningCode( + VorhandenDefiningCode chronischeErkrankungenVorhandenDefiningCode) { + this.chronischeErkrankungenVorhandenDefiningCode = chronischeErkrankungenVorhandenDefiningCode; + } + + public VorhandenDefiningCode getChronischeErkrankungenVorhandenDefiningCode() { + return this.chronischeErkrankungenVorhandenDefiningCode ; + } + + public void setChronischeErkrankungenDetaillierteAngabenZumSymptomAnzeichen( + List chronischeErkrankungenDetaillierteAngabenZumSymptomAnzeichen) { + this.chronischeErkrankungenDetaillierteAngabenZumSymptomAnzeichen = chronischeErkrankungenDetaillierteAngabenZumSymptomAnzeichen; + } + + public List getChronischeErkrankungenDetaillierteAngabenZumSymptomAnzeichen() { + return this.chronischeErkrankungenDetaillierteAngabenZumSymptomAnzeichen ; + } + + public void setChronischeErkrankungenTimeValue(TemporalAccessor chronischeErkrankungenTimeValue) { + this.chronischeErkrankungenTimeValue = chronischeErkrankungenTimeValue; + } + + public TemporalAccessor getChronischeErkrankungenTimeValue() { + return this.chronischeErkrankungenTimeValue ; + } + + public void setChronischeErkrankungenOriginValue( + TemporalAccessor chronischeErkrankungenOriginValue) { + this.chronischeErkrankungenOriginValue = chronischeErkrankungenOriginValue; + } + + public TemporalAccessor getChronischeErkrankungenOriginValue() { + return this.chronischeErkrankungenOriginValue ; + } + + public void setChronischeErkrankungenErweiterung( + List chronischeErkrankungenErweiterung) { + this.chronischeErkrankungenErweiterung = chronischeErkrankungenErweiterung; + } + + public List getChronischeErkrankungenErweiterung() { + return this.chronischeErkrankungenErweiterung ; + } + + public void setChronischeErkrankungenSubject(PartyProxy chronischeErkrankungenSubject) { + this.chronischeErkrankungenSubject = chronischeErkrankungenSubject; + } + + public PartyProxy getChronischeErkrankungenSubject() { + return this.chronischeErkrankungenSubject ; + } + + public void setChronischeErkrankungenLanguage(Language chronischeErkrankungenLanguage) { + this.chronischeErkrankungenLanguage = chronischeErkrankungenLanguage; + } + + public Language getChronischeErkrankungenLanguage() { + return this.chronischeErkrankungenLanguage ; + } + + public void setProblemDiagnose(List problemDiagnose) { + this.problemDiagnose = problemDiagnose; + } + + public List getProblemDiagnose() { + return this.problemDiagnose ; + } + + public void setMedikamenteInVerwendung(DvCodedText medikamenteInVerwendung) { + this.medikamenteInVerwendung = medikamenteInVerwendung; + } + + public DvCodedText getMedikamenteInVerwendung() { + return this.medikamenteInVerwendung ; + } + + public void setNameDerMedikamentenklasseValue(String nameDerMedikamentenklasseValue) { + this.nameDerMedikamentenklasseValue = nameDerMedikamentenklasseValue; + } + + public String getNameDerMedikamentenklasseValue() { + return this.nameDerMedikamentenklasseValue ; + } + + public void setMedikamentenklasseInVerwendungDefiningCode( + MedikamentenklasseInVerwendungDefiningCode medikamentenklasseInVerwendungDefiningCode) { + this.medikamentenklasseInVerwendungDefiningCode = medikamentenklasseInVerwendungDefiningCode; + } + + public MedikamentenklasseInVerwendungDefiningCode getMedikamentenklasseInVerwendungDefiningCode( + ) { + return this.medikamentenklasseInVerwendungDefiningCode ; + } + + public void setSpezifischeMedikamente( + List spezifischeMedikamente) { + this.spezifischeMedikamente = spezifischeMedikamente; + } + + public List getSpezifischeMedikamente( + ) { + return this.spezifischeMedikamente ; + } + + public void setFragebogenZumMedikationsScreeningTimeValue( + TemporalAccessor fragebogenZumMedikationsScreeningTimeValue) { + this.fragebogenZumMedikationsScreeningTimeValue = fragebogenZumMedikationsScreeningTimeValue; + } + + public TemporalAccessor getFragebogenZumMedikationsScreeningTimeValue() { + return this.fragebogenZumMedikationsScreeningTimeValue ; + } + + public void setFragebogenZumMedikationsScreeningOriginValue( + TemporalAccessor fragebogenZumMedikationsScreeningOriginValue) { + this.fragebogenZumMedikationsScreeningOriginValue = fragebogenZumMedikationsScreeningOriginValue; + } + + public TemporalAccessor getFragebogenZumMedikationsScreeningOriginValue() { + return this.fragebogenZumMedikationsScreeningOriginValue ; + } + + public void setFragebogenZumMedikationsScreeningErweiterung( + List fragebogenZumMedikationsScreeningErweiterung) { + this.fragebogenZumMedikationsScreeningErweiterung = fragebogenZumMedikationsScreeningErweiterung; + } + + public List getFragebogenZumMedikationsScreeningErweiterung() { + return this.fragebogenZumMedikationsScreeningErweiterung ; + } + + public void setFragebogenZumMedikationsScreeningSubject( + PartyProxy fragebogenZumMedikationsScreeningSubject) { + this.fragebogenZumMedikationsScreeningSubject = fragebogenZumMedikationsScreeningSubject; + } + + public PartyProxy getFragebogenZumMedikationsScreeningSubject() { + return this.fragebogenZumMedikationsScreeningSubject ; + } + + public void setFragebogenZumMedikationsScreeningLanguage( + Language fragebogenZumMedikationsScreeningLanguage) { + this.fragebogenZumMedikationsScreeningLanguage = fragebogenZumMedikationsScreeningLanguage; + } + + public Language getFragebogenZumMedikationsScreeningLanguage() { + return this.fragebogenZumMedikationsScreeningLanguage ; + } + + public void setBeschaftigungsstatusValue(String beschaftigungsstatusValue) { + this.beschaftigungsstatusValue = beschaftigungsstatusValue; + } + + public String getBeschaftigungsstatusValue() { + return this.beschaftigungsstatusValue ; + } + + public void setBeschaftigung(List beschaftigung) { + this.beschaftigung = beschaftigung; + } + + public List getBeschaftigung() { + return this.beschaftigung ; + } + + public void setZusatzlicheAngaben(List zusatzlicheAngaben) { + this.zusatzlicheAngaben = zusatzlicheAngaben; + } + + public List getZusatzlicheAngaben() { + return this.zusatzlicheAngaben ; + } + + public void setGesundheitsbezogenerBerufErweiterung( + List gesundheitsbezogenerBerufErweiterung) { + this.gesundheitsbezogenerBerufErweiterung = gesundheitsbezogenerBerufErweiterung; + } + + public List getGesundheitsbezogenerBerufErweiterung() { + return this.gesundheitsbezogenerBerufErweiterung ; + } + + public void setGesundheitsbezogenerBerufSubject(PartyProxy gesundheitsbezogenerBerufSubject) { + this.gesundheitsbezogenerBerufSubject = gesundheitsbezogenerBerufSubject; + } + + public PartyProxy getGesundheitsbezogenerBerufSubject() { + return this.gesundheitsbezogenerBerufSubject ; + } + + public void setGesundheitsbezogenerBerufLanguage(Language gesundheitsbezogenerBerufLanguage) { + this.gesundheitsbezogenerBerufLanguage = gesundheitsbezogenerBerufLanguage; + } + + public Language getGesundheitsbezogenerBerufLanguage() { + return this.gesundheitsbezogenerBerufLanguage ; + } + + public void setWohnsituation(List wohnsituation) { + this.wohnsituation = wohnsituation; + } + + public List getWohnsituation() { + return this.wohnsituation ; + } + + public void setBewertungDesGesundheitsrisikos( + List bewertungDesGesundheitsrisikos) { + this.bewertungDesGesundheitsrisikos = bewertungDesGesundheitsrisikos; + } + + public List getBewertungDesGesundheitsrisikos() { + return this.bewertungDesGesundheitsrisikos ; + } + + public void setNameDesProblemsDerDiagnoseValue(String nameDesProblemsDerDiagnoseValue) { + this.nameDesProblemsDerDiagnoseValue = nameDesProblemsDerDiagnoseValue; + } + + public String getNameDesProblemsDerDiagnoseValue() { + return this.nameDesProblemsDerDiagnoseValue ; + } + + public void setAnatomischeStelleStrukturiert(List anatomischeStelleStrukturiert) { + this.anatomischeStelleStrukturiert = anatomischeStelleStrukturiert; + } + + public List getAnatomischeStelleStrukturiert() { + return this.anatomischeStelleStrukturiert ; + } + + public void setSpezifischeAngaben(List spezifischeAngaben) { + this.spezifischeAngaben = spezifischeAngaben; + } + + public List getSpezifischeAngaben() { + return this.spezifischeAngaben ; + } + + public void setDiagnosestatusDefiningCode(DiagnosestatusDefiningCode diagnosestatusDefiningCode) { + this.diagnosestatusDefiningCode = diagnosestatusDefiningCode; + } + + public DiagnosestatusDefiningCode getDiagnosestatusDefiningCode() { + return this.diagnosestatusDefiningCode ; + } + + public void setProblemDiganoseCoronovirusKommentarValue( + String problemDiganoseCoronovirusKommentarValue) { + this.problemDiganoseCoronovirusKommentarValue = problemDiganoseCoronovirusKommentarValue; + } + + public String getProblemDiganoseCoronovirusKommentarValue() { + return this.problemDiganoseCoronovirusKommentarValue ; + } + + public void setZuletztAktualisiertValue(TemporalAccessor zuletztAktualisiertValue) { + this.zuletztAktualisiertValue = zuletztAktualisiertValue; + } + + public TemporalAccessor getZuletztAktualisiertValue() { + return this.zuletztAktualisiertValue ; + } + + public void setProblemDiganoseCoronovirusErweiterung( + List problemDiganoseCoronovirusErweiterung) { + this.problemDiganoseCoronovirusErweiterung = problemDiganoseCoronovirusErweiterung; + } + + public List getProblemDiganoseCoronovirusErweiterung() { + return this.problemDiganoseCoronovirusErweiterung ; + } + + public void setProblemDiganoseCoronovirusSubject(PartyProxy problemDiganoseCoronovirusSubject) { + this.problemDiganoseCoronovirusSubject = problemDiganoseCoronovirusSubject; + } + + public PartyProxy getProblemDiganoseCoronovirusSubject() { + return this.problemDiganoseCoronovirusSubject ; + } + + public void setProblemDiganoseCoronovirusLanguage(Language problemDiganoseCoronovirusLanguage) { + this.problemDiganoseCoronovirusLanguage = problemDiganoseCoronovirusLanguage; + } + + public Language getProblemDiganoseCoronovirusLanguage() { + return this.problemDiganoseCoronovirusLanguage ; + } + + public void setDienstleistung(List dienstleistung) { + this.dienstleistung = dienstleistung; + } + + public List getDienstleistung() { + return this.dienstleistung ; + } + + public void setComposer(PartyProxy composer) { + this.composer = composer; + } + + public PartyProxy getComposer() { + return this.composer ; + } + + public void setBerichtLanguage(Language berichtLanguage) { + this.berichtLanguage = berichtLanguage; + } + + public Language getBerichtLanguage() { + return this.berichtLanguage ; + } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + + public void setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } + + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } + + public void setTerritory(Territory territory) { + this.territory = territory; + } + + public Territory getTerritory() { + return this.territory ; + } + + public void setDiagnostischeSicherheit( + ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice diagnostischeSicherheit) { + this.diagnostischeSicherheit = diagnostischeSicherheit; + } + + public ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice getDiagnostischeSicherheit() { + return this.diagnostischeSicherheit ; + } + + public void setBeliebigesEreignis(List beliebigesEreignis) { + this.beliebigesEreignis = beliebigesEreignis; + } + + public List getBeliebigesEreignis() { + return this.beliebigesEreignis ; + } + + public VersionUid getVersionUid() { + return this.versionUid ; + } + + public void setVersionUid(VersionUid versionUid) { + this.versionUid = versionUid; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java new file mode 100644 index 000000000..123b0e1be --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java @@ -0,0 +1,359 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition; + +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.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.BerichtBeliebigesEreignisChoice; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.BeschaftigungCluster; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.BewertungDesGesundheitsrisikosEvaluation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.DiagnosestatusDefiningCode; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.DienstleistungInstruction; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.GeschichteHistorieObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.HistorieDerReiseObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.KorpertemperaturStorfaktorenElement; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.MedikamentenklasseInVerwendungDefiningCode; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.PresenceOfAnyExposureEnDefiningCode; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.ProblemDiagnoseEvaluation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.ReisefallObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.VorhandenDefiningCode; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.VorhandenseinDefiningCode; +import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.WohnsituationEvaluation; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; + +public class CoronaAnamneseCompositionContainment extends Containment { + public SelectAqlField CORONA_ANAMNESE_COMPOSITION = new AqlFieldImp(CoronaAnamneseComposition.class, "", "CoronaAnamneseComposition", CoronaAnamneseComposition.class, this); + + public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); + + public SelectAqlField STATUS_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "statusValue", String.class, this); + + public ListSelectAqlField BERICHT_ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/context/other_context[at0001]/items[at0006]", "berichtErweiterung", Cluster.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/context/participations", "participations", Participation.class, this); + + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + + public SelectAqlField LOCATION = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/location", "location", String.class, this); + + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); + + public ListSelectAqlField GESCHICHTE_HISTORIE = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-OBSERVATION.story.v1]", "geschichteHistorie", GeschichteHistorieObservation.class, this); + + public SelectAqlField HUSTEN_BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "hustenBezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField HUSTEN_VORHANDEN_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "hustenVorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField HUSTEN_DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "hustenDetaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField HUSTEN_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/time|value", "hustenTimeValue", TemporalAccessor.class, this); + + public SelectAqlField HUSTEN_ORIGIN_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/origin|value", "hustenOriginValue", TemporalAccessor.class, this); + + public ListSelectAqlField HUSTEN_ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/protocol[at0007]/items[at0021]", "hustenErweiterung", Cluster.class, this); + + public SelectAqlField HUSTEN_SUBJECT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/subject", "hustenSubject", PartyProxy.class, this); + + public SelectAqlField HUSTEN_LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/language", "hustenLanguage", Language.class, this); + + public SelectAqlField SCHNUPFEN_BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "schnupfenBezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField SCHNUPFEN_VORHANDEN_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "schnupfenVorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField SCHNUPFEN_DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "schnupfenDetaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField SCHNUPFEN_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/time|value", "schnupfenTimeValue", TemporalAccessor.class, this); + + public SelectAqlField SCHNUPFEN_ORIGIN_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/origin|value", "schnupfenOriginValue", TemporalAccessor.class, this); + + public ListSelectAqlField SCHNUPFEN_ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/protocol[at0007]/items[at0021]", "schnupfenErweiterung", Cluster.class, this); + + public SelectAqlField SCHNUPFEN_SUBJECT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/subject", "schnupfenSubject", PartyProxy.class, this); + + public SelectAqlField SCHNUPFEN_LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/language", "schnupfenLanguage", Language.class, this); + + public SelectAqlField HEISERKEIT_BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "heiserkeitBezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField HEISERKEIT_VORHANDEN_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "heiserkeitVorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField HEISERKEIT_DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "heiserkeitDetaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField HEISERKEIT_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/time|value", "heiserkeitTimeValue", TemporalAccessor.class, this); + + public SelectAqlField HEISERKEIT_ORIGIN_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/origin|value", "heiserkeitOriginValue", TemporalAccessor.class, this); + + public ListSelectAqlField HEISERKEIT_ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/protocol[at0007]/items[at0021]", "heiserkeitErweiterung", Cluster.class, this); + + public SelectAqlField HEISERKEIT_SUBJECT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/subject", "heiserkeitSubject", PartyProxy.class, this); + + public SelectAqlField HEISERKEIT_LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/language", "heiserkeitLanguage", Language.class, this); + + public SelectAqlField FIEBER_ODER_ERHOHTE_KORPERTEMPERATUR_BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "fieberOderErhohteKorpertemperaturBezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField FIEBER_ODER_ERHOHTE_KORPERTEMPERATUR_VORHANDEN_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "fieberOderErhohteKorpertemperaturVorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField FIEBER_ODER_ERHOHTE_KORPERTEMPERATUR_DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "fieberOderErhohteKorpertemperaturDetaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField FIEBER_ODER_ERHOHTE_KORPERTEMPERATUR_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/time|value", "fieberOderErhohteKorpertemperaturTimeValue", TemporalAccessor.class, this); + + public SelectAqlField FIEBER_ODER_ERHOHTE_KORPERTEMPERATUR_ORIGIN_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/origin|value", "fieberOderErhohteKorpertemperaturOriginValue", TemporalAccessor.class, this); + + public ListSelectAqlField FIEBER_ODER_ERHOHTE_KORPERTEMPERATUR_ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/protocol[at0007]/items[at0021]", "fieberOderErhohteKorpertemperaturErweiterung", Cluster.class, this); + + public SelectAqlField FIEBER_ODER_ERHOHTE_KORPERTEMPERATUR_SUBJECT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/subject", "fieberOderErhohteKorpertemperaturSubject", PartyProxy.class, this); + + public SelectAqlField FIEBER_ODER_ERHOHTE_KORPERTEMPERATUR_LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/language", "fieberOderErhohteKorpertemperaturLanguage", Language.class, this); + + public SelectAqlField TEMPERATUR_MAGNITUDE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude", "temperaturMagnitude", Double.class, this); + + public SelectAqlField TEMPERATUR_UNITS = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units", "temperaturUnits", String.class, this); + + public ListSelectAqlField STORFAKTOREN = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/data[at0002]/events[at0003]/state[at0029]/items[at0066]", "storfaktoren", KorpertemperaturStorfaktorenElement.class, this); + + public ListSelectAqlField UMGEBUNGSBEDINGUNGEN = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/data[at0002]/events[at0003]/state[at0029]/items[at0056]", "umgebungsbedingungen", Cluster.class, this); + + public SelectAqlField BETATIGUNG = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/data[at0002]/events[at0003]/state[at0029]/items[at0057]", "betatigung", Cluster.class, this); + + public SelectAqlField KORPERTEMPERATUR_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/data[at0002]/events[at0003]/time|value", "korpertemperaturTimeValue", TemporalAccessor.class, this); + + public SelectAqlField KORPERTEMPERATUR_ORIGIN_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/data[at0002]/origin|value", "korpertemperaturOriginValue", TemporalAccessor.class, this); + + public ListSelectAqlField STRUKTURIERTE_LOKALISATION_DER_MESSUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/protocol[at0020]/items[at0064]", "strukturierteLokalisationDerMessung", Cluster.class, this); + + public SelectAqlField GERAT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/protocol[at0020]/items[at0059]", "gerat", Cluster.class, this); + + public ListSelectAqlField KORPERTEMPERATUR_ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/protocol[at0020]/items[at0062]", "korpertemperaturErweiterung", Cluster.class, this); + + public SelectAqlField KORPERTEMPERATUR_SUBJECT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/subject", "korpertemperaturSubject", PartyProxy.class, this); + + public SelectAqlField KORPERTEMPERATUR_LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.body_temperature.v2]/language", "korpertemperaturLanguage", Language.class, this); + + public SelectAqlField GESTORTER_GERUCHSSINN_BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "gestorterGeruchssinnBezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField GESTORTER_GERUCHSSINN_VORHANDEN_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "gestorterGeruchssinnVorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField GESTORTER_GERUCHSSINN_DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "gestorterGeruchssinnDetaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField GESTORTER_GERUCHSSINN_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/time|value", "gestorterGeruchssinnTimeValue", TemporalAccessor.class, this); + + public SelectAqlField GESTORTER_GERUCHSSINN_ORIGIN_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/origin|value", "gestorterGeruchssinnOriginValue", TemporalAccessor.class, this); + + public ListSelectAqlField GESTORTER_GERUCHSSINN_ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/protocol[at0007]/items[at0021]", "gestorterGeruchssinnErweiterung", Cluster.class, this); + + public SelectAqlField GESTORTER_GERUCHSSINN_SUBJECT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/subject", "gestorterGeruchssinnSubject", PartyProxy.class, this); + + public SelectAqlField GESTORTER_GERUCHSSINN_LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/language", "gestorterGeruchssinnLanguage", Language.class, this); + + public SelectAqlField GESTORTER_GESCHMACKSSINN_BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "gestorterGeschmackssinnBezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField GESTORTER_GESCHMACKSSINN_VORHANDEN_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "gestorterGeschmackssinnVorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField GESTORTER_GESCHMACKSSINN_DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "gestorterGeschmackssinnDetaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField GESTORTER_GESCHMACKSSINN_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/time|value", "gestorterGeschmackssinnTimeValue", TemporalAccessor.class, this); + + public SelectAqlField GESTORTER_GESCHMACKSSINN_ORIGIN_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/origin|value", "gestorterGeschmackssinnOriginValue", TemporalAccessor.class, this); + + public ListSelectAqlField GESTORTER_GESCHMACKSSINN_ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/protocol[at0007]/items[at0021]", "gestorterGeschmackssinnErweiterung", Cluster.class, this); + + public SelectAqlField GESTORTER_GESCHMACKSSINN_SUBJECT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/subject", "gestorterGeschmackssinnSubject", PartyProxy.class, this); + + public SelectAqlField GESTORTER_GESCHMACKSSINN_LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/language", "gestorterGeschmackssinnLanguage", Language.class, this); + + public SelectAqlField DURCHFALL_BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "durchfallBezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField DURCHFALL_VORHANDEN_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "durchfallVorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField DURCHFALL_DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "durchfallDetaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField DURCHFALL_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/time|value", "durchfallTimeValue", TemporalAccessor.class, this); + + public SelectAqlField DURCHFALL_ORIGIN_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/origin|value", "durchfallOriginValue", TemporalAccessor.class, this); + + public ListSelectAqlField DURCHFALL_ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/protocol[at0007]/items[at0021]", "durchfallErweiterung", Cluster.class, this); + + public SelectAqlField DURCHFALL_SUBJECT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/subject", "durchfallSubject", PartyProxy.class, this); + + public SelectAqlField DURCHFALL_LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/language", "durchfallLanguage", Language.class, this); + + public SelectAqlField WEITERE_SYMPTOME_ORIGIN_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/origin|value", "weitereSymptomeOriginValue", TemporalAccessor.class, this); + + public ListSelectAqlField WEITERE_SYMPTOME_ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/protocol[at0007]/items[at0021]", "weitereSymptomeErweiterung", Cluster.class, this); + + public SelectAqlField WEITERE_SYMPTOME_SUBJECT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/subject", "weitereSymptomeSubject", PartyProxy.class, this); + + public SelectAqlField WEITERE_SYMPTOME_LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/language", "weitereSymptomeLanguage", Language.class, this); + + public SelectAqlField PERSONENKONTAKT_AGENT_EN_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value", "personenkontaktAgentEnValue", String.class, this); + + public SelectAqlField PERSONENKONTAKT_PRESENCE_OF_ANY_EXPOSURE_EN_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code", "personenkontaktPresenceOfAnyExposureEnDefiningCode", PresenceOfAnyExposureEnDefiningCode.class, this); + + public SelectAqlField PERSONENKONTAKT_EXPOSURE_EN_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value", "personenkontaktExposureEnValue", String.class, this); + + public SelectAqlField PERSONENKONTAKT_VORHANDENSEIN_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code", "personenkontaktVorhandenseinDefiningCode", VorhandenseinDefiningCode.class, this); + + public SelectAqlField PERSONENKONTAKT_KOMMENTAR_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value", "personenkontaktKommentarValue", String.class, this); + + public SelectAqlField PERSONENKONTAKT_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]/data[at0001]/events[at0002]/time|value", "personenkontaktTimeValue", TemporalAccessor.class, this); + + public SelectAqlField PERSONENKONTAKT_ORIGIN_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]/data[at0001]/origin|value", "personenkontaktOriginValue", TemporalAccessor.class, this); + + public ListSelectAqlField PERSONENKONTAKT_ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]/protocol[at0004]/items[at0056]", "personenkontaktErweiterung", Cluster.class, this); + + public SelectAqlField PERSONENKONTAKT_SUBJECT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]/subject", "personenkontaktSubject", PartyProxy.class, this); + + public SelectAqlField PERSONENKONTAKT_LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]/language", "personenkontaktLanguage", Language.class, this); + + public SelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG_AGENT_EN_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value", "aufenthaltInGesundheitseinrichtungAgentEnValue", String.class, this); + + public SelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG_PRESENCE_OF_ANY_EXPOSURE_EN_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code", "aufenthaltInGesundheitseinrichtungPresenceOfAnyExposureEnDefiningCode", PresenceOfAnyExposureEnDefiningCode.class, this); + + public SelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG_EXPOSURE_EN_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value", "aufenthaltInGesundheitseinrichtungExposureEnValue", String.class, this); + + public SelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG_VORHANDENSEIN_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code", "aufenthaltInGesundheitseinrichtungVorhandenseinDefiningCode", VorhandenseinDefiningCode.class, this); + + public SelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG_KOMMENTAR_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value", "aufenthaltInGesundheitseinrichtungKommentarValue", String.class, this); + + public SelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]/data[at0001]/events[at0002]/time|value", "aufenthaltInGesundheitseinrichtungTimeValue", TemporalAccessor.class, this); + + public SelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG_ORIGIN_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]/data[at0001]/origin|value", "aufenthaltInGesundheitseinrichtungOriginValue", TemporalAccessor.class, this); + + public ListSelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG_ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]/protocol[at0004]/items[at0056]", "aufenthaltInGesundheitseinrichtungErweiterung", Cluster.class, this); + + public SelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG_SUBJECT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]/subject", "aufenthaltInGesundheitseinrichtungSubject", PartyProxy.class, this); + + public SelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG_LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]/language", "aufenthaltInGesundheitseinrichtungLanguage", Language.class, this); + + public ListSelectAqlField HISTORIE_DER_REISE = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.travel_history.v0]", "historieDerReise", HistorieDerReiseObservation.class, this); + + public ListSelectAqlField REISEFALL = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.travel_event.v0]", "reisefall", ReisefallObservation.class, this); + + public SelectAqlField ANDERE_AKTUELLE_ERKRANKUNGEN_BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "andereAktuelleErkrankungenBezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField ANDERE_AKTUELLE_ERKRANKUNGEN_VORHANDEN_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "andereAktuelleErkrankungenVorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField ANDERE_AKTUELLE_ERKRANKUNGEN_DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "andereAktuelleErkrankungenDetaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField ANDERE_AKTUELLE_ERKRANKUNGEN_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/time|value", "andereAktuelleErkrankungenTimeValue", TemporalAccessor.class, this); + + public SelectAqlField ANDERE_AKTUELLE_ERKRANKUNGEN_ORIGIN_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/origin|value", "andereAktuelleErkrankungenOriginValue", TemporalAccessor.class, this); + + public ListSelectAqlField ANDERE_AKTUELLE_ERKRANKUNGEN_ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/protocol[at0007]/items[at0021]", "andereAktuelleErkrankungenErweiterung", Cluster.class, this); + + public SelectAqlField ANDERE_AKTUELLE_ERKRANKUNGEN_SUBJECT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/subject", "andereAktuelleErkrankungenSubject", PartyProxy.class, this); + + public SelectAqlField ANDERE_AKTUELLE_ERKRANKUNGEN_LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/language", "andereAktuelleErkrankungenLanguage", Language.class, this); + + public SelectAqlField CHRONISCHE_ERKRANKUNGEN_BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "chronischeErkrankungenBezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField CHRONISCHE_ERKRANKUNGEN_VORHANDEN_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "chronischeErkrankungenVorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField CHRONISCHE_ERKRANKUNGEN_DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "chronischeErkrankungenDetaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField CHRONISCHE_ERKRANKUNGEN_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]/time|value", "chronischeErkrankungenTimeValue", TemporalAccessor.class, this); + + public SelectAqlField CHRONISCHE_ERKRANKUNGEN_ORIGIN_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/origin|value", "chronischeErkrankungenOriginValue", TemporalAccessor.class, this); + + public ListSelectAqlField CHRONISCHE_ERKRANKUNGEN_ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/protocol[at0007]/items[at0021]", "chronischeErkrankungenErweiterung", Cluster.class, this); + + public SelectAqlField CHRONISCHE_ERKRANKUNGEN_SUBJECT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/subject", "chronischeErkrankungenSubject", PartyProxy.class, this); + + public SelectAqlField CHRONISCHE_ERKRANKUNGEN_LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/language", "chronischeErkrankungenLanguage", Language.class, this); + + public ListSelectAqlField PROBLEM_DIAGNOSE = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.problem_diagnosis.v1]", "problemDiagnose", ProblemDiagnoseEvaluation.class, this); + + public SelectAqlField MEDIKAMENTE_IN_VERWENDUNG = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.medication_use.v0]/data[at0022]/events[at0023]/data[at0001]/items[at0027]/value", "medikamenteInVerwendung", DvCodedText.class, this); + + public SelectAqlField NAME_DER_MEDIKAMENTENKLASSE_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.medication_use.v0]/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0002]/value|value", "nameDerMedikamentenklasseValue", String.class, this); + + public SelectAqlField MEDIKAMENTENKLASSE_IN_VERWENDUNG_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.medication_use.v0]/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0003]/value|defining_code", "medikamentenklasseInVerwendungDefiningCode", MedikamentenklasseInVerwendungDefiningCode.class, this); + + public ListSelectAqlField SPEZIFISCHE_MEDIKAMENTE = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.medication_use.v0]/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0008]", "spezifischeMedikamente", FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.class, this); + + public SelectAqlField FRAGEBOGEN_ZUM_MEDIKATIONS_SCREENING_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.medication_use.v0]/data[at0022]/events[at0023]/time|value", "fragebogenZumMedikationsScreeningTimeValue", TemporalAccessor.class, this); + + public SelectAqlField FRAGEBOGEN_ZUM_MEDIKATIONS_SCREENING_ORIGIN_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.medication_use.v0]/data[at0022]/origin|value", "fragebogenZumMedikationsScreeningOriginValue", TemporalAccessor.class, this); + + public ListSelectAqlField FRAGEBOGEN_ZUM_MEDIKATIONS_SCREENING_ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.medication_use.v0]/protocol[at0005]/items[at0019]", "fragebogenZumMedikationsScreeningErweiterung", Cluster.class, this); + + public SelectAqlField FRAGEBOGEN_ZUM_MEDIKATIONS_SCREENING_SUBJECT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.medication_use.v0]/subject", "fragebogenZumMedikationsScreeningSubject", PartyProxy.class, this); + + public SelectAqlField FRAGEBOGEN_ZUM_MEDIKATIONS_SCREENING_LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.medication_use.v0]/language", "fragebogenZumMedikationsScreeningLanguage", Language.class, this); + + public SelectAqlField BESCHAFTIGUNGSSTATUS_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.occupation_summary.v1]/data[at0001]/items[at0004]/value|value", "beschaftigungsstatusValue", String.class, this); + + public ListSelectAqlField BESCHAFTIGUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.occupation_summary.v1]/data[at0001]/items[openEHR-EHR-CLUSTER.occupation_record.v1]", "beschaftigung", BeschaftigungCluster.class, this); + + public ListSelectAqlField ZUSATZLICHE_ANGABEN = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.occupation_summary.v1]/data[at0001]/items[at0005]", "zusatzlicheAngaben", Cluster.class, this); + + public ListSelectAqlField GESUNDHEITSBEZOGENER_BERUF_ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.occupation_summary.v1]/protocol[at0007]/items[at0008]", "gesundheitsbezogenerBerufErweiterung", Cluster.class, this); + + public SelectAqlField GESUNDHEITSBEZOGENER_BERUF_SUBJECT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.occupation_summary.v1]/subject", "gesundheitsbezogenerBerufSubject", PartyProxy.class, this); + + public SelectAqlField GESUNDHEITSBEZOGENER_BERUF_LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.occupation_summary.v1]/language", "gesundheitsbezogenerBerufLanguage", Language.class, this); + + public ListSelectAqlField WOHNSITUATION = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.living_arrangement.v0]", "wohnsituation", WohnsituationEvaluation.class, this); + + public ListSelectAqlField BEWERTUNG_DES_GESUNDHEITSRISIKOS = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.health_risk.v1]", "bewertungDesGesundheitsrisikos", BewertungDesGesundheitsrisikosEvaluation.class, this); + + public SelectAqlField NAME_DES_PROBLEMS_DER_DIAGNOSE_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1]/data[at0001]/items[at0002]/value|value", "nameDesProblemsDerDiagnoseValue", String.class, this); + + public ListSelectAqlField ANATOMISCHE_STELLE_STRUKTURIERT = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1]/data[at0001]/items[at0039]", "anatomischeStelleStrukturiert", Cluster.class, this); + + public ListSelectAqlField SPEZIFISCHE_ANGABEN = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1]/data[at0001]/items[at0043]", "spezifischeAngaben", Cluster.class, this); + + public SelectAqlField DIAGNOSESTATUS_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1]/data[at0001]/items[openEHR-EHR-CLUSTER.problem_qualifier.v1]/items[at0004]/value|defining_code", "diagnosestatusDefiningCode", DiagnosestatusDefiningCode.class, this); + + public SelectAqlField PROBLEM_DIGANOSE_CORONOVIRUS_KOMMENTAR_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1]/data[at0001]/items[at0069]/value|value", "problemDiganoseCoronovirusKommentarValue", String.class, this); + + public SelectAqlField ZULETZT_AKTUALISIERT_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1]/protocol[at0032]/items[at0070]/value|value", "zuletztAktualisiertValue", TemporalAccessor.class, this); + + public ListSelectAqlField PROBLEM_DIGANOSE_CORONOVIRUS_ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1]/protocol[at0032]/items[at0071]", "problemDiganoseCoronovirusErweiterung", Cluster.class, this); + + public SelectAqlField PROBLEM_DIGANOSE_CORONOVIRUS_SUBJECT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1]/subject", "problemDiganoseCoronovirusSubject", PartyProxy.class, this); + + public SelectAqlField PROBLEM_DIGANOSE_CORONOVIRUS_LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1]/language", "problemDiganoseCoronovirusLanguage", Language.class, this); + + public ListSelectAqlField DIENSTLEISTUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-INSTRUCTION.service_request.v1]", "dienstleistung", DienstleistungInstruction.class, this); + + public SelectAqlField COMPOSER = new AqlFieldImp(CoronaAnamneseComposition.class, "/composer", "composer", PartyProxy.class, this); + + public SelectAqlField BERICHT_LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/language", "berichtLanguage", Language.class, this); + + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(CoronaAnamneseComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); + + public SelectAqlField TERRITORY = new AqlFieldImp(CoronaAnamneseComposition.class, "/territory", "territory", Territory.class, this); + + public SelectAqlField DIAGNOSTISCHE_SICHERHEIT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1]/data[at0001]/items[at0073]/value", "diagnostischeSicherheit", ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.class, this); + + public ListSelectAqlField BELIEBIGES_EREIGNIS = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]/data[at0001]/events[at0002]", "beliebigesEreignis", BerichtBeliebigesEreignisChoice.class, this); + + private CoronaAnamneseCompositionContainment() { + super("openEHR-EHR-COMPOSITION.report.v1"); + } + + public static CoronaAnamneseCompositionContainment getInstance() { + return new CoronaAnamneseCompositionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseCluster.java new file mode 100644 index 000000000..b2627f10b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseCluster.java @@ -0,0 +1,38 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.address_cc.v0") +public class AdresseCluster { + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Adresse/Stadt + */ + @Path("/items[at0012]/value|value") + private String stadtValue; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Adresse/Land + */ + @Path("/items[at0015]/value|value") + private String landValue; + + public void setStadtValue(String stadtValue) { + this.stadtValue = stadtValue; + } + + public String getStadtValue() { + return this.stadtValue ; + } + + public void setLandValue(String landValue) { + this.landValue = landValue; + } + + public String getLandValue() { + return this.landValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseClusterContainment.java new file mode 100644 index 000000000..c2706e05b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseClusterContainment.java @@ -0,0 +1,22 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class AdresseClusterContainment extends Containment { + public SelectAqlField ADRESSE_CLUSTER = new AqlFieldImp(AdresseCluster.class, "", "AdresseCluster", AdresseCluster.class, this); + + public SelectAqlField STADT_VALUE = new AqlFieldImp(AdresseCluster.class, "/items[at0012]/value|value", "stadtValue", String.class, this); + + public SelectAqlField LAND_VALUE = new AqlFieldImp(AdresseCluster.class, "/items[at0015]/value|value", "landValue", String.class, this); + + private AdresseClusterContainment() { + super("openEHR-EHR-CLUSTER.address_cc.v0"); + } + + public static AdresseClusterContainment getInstance() { + return new AdresseClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java new file mode 100644 index 000000000..5b74703f2 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java @@ -0,0 +1,42 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ implements EnumValueSet { + JA("Ja", "Der Patient ist vor kurzem gereist.", "local", "at0112"), + + NEIN("Nein", "Der Patient ist in letzter Zeit nicht gereist.", "local", "at0113"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisChoice.java new file mode 100644 index 000000000..5f794b9e9 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +public interface BerichtBeliebigesEreignisChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisIntervalEvent.java new file mode 100644 index 000000000..64766abb7 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisIntervalEvent.java @@ -0,0 +1,70 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; + +@Entity +@OptionFor("INTERVAL_EVENT") +public class BerichtBeliebigesEreignisIntervalEvent implements BerichtBeliebigesEreignisChoice { + /** + * Bericht/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen + */ + @Path("/data[at0003]/items[at0022]") + private List spezifischesSymptomAnzeichen; + + /** + * Bericht/Beliebiges Ereignis/time + */ + @Path("/time|value") + private TemporalAccessor timeValue; + + /** + * Bericht/Beliebiges Ereignis/width + */ + @Path("/width|value") + private TemporalAmount widthValue; + + /** + * Bericht/Beliebiges Ereignis/math_function + */ + @Path("/math_function|defining_code") + private MathFunction mathFunctionDefiningCode; + + public void setSpezifischesSymptomAnzeichen( + List spezifischesSymptomAnzeichen) { + this.spezifischesSymptomAnzeichen = spezifischesSymptomAnzeichen; + } + + public List getSpezifischesSymptomAnzeichen() { + return this.spezifischesSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setWidthValue(TemporalAmount widthValue) { + this.widthValue = widthValue; + } + + public TemporalAmount getWidthValue() { + return this.widthValue ; + } + + public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { + this.mathFunctionDefiningCode = mathFunctionDefiningCode; + } + + public MathFunction getMathFunctionDefiningCode() { + return this.mathFunctionDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisPointEvent.java new file mode 100644 index 000000000..45938cfc9 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisPointEvent.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("POINT_EVENT") +public class BerichtBeliebigesEreignisPointEvent implements BerichtBeliebigesEreignisChoice { + /** + * Bericht/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen + */ + @Path("/data[at0003]/items[at0022]") + private List spezifischesSymptomAnzeichen; + + /** + * Bericht/Beliebiges Ereignis/time + */ + @Path("/time|value") + private TemporalAccessor timeValue; + + public void setSpezifischesSymptomAnzeichen( + List spezifischesSymptomAnzeichen) { + this.spezifischesSymptomAnzeichen = spezifischesSymptomAnzeichen; + } + + public List getSpezifischesSymptomAnzeichen() { + return this.spezifischesSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtSpezifischesSymptomAnzeichenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtSpezifischesSymptomAnzeichenCluster.java new file mode 100644 index 000000000..b15f53eea --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtSpezifischesSymptomAnzeichenCluster.java @@ -0,0 +1,68 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class BerichtSpezifischesSymptomAnzeichenCluster { + /** + * Bericht/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ + @Path("/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + /** + * Bericht/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ + @Path("/items[at0005]/value|defining_code") + private VorhandenDefiningCode2 vorhandenDefiningCode; + + /** + * Bericht/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ + @Path("/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; + + /** + * Bericht/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Kommentar + */ + @Path("/items[at0035]/value|value") + private String kommentarValue; + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setVorhandenDefiningCode(VorhandenDefiningCode2 vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } + + public VorhandenDefiningCode2 getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } + + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } + + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } + + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } + + public String getKommentarValue() { + return this.kommentarValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungCluster.java new file mode 100644 index 000000000..b54ceb3da --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungCluster.java @@ -0,0 +1,54 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.occupation_record.v1") +public class BeschaftigungCluster { + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Berufsbezeichnung/Rolle + */ + @Path("/items[at0005]/value|value") + private String berufsbezeichnungRolleValue; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation + */ + @Path("/items[openEHR-EHR-CLUSTER.organisation_cc.v0]") + private List organisation; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Zusätzliche Angaben + */ + @Path("/items[at0018]") + private List zusatzlicheAngaben; + + public void setBerufsbezeichnungRolleValue(String berufsbezeichnungRolleValue) { + this.berufsbezeichnungRolleValue = berufsbezeichnungRolleValue; + } + + public String getBerufsbezeichnungRolleValue() { + return this.berufsbezeichnungRolleValue ; + } + + public void setOrganisation(List organisation) { + this.organisation = organisation; + } + + public List getOrganisation() { + return this.organisation ; + } + + public void setZusatzlicheAngaben(List zusatzlicheAngaben) { + this.zusatzlicheAngaben = zusatzlicheAngaben; + } + + public List getZusatzlicheAngaben() { + return this.zusatzlicheAngaben ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java new file mode 100644 index 000000000..9c95e2435 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java @@ -0,0 +1,27 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class BeschaftigungClusterContainment extends Containment { + public SelectAqlField BESCHAFTIGUNG_CLUSTER = new AqlFieldImp(BeschaftigungCluster.class, "", "BeschaftigungCluster", BeschaftigungCluster.class, this); + + public SelectAqlField BERUFSBEZEICHNUNG_ROLLE_VALUE = new AqlFieldImp(BeschaftigungCluster.class, "/items[at0005]/value|value", "berufsbezeichnungRolleValue", String.class, this); + + public ListSelectAqlField ORGANISATION = new ListAqlFieldImp(BeschaftigungCluster.class, "/items[openEHR-EHR-CLUSTER.organisation_cc.v0]", "organisation", OrganisationCluster.class, this); + + public ListSelectAqlField ZUSATZLICHE_ANGABEN = new ListAqlFieldImp(BeschaftigungCluster.class, "/items[at0018]", "zusatzlicheAngaben", Cluster.class, this); + + private BeschaftigungClusterContainment() { + super("openEHR-EHR-CLUSTER.occupation_record.v1"); + } + + public static BeschaftigungClusterContainment getInstance() { + return new BeschaftigungClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java new file mode 100644 index 000000000..75a6b21d1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java @@ -0,0 +1,203 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.health_risk.v1") +public class BewertungDesGesundheitsrisikosEvaluation { + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Gesundheitsrisiko + */ + @Path("/data[at0001]/items[at0002]/value|value") + private String gesundheitsrisikoValue; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Spezifischer Risikofaktor/Risikofaktor + */ + @Path("/data[at0001]/items[at0016 and name/value='Spezifischer Risikofaktor']/items[at0013]/value|value") + private String bewertungDesGesundheitsrisikosRisikofaktorValue; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Spezifischer Risikofaktor/Vorhandensein + */ + @Path("/data[at0001]/items[at0016 and name/value='Spezifischer Risikofaktor']/items[at0017]/value|defining_code") + private VorhandenseinDefiningCode2 bewertungDesGesundheitsrisikosVorhandenseinDefiningCode; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Spezifischer Risikofaktor/Details + */ + @Path("/data[at0001]/items[at0016 and name/value='Spezifischer Risikofaktor']/items[at0027]") + private List bewertungDesGesundheitsrisikosDetails; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Andere Risikofaktoren/Risikofaktor + */ + @Path("/data[at0001]/items[at0016 and name/value='Andere Risikofaktoren']/items[at0013]/value|value") + private String bewertungDesGesundheitsrisikosRisikofaktorValue2; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Andere Risikofaktoren/Vorhandensein + */ + @Path("/data[at0001]/items[at0016 and name/value='Andere Risikofaktoren']/items[at0017]/value|defining_code") + private VorhandenseinDefiningCode2 bewertungDesGesundheitsrisikosVorhandenseinDefiningCode2; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Andere Risikofaktoren/Details + */ + @Path("/data[at0001]/items[at0016 and name/value='Andere Risikofaktoren']/items[at0027]") + private List bewertungDesGesundheitsrisikosDetails2; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Risikobewertung + */ + @Path("/data[at0001]/items[at0003]/value|value") + private String risikobewertungValue; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Letzte Aktualisierung + */ + @Path("/protocol[at0010]/items[at0024]/value|value") + private TemporalAccessor letzteAktualisierungValue; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Bewertungsmethode + */ + @Path("/protocol[at0010]/items[at0025]/value|value") + private String bewertungsmethodeValue; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Erweiterung + */ + @Path("/protocol[at0010]/items[at0011]") + private List erweiterung; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/language + */ + @Path("/language") + private Language language; + + public void setGesundheitsrisikoValue(String gesundheitsrisikoValue) { + this.gesundheitsrisikoValue = gesundheitsrisikoValue; + } + + public String getGesundheitsrisikoValue() { + return this.gesundheitsrisikoValue ; + } + + public void setBewertungDesGesundheitsrisikosRisikofaktorValue( + String bewertungDesGesundheitsrisikosRisikofaktorValue) { + this.bewertungDesGesundheitsrisikosRisikofaktorValue = bewertungDesGesundheitsrisikosRisikofaktorValue; + } + + public String getBewertungDesGesundheitsrisikosRisikofaktorValue() { + return this.bewertungDesGesundheitsrisikosRisikofaktorValue ; + } + + public void setBewertungDesGesundheitsrisikosVorhandenseinDefiningCode( + VorhandenseinDefiningCode2 bewertungDesGesundheitsrisikosVorhandenseinDefiningCode) { + this.bewertungDesGesundheitsrisikosVorhandenseinDefiningCode = bewertungDesGesundheitsrisikosVorhandenseinDefiningCode; + } + + public VorhandenseinDefiningCode2 getBewertungDesGesundheitsrisikosVorhandenseinDefiningCode() { + return this.bewertungDesGesundheitsrisikosVorhandenseinDefiningCode ; + } + + public void setBewertungDesGesundheitsrisikosDetails( + List bewertungDesGesundheitsrisikosDetails) { + this.bewertungDesGesundheitsrisikosDetails = bewertungDesGesundheitsrisikosDetails; + } + + public List getBewertungDesGesundheitsrisikosDetails() { + return this.bewertungDesGesundheitsrisikosDetails ; + } + + public void setBewertungDesGesundheitsrisikosRisikofaktorValue2( + String bewertungDesGesundheitsrisikosRisikofaktorValue2) { + this.bewertungDesGesundheitsrisikosRisikofaktorValue2 = bewertungDesGesundheitsrisikosRisikofaktorValue2; + } + + public String getBewertungDesGesundheitsrisikosRisikofaktorValue2() { + return this.bewertungDesGesundheitsrisikosRisikofaktorValue2 ; + } + + public void setBewertungDesGesundheitsrisikosVorhandenseinDefiningCode2( + VorhandenseinDefiningCode2 bewertungDesGesundheitsrisikosVorhandenseinDefiningCode2) { + this.bewertungDesGesundheitsrisikosVorhandenseinDefiningCode2 = bewertungDesGesundheitsrisikosVorhandenseinDefiningCode2; + } + + public VorhandenseinDefiningCode2 getBewertungDesGesundheitsrisikosVorhandenseinDefiningCode2() { + return this.bewertungDesGesundheitsrisikosVorhandenseinDefiningCode2 ; + } + + public void setBewertungDesGesundheitsrisikosDetails2( + List bewertungDesGesundheitsrisikosDetails2) { + this.bewertungDesGesundheitsrisikosDetails2 = bewertungDesGesundheitsrisikosDetails2; + } + + public List getBewertungDesGesundheitsrisikosDetails2() { + return this.bewertungDesGesundheitsrisikosDetails2 ; + } + + public void setRisikobewertungValue(String risikobewertungValue) { + this.risikobewertungValue = risikobewertungValue; + } + + public String getRisikobewertungValue() { + return this.risikobewertungValue ; + } + + public void setLetzteAktualisierungValue(TemporalAccessor letzteAktualisierungValue) { + this.letzteAktualisierungValue = letzteAktualisierungValue; + } + + public TemporalAccessor getLetzteAktualisierungValue() { + return this.letzteAktualisierungValue ; + } + + public void setBewertungsmethodeValue(String bewertungsmethodeValue) { + this.bewertungsmethodeValue = bewertungsmethodeValue; + } + + public String getBewertungsmethodeValue() { + return this.bewertungsmethodeValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java new file mode 100644 index 000000000..b7724c9dd --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java @@ -0,0 +1,50 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class BewertungDesGesundheitsrisikosEvaluationContainment extends Containment { + public SelectAqlField BEWERTUNG_DES_GESUNDHEITSRISIKOS_EVALUATION = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "", "BewertungDesGesundheitsrisikosEvaluation", BewertungDesGesundheitsrisikosEvaluation.class, this); + + public SelectAqlField GESUNDHEITSRISIKO_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0002]/value|value", "gesundheitsrisikoValue", String.class, this); + + public SelectAqlField BEWERTUNG_DES_GESUNDHEITSRISIKOS_RISIKOFAKTOR_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0013]/value|value", "bewertungDesGesundheitsrisikosRisikofaktorValue", String.class, this); + + public SelectAqlField BEWERTUNG_DES_GESUNDHEITSRISIKOS_VORHANDENSEIN_DEFINING_CODE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0017]/value|defining_code", "bewertungDesGesundheitsrisikosVorhandenseinDefiningCode", VorhandenseinDefiningCode2.class, this); + + public ListSelectAqlField BEWERTUNG_DES_GESUNDHEITSRISIKOS_DETAILS = new ListAqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0027]", "bewertungDesGesundheitsrisikosDetails", Cluster.class, this); + + public SelectAqlField BEWERTUNG_DES_GESUNDHEITSRISIKOS_RISIKOFAKTOR_VALUE2 = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0013]/value|value", "bewertungDesGesundheitsrisikosRisikofaktorValue2", String.class, this); + + public SelectAqlField BEWERTUNG_DES_GESUNDHEITSRISIKOS_VORHANDENSEIN_DEFINING_CODE2 = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0017]/value|defining_code", "bewertungDesGesundheitsrisikosVorhandenseinDefiningCode2", VorhandenseinDefiningCode2.class, this); + + public ListSelectAqlField BEWERTUNG_DES_GESUNDHEITSRISIKOS_DETAILS2 = new ListAqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0027]", "bewertungDesGesundheitsrisikosDetails2", Cluster.class, this); + + public SelectAqlField RISIKOBEWERTUNG_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0003]/value|value", "risikobewertungValue", String.class, this); + + public SelectAqlField LETZTE_AKTUALISIERUNG_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/protocol[at0010]/items[at0024]/value|value", "letzteAktualisierungValue", TemporalAccessor.class, this); + + public SelectAqlField BEWERTUNGSMETHODE_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/protocol[at0010]/items[at0025]/value|value", "bewertungsmethodeValue", String.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/protocol[at0010]/items[at0011]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/language", "language", Language.class, this); + + private BewertungDesGesundheitsrisikosEvaluationContainment() { + super("openEHR-EHR-EVALUATION.health_risk.v1"); + } + + public static BewertungDesGesundheitsrisikosEvaluationContainment getInstance() { + return new BewertungDesGesundheitsrisikosEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DiagnosestatusDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DiagnosestatusDefiningCode.java new file mode 100644 index 000000000..6270da724 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DiagnosestatusDefiningCode.java @@ -0,0 +1,39 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum DiagnosestatusDefiningCode implements EnumValueSet { + IN_BEARBEITUNG("In Bearbeitung", "Eine vorübergehende Diagnose, bei welcher Testergebnisse und klinische Hinweise oder Empfehlungen noch ausstehen, welche aber bereits auf einer soliden klinischen Sicherheit beruht. Sobald weitere Testresultate und klinische Hinweise oder Empfehlungen zur Verfügung stehen, kann sich die Diagnose noch ändern.", "local", "at0017"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + DiagnosestatusDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningCode.java new file mode 100644 index 000000000..627a58752 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningCode.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum DiagnostischeSicherheitDefiningCode implements EnumValueSet { + WAHRSCHEINLICH("Wahrscheinlich", "Die Diagnose wurde mit einem hohen Maß an Sicherheit gestellt.", "local", "at0075"), + + VERMUTET("Vermutet", "Die Diagnose wurde mit einem niedrigen Grad an Sicherheit gestellt.", "local", "at0074"), + + BESTATIGT("Bestätigt", "Die Diagnose wurde anhand anerkannter Kriterien bestätigt.", "local", "at0076"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + DiagnostischeSicherheitDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java new file mode 100644 index 000000000..f872d2347 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java @@ -0,0 +1,110 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class DienstleistungAktuelleAktivitatActivity { + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Name der Dienstleistung + */ + @Path("/description[at0009]/items[at0121]/value|value") + private String nameDerDienstleistungValue; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Grund für die Anforderung + */ + @Path("/description[at0009]/items[at0062]") + private List grundFurDieAnforderung; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Komplexe Zeitplanung + */ + @Path("/description[at0009]/items[at0151]") + private List komplexeZeitplanung; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Spezifische Details + */ + @Path("/description[at0009]/items[at0132]") + private List spezifischeDetails; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Unterstützende Informationen + */ + @Path("/description[at0009]/items[at0149]") + private List unterstutzendeInformationen; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Anforderungen an Patienten + */ + @Path("/description[at0009]/items[at0116]") + private List anforderungenAnPatienten; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/timing + */ + @Path("/timing") + private DvParsable timing; + + public void setNameDerDienstleistungValue(String nameDerDienstleistungValue) { + this.nameDerDienstleistungValue = nameDerDienstleistungValue; + } + + public String getNameDerDienstleistungValue() { + return this.nameDerDienstleistungValue ; + } + + public void setGrundFurDieAnforderung( + List grundFurDieAnforderung) { + this.grundFurDieAnforderung = grundFurDieAnforderung; + } + + public List getGrundFurDieAnforderung() { + return this.grundFurDieAnforderung ; + } + + public void setKomplexeZeitplanung(List komplexeZeitplanung) { + this.komplexeZeitplanung = komplexeZeitplanung; + } + + public List getKomplexeZeitplanung() { + return this.komplexeZeitplanung ; + } + + public void setSpezifischeDetails(List spezifischeDetails) { + this.spezifischeDetails = spezifischeDetails; + } + + public List getSpezifischeDetails() { + return this.spezifischeDetails ; + } + + public void setUnterstutzendeInformationen(List unterstutzendeInformationen) { + this.unterstutzendeInformationen = unterstutzendeInformationen; + } + + public List getUnterstutzendeInformationen() { + return this.unterstutzendeInformationen ; + } + + public void setAnforderungenAnPatienten(List anforderungenAnPatienten) { + this.anforderungenAnPatienten = anforderungenAnPatienten; + } + + public List getAnforderungenAnPatienten() { + return this.anforderungenAnPatienten ; + } + + public void setTiming(DvParsable timing) { + this.timing = timing; + } + + public DvParsable getTiming() { + return this.timing ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java new file mode 100644 index 000000000..d92029974 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java @@ -0,0 +1,22 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class DienstleistungGrundFurDieAnforderungElement { + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Grund für die Anforderung + */ + @Path("/value|value") + private String value; + + public void setValue(String value) { + this.value = value; + } + + public String getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstruction.java new file mode 100644 index 000000000..65f13ab1c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstruction.java @@ -0,0 +1,142 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-INSTRUCTION.service_request.v1") +public class DienstleistungInstruction { + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität + */ + @Path("/activities[at0001]") + private List aktuelleAktivitat; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Einsender + */ + @Path("/protocol[at0008]/items[at0141]") + private Cluster einsender; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Empfänger + */ + @Path("/protocol[at0008]/items[at0142]") + private Cluster empfanger; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Verteilerliste + */ + @Path("/protocol[at0008]/items[at0128]") + private List verteilerliste; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Erweiterung + */ + @Path("/protocol[at0008]/items[at0112]") + private List erweiterung; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/narrative + */ + @Path("/narrative|value") + private String narrativeValue; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/language + */ + @Path("/language") + private Language language; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/expiry_time + */ + @Path("/expiry_time|value") + private TemporalAccessor expiryTimeValue; + + public void setAktuelleAktivitat( + List aktuelleAktivitat) { + this.aktuelleAktivitat = aktuelleAktivitat; + } + + public List getAktuelleAktivitat() { + return this.aktuelleAktivitat ; + } + + public void setEinsender(Cluster einsender) { + this.einsender = einsender; + } + + public Cluster getEinsender() { + return this.einsender ; + } + + public void setEmpfanger(Cluster empfanger) { + this.empfanger = empfanger; + } + + public Cluster getEmpfanger() { + return this.empfanger ; + } + + public void setVerteilerliste(List verteilerliste) { + this.verteilerliste = verteilerliste; + } + + public List getVerteilerliste() { + return this.verteilerliste ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setNarrativeValue(String narrativeValue) { + this.narrativeValue = narrativeValue; + } + + public String getNarrativeValue() { + return this.narrativeValue ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setExpiryTimeValue(TemporalAccessor expiryTimeValue) { + this.expiryTimeValue = expiryTimeValue; + } + + public TemporalAccessor getExpiryTimeValue() { + return this.expiryTimeValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java new file mode 100644 index 000000000..006c0b5a3 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java @@ -0,0 +1,42 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class DienstleistungInstructionContainment extends Containment { + public SelectAqlField DIENSTLEISTUNG_INSTRUCTION = new AqlFieldImp(DienstleistungInstruction.class, "", "DienstleistungInstruction", DienstleistungInstruction.class, this); + + public ListSelectAqlField AKTUELLE_AKTIVITAT = new ListAqlFieldImp(DienstleistungInstruction.class, "/activities[at0001]", "aktuelleAktivitat", DienstleistungAktuelleAktivitatActivity.class, this); + + public SelectAqlField EINSENDER = new AqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0141]", "einsender", Cluster.class, this); + + public SelectAqlField EMPFANGER = new AqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0142]", "empfanger", Cluster.class, this); + + public ListSelectAqlField VERTEILERLISTE = new ListAqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0128]", "verteilerliste", Cluster.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0112]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(DienstleistungInstruction.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField NARRATIVE_VALUE = new AqlFieldImp(DienstleistungInstruction.class, "/narrative|value", "narrativeValue", String.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(DienstleistungInstruction.class, "/language", "language", Language.class, this); + + public SelectAqlField EXPIRY_TIME_VALUE = new AqlFieldImp(DienstleistungInstruction.class, "/expiry_time|value", "expiryTimeValue", TemporalAccessor.class, this); + + private DienstleistungInstructionContainment() { + super("openEHR-EHR-INSTRUCTION.service_request.v1"); + } + + public static DienstleistungInstructionContainment getInstance() { + return new DienstleistungInstructionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java new file mode 100644 index 000000000..c39f48f6b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java @@ -0,0 +1,37 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster { + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Spezifische Medikamente/Name des Medikaments + */ + @Path("/items[at0021]/value|value") + private String nameDesMedikamentsValue; + + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Spezifische Medikamente/Medikament in Verwendung? + */ + @Path("/items[at0024]/value|defining_code") + private MedikamentInVerwendungDefiningCode medikamentInVerwendungDefiningCode; + + public void setNameDesMedikamentsValue(String nameDesMedikamentsValue) { + this.nameDesMedikamentsValue = nameDesMedikamentsValue; + } + + public String getNameDesMedikamentsValue() { + return this.nameDesMedikamentsValue ; + } + + public void setMedikamentInVerwendungDefiningCode( + MedikamentInVerwendungDefiningCode medikamentInVerwendungDefiningCode) { + this.medikamentInVerwendungDefiningCode = medikamentInVerwendungDefiningCode; + } + + public MedikamentInVerwendungDefiningCode getMedikamentInVerwendungDefiningCode() { + return this.medikamentInVerwendungDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java new file mode 100644 index 000000000..d2e9340ab --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +public interface GeschichteHistorieBeliebigesEreignisChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java new file mode 100644 index 000000000..cee9e27c9 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java @@ -0,0 +1,84 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; + +@Entity +@OptionFor("INTERVAL_EVENT") +public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements GeschichteHistorieBeliebigesEreignisChoice { + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/Geschichte + */ + @Path("/data[at0003]/items[at0004]") + private List geschichte; + + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/Strukturierte Angabe + */ + @Path("/data[at0003]/items[at0006]") + private List strukturierteAngabe; + + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/time + */ + @Path("/time|value") + private TemporalAccessor timeValue; + + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/width + */ + @Path("/width|value") + private TemporalAmount widthValue; + + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/math_function + */ + @Path("/math_function|defining_code") + private MathFunction mathFunctionDefiningCode; + + public void setGeschichte(List geschichte) { + this.geschichte = geschichte; + } + + public List getGeschichte() { + return this.geschichte ; + } + + public void setStrukturierteAngabe(List strukturierteAngabe) { + this.strukturierteAngabe = strukturierteAngabe; + } + + public List getStrukturierteAngabe() { + return this.strukturierteAngabe ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setWidthValue(TemporalAmount widthValue) { + this.widthValue = widthValue; + } + + public TemporalAmount getWidthValue() { + return this.widthValue ; + } + + public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { + this.mathFunctionDefiningCode = mathFunctionDefiningCode; + } + + public MathFunction getMathFunctionDefiningCode() { + return this.mathFunctionDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java new file mode 100644 index 000000000..217ea352f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java @@ -0,0 +1,54 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("POINT_EVENT") +public class GeschichteHistorieBeliebigesEreignisPointEvent implements GeschichteHistorieBeliebigesEreignisChoice { + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/Geschichte + */ + @Path("/data[at0003]/items[at0004]") + private List geschichte; + + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/Strukturierte Angabe + */ + @Path("/data[at0003]/items[at0006]") + private List strukturierteAngabe; + + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/time + */ + @Path("/time|value") + private TemporalAccessor timeValue; + + public void setGeschichte(List geschichte) { + this.geschichte = geschichte; + } + + public List getGeschichte() { + return this.geschichte ; + } + + public void setStrukturierteAngabe(List strukturierteAngabe) { + this.strukturierteAngabe = strukturierteAngabe; + } + + public List getStrukturierteAngabe() { + return this.strukturierteAngabe ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java new file mode 100644 index 000000000..2d6a980e3 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java @@ -0,0 +1,22 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class GeschichteHistorieGeschichteElement { + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/Geschichte + */ + @Path("/value|value") + private String value; + + public void setValue(String value) { + this.value = value; + } + + public String getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java new file mode 100644 index 000000000..5a2e768b9 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java @@ -0,0 +1,87 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; +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.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.story.v1") +public class GeschichteHistorieObservation { + /** + * Bericht/Geschichte/Historie/origin + */ + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + /** + * Bericht/Geschichte/Historie/Erweiterung + */ + @Path("/protocol[at0007]/items[at0008]") + private List erweiterung; + + /** + * Bericht/Geschichte/Historie/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Geschichte/Historie/language + */ + @Path("/language") + private Language language; + + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis + */ + @Path("/data[at0001]/events[at0002]") + @Choice + private List beliebigesEreignis; + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setBeliebigesEreignis( + List beliebigesEreignis) { + this.beliebigesEreignis = beliebigesEreignis; + } + + public List getBeliebigesEreignis() { + return this.beliebigesEreignis ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java new file mode 100644 index 000000000..b2972af23 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java @@ -0,0 +1,33 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class GeschichteHistorieObservationContainment extends Containment { + public SelectAqlField GESCHICHTE_HISTORIE_OBSERVATION = new AqlFieldImp(GeschichteHistorieObservation.class, "", "GeschichteHistorieObservation", GeschichteHistorieObservation.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(GeschichteHistorieObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GeschichteHistorieObservation.class, "/protocol[at0007]/items[at0008]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(GeschichteHistorieObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(GeschichteHistorieObservation.class, "/language", "language", Language.class, this); + + public ListSelectAqlField BELIEBIGES_EREIGNIS = new ListAqlFieldImp(GeschichteHistorieObservation.class, "/data[at0001]/events[at0002]", "beliebigesEreignis", GeschichteHistorieBeliebigesEreignisChoice.class, this); + + private GeschichteHistorieObservationContainment() { + super("openEHR-EHR-OBSERVATION.story.v1"); + } + + public static GeschichteHistorieObservationContainment getInstance() { + return new GeschichteHistorieObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java new file mode 100644 index 000000000..56a8f08c4 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java @@ -0,0 +1,143 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.travel_history.v0") +public class HistorieDerReiseObservation { + /** + * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Aufenthalt in den letzten 14 Tage in einem der Risikogebiete für Coronainfektion oder Kontakt zu Menschen, die dort waren + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0111 and name/value='Aufenthalt in den letzten 14 Tage in einem der Risikogebiete für Coronainfektion oder Kontakt zu Menschen, die dort waren']/value|defining_code") + private AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode; + + /** + * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Ortsbeschreibung/Standort/Standortbeschreibung + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0134]/items[openEHR-EHR-CLUSTER.location.v1]/items[at0046]/value|value") + private String standortbeschreibungValue; + + /** + * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Ortsbeschreibung/Standort/Details + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0134]/items[openEHR-EHR-CLUSTER.location.v1]/items[at0047]") + private List details; + + /** + * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Detaillierte Angaben zur Exposition + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0109]") + private List detaillierteAngabenZurExposition; + + /** + * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/time + */ + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + /** + * Bericht/Risikogebiet/Historie der Reise/origin + */ + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + /** + * Bericht/Risikogebiet/Historie der Reise/*Extension(en) + */ + @Path("/protocol[at0100]/items[at0101]") + private List extensionEn; + + /** + * Bericht/Risikogebiet/Historie der Reise/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Risikogebiet/Historie der Reise/language + */ + @Path("/language") + private Language language; + + public void setAufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode( + AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode) { + this.aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode = aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode; + } + + public AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ getAufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode( + ) { + return this.aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode ; + } + + public void setStandortbeschreibungValue(String standortbeschreibungValue) { + this.standortbeschreibungValue = standortbeschreibungValue; + } + + public String getStandortbeschreibungValue() { + return this.standortbeschreibungValue ; + } + + public void setDetails(List details) { + this.details = details; + } + + public List getDetails() { + return this.details ; + } + + public void setDetaillierteAngabenZurExposition(List detaillierteAngabenZurExposition) { + this.detaillierteAngabenZurExposition = detaillierteAngabenZurExposition; + } + + public List getDetaillierteAngabenZurExposition() { + return this.detaillierteAngabenZurExposition ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setExtensionEn(List extensionEn) { + this.extensionEn = extensionEn; + } + + public List getExtensionEn() { + return this.extensionEn ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java new file mode 100644 index 000000000..cb3c9fbdd --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java @@ -0,0 +1,42 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class HistorieDerReiseObservationContainment extends Containment { + public SelectAqlField HISTORIE_DER_REISE_OBSERVATION = new AqlFieldImp(HistorieDerReiseObservation.class, "", "HistorieDerReiseObservation", HistorieDerReiseObservation.class, this); + + public SelectAqlField AUFENTHALT_IN_DEN_LETZTEN14_TAGE_IN_EINEM_DER_RISIKOGEBIETE_FUR_CORONAINFEKTION_ODER_KONTAKT_ZU_MENSCHEN_DIE_DORT_WAREN_DEFINING_CODE = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0111]/value|defining_code", "aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode", AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.class, this); + + public SelectAqlField STANDORTBESCHREIBUNG_VALUE = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0134]/items[openEHR-EHR-CLUSTER.location.v1]/items[at0046]/value|value", "standortbeschreibungValue", String.class, this); + + public ListSelectAqlField DETAILS = new ListAqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0134]/items[openEHR-EHR-CLUSTER.location.v1]/items[at0047]", "details", Cluster.class, this); + + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUR_EXPOSITION = new ListAqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0109]", "detaillierteAngabenZurExposition", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField EXTENSION_EN = new ListAqlFieldImp(HistorieDerReiseObservation.class, "/protocol[at0100]/items[at0101]", "extensionEn", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(HistorieDerReiseObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(HistorieDerReiseObservation.class, "/language", "language", Language.class, this); + + private HistorieDerReiseObservationContainment() { + super("openEHR-EHR-OBSERVATION.travel_history.v0"); + } + + public static HistorieDerReiseObservationContainment getInstance() { + return new HistorieDerReiseObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/InlandAuslandDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/InlandAuslandDefiningCode.java new file mode 100644 index 000000000..497fcb195 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/InlandAuslandDefiningCode.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum InlandAuslandDefiningCode implements EnumValueSet { + INLANDSREISE("Inlandsreise", "Die Person ist innerhalb des angegebenen Zeitraums im Inland gereist.", "local", "at0028"), + + INLANDS_UND_AUSLANDSREISE("Inlands- und Auslandsreise", "Die Person ist innerhalb des festgelegten Zeitraums sowohl im Inland als auch international gereist.", "local", "at0030"), + + AUSLANDREISE("Auslandreise", "Die Person ist innerhalb des angegebenen Zeitraums international gereist.", "local", "at0029"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + InlandAuslandDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java new file mode 100644 index 000000000..b826c579b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java @@ -0,0 +1,22 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class KorpertemperaturStorfaktorenElement { + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Störfaktoren + */ + @Path("/value|value") + private String value; + + public void setValue(String value) { + this.value = value; + } + + public String getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/LetzteReiseDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/LetzteReiseDefiningCode.java new file mode 100644 index 000000000..0848c547c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/LetzteReiseDefiningCode.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum LetzteReiseDefiningCode implements EnumValueSet { + NEIN("Nein", "Die Person ist nicht innerhalb des angegebenen Zeitraums gereist.", "local", "at0005"), + + UNBEKANNT("Unbekannt", "Es ist nicht bekannt, ob die Person innerhalb des angegebenen Zeitinraumss gereist ist.", "local", "at0027"), + + JA_NATIONAL("Ja - national", "Die Person ist innerhalb des angegebenen Zeitraums national gereist.", "local", "at0006"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + LetzteReiseDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningCode.java new file mode 100644 index 000000000..4e3ca59a8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningCode.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum MedikamentInVerwendungDefiningCode implements EnumValueSet { + NICHT_IN_VERWENDUNG("Nicht in Verwendung", "Die Person verwendet das Medikament zum Zeitpunkt des Ergebnis oder währendessen nicht oder hat es nicht verwendet.", "local", "at0032"), + + UNBEKANNT("Unbekannt", "Es ist unbekannt, ob die Person das Medikament zum Zeitpunkt des Ergebnis oder währendessen verwendet oder es verwendet hat.", "local", "at0033"), + + IN_VERWENDUNG("In Verwendung", "Die Person verwendet das Medikament zum Zeitpunkt des Ergebnis oder währendessen oder hat es verwendet.", "local", "at0031"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + MedikamentInVerwendungDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningCode.java new file mode 100644 index 000000000..4a4b19c24 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningCode.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum MedikamentenklasseInVerwendungDefiningCode implements EnumValueSet { + IN_VERWENDUNG("In Verwendung", "Die Person verwendet die Medikamentenklasse zum Zeitpunkt des Ergebnis oder währendessen oder hat sie verwendet.", "local", "at0028"), + + UNBEKANNT("Unbekannt", "Es ist unbekannt, ob die Person die Medikamentenklasse zum Zeitpunkt des Ergebnis oder währendessen verwendet oder sie verwendet hat.", "local", "at0030"), + + NICHT_IN_VERWENDUNG("Nicht in Verwendung", "Die Person verwendet die Medikamentenklasse zum Zeitpunkt des Ergebnis oder währendessen nicht oder hat sie nicht verwendet.", "local", "at0029"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + MedikamentenklasseInVerwendungDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationCluster.java new file mode 100644 index 000000000..84fd21c9e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationCluster.java @@ -0,0 +1,96 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.organisation_cc.v0") +public class OrganisationCluster { + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Identifier + */ + @Path("/items[at0018]") + private List identifier; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Name der Einrichtung + */ + @Path("/items[at0012 and name/value='Name der Einrichtung']/value|value") + private String nameDerEinrichtungValue; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Telefon + */ + @Path("/items[at0014]") + private List telefon; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Adresse + */ + @Path("/items[openEHR-EHR-CLUSTER.address_cc.v0]") + private List adresse; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Teil von + */ + @Path("/items[at0017]") + private List teilVon; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Kontakt + */ + @Path("/items[at0016]") + private List kontakt; + + public void setIdentifier(List identifier) { + this.identifier = identifier; + } + + public List getIdentifier() { + return this.identifier ; + } + + public void setNameDerEinrichtungValue(String nameDerEinrichtungValue) { + this.nameDerEinrichtungValue = nameDerEinrichtungValue; + } + + public String getNameDerEinrichtungValue() { + return this.nameDerEinrichtungValue ; + } + + public void setTelefon(List telefon) { + this.telefon = telefon; + } + + public List getTelefon() { + return this.telefon ; + } + + public void setAdresse(List adresse) { + this.adresse = adresse; + } + + public List getAdresse() { + return this.adresse ; + } + + public void setTeilVon(List teilVon) { + this.teilVon = teilVon; + } + + public List getTeilVon() { + return this.teilVon ; + } + + public void setKontakt(List kontakt) { + this.kontakt = kontakt; + } + + public List getKontakt() { + return this.kontakt ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationClusterContainment.java new file mode 100644 index 000000000..11790ce35 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationClusterContainment.java @@ -0,0 +1,33 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class OrganisationClusterContainment extends Containment { + public SelectAqlField ORGANISATION_CLUSTER = new AqlFieldImp(OrganisationCluster.class, "", "OrganisationCluster", OrganisationCluster.class, this); + + public ListSelectAqlField IDENTIFIER = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0018]", "identifier", Cluster.class, this); + + public SelectAqlField NAME_DER_EINRICHTUNG_VALUE = new AqlFieldImp(OrganisationCluster.class, "/items[at0012]/value|value", "nameDerEinrichtungValue", String.class, this); + + public ListSelectAqlField TELEFON = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0014]", "telefon", Cluster.class, this); + + public ListSelectAqlField ADRESSE = new ListAqlFieldImp(OrganisationCluster.class, "/items[openEHR-EHR-CLUSTER.address_cc.v0]", "adresse", AdresseCluster.class, this); + + public ListSelectAqlField TEIL_VON = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0017]", "teilVon", Cluster.class, this); + + public ListSelectAqlField KONTAKT = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0016]", "kontakt", Cluster.class, this); + + private OrganisationClusterContainment() { + super("openEHR-EHR-CLUSTER.organisation_cc.v0"); + } + + public static OrganisationClusterContainment getInstance() { + return new OrganisationClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningCode.java new file mode 100644 index 000000000..f4b0b1a5e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningCode.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum PresenceOfAnyExposureEnDefiningCode implements EnumValueSet { + N_ABSENT_EN("*Absent (en)", "*Exposure is or has been absent at or during the event. (en)", "local", "at0059"), + + N_UNKNOWN_EN("*Unknown (en)", "*It is not known whether any exposure is or has been present or absent at or during the event. (en)", "local", "at0060"), + + N_PRESENT_EN("*Present (en)", "*Exposure is or has been present at or during the event. (en)", "local", "at0058"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + PresenceOfAnyExposureEnDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java new file mode 100644 index 000000000..cec933a13 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java @@ -0,0 +1,112 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.problem_diagnosis.v1") +public class ProblemDiagnoseEvaluation { + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/Name des Problems/ der Diagnose + */ + @Path("/data[at0001]/items[at0002]/value|value") + private String nameDesProblemsDerDiagnoseValue; + + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/Anatomische Stelle (strukturiert) + */ + @Path("/data[at0001]/items[at0039]") + private List anatomischeStelleStrukturiert; + + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/Spezifische Angaben + */ + @Path("/data[at0001]/items[at0043]") + private List spezifischeAngaben; + + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/Status + */ + @Path("/data[at0001]/items[at0046]") + private List status; + + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/Erweiterung + */ + @Path("/protocol[at0032]/items[at0071]") + private List erweiterung; + + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/language + */ + @Path("/language") + private Language language; + + public void setNameDesProblemsDerDiagnoseValue(String nameDesProblemsDerDiagnoseValue) { + this.nameDesProblemsDerDiagnoseValue = nameDesProblemsDerDiagnoseValue; + } + + public String getNameDesProblemsDerDiagnoseValue() { + return this.nameDesProblemsDerDiagnoseValue ; + } + + public void setAnatomischeStelleStrukturiert(List anatomischeStelleStrukturiert) { + this.anatomischeStelleStrukturiert = anatomischeStelleStrukturiert; + } + + public List getAnatomischeStelleStrukturiert() { + return this.anatomischeStelleStrukturiert ; + } + + public void setSpezifischeAngaben(List spezifischeAngaben) { + this.spezifischeAngaben = spezifischeAngaben; + } + + public List getSpezifischeAngaben() { + return this.spezifischeAngaben ; + } + + public void setStatus(List status) { + this.status = status; + } + + public List getStatus() { + return this.status ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java new file mode 100644 index 000000000..bc0013de2 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java @@ -0,0 +1,37 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class ProblemDiagnoseEvaluationContainment extends Containment { + public SelectAqlField PROBLEM_DIAGNOSE_EVALUATION = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "", "ProblemDiagnoseEvaluation", ProblemDiagnoseEvaluation.class, this); + + public SelectAqlField NAME_DES_PROBLEMS_DER_DIAGNOSE_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0002]/value|value", "nameDesProblemsDerDiagnoseValue", String.class, this); + + public ListSelectAqlField ANATOMISCHE_STELLE_STRUKTURIERT = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0039]", "anatomischeStelleStrukturiert", Cluster.class, this); + + public ListSelectAqlField SPEZIFISCHE_ANGABEN = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0043]", "spezifischeAngaben", Cluster.class, this); + + public ListSelectAqlField STATUS = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0046]", "status", Cluster.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/protocol[at0032]/items[at0071]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/language", "language", Language.class, this); + + private ProblemDiagnoseEvaluationContainment() { + super("openEHR-EHR-EVALUATION.problem_diagnosis.v1"); + } + + public static ProblemDiagnoseEvaluationContainment getInstance() { + return new ProblemDiagnoseEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java new file mode 100644 index 000000000..ae867e53b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +public interface ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java new file mode 100644 index 000000000..8d4960a7c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java @@ -0,0 +1,24 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText implements ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/value/value + */ + @Path("|defining_code") + private DiagnostischeSicherheitDefiningCode diagnostischeSicherheitDefiningCode; + + public void setDiagnostischeSicherheitDefiningCode( + DiagnostischeSicherheitDefiningCode diagnostischeSicherheitDefiningCode) { + this.diagnostischeSicherheitDefiningCode = diagnostischeSicherheitDefiningCode; + } + + public DiagnostischeSicherheitDefiningCode getDiagnostischeSicherheitDefiningCode() { + return this.diagnostischeSicherheitDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java new file mode 100644 index 000000000..28805d892 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java @@ -0,0 +1,24 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText implements ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/value/value + */ + @Path("|value") + private String diagnostischeSicherheitValue; + + public void setDiagnostischeSicherheitValue(String diagnostischeSicherheitValue) { + this.diagnostischeSicherheitValue = diagnostischeSicherheitValue; + } + + public String getDiagnostischeSicherheitValue() { + return this.diagnostischeSicherheitValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java new file mode 100644 index 000000000..89dfb153b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java @@ -0,0 +1,95 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; + +@Entity +public class ReisefallBeliebigesIntervallereignisIntervalEvent { + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Letzte Reise? + */ + @Path("/data[at0003]/items[at0004 and name/value='Letzte Reise?']/value|defining_code") + private LetzteReiseDefiningCode letzteReiseDefiningCode; + + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Inland/Ausland + */ + @Path("/data[at0003]/items[at0026]/value|defining_code") + private InlandAuslandDefiningCode inlandAuslandDefiningCode; + + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise + */ + @Path("/data[at0003]/items[at0008]") + private List bestimmteReise; + + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/math_function + */ + @Path("/math_function|defining_code") + private MathFunction mathFunctionDefiningCode; + + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/width + */ + @Path("/width|value") + private TemporalAmount widthValue; + + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/time + */ + @Path("/time|value") + private TemporalAccessor timeValue; + + public void setLetzteReiseDefiningCode(LetzteReiseDefiningCode letzteReiseDefiningCode) { + this.letzteReiseDefiningCode = letzteReiseDefiningCode; + } + + public LetzteReiseDefiningCode getLetzteReiseDefiningCode() { + return this.letzteReiseDefiningCode ; + } + + public void setInlandAuslandDefiningCode(InlandAuslandDefiningCode inlandAuslandDefiningCode) { + this.inlandAuslandDefiningCode = inlandAuslandDefiningCode; + } + + public InlandAuslandDefiningCode getInlandAuslandDefiningCode() { + return this.inlandAuslandDefiningCode ; + } + + public void setBestimmteReise(List bestimmteReise) { + this.bestimmteReise = bestimmteReise; + } + + public List getBestimmteReise() { + return this.bestimmteReise ; + } + + public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { + this.mathFunctionDefiningCode = mathFunctionDefiningCode; + } + + public MathFunction getMathFunctionDefiningCode() { + return this.mathFunctionDefiningCode ; + } + + public void setWidthValue(TemporalAmount widthValue) { + this.widthValue = widthValue; + } + + public TemporalAmount getWidthValue() { + return this.widthValue ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java new file mode 100644 index 000000000..948e35c6a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java @@ -0,0 +1,53 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class ReisefallBestimmteReiseCluster { + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel + */ + @Path("/items[at0010]") + private List bestimmtesReiseziel; + + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Zusätzliche Reisedetails + */ + @Path("/items[at0025]") + private List zusatzlicheReisedetails; + + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Rückreisedatum + */ + @Path("/items[at0019]/value|value") + private TemporalAccessor ruckreisedatumValue; + + public void setBestimmtesReiseziel( + List bestimmtesReiseziel) { + this.bestimmtesReiseziel = bestimmtesReiseziel; + } + + public List getBestimmtesReiseziel() { + return this.bestimmtesReiseziel ; + } + + public void setZusatzlicheReisedetails(List zusatzlicheReisedetails) { + this.zusatzlicheReisedetails = zusatzlicheReisedetails; + } + + public List getZusatzlicheReisedetails() { + return this.zusatzlicheReisedetails ; + } + + public void setRuckreisedatumValue(TemporalAccessor ruckreisedatumValue) { + this.ruckreisedatumValue = ruckreisedatumValue; + } + + public TemporalAccessor getRuckreisedatumValue() { + return this.ruckreisedatumValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java new file mode 100644 index 000000000..21d52641d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java @@ -0,0 +1,80 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class ReisefallBestimmtesReisezielCluster { + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/Land + */ + @Path("/items[at0011]/value|value") + private String landValue; + + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/Bundesland / Region + */ + @Path("/items[at0012]/value|value") + private String bundeslandRegionValue; + + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/Stadt + */ + @Path("/items[at0013]/value|value") + private String stadtValue; + + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/Bestimmte Gegend + */ + @Path("/items[at0031]/value|value") + private String bestimmteGegendValue; + + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/Zusätzliche Angaben zum Zielort + */ + @Path("/items[at0024]") + private List zusatzlicheAngabenZumZielort; + + public void setLandValue(String landValue) { + this.landValue = landValue; + } + + public String getLandValue() { + return this.landValue ; + } + + public void setBundeslandRegionValue(String bundeslandRegionValue) { + this.bundeslandRegionValue = bundeslandRegionValue; + } + + public String getBundeslandRegionValue() { + return this.bundeslandRegionValue ; + } + + public void setStadtValue(String stadtValue) { + this.stadtValue = stadtValue; + } + + public String getStadtValue() { + return this.stadtValue ; + } + + public void setBestimmteGegendValue(String bestimmteGegendValue) { + this.bestimmteGegendValue = bestimmteGegendValue; + } + + public String getBestimmteGegendValue() { + return this.bestimmteGegendValue ; + } + + public void setZusatzlicheAngabenZumZielort(List zusatzlicheAngabenZumZielort) { + this.zusatzlicheAngabenZumZielort = zusatzlicheAngabenZumZielort; + } + + public List getZusatzlicheAngabenZumZielort() { + return this.zusatzlicheAngabenZumZielort ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservation.java new file mode 100644 index 000000000..7ecd26fa8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservation.java @@ -0,0 +1,85 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.travel_event.v0") +public class ReisefallObservation { + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis + */ + @Path("/data[at0001]/events[at0002]") + private List beliebigesIntervallereignis; + + /** + * Bericht/Risikogebiet/Reisefall/origin + */ + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + /** + * Bericht/Risikogebiet/Reisefall/Erweiterung + */ + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + /** + * Bericht/Risikogebiet/Reisefall/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Risikogebiet/Reisefall/language + */ + @Path("/language") + private Language language; + + public void setBeliebigesIntervallereignis( + List beliebigesIntervallereignis) { + this.beliebigesIntervallereignis = beliebigesIntervallereignis; + } + + public List getBeliebigesIntervallereignis() { + return this.beliebigesIntervallereignis ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservationContainment.java new file mode 100644 index 000000000..8bf83ff21 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservationContainment.java @@ -0,0 +1,33 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class ReisefallObservationContainment extends Containment { + public SelectAqlField REISEFALL_OBSERVATION = new AqlFieldImp(ReisefallObservation.class, "", "ReisefallObservation", ReisefallObservation.class, this); + + public ListSelectAqlField BELIEBIGES_INTERVALLEREIGNIS = new ListAqlFieldImp(ReisefallObservation.class, "/data[at0001]/events[at0002]", "beliebigesIntervallereignis", ReisefallBeliebigesIntervallereignisIntervalEvent.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(ReisefallObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ReisefallObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(ReisefallObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(ReisefallObservation.class, "/language", "language", Language.class, this); + + private ReisefallObservationContainment() { + super("openEHR-EHR-OBSERVATION.travel_event.v0"); + } + + public static ReisefallObservationContainment getInstance() { + return new ReisefallObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/VorhandenDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/VorhandenDefiningCode.java new file mode 100644 index 000000000..c3a46dfb6 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/VorhandenDefiningCode.java @@ -0,0 +1,41 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum VorhandenDefiningCode implements EnumValueSet { + NICHT_VORHANDEN("Nicht vorhanden", "Das spezifische Symptom oder Anzeichen ist nicht vorhanden.", "local", "at0024"), + + VORHANDEN("Vorhanden", "Das spezifische Symptom oder Anzeichen ist vorhanden.", "local", "at0023"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + VorhandenDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/VorhandenDefiningCode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/VorhandenDefiningCode2.java new file mode 100644 index 000000000..002e9dcfd --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/VorhandenDefiningCode2.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum VorhandenDefiningCode2 implements EnumValueSet { + NICHT_VORHANDEN("Nicht vorhanden", "Das spezifische Symptom oder Anzeichen ist nicht vorhanden.", "local", "at0024"), + + VORHANDEN("Vorhanden", "Das spezifische Symptom oder Anzeichen ist vorhanden.", "local", "at0023"), + + UNBEKANNT("Unbekannt", "Es ist nicht bekannt, ob das Symptom oder Anzeichen vorhanden ist oder nicht.", "local", "at0027"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + VorhandenDefiningCode2(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/VorhandenseinDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/VorhandenseinDefiningCode.java new file mode 100644 index 000000000..33bd5ecf1 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/VorhandenseinDefiningCode.java @@ -0,0 +1,41 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum VorhandenseinDefiningCode implements EnumValueSet { + NICHT_VORHANDEN("Nicht vorhanden", "*The specific exposure is or has been absent at or during the event.(en)", "local", "at0049"), + + VORHANDEN("Vorhanden", "*The specific exposure is or has been present at or during the event.(en)", "local", "at0047"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + VorhandenseinDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java new file mode 100644 index 000000000..866a20e69 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum VorhandenseinDefiningCode2 implements EnumValueSet { + VORHANDEN("Vorhanden", "Der Risikofaktor wurde bei der Person identifiziert.", "local", "at0018"), + + UNBESTIMMT("Unbestimmt", "Es ist nicht möglich festzustellen, ob der Risikofaktor vorhanden oder nicht vorhanden ist.", "local", "at0026"), + + NICHT_VORHANDEN("Nicht vorhanden", "Der Risikofaktor wurde bei der Person nicht festgestellt.", "local", "at0019"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + VorhandenseinDefiningCode2(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluation.java new file mode 100644 index 000000000..f1b66fba4 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluation.java @@ -0,0 +1,99 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Long; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.living_arrangement.v0") +public class WohnsituationEvaluation { + /** + * Bericht/Allgemeine Angaben/Wohnsituation/Beschreibung + */ + @Path("/data[at0001]/items[at0003]/value|value") + private String beschreibungValue; + + /** + * Bericht/Allgemeine Angaben/Wohnsituation/Anzahl der Haushaltsmitglieder + */ + @Path("/data[at0001]/items[at0007]/value|magnitude") + private Long anzahlDerHaushaltsmitgliederMagnitude; + + /** + * Bericht/Allgemeine Angaben/Wohnsituation/Wohnstätte + */ + @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.dwelling.v0]") + private List wohnstatte; + + /** + * Bericht/Allgemeine Angaben/Wohnsituation/Erweiterung + */ + @Path("/protocol[at0002]/items[at0011]") + private List erweiterung; + + /** + * Bericht/Allgemeine Angaben/Wohnsituation/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Allgemeine Angaben/Wohnsituation/language + */ + @Path("/language") + private Language language; + + public void setBeschreibungValue(String beschreibungValue) { + this.beschreibungValue = beschreibungValue; + } + + public String getBeschreibungValue() { + return this.beschreibungValue ; + } + + public void setAnzahlDerHaushaltsmitgliederMagnitude(Long anzahlDerHaushaltsmitgliederMagnitude) { + this.anzahlDerHaushaltsmitgliederMagnitude = anzahlDerHaushaltsmitgliederMagnitude; + } + + public Long getAnzahlDerHaushaltsmitgliederMagnitude() { + return this.anzahlDerHaushaltsmitgliederMagnitude ; + } + + public void setWohnstatte(List wohnstatte) { + this.wohnstatte = wohnstatte; + } + + public List getWohnstatte() { + return this.wohnstatte ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java new file mode 100644 index 000000000..aafb1b412 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java @@ -0,0 +1,36 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Long; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class WohnsituationEvaluationContainment extends Containment { + public SelectAqlField WOHNSITUATION_EVALUATION = new AqlFieldImp(WohnsituationEvaluation.class, "", "WohnsituationEvaluation", WohnsituationEvaluation.class, this); + + public SelectAqlField BESCHREIBUNG_VALUE = new AqlFieldImp(WohnsituationEvaluation.class, "/data[at0001]/items[at0003]/value|value", "beschreibungValue", String.class, this); + + public SelectAqlField ANZAHL_DER_HAUSHALTSMITGLIEDER_MAGNITUDE = new AqlFieldImp(WohnsituationEvaluation.class, "/data[at0001]/items[at0007]/value|magnitude", "anzahlDerHaushaltsmitgliederMagnitude", Long.class, this); + + public ListSelectAqlField WOHNSTATTE = new ListAqlFieldImp(WohnsituationEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.dwelling.v0]", "wohnstatte", WohnstatteCluster.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(WohnsituationEvaluation.class, "/protocol[at0002]/items[at0011]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(WohnsituationEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(WohnsituationEvaluation.class, "/language", "language", Language.class, this); + + private WohnsituationEvaluationContainment() { + super("openEHR-EHR-EVALUATION.living_arrangement.v0"); + } + + public static WohnsituationEvaluationContainment getInstance() { + return new WohnsituationEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteCluster.java new file mode 100644 index 000000000..cb2562a13 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteCluster.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Long; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.dwelling.v0") +public class WohnstatteCluster { + /** + * Bericht/Allgemeine Angaben/Wohnsituation/Wohnstätte/Anzahl der Schlafzimmer + */ + @Path("/items[at0028]/value|magnitude") + private Long anzahlDerSchlafzimmerMagnitude; + + /** + * Bericht/Allgemeine Angaben/Wohnsituation/Wohnstätte/Ergänzende Details + */ + @Path("/items[at0003]") + private List erganzendeDetails; + + public void setAnzahlDerSchlafzimmerMagnitude(Long anzahlDerSchlafzimmerMagnitude) { + this.anzahlDerSchlafzimmerMagnitude = anzahlDerSchlafzimmerMagnitude; + } + + public Long getAnzahlDerSchlafzimmerMagnitude() { + return this.anzahlDerSchlafzimmerMagnitude ; + } + + public void setErganzendeDetails(List erganzendeDetails) { + this.erganzendeDetails = erganzendeDetails; + } + + public List getErganzendeDetails() { + return this.erganzendeDetails ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java new file mode 100644 index 000000000..0cbef3d3f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java @@ -0,0 +1,25 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Long; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class WohnstatteClusterContainment extends Containment { + public SelectAqlField WOHNSTATTE_CLUSTER = new AqlFieldImp(WohnstatteCluster.class, "", "WohnstatteCluster", WohnstatteCluster.class, this); + + public SelectAqlField ANZAHL_DER_SCHLAFZIMMER_MAGNITUDE = new AqlFieldImp(WohnstatteCluster.class, "/items[at0028]/value|magnitude", "anzahlDerSchlafzimmerMagnitude", Long.class, this); + + public ListSelectAqlField ERGANZENDE_DETAILS = new ListAqlFieldImp(WohnstatteCluster.class, "/items[at0003]", "erganzendeDetails", Cluster.class, this); + + private WohnstatteClusterContainment() { + super("openEHR-EHR-CLUSTER.dwelling.v0"); + } + + public static WohnstatteClusterContainment getInstance() { + return new WohnstatteClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/CoronaAnamneseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/CoronaAnamneseComposition.java new file mode 100644 index 000000000..74a210fa2 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/CoronaAnamneseComposition.java @@ -0,0 +1,585 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +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 org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Id; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.annotations.Template; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.AndereAktuelleErkrankungenObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.AufenthaltInGesundheitseinrichtungObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.BewertungDesGesundheitsrisikosEvaluation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.ChronischeErkrankungenObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.DienstleistungInstruction; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.DurchfallObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.FieberOderErhohteKorpertemperaturObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.FragebogenZumMedikationsScreeningObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.GeschichteHistorieObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.GestorterGeruchssinnObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.GestorterGeschmackssinnObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.GesundheitsbezogenerBerufEvaluation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.HeiserkeitObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.HistorieDerReiseObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.HustenObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.KorpertemperaturObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.PersonenkontaktObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.ProblemDiagnoseEvaluation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.ProblemDiganoseCoronovirusEvaluation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.ReisefallObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.SchnupfenObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.WeitereSymptomeObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.WohnsituationEvaluation; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; +import org.ehrbase.client.openehrclient.VersionUid; + +@Entity +@Archetype("openEHR-EHR-COMPOSITION.report.v1") +@Template("Corona_Anamnese") +public class CoronaAnamneseComposition { + /** + * Bericht/context/Bericht ID + */ + @Path("/context/other_context[at0001]/items[at0002]/value|value") + private String berichtIdValue; + + /** + * Bericht/context/Status + */ + @Path("/context/other_context[at0001]/items[at0005]/value|value") + private String statusValue; + + /** + * Bericht/context/Erweiterung + */ + @Path("/context/other_context[at0001]/items[at0006]") + private List erweiterung; + + /** + * Bericht/context/start_time + */ + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; + + /** + * Bericht/context/participations + */ + @Path("/context/participations") + private List participations; + + /** + * Bericht/context/end_time + */ + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + /** + * Bericht/context/location + */ + @Path("/context/location") + private String location; + + /** + * Bericht/context/health_care_facility + */ + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; + + /** + * Bericht/context/setting + */ + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; + + /** + * Bericht/Geschichte/Historie + */ + @Path("/content[openEHR-EHR-OBSERVATION.story.v1]") + private List geschichteHistorie; + + /** + * Bericht/Symptome/Husten + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Husten']") + private HustenObservation husten; + + /** + * Bericht/Symptome/Schnupfen + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Schnupfen']") + private SchnupfenObservation schnupfen; + + /** + * Bericht/Symptome/Heiserkeit + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Heiserkeit']") + private HeiserkeitObservation heiserkeit; + + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Fieber oder erhöhte Körpertemperatur']") + private FieberOderErhohteKorpertemperaturObservation fieberOderErhohteKorpertemperatur; + + /** + * Bericht/Symptome/Körpertemperatur + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.body_temperature.v2]") + private KorpertemperaturObservation korpertemperatur; + + /** + * Bericht/Symptome/Gestörter Geruchssinn + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geruchssinn']") + private GestorterGeruchssinnObservation gestorterGeruchssinn; + + /** + * Bericht/Symptome/Gestörter Geschmackssinn + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Gestörter Geschmackssinn']") + private GestorterGeschmackssinnObservation gestorterGeschmackssinn; + + /** + * Bericht/Symptome/Durchfall + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Durchfall']") + private DurchfallObservation durchfall; + + /** + * Bericht/Symptome/Weitere Symptome + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Symptome']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Weitere Symptome']") + private WeitereSymptomeObservation weitereSymptome; + + /** + * Bericht/Kontakt/Personenkontakt + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Personenkontakt']") + private PersonenkontaktObservation personenkontakt; + + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Kontakt']/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Aufenthalt in Gesundheitseinrichtung']") + private AufenthaltInGesundheitseinrichtungObservation aufenthaltInGesundheitseinrichtung; + + /** + * Bericht/Risikogebiet/Historie der Reise + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Risikogebiet']/items[openEHR-EHR-OBSERVATION.travel_history.v0]") + private List historieDerReise; + + /** + * Bericht/Risikogebiet/Reisefall + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Risikogebiet']/items[openEHR-EHR-OBSERVATION.travel_event.v0]") + private List reisefall; + + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Andere aktuelle Erkrankungen']") + private AndereAktuelleErkrankungenObservation andereAktuelleErkrankungen; + + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Chronische Erkrankungen']") + private ChronischeErkrankungenObservation chronischeErkrankungen; + + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.problem_diagnosis.v1]") + private List problemDiagnose; + + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-OBSERVATION.medication_use.v0]") + private FragebogenZumMedikationsScreeningObservation fragebogenZumMedikationsScreening; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.occupation_summary.v1 and name/value='Gesundheitsbezogener Beruf']") + private GesundheitsbezogenerBerufEvaluation gesundheitsbezogenerBeruf; + + /** + * Bericht/Allgemeine Angaben/Wohnsituation + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.living_arrangement.v0]") + private List wohnsituation; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.health_risk.v1]") + private List bewertungDesGesundheitsrisikos; + + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1 and name/value='Problem/Diganose Coronovirus']") + private ProblemDiganoseCoronovirusEvaluation problemDiganoseCoronovirus; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung + */ + @Path("/content[openEHR-EHR-SECTION.adhoc.v1 and name/value='Allgemeine Angaben']/items[openEHR-EHR-INSTRUCTION.service_request.v1]") + private List dienstleistung; + + /** + * Bericht/composer + */ + @Path("/composer") + private PartyProxy composer; + + /** + * Bericht/language + */ + @Path("/language") + private Language language; + + /** + * Bericht/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + + /** + * Bericht/category + */ + @Path("/category|defining_code") + private Category categoryDefiningCode; + + /** + * Bericht/territory + */ + @Path("/territory") + private Territory territory; + + @Id + private VersionUid versionUid; + + public void setBerichtIdValue(String berichtIdValue) { + this.berichtIdValue = berichtIdValue; + } + + public String getBerichtIdValue() { + return this.berichtIdValue ; + } + + public void setStatusValue(String statusValue) { + this.statusValue = statusValue; + } + + public String getStatusValue() { + return this.statusValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + 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 setGeschichteHistorie(List geschichteHistorie) { + this.geschichteHistorie = geschichteHistorie; + } + + public List getGeschichteHistorie() { + return this.geschichteHistorie ; + } + + public void setHusten(HustenObservation husten) { + this.husten = husten; + } + + public HustenObservation getHusten() { + return this.husten ; + } + + public void setSchnupfen(SchnupfenObservation schnupfen) { + this.schnupfen = schnupfen; + } + + public SchnupfenObservation getSchnupfen() { + return this.schnupfen ; + } + + public void setHeiserkeit(HeiserkeitObservation heiserkeit) { + this.heiserkeit = heiserkeit; + } + + public HeiserkeitObservation getHeiserkeit() { + return this.heiserkeit ; + } + + public void setFieberOderErhohteKorpertemperatur( + FieberOderErhohteKorpertemperaturObservation fieberOderErhohteKorpertemperatur) { + this.fieberOderErhohteKorpertemperatur = fieberOderErhohteKorpertemperatur; + } + + public FieberOderErhohteKorpertemperaturObservation getFieberOderErhohteKorpertemperatur() { + return this.fieberOderErhohteKorpertemperatur ; + } + + public void setKorpertemperatur(KorpertemperaturObservation korpertemperatur) { + this.korpertemperatur = korpertemperatur; + } + + public KorpertemperaturObservation getKorpertemperatur() { + return this.korpertemperatur ; + } + + public void setGestorterGeruchssinn(GestorterGeruchssinnObservation gestorterGeruchssinn) { + this.gestorterGeruchssinn = gestorterGeruchssinn; + } + + public GestorterGeruchssinnObservation getGestorterGeruchssinn() { + return this.gestorterGeruchssinn ; + } + + public void setGestorterGeschmackssinn( + GestorterGeschmackssinnObservation gestorterGeschmackssinn) { + this.gestorterGeschmackssinn = gestorterGeschmackssinn; + } + + public GestorterGeschmackssinnObservation getGestorterGeschmackssinn() { + return this.gestorterGeschmackssinn ; + } + + public void setDurchfall(DurchfallObservation durchfall) { + this.durchfall = durchfall; + } + + public DurchfallObservation getDurchfall() { + return this.durchfall ; + } + + public void setWeitereSymptome(WeitereSymptomeObservation weitereSymptome) { + this.weitereSymptome = weitereSymptome; + } + + public WeitereSymptomeObservation getWeitereSymptome() { + return this.weitereSymptome ; + } + + public void setPersonenkontakt(PersonenkontaktObservation personenkontakt) { + this.personenkontakt = personenkontakt; + } + + public PersonenkontaktObservation getPersonenkontakt() { + return this.personenkontakt ; + } + + public void setAufenthaltInGesundheitseinrichtung( + AufenthaltInGesundheitseinrichtungObservation aufenthaltInGesundheitseinrichtung) { + this.aufenthaltInGesundheitseinrichtung = aufenthaltInGesundheitseinrichtung; + } + + public AufenthaltInGesundheitseinrichtungObservation getAufenthaltInGesundheitseinrichtung() { + return this.aufenthaltInGesundheitseinrichtung ; + } + + public void setHistorieDerReise(List historieDerReise) { + this.historieDerReise = historieDerReise; + } + + public List getHistorieDerReise() { + return this.historieDerReise ; + } + + public void setReisefall(List reisefall) { + this.reisefall = reisefall; + } + + public List getReisefall() { + return this.reisefall ; + } + + public void setAndereAktuelleErkrankungen( + AndereAktuelleErkrankungenObservation andereAktuelleErkrankungen) { + this.andereAktuelleErkrankungen = andereAktuelleErkrankungen; + } + + public AndereAktuelleErkrankungenObservation getAndereAktuelleErkrankungen() { + return this.andereAktuelleErkrankungen ; + } + + public void setChronischeErkrankungen(ChronischeErkrankungenObservation chronischeErkrankungen) { + this.chronischeErkrankungen = chronischeErkrankungen; + } + + public ChronischeErkrankungenObservation getChronischeErkrankungen() { + return this.chronischeErkrankungen ; + } + + public void setProblemDiagnose(List problemDiagnose) { + this.problemDiagnose = problemDiagnose; + } + + public List getProblemDiagnose() { + return this.problemDiagnose ; + } + + public void setFragebogenZumMedikationsScreening( + FragebogenZumMedikationsScreeningObservation fragebogenZumMedikationsScreening) { + this.fragebogenZumMedikationsScreening = fragebogenZumMedikationsScreening; + } + + public FragebogenZumMedikationsScreeningObservation getFragebogenZumMedikationsScreening() { + return this.fragebogenZumMedikationsScreening ; + } + + public void setGesundheitsbezogenerBeruf( + GesundheitsbezogenerBerufEvaluation gesundheitsbezogenerBeruf) { + this.gesundheitsbezogenerBeruf = gesundheitsbezogenerBeruf; + } + + public GesundheitsbezogenerBerufEvaluation getGesundheitsbezogenerBeruf() { + return this.gesundheitsbezogenerBeruf ; + } + + public void setWohnsituation(List wohnsituation) { + this.wohnsituation = wohnsituation; + } + + public List getWohnsituation() { + return this.wohnsituation ; + } + + public void setBewertungDesGesundheitsrisikos( + List bewertungDesGesundheitsrisikos) { + this.bewertungDesGesundheitsrisikos = bewertungDesGesundheitsrisikos; + } + + public List getBewertungDesGesundheitsrisikos() { + return this.bewertungDesGesundheitsrisikos ; + } + + public void setProblemDiganoseCoronovirus( + ProblemDiganoseCoronovirusEvaluation problemDiganoseCoronovirus) { + this.problemDiganoseCoronovirus = problemDiganoseCoronovirus; + } + + public ProblemDiganoseCoronovirusEvaluation getProblemDiganoseCoronovirus() { + return this.problemDiganoseCoronovirus ; + } + + public void setDienstleistung(List dienstleistung) { + this.dienstleistung = dienstleistung; + } + + public List getDienstleistung() { + return this.dienstleistung ; + } + + 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 setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } + + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } + + 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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java new file mode 100644 index 000000000..3b4589ad8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java @@ -0,0 +1,127 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition; + +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +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 org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.AndereAktuelleErkrankungenObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.AufenthaltInGesundheitseinrichtungObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.BewertungDesGesundheitsrisikosEvaluation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.ChronischeErkrankungenObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.DienstleistungInstruction; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.DurchfallObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.FieberOderErhohteKorpertemperaturObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.FragebogenZumMedikationsScreeningObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.GeschichteHistorieObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.GestorterGeruchssinnObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.GestorterGeschmackssinnObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.GesundheitsbezogenerBerufEvaluation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.HeiserkeitObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.HistorieDerReiseObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.HustenObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.KorpertemperaturObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.PersonenkontaktObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.ProblemDiagnoseEvaluation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.ProblemDiganoseCoronovirusEvaluation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.ReisefallObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.SchnupfenObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.WeitereSymptomeObservation; +import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.WohnsituationEvaluation; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; + +public class CoronaAnamneseCompositionContainment extends Containment { + public SelectAqlField CORONA_ANAMNESE_COMPOSITION = new AqlFieldImp(CoronaAnamneseComposition.class, "", "CoronaAnamneseComposition", CoronaAnamneseComposition.class, this); + + public SelectAqlField BERICHT_ID_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/other_context[at0001]/items[at0002]/value|value", "berichtIdValue", String.class, this); + + public SelectAqlField STATUS_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/other_context[at0001]/items[at0005]/value|value", "statusValue", String.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/context/other_context[at0001]/items[at0006]", "erweiterung", Cluster.class, this); + + public SelectAqlField START_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/start_time|value", "startTimeValue", TemporalAccessor.class, this); + + public ListSelectAqlField PARTICIPATIONS = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/context/participations", "participations", Participation.class, this); + + public SelectAqlField END_TIME_VALUE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/end_time|value", "endTimeValue", TemporalAccessor.class, this); + + public SelectAqlField LOCATION = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/location", "location", String.class, this); + + public SelectAqlField HEALTH_CARE_FACILITY = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/health_care_facility", "healthCareFacility", PartyIdentified.class, this); + + public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); + + public ListSelectAqlField GESCHICHTE_HISTORIE = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-OBSERVATION.story.v1]", "geschichteHistorie", GeschichteHistorieObservation.class, this); + + public SelectAqlField HUSTEN = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "husten", HustenObservation.class, this); + + public SelectAqlField SCHNUPFEN = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "schnupfen", SchnupfenObservation.class, this); + + public SelectAqlField HEISERKEIT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "heiserkeit", HeiserkeitObservation.class, this); + + public SelectAqlField FIEBER_ODER_ERHOHTE_KORPERTEMPERATUR = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "fieberOderErhohteKorpertemperatur", FieberOderErhohteKorpertemperaturObservation.class, this); + + public SelectAqlField KORPERTEMPERATUR = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.body_temperature.v2]", "korpertemperatur", KorpertemperaturObservation.class, this); + + public SelectAqlField GESTORTER_GERUCHSSINN = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "gestorterGeruchssinn", GestorterGeruchssinnObservation.class, this); + + public SelectAqlField GESTORTER_GESCHMACKSSINN = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "gestorterGeschmackssinn", GestorterGeschmackssinnObservation.class, this); + + public SelectAqlField DURCHFALL = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "durchfall", DurchfallObservation.class, this); + + public SelectAqlField WEITERE_SYMPTOME = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "weitereSymptome", WeitereSymptomeObservation.class, this); + + public SelectAqlField PERSONENKONTAKT = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]", "personenkontakt", PersonenkontaktObservation.class, this); + + public SelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]", "aufenthaltInGesundheitseinrichtung", AufenthaltInGesundheitseinrichtungObservation.class, this); + + public ListSelectAqlField HISTORIE_DER_REISE = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.travel_history.v0]", "historieDerReise", HistorieDerReiseObservation.class, this); + + public ListSelectAqlField REISEFALL = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.travel_event.v0]", "reisefall", ReisefallObservation.class, this); + + public SelectAqlField ANDERE_AKTUELLE_ERKRANKUNGEN = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "andereAktuelleErkrankungen", AndereAktuelleErkrankungenObservation.class, this); + + public SelectAqlField CHRONISCHE_ERKRANKUNGEN = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "chronischeErkrankungen", ChronischeErkrankungenObservation.class, this); + + public ListSelectAqlField PROBLEM_DIAGNOSE = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.problem_diagnosis.v1]", "problemDiagnose", ProblemDiagnoseEvaluation.class, this); + + public SelectAqlField FRAGEBOGEN_ZUM_MEDIKATIONS_SCREENING = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-OBSERVATION.medication_use.v0]", "fragebogenZumMedikationsScreening", FragebogenZumMedikationsScreeningObservation.class, this); + + public SelectAqlField GESUNDHEITSBEZOGENER_BERUF = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.occupation_summary.v1]", "gesundheitsbezogenerBeruf", GesundheitsbezogenerBerufEvaluation.class, this); + + public ListSelectAqlField WOHNSITUATION = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.living_arrangement.v0]", "wohnsituation", WohnsituationEvaluation.class, this); + + public ListSelectAqlField BEWERTUNG_DES_GESUNDHEITSRISIKOS = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.health_risk.v1]", "bewertungDesGesundheitsrisikos", BewertungDesGesundheitsrisikosEvaluation.class, this); + + public SelectAqlField PROBLEM_DIGANOSE_CORONOVIRUS = new AqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1]", "problemDiganoseCoronovirus", ProblemDiganoseCoronovirusEvaluation.class, this); + + public ListSelectAqlField DIENSTLEISTUNG = new ListAqlFieldImp(CoronaAnamneseComposition.class, "/content[openEHR-EHR-SECTION.adhoc.v1]/items[openEHR-EHR-INSTRUCTION.service_request.v1]", "dienstleistung", DienstleistungInstruction.class, this); + + public SelectAqlField COMPOSER = new AqlFieldImp(CoronaAnamneseComposition.class, "/composer", "composer", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/language", "language", Language.class, this); + + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(CoronaAnamneseComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + + public SelectAqlField CATEGORY_DEFINING_CODE = new AqlFieldImp(CoronaAnamneseComposition.class, "/category|defining_code", "categoryDefiningCode", Category.class, this); + + public SelectAqlField TERRITORY = new AqlFieldImp(CoronaAnamneseComposition.class, "/territory", "territory", Territory.class, this); + + private CoronaAnamneseCompositionContainment() { + super("openEHR-EHR-COMPOSITION.report.v1"); + } + + public static CoronaAnamneseCompositionContainment getInstance() { + return new CoronaAnamneseCompositionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseCluster.java new file mode 100644 index 000000000..7fb49ca4b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseCluster.java @@ -0,0 +1,38 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.address_cc.v0") +public class AdresseCluster { + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Adresse/Stadt + */ + @Path("/items[at0012]/value|value") + private String stadtValue; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Adresse/Land + */ + @Path("/items[at0015]/value|value") + private String landValue; + + public void setStadtValue(String stadtValue) { + this.stadtValue = stadtValue; + } + + public String getStadtValue() { + return this.stadtValue ; + } + + public void setLandValue(String landValue) { + this.landValue = landValue; + } + + public String getLandValue() { + return this.landValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseClusterContainment.java new file mode 100644 index 000000000..9de619695 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseClusterContainment.java @@ -0,0 +1,22 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class AdresseClusterContainment extends Containment { + public SelectAqlField ADRESSE_CLUSTER = new AqlFieldImp(AdresseCluster.class, "", "AdresseCluster", AdresseCluster.class, this); + + public SelectAqlField STADT_VALUE = new AqlFieldImp(AdresseCluster.class, "/items[at0012]/value|value", "stadtValue", String.class, this); + + public SelectAqlField LAND_VALUE = new AqlFieldImp(AdresseCluster.class, "/items[at0015]/value|value", "landValue", String.class, this); + + private AdresseClusterContainment() { + super("openEHR-EHR-CLUSTER.address_cc.v0"); + } + + public static AdresseClusterContainment getInstance() { + return new AdresseClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java new file mode 100644 index 000000000..e1111af14 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java @@ -0,0 +1,129 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class AndereAktuelleErkrankungenObservation { + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; + + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; + + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/Beliebiges Ereignis/time + */ + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/origin + */ + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/Erweiterung + */ + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/language + */ + @Path("/language") + private Language language; + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } + + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } + + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } + + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java new file mode 100644 index 000000000..8a60d5b56 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class AndereAktuelleErkrankungenObservationContainment extends Containment { + public SelectAqlField ANDERE_AKTUELLE_ERKRANKUNGEN_OBSERVATION = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "", "AndereAktuelleErkrankungenObservation", AndereAktuelleErkrankungenObservation.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/language", "language", Language.class, this); + + private AndereAktuelleErkrankungenObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static AndereAktuelleErkrankungenObservationContainment getInstance() { + return new AndereAktuelleErkrankungenObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java new file mode 100644 index 000000000..12c458336 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.java @@ -0,0 +1,42 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ implements EnumValueSet { + JA("Ja", "Der Patient ist vor kurzem gereist.", "local", "at0112"), + + NEIN("Nein", "Der Patient ist in letzter Zeit nicht gereist.", "local", "at0113"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java new file mode 100644 index 000000000..ab9544b7d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java @@ -0,0 +1,156 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.exposure_assessment.v0") +public class AufenthaltInGesundheitseinrichtungObservation { + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Beliebiges Ereignis/*Agent (en) + */ + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value") + private String agentEnValue; + + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Beliebiges Ereignis/*Presence of any exposure? (en) + */ + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code") + private PresenceOfAnyExposureEnDefiningCode presenceOfAnyExposureEnDefiningCode; + + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Beliebiges Ereignis/*Specific exposure (en)/*Exposure (en) + */ + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value") + private String exposureEnValue; + + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Beliebiges Ereignis/*Specific exposure (en)/Vorhandensein + */ + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code") + private VorhandenseinDefiningCode vorhandenseinDefiningCode; + + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Beliebiges Ereignis/Kommentar + */ + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value") + private String kommentarValue; + + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Beliebiges Ereignis/time + */ + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/origin + */ + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Erweiterung + */ + @Path("/protocol[at0004]/items[at0056]") + private List erweiterung; + + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/language + */ + @Path("/language") + private Language language; + + public void setAgentEnValue(String agentEnValue) { + this.agentEnValue = agentEnValue; + } + + public String getAgentEnValue() { + return this.agentEnValue ; + } + + public void setPresenceOfAnyExposureEnDefiningCode( + PresenceOfAnyExposureEnDefiningCode presenceOfAnyExposureEnDefiningCode) { + this.presenceOfAnyExposureEnDefiningCode = presenceOfAnyExposureEnDefiningCode; + } + + public PresenceOfAnyExposureEnDefiningCode getPresenceOfAnyExposureEnDefiningCode() { + return this.presenceOfAnyExposureEnDefiningCode ; + } + + public void setExposureEnValue(String exposureEnValue) { + this.exposureEnValue = exposureEnValue; + } + + public String getExposureEnValue() { + return this.exposureEnValue ; + } + + public void setVorhandenseinDefiningCode(VorhandenseinDefiningCode vorhandenseinDefiningCode) { + this.vorhandenseinDefiningCode = vorhandenseinDefiningCode; + } + + public VorhandenseinDefiningCode getVorhandenseinDefiningCode() { + return this.vorhandenseinDefiningCode ; + } + + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } + + public String getKommentarValue() { + return this.kommentarValue ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java new file mode 100644 index 000000000..7c7bea57f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class AufenthaltInGesundheitseinrichtungObservationContainment extends Containment { + public SelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG_OBSERVATION = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "", "AufenthaltInGesundheitseinrichtungObservation", AufenthaltInGesundheitseinrichtungObservation.class, this); + + public SelectAqlField AGENT_EN_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value", "agentEnValue", String.class, this); + + public SelectAqlField PRESENCE_OF_ANY_EXPOSURE_EN_DEFINING_CODE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code", "presenceOfAnyExposureEnDefiningCode", PresenceOfAnyExposureEnDefiningCode.class, this); + + public SelectAqlField EXPOSURE_EN_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value", "exposureEnValue", String.class, this); + + public SelectAqlField VORHANDENSEIN_DEFINING_CODE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code", "vorhandenseinDefiningCode", VorhandenseinDefiningCode.class, this); + + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value", "kommentarValue", String.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/protocol[at0004]/items[at0056]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/language", "language", Language.class, this); + + private AufenthaltInGesundheitseinrichtungObservationContainment() { + super("openEHR-EHR-OBSERVATION.exposure_assessment.v0"); + } + + public static AufenthaltInGesundheitseinrichtungObservationContainment getInstance() { + return new AufenthaltInGesundheitseinrichtungObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungCluster.java new file mode 100644 index 000000000..767779ebd --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungCluster.java @@ -0,0 +1,54 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.occupation_record.v1") +public class BeschaftigungCluster { + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Berufsbezeichnung/Rolle + */ + @Path("/items[at0005]/value|value") + private String berufsbezeichnungRolleValue; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation + */ + @Path("/items[openEHR-EHR-CLUSTER.organisation_cc.v0]") + private List organisation; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Zusätzliche Angaben + */ + @Path("/items[at0018]") + private List zusatzlicheAngaben; + + public void setBerufsbezeichnungRolleValue(String berufsbezeichnungRolleValue) { + this.berufsbezeichnungRolleValue = berufsbezeichnungRolleValue; + } + + public String getBerufsbezeichnungRolleValue() { + return this.berufsbezeichnungRolleValue ; + } + + public void setOrganisation(List organisation) { + this.organisation = organisation; + } + + public List getOrganisation() { + return this.organisation ; + } + + public void setZusatzlicheAngaben(List zusatzlicheAngaben) { + this.zusatzlicheAngaben = zusatzlicheAngaben; + } + + public List getZusatzlicheAngaben() { + return this.zusatzlicheAngaben ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java new file mode 100644 index 000000000..f54a9979b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java @@ -0,0 +1,27 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class BeschaftigungClusterContainment extends Containment { + public SelectAqlField BESCHAFTIGUNG_CLUSTER = new AqlFieldImp(BeschaftigungCluster.class, "", "BeschaftigungCluster", BeschaftigungCluster.class, this); + + public SelectAqlField BERUFSBEZEICHNUNG_ROLLE_VALUE = new AqlFieldImp(BeschaftigungCluster.class, "/items[at0005]/value|value", "berufsbezeichnungRolleValue", String.class, this); + + public ListSelectAqlField ORGANISATION = new ListAqlFieldImp(BeschaftigungCluster.class, "/items[openEHR-EHR-CLUSTER.organisation_cc.v0]", "organisation", OrganisationCluster.class, this); + + public ListSelectAqlField ZUSATZLICHE_ANGABEN = new ListAqlFieldImp(BeschaftigungCluster.class, "/items[at0018]", "zusatzlicheAngaben", Cluster.class, this); + + private BeschaftigungClusterContainment() { + super("openEHR-EHR-CLUSTER.occupation_record.v1"); + } + + public static BeschaftigungClusterContainment getInstance() { + return new BeschaftigungClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java new file mode 100644 index 000000000..fa5aa6de4 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java @@ -0,0 +1,201 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.health_risk.v1") +public class BewertungDesGesundheitsrisikosEvaluation { + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Gesundheitsrisiko + */ + @Path("/data[at0001]/items[at0002]/value|value") + private String gesundheitsrisikoValue; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Spezifischer Risikofaktor/Risikofaktor + */ + @Path("/data[at0001]/items[at0016 and name/value='Spezifischer Risikofaktor']/items[at0013]/value|value") + private String spezifischerRisikofaktorRisikofaktorValue; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Spezifischer Risikofaktor/Vorhandensein + */ + @Path("/data[at0001]/items[at0016 and name/value='Spezifischer Risikofaktor']/items[at0017]/value|defining_code") + private VorhandenseinDefiningCode2 spezifischerRisikofaktorVorhandenseinDefiningCode; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Spezifischer Risikofaktor/Details + */ + @Path("/data[at0001]/items[at0016 and name/value='Spezifischer Risikofaktor']/items[at0027]") + private List spezifischerRisikofaktorDetails; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Andere Risikofaktoren/Risikofaktor + */ + @Path("/data[at0001]/items[at0016 and name/value='Andere Risikofaktoren']/items[at0013]/value|value") + private String andereRisikofaktorenRisikofaktorValue; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Andere Risikofaktoren/Vorhandensein + */ + @Path("/data[at0001]/items[at0016 and name/value='Andere Risikofaktoren']/items[at0017]/value|defining_code") + private VorhandenseinDefiningCode2 andereRisikofaktorenVorhandenseinDefiningCode; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Andere Risikofaktoren/Details + */ + @Path("/data[at0001]/items[at0016 and name/value='Andere Risikofaktoren']/items[at0027]") + private List andereRisikofaktorenDetails; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Risikobewertung + */ + @Path("/data[at0001]/items[at0003]/value|value") + private String risikobewertungValue; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Letzte Aktualisierung + */ + @Path("/protocol[at0010]/items[at0024]/value|value") + private TemporalAccessor letzteAktualisierungValue; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Bewertungsmethode + */ + @Path("/protocol[at0010]/items[at0025]/value|value") + private String bewertungsmethodeValue; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Erweiterung + */ + @Path("/protocol[at0010]/items[at0011]") + private List erweiterung; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/language + */ + @Path("/language") + private Language language; + + public void setGesundheitsrisikoValue(String gesundheitsrisikoValue) { + this.gesundheitsrisikoValue = gesundheitsrisikoValue; + } + + public String getGesundheitsrisikoValue() { + return this.gesundheitsrisikoValue ; + } + + public void setSpezifischerRisikofaktorRisikofaktorValue( + String spezifischerRisikofaktorRisikofaktorValue) { + this.spezifischerRisikofaktorRisikofaktorValue = spezifischerRisikofaktorRisikofaktorValue; + } + + public String getSpezifischerRisikofaktorRisikofaktorValue() { + return this.spezifischerRisikofaktorRisikofaktorValue ; + } + + public void setSpezifischerRisikofaktorVorhandenseinDefiningCode( + VorhandenseinDefiningCode2 spezifischerRisikofaktorVorhandenseinDefiningCode) { + this.spezifischerRisikofaktorVorhandenseinDefiningCode = spezifischerRisikofaktorVorhandenseinDefiningCode; + } + + public VorhandenseinDefiningCode2 getSpezifischerRisikofaktorVorhandenseinDefiningCode() { + return this.spezifischerRisikofaktorVorhandenseinDefiningCode ; + } + + public void setSpezifischerRisikofaktorDetails(List spezifischerRisikofaktorDetails) { + this.spezifischerRisikofaktorDetails = spezifischerRisikofaktorDetails; + } + + public List getSpezifischerRisikofaktorDetails() { + return this.spezifischerRisikofaktorDetails ; + } + + public void setAndereRisikofaktorenRisikofaktorValue( + String andereRisikofaktorenRisikofaktorValue) { + this.andereRisikofaktorenRisikofaktorValue = andereRisikofaktorenRisikofaktorValue; + } + + public String getAndereRisikofaktorenRisikofaktorValue() { + return this.andereRisikofaktorenRisikofaktorValue ; + } + + public void setAndereRisikofaktorenVorhandenseinDefiningCode( + VorhandenseinDefiningCode2 andereRisikofaktorenVorhandenseinDefiningCode) { + this.andereRisikofaktorenVorhandenseinDefiningCode = andereRisikofaktorenVorhandenseinDefiningCode; + } + + public VorhandenseinDefiningCode2 getAndereRisikofaktorenVorhandenseinDefiningCode() { + return this.andereRisikofaktorenVorhandenseinDefiningCode ; + } + + public void setAndereRisikofaktorenDetails(List andereRisikofaktorenDetails) { + this.andereRisikofaktorenDetails = andereRisikofaktorenDetails; + } + + public List getAndereRisikofaktorenDetails() { + return this.andereRisikofaktorenDetails ; + } + + public void setRisikobewertungValue(String risikobewertungValue) { + this.risikobewertungValue = risikobewertungValue; + } + + public String getRisikobewertungValue() { + return this.risikobewertungValue ; + } + + public void setLetzteAktualisierungValue(TemporalAccessor letzteAktualisierungValue) { + this.letzteAktualisierungValue = letzteAktualisierungValue; + } + + public TemporalAccessor getLetzteAktualisierungValue() { + return this.letzteAktualisierungValue ; + } + + public void setBewertungsmethodeValue(String bewertungsmethodeValue) { + this.bewertungsmethodeValue = bewertungsmethodeValue; + } + + public String getBewertungsmethodeValue() { + return this.bewertungsmethodeValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java new file mode 100644 index 000000000..37fb572e8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java @@ -0,0 +1,50 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class BewertungDesGesundheitsrisikosEvaluationContainment extends Containment { + public SelectAqlField BEWERTUNG_DES_GESUNDHEITSRISIKOS_EVALUATION = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "", "BewertungDesGesundheitsrisikosEvaluation", BewertungDesGesundheitsrisikosEvaluation.class, this); + + public SelectAqlField GESUNDHEITSRISIKO_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0002]/value|value", "gesundheitsrisikoValue", String.class, this); + + public SelectAqlField SPEZIFISCHER_RISIKOFAKTOR_RISIKOFAKTOR_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0013]/value|value", "spezifischerRisikofaktorRisikofaktorValue", String.class, this); + + public SelectAqlField SPEZIFISCHER_RISIKOFAKTOR_VORHANDENSEIN_DEFINING_CODE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0017]/value|defining_code", "spezifischerRisikofaktorVorhandenseinDefiningCode", VorhandenseinDefiningCode2.class, this); + + public ListSelectAqlField SPEZIFISCHER_RISIKOFAKTOR_DETAILS = new ListAqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0027]", "spezifischerRisikofaktorDetails", Cluster.class, this); + + public SelectAqlField ANDERE_RISIKOFAKTOREN_RISIKOFAKTOR_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0013]/value|value", "andereRisikofaktorenRisikofaktorValue", String.class, this); + + public SelectAqlField ANDERE_RISIKOFAKTOREN_VORHANDENSEIN_DEFINING_CODE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0017]/value|defining_code", "andereRisikofaktorenVorhandenseinDefiningCode", VorhandenseinDefiningCode2.class, this); + + public ListSelectAqlField ANDERE_RISIKOFAKTOREN_DETAILS = new ListAqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0027]", "andereRisikofaktorenDetails", Cluster.class, this); + + public SelectAqlField RISIKOBEWERTUNG_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0003]/value|value", "risikobewertungValue", String.class, this); + + public SelectAqlField LETZTE_AKTUALISIERUNG_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/protocol[at0010]/items[at0024]/value|value", "letzteAktualisierungValue", TemporalAccessor.class, this); + + public SelectAqlField BEWERTUNGSMETHODE_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/protocol[at0010]/items[at0025]/value|value", "bewertungsmethodeValue", String.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/protocol[at0010]/items[at0011]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/language", "language", Language.class, this); + + private BewertungDesGesundheitsrisikosEvaluationContainment() { + super("openEHR-EHR-EVALUATION.health_risk.v1"); + } + + public static BewertungDesGesundheitsrisikosEvaluationContainment getInstance() { + return new BewertungDesGesundheitsrisikosEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java new file mode 100644 index 000000000..d2bc9c713 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java @@ -0,0 +1,129 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class ChronischeErkrankungenObservation { + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; + + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; + + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/Beliebiges Ereignis/time + */ + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/origin + */ + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/Erweiterung + */ + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/language + */ + @Path("/language") + private Language language; + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } + + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } + + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } + + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java new file mode 100644 index 000000000..2007bd62c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class ChronischeErkrankungenObservationContainment extends Containment { + public SelectAqlField CHRONISCHE_ERKRANKUNGEN_OBSERVATION = new AqlFieldImp(ChronischeErkrankungenObservation.class, "", "ChronischeErkrankungenObservation", ChronischeErkrankungenObservation.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ChronischeErkrankungenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/language", "language", Language.class, this); + + private ChronischeErkrankungenObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static ChronischeErkrankungenObservationContainment getInstance() { + return new ChronischeErkrankungenObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DiagnosestatusDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DiagnosestatusDefiningCode.java new file mode 100644 index 000000000..bf1624491 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DiagnosestatusDefiningCode.java @@ -0,0 +1,39 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum DiagnosestatusDefiningCode implements EnumValueSet { + IN_BEARBEITUNG("In Bearbeitung", "Eine vorübergehende Diagnose, bei welcher Testergebnisse und klinische Hinweise oder Empfehlungen noch ausstehen, welche aber bereits auf einer soliden klinischen Sicherheit beruht. Sobald weitere Testresultate und klinische Hinweise oder Empfehlungen zur Verfügung stehen, kann sich die Diagnose noch ändern.", "local", "at0017"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + DiagnosestatusDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningCode.java new file mode 100644 index 000000000..33e1462c4 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningCode.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum DiagnostischeSicherheitDefiningCode implements EnumValueSet { + WAHRSCHEINLICH("Wahrscheinlich", "Die Diagnose wurde mit einem hohen Maß an Sicherheit gestellt.", "local", "at0075"), + + VERMUTET("Vermutet", "Die Diagnose wurde mit einem niedrigen Grad an Sicherheit gestellt.", "local", "at0074"), + + BESTATIGT("Bestätigt", "Die Diagnose wurde anhand anerkannter Kriterien bestätigt.", "local", "at0076"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + DiagnostischeSicherheitDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java new file mode 100644 index 000000000..6fa3ed456 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java @@ -0,0 +1,110 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class DienstleistungAktuelleAktivitatActivity { + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Name der Dienstleistung + */ + @Path("/description[at0009]/items[at0121]/value|value") + private String nameDerDienstleistungValue; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Grund für die Anforderung + */ + @Path("/description[at0009]/items[at0062]") + private List grundFurDieAnforderung; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Komplexe Zeitplanung + */ + @Path("/description[at0009]/items[at0151]") + private List komplexeZeitplanung; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Spezifische Details + */ + @Path("/description[at0009]/items[at0132]") + private List spezifischeDetails; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Unterstützende Informationen + */ + @Path("/description[at0009]/items[at0149]") + private List unterstutzendeInformationen; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Anforderungen an Patienten + */ + @Path("/description[at0009]/items[at0116]") + private List anforderungenAnPatienten; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/timing + */ + @Path("/timing") + private DvParsable timing; + + public void setNameDerDienstleistungValue(String nameDerDienstleistungValue) { + this.nameDerDienstleistungValue = nameDerDienstleistungValue; + } + + public String getNameDerDienstleistungValue() { + return this.nameDerDienstleistungValue ; + } + + public void setGrundFurDieAnforderung( + List grundFurDieAnforderung) { + this.grundFurDieAnforderung = grundFurDieAnforderung; + } + + public List getGrundFurDieAnforderung() { + return this.grundFurDieAnforderung ; + } + + public void setKomplexeZeitplanung(List komplexeZeitplanung) { + this.komplexeZeitplanung = komplexeZeitplanung; + } + + public List getKomplexeZeitplanung() { + return this.komplexeZeitplanung ; + } + + public void setSpezifischeDetails(List spezifischeDetails) { + this.spezifischeDetails = spezifischeDetails; + } + + public List getSpezifischeDetails() { + return this.spezifischeDetails ; + } + + public void setUnterstutzendeInformationen(List unterstutzendeInformationen) { + this.unterstutzendeInformationen = unterstutzendeInformationen; + } + + public List getUnterstutzendeInformationen() { + return this.unterstutzendeInformationen ; + } + + public void setAnforderungenAnPatienten(List anforderungenAnPatienten) { + this.anforderungenAnPatienten = anforderungenAnPatienten; + } + + public List getAnforderungenAnPatienten() { + return this.anforderungenAnPatienten ; + } + + public void setTiming(DvParsable timing) { + this.timing = timing; + } + + public DvParsable getTiming() { + return this.timing ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java new file mode 100644 index 000000000..4c367ee23 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java @@ -0,0 +1,22 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class DienstleistungGrundFurDieAnforderungElement { + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Grund für die Anforderung + */ + @Path("/value|value") + private String value; + + public void setValue(String value) { + this.value = value; + } + + public String getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstruction.java new file mode 100644 index 000000000..0799149f6 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstruction.java @@ -0,0 +1,142 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-INSTRUCTION.service_request.v1") +public class DienstleistungInstruction { + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität + */ + @Path("/activities[at0001]") + private List aktuelleAktivitat; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Einsender + */ + @Path("/protocol[at0008]/items[at0141]") + private Cluster einsender; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Empfänger + */ + @Path("/protocol[at0008]/items[at0142]") + private Cluster empfanger; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Verteilerliste + */ + @Path("/protocol[at0008]/items[at0128]") + private List verteilerliste; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Erweiterung + */ + @Path("/protocol[at0008]/items[at0112]") + private List erweiterung; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/narrative + */ + @Path("/narrative|value") + private String narrativeValue; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/language + */ + @Path("/language") + private Language language; + + /** + * Bericht/Allgemeine Angaben/Dienstleistung/expiry_time + */ + @Path("/expiry_time|value") + private TemporalAccessor expiryTimeValue; + + public void setAktuelleAktivitat( + List aktuelleAktivitat) { + this.aktuelleAktivitat = aktuelleAktivitat; + } + + public List getAktuelleAktivitat() { + return this.aktuelleAktivitat ; + } + + public void setEinsender(Cluster einsender) { + this.einsender = einsender; + } + + public Cluster getEinsender() { + return this.einsender ; + } + + public void setEmpfanger(Cluster empfanger) { + this.empfanger = empfanger; + } + + public Cluster getEmpfanger() { + return this.empfanger ; + } + + public void setVerteilerliste(List verteilerliste) { + this.verteilerliste = verteilerliste; + } + + public List getVerteilerliste() { + return this.verteilerliste ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setNarrativeValue(String narrativeValue) { + this.narrativeValue = narrativeValue; + } + + public String getNarrativeValue() { + return this.narrativeValue ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setExpiryTimeValue(TemporalAccessor expiryTimeValue) { + this.expiryTimeValue = expiryTimeValue; + } + + public TemporalAccessor getExpiryTimeValue() { + return this.expiryTimeValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java new file mode 100644 index 000000000..f85cee468 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java @@ -0,0 +1,42 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class DienstleistungInstructionContainment extends Containment { + public SelectAqlField DIENSTLEISTUNG_INSTRUCTION = new AqlFieldImp(DienstleistungInstruction.class, "", "DienstleistungInstruction", DienstleistungInstruction.class, this); + + public ListSelectAqlField AKTUELLE_AKTIVITAT = new ListAqlFieldImp(DienstleistungInstruction.class, "/activities[at0001]", "aktuelleAktivitat", DienstleistungAktuelleAktivitatActivity.class, this); + + public SelectAqlField EINSENDER = new AqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0141]", "einsender", Cluster.class, this); + + public SelectAqlField EMPFANGER = new AqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0142]", "empfanger", Cluster.class, this); + + public ListSelectAqlField VERTEILERLISTE = new ListAqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0128]", "verteilerliste", Cluster.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(DienstleistungInstruction.class, "/protocol[at0008]/items[at0112]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(DienstleistungInstruction.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField NARRATIVE_VALUE = new AqlFieldImp(DienstleistungInstruction.class, "/narrative|value", "narrativeValue", String.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(DienstleistungInstruction.class, "/language", "language", Language.class, this); + + public SelectAqlField EXPIRY_TIME_VALUE = new AqlFieldImp(DienstleistungInstruction.class, "/expiry_time|value", "expiryTimeValue", TemporalAccessor.class, this); + + private DienstleistungInstructionContainment() { + super("openEHR-EHR-INSTRUCTION.service_request.v1"); + } + + public static DienstleistungInstructionContainment getInstance() { + return new DienstleistungInstructionContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservation.java new file mode 100644 index 000000000..6b6251a9e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservation.java @@ -0,0 +1,129 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class DurchfallObservation { + /** + * Bericht/Symptome/Durchfall/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + /** + * Bericht/Symptome/Durchfall/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; + + /** + * Bericht/Symptome/Durchfall/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; + + /** + * Bericht/Symptome/Durchfall/Beliebiges Ereignis/time + */ + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + /** + * Bericht/Symptome/Durchfall/origin + */ + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + /** + * Bericht/Symptome/Durchfall/Erweiterung + */ + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + /** + * Bericht/Symptome/Durchfall/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Symptome/Durchfall/language + */ + @Path("/language") + private Language language; + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } + + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } + + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } + + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservationContainment.java new file mode 100644 index 000000000..f890dc9b3 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class DurchfallObservationContainment extends Containment { + public SelectAqlField DURCHFALL_OBSERVATION = new AqlFieldImp(DurchfallObservation.class, "", "DurchfallObservation", DurchfallObservation.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(DurchfallObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(DurchfallObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(DurchfallObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(DurchfallObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(DurchfallObservation.class, "/language", "language", Language.class, this); + + private DurchfallObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static DurchfallObservationContainment getInstance() { + return new DurchfallObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java new file mode 100644 index 000000000..d752d93bd --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java @@ -0,0 +1,129 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class FieberOderErhohteKorpertemperaturObservation { + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; + + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; + + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/Beliebiges Ereignis/time + */ + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/origin + */ + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/Erweiterung + */ + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/language + */ + @Path("/language") + private Language language; + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } + + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } + + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } + + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java new file mode 100644 index 000000000..818a7f99f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class FieberOderErhohteKorpertemperaturObservationContainment extends Containment { + public SelectAqlField FIEBER_ODER_ERHOHTE_KORPERTEMPERATUR_OBSERVATION = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "", "FieberOderErhohteKorpertemperaturObservation", FieberOderErhohteKorpertemperaturObservation.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/language", "language", Language.class, this); + + private FieberOderErhohteKorpertemperaturObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static FieberOderErhohteKorpertemperaturObservationContainment getInstance() { + return new FieberOderErhohteKorpertemperaturObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java new file mode 100644 index 000000000..4bb44b935 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java @@ -0,0 +1,146 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +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 org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.medication_use.v0") +public class FragebogenZumMedikationsScreeningObservation { + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Medikamente in Verwendung? + */ + @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0027]/value") + private DvCodedText medikamenteInVerwendung; + + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Name der Medikamentenklasse + */ + @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0002]/value|value") + private String nameDerMedikamentenklasseValue; + + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Medikamentenklasse in Verwendung? + */ + @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0003]/value|defining_code") + private MedikamentenklasseInVerwendungDefiningCode medikamentenklasseInVerwendungDefiningCode; + + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Spezifische Medikamente + */ + @Path("/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0008]") + private List spezifischeMedikamente; + + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/time + */ + @Path("/data[at0022]/events[at0023]/time|value") + private TemporalAccessor timeValue; + + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/origin + */ + @Path("/data[at0022]/origin|value") + private TemporalAccessor originValue; + + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Erweiterung + */ + @Path("/protocol[at0005]/items[at0019]") + private List erweiterung; + + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/language + */ + @Path("/language") + private Language language; + + public void setMedikamenteInVerwendung(DvCodedText medikamenteInVerwendung) { + this.medikamenteInVerwendung = medikamenteInVerwendung; + } + + public DvCodedText getMedikamenteInVerwendung() { + return this.medikamenteInVerwendung ; + } + + public void setNameDerMedikamentenklasseValue(String nameDerMedikamentenklasseValue) { + this.nameDerMedikamentenklasseValue = nameDerMedikamentenklasseValue; + } + + public String getNameDerMedikamentenklasseValue() { + return this.nameDerMedikamentenklasseValue ; + } + + public void setMedikamentenklasseInVerwendungDefiningCode( + MedikamentenklasseInVerwendungDefiningCode medikamentenklasseInVerwendungDefiningCode) { + this.medikamentenklasseInVerwendungDefiningCode = medikamentenklasseInVerwendungDefiningCode; + } + + public MedikamentenklasseInVerwendungDefiningCode getMedikamentenklasseInVerwendungDefiningCode( + ) { + return this.medikamentenklasseInVerwendungDefiningCode ; + } + + public void setSpezifischeMedikamente( + List spezifischeMedikamente) { + this.spezifischeMedikamente = spezifischeMedikamente; + } + + public List getSpezifischeMedikamente( + ) { + return this.spezifischeMedikamente ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java new file mode 100644 index 000000000..2ed4af857 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +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 org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class FragebogenZumMedikationsScreeningObservationContainment extends Containment { + public SelectAqlField FRAGEBOGEN_ZUM_MEDIKATIONS_SCREENING_OBSERVATION = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "", "FragebogenZumMedikationsScreeningObservation", FragebogenZumMedikationsScreeningObservation.class, this); + + public SelectAqlField MEDIKAMENTE_IN_VERWENDUNG = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0027]/value", "medikamenteInVerwendung", DvCodedText.class, this); + + public SelectAqlField NAME_DER_MEDIKAMENTENKLASSE_VALUE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0002]/value|value", "nameDerMedikamentenklasseValue", String.class, this); + + public SelectAqlField MEDIKAMENTENKLASSE_IN_VERWENDUNG_DEFINING_CODE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0003]/value|defining_code", "medikamentenklasseInVerwendungDefiningCode", MedikamentenklasseInVerwendungDefiningCode.class, this); + + public ListSelectAqlField SPEZIFISCHE_MEDIKAMENTE = new ListAqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/data[at0001]/items[at0026]/items[at0008]", "spezifischeMedikamente", FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/events[at0023]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/data[at0022]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/protocol[at0005]/items[at0019]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/language", "language", Language.class, this); + + private FragebogenZumMedikationsScreeningObservationContainment() { + super("openEHR-EHR-OBSERVATION.medication_use.v0"); + } + + public static FragebogenZumMedikationsScreeningObservationContainment getInstance() { + return new FragebogenZumMedikationsScreeningObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java new file mode 100644 index 000000000..563623a65 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java @@ -0,0 +1,37 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster { + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Spezifische Medikamente/Name des Medikaments + */ + @Path("/items[at0021]/value|value") + private String nameDesMedikamentsValue; + + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Spezifische Medikamente/Medikament in Verwendung? + */ + @Path("/items[at0024]/value|defining_code") + private MedikamentInVerwendungDefiningCode medikamentInVerwendungDefiningCode; + + public void setNameDesMedikamentsValue(String nameDesMedikamentsValue) { + this.nameDesMedikamentsValue = nameDesMedikamentsValue; + } + + public String getNameDesMedikamentsValue() { + return this.nameDesMedikamentsValue ; + } + + public void setMedikamentInVerwendungDefiningCode( + MedikamentInVerwendungDefiningCode medikamentInVerwendungDefiningCode) { + this.medikamentInVerwendungDefiningCode = medikamentInVerwendungDefiningCode; + } + + public MedikamentInVerwendungDefiningCode getMedikamentInVerwendungDefiningCode() { + return this.medikamentInVerwendungDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java new file mode 100644 index 000000000..fde9d227f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +public interface GeschichteHistorieBeliebigesEreignisChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java new file mode 100644 index 000000000..f44fb0f82 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java @@ -0,0 +1,84 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; + +@Entity +@OptionFor("INTERVAL_EVENT") +public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements GeschichteHistorieBeliebigesEreignisChoice { + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/Geschichte + */ + @Path("/data[at0003]/items[at0004]") + private List geschichte; + + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/Strukturierte Angabe + */ + @Path("/data[at0003]/items[at0006]") + private List strukturierteAngabe; + + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/time + */ + @Path("/time|value") + private TemporalAccessor timeValue; + + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/width + */ + @Path("/width|value") + private TemporalAmount widthValue; + + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/math_function + */ + @Path("/math_function|defining_code") + private MathFunction mathFunctionDefiningCode; + + public void setGeschichte(List geschichte) { + this.geschichte = geschichte; + } + + public List getGeschichte() { + return this.geschichte ; + } + + public void setStrukturierteAngabe(List strukturierteAngabe) { + this.strukturierteAngabe = strukturierteAngabe; + } + + public List getStrukturierteAngabe() { + return this.strukturierteAngabe ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setWidthValue(TemporalAmount widthValue) { + this.widthValue = widthValue; + } + + public TemporalAmount getWidthValue() { + return this.widthValue ; + } + + public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { + this.mathFunctionDefiningCode = mathFunctionDefiningCode; + } + + public MathFunction getMathFunctionDefiningCode() { + return this.mathFunctionDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java new file mode 100644 index 000000000..09f0cc693 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java @@ -0,0 +1,54 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("POINT_EVENT") +public class GeschichteHistorieBeliebigesEreignisPointEvent implements GeschichteHistorieBeliebigesEreignisChoice { + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/Geschichte + */ + @Path("/data[at0003]/items[at0004]") + private List geschichte; + + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/Strukturierte Angabe + */ + @Path("/data[at0003]/items[at0006]") + private List strukturierteAngabe; + + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/time + */ + @Path("/time|value") + private TemporalAccessor timeValue; + + public void setGeschichte(List geschichte) { + this.geschichte = geschichte; + } + + public List getGeschichte() { + return this.geschichte ; + } + + public void setStrukturierteAngabe(List strukturierteAngabe) { + this.strukturierteAngabe = strukturierteAngabe; + } + + public List getStrukturierteAngabe() { + return this.strukturierteAngabe ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java new file mode 100644 index 000000000..f34066616 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java @@ -0,0 +1,22 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class GeschichteHistorieGeschichteElement { + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/Geschichte + */ + @Path("/value|value") + private String value; + + public void setValue(String value) { + this.value = value; + } + + public String getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java new file mode 100644 index 000000000..9f5c5a3b7 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java @@ -0,0 +1,87 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; +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.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.story.v1") +public class GeschichteHistorieObservation { + /** + * Bericht/Geschichte/Historie/origin + */ + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + /** + * Bericht/Geschichte/Historie/Erweiterung + */ + @Path("/protocol[at0007]/items[at0008]") + private List erweiterung; + + /** + * Bericht/Geschichte/Historie/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Geschichte/Historie/language + */ + @Path("/language") + private Language language; + + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis + */ + @Path("/data[at0001]/events[at0002]") + @Choice + private List beliebigesEreignis; + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setBeliebigesEreignis( + List beliebigesEreignis) { + this.beliebigesEreignis = beliebigesEreignis; + } + + public List getBeliebigesEreignis() { + return this.beliebigesEreignis ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java new file mode 100644 index 000000000..e8cf757bf --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java @@ -0,0 +1,33 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class GeschichteHistorieObservationContainment extends Containment { + public SelectAqlField GESCHICHTE_HISTORIE_OBSERVATION = new AqlFieldImp(GeschichteHistorieObservation.class, "", "GeschichteHistorieObservation", GeschichteHistorieObservation.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(GeschichteHistorieObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GeschichteHistorieObservation.class, "/protocol[at0007]/items[at0008]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(GeschichteHistorieObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(GeschichteHistorieObservation.class, "/language", "language", Language.class, this); + + public ListSelectAqlField BELIEBIGES_EREIGNIS = new ListAqlFieldImp(GeschichteHistorieObservation.class, "/data[at0001]/events[at0002]", "beliebigesEreignis", GeschichteHistorieBeliebigesEreignisChoice.class, this); + + private GeschichteHistorieObservationContainment() { + super("openEHR-EHR-OBSERVATION.story.v1"); + } + + public static GeschichteHistorieObservationContainment getInstance() { + return new GeschichteHistorieObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java new file mode 100644 index 000000000..50e883b5e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java @@ -0,0 +1,129 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class GestorterGeruchssinnObservation { + /** + * Bericht/Symptome/Gestörter Geruchssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + /** + * Bericht/Symptome/Gestörter Geruchssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; + + /** + * Bericht/Symptome/Gestörter Geruchssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; + + /** + * Bericht/Symptome/Gestörter Geruchssinn/Beliebiges Ereignis/time + */ + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + /** + * Bericht/Symptome/Gestörter Geruchssinn/origin + */ + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + /** + * Bericht/Symptome/Gestörter Geruchssinn/Erweiterung + */ + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + /** + * Bericht/Symptome/Gestörter Geruchssinn/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Symptome/Gestörter Geruchssinn/language + */ + @Path("/language") + private Language language; + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } + + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } + + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } + + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java new file mode 100644 index 000000000..753929d53 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class GestorterGeruchssinnObservationContainment extends Containment { + public SelectAqlField GESTORTER_GERUCHSSINN_OBSERVATION = new AqlFieldImp(GestorterGeruchssinnObservation.class, "", "GestorterGeruchssinnObservation", GestorterGeruchssinnObservation.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GestorterGeruchssinnObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/language", "language", Language.class, this); + + private GestorterGeruchssinnObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static GestorterGeruchssinnObservationContainment getInstance() { + return new GestorterGeruchssinnObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java new file mode 100644 index 000000000..bc3f86be8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java @@ -0,0 +1,129 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class GestorterGeschmackssinnObservation { + /** + * Bericht/Symptome/Gestörter Geschmackssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + /** + * Bericht/Symptome/Gestörter Geschmackssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; + + /** + * Bericht/Symptome/Gestörter Geschmackssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; + + /** + * Bericht/Symptome/Gestörter Geschmackssinn/Beliebiges Ereignis/time + */ + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + /** + * Bericht/Symptome/Gestörter Geschmackssinn/origin + */ + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + /** + * Bericht/Symptome/Gestörter Geschmackssinn/Erweiterung + */ + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + /** + * Bericht/Symptome/Gestörter Geschmackssinn/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Symptome/Gestörter Geschmackssinn/language + */ + @Path("/language") + private Language language; + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } + + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } + + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } + + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java new file mode 100644 index 000000000..e4e9c4d77 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class GestorterGeschmackssinnObservationContainment extends Containment { + public SelectAqlField GESTORTER_GESCHMACKSSINN_OBSERVATION = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "", "GestorterGeschmackssinnObservation", GestorterGeschmackssinnObservation.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GestorterGeschmackssinnObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/language", "language", Language.class, this); + + private GestorterGeschmackssinnObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static GestorterGeschmackssinnObservationContainment getInstance() { + return new GestorterGeschmackssinnObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java new file mode 100644 index 000000000..20d1ff442 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java @@ -0,0 +1,98 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.occupation_summary.v1") +public class GesundheitsbezogenerBerufEvaluation { + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigungsstatus + */ + @Path("/data[at0001]/items[at0004]/value|value") + private String beschaftigungsstatusValue; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung + */ + @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.occupation_record.v1]") + private List beschaftigung; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Zusätzliche Angaben + */ + @Path("/data[at0001]/items[at0005]") + private List zusatzlicheAngaben; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Erweiterung + */ + @Path("/protocol[at0007]/items[at0008]") + private List erweiterung; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/language + */ + @Path("/language") + private Language language; + + public void setBeschaftigungsstatusValue(String beschaftigungsstatusValue) { + this.beschaftigungsstatusValue = beschaftigungsstatusValue; + } + + public String getBeschaftigungsstatusValue() { + return this.beschaftigungsstatusValue ; + } + + public void setBeschaftigung(List beschaftigung) { + this.beschaftigung = beschaftigung; + } + + public List getBeschaftigung() { + return this.beschaftigung ; + } + + public void setZusatzlicheAngaben(List zusatzlicheAngaben) { + this.zusatzlicheAngaben = zusatzlicheAngaben; + } + + public List getZusatzlicheAngaben() { + return this.zusatzlicheAngaben ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java new file mode 100644 index 000000000..666f46612 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java @@ -0,0 +1,35 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class GesundheitsbezogenerBerufEvaluationContainment extends Containment { + public SelectAqlField GESUNDHEITSBEZOGENER_BERUF_EVALUATION = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "", "GesundheitsbezogenerBerufEvaluation", GesundheitsbezogenerBerufEvaluation.class, this); + + public SelectAqlField BESCHAFTIGUNGSSTATUS_VALUE = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/data[at0001]/items[at0004]/value|value", "beschaftigungsstatusValue", String.class, this); + + public ListSelectAqlField BESCHAFTIGUNG = new ListAqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.occupation_record.v1]", "beschaftigung", BeschaftigungCluster.class, this); + + public ListSelectAqlField ZUSATZLICHE_ANGABEN = new ListAqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/data[at0001]/items[at0005]", "zusatzlicheAngaben", Cluster.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/protocol[at0007]/items[at0008]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/language", "language", Language.class, this); + + private GesundheitsbezogenerBerufEvaluationContainment() { + super("openEHR-EHR-EVALUATION.occupation_summary.v1"); + } + + public static GesundheitsbezogenerBerufEvaluationContainment getInstance() { + return new GesundheitsbezogenerBerufEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservation.java new file mode 100644 index 000000000..547c9414a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservation.java @@ -0,0 +1,129 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class HeiserkeitObservation { + /** + * Bericht/Symptome/Heiserkeit/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + /** + * Bericht/Symptome/Heiserkeit/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; + + /** + * Bericht/Symptome/Heiserkeit/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; + + /** + * Bericht/Symptome/Heiserkeit/Beliebiges Ereignis/time + */ + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + /** + * Bericht/Symptome/Heiserkeit/origin + */ + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + /** + * Bericht/Symptome/Heiserkeit/Erweiterung + */ + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + /** + * Bericht/Symptome/Heiserkeit/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Symptome/Heiserkeit/language + */ + @Path("/language") + private Language language; + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } + + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } + + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } + + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java new file mode 100644 index 000000000..afe0739ea --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class HeiserkeitObservationContainment extends Containment { + public SelectAqlField HEISERKEIT_OBSERVATION = new AqlFieldImp(HeiserkeitObservation.class, "", "HeiserkeitObservation", HeiserkeitObservation.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(HeiserkeitObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(HeiserkeitObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(HeiserkeitObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(HeiserkeitObservation.class, "/language", "language", Language.class, this); + + private HeiserkeitObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static HeiserkeitObservationContainment getInstance() { + return new HeiserkeitObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java new file mode 100644 index 000000000..7f4e3533d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java @@ -0,0 +1,128 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.travel_history.v0") +public class HistorieDerReiseObservation { + /** + * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Aufenthalt in den letzten 14 Tage in einem der Risikogebiete für Coronainfektion oder Kontakt zu Menschen, die dort waren + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0111 and name/value='Aufenthalt in den letzten 14 Tage in einem der Risikogebiete für Coronainfektion oder Kontakt zu Menschen, die dort waren']/value|defining_code") + private AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode; + + /** + * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Ortsbeschreibung/Standort + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0134]/items[openEHR-EHR-CLUSTER.location.v1]") + private StandortCluster standort; + + /** + * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Detaillierte Angaben zur Exposition + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0109]") + private List detaillierteAngabenZurExposition; + + /** + * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/time + */ + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + /** + * Bericht/Risikogebiet/Historie der Reise/origin + */ + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + /** + * Bericht/Risikogebiet/Historie der Reise/*Extension(en) + */ + @Path("/protocol[at0100]/items[at0101]") + private List extensionEn; + + /** + * Bericht/Risikogebiet/Historie der Reise/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Risikogebiet/Historie der Reise/language + */ + @Path("/language") + private Language language; + + public void setAufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode( + AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode) { + this.aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode = aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode; + } + + public AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ getAufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode( + ) { + return this.aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode ; + } + + public void setStandort(StandortCluster standort) { + this.standort = standort; + } + + public StandortCluster getStandort() { + return this.standort ; + } + + public void setDetaillierteAngabenZurExposition(List detaillierteAngabenZurExposition) { + this.detaillierteAngabenZurExposition = detaillierteAngabenZurExposition; + } + + public List getDetaillierteAngabenZurExposition() { + return this.detaillierteAngabenZurExposition ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setExtensionEn(List extensionEn) { + this.extensionEn = extensionEn; + } + + public List getExtensionEn() { + return this.extensionEn ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java new file mode 100644 index 000000000..c8a4c9b3a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java @@ -0,0 +1,39 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class HistorieDerReiseObservationContainment extends Containment { + public SelectAqlField HISTORIE_DER_REISE_OBSERVATION = new AqlFieldImp(HistorieDerReiseObservation.class, "", "HistorieDerReiseObservation", HistorieDerReiseObservation.class, this); + + public SelectAqlField AUFENTHALT_IN_DEN_LETZTEN14_TAGE_IN_EINEM_DER_RISIKOGEBIETE_FUR_CORONAINFEKTION_ODER_KONTAKT_ZU_MENSCHEN_DIE_DORT_WAREN_DEFINING_CODE = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0111]/value|defining_code", "aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode", AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_.class, this); + + public SelectAqlField STANDORT = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0134]/items[openEHR-EHR-CLUSTER.location.v1]", "standort", StandortCluster.class, this); + + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUR_EXPOSITION = new ListAqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0109]", "detaillierteAngabenZurExposition", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(HistorieDerReiseObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField EXTENSION_EN = new ListAqlFieldImp(HistorieDerReiseObservation.class, "/protocol[at0100]/items[at0101]", "extensionEn", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(HistorieDerReiseObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(HistorieDerReiseObservation.class, "/language", "language", Language.class, this); + + private HistorieDerReiseObservationContainment() { + super("openEHR-EHR-OBSERVATION.travel_history.v0"); + } + + public static HistorieDerReiseObservationContainment getInstance() { + return new HistorieDerReiseObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservation.java new file mode 100644 index 000000000..f0299402c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservation.java @@ -0,0 +1,129 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class HustenObservation { + /** + * Bericht/Symptome/Husten/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + /** + * Bericht/Symptome/Husten/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; + + /** + * Bericht/Symptome/Husten/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; + + /** + * Bericht/Symptome/Husten/Beliebiges Ereignis/time + */ + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + /** + * Bericht/Symptome/Husten/origin + */ + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + /** + * Bericht/Symptome/Husten/Erweiterung + */ + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + /** + * Bericht/Symptome/Husten/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Symptome/Husten/language + */ + @Path("/language") + private Language language; + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } + + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } + + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } + + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservationContainment.java new file mode 100644 index 000000000..90a5fd719 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class HustenObservationContainment extends Containment { + public SelectAqlField HUSTEN_OBSERVATION = new AqlFieldImp(HustenObservation.class, "", "HustenObservation", HustenObservation.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(HustenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(HustenObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(HustenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(HustenObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(HustenObservation.class, "/language", "language", Language.class, this); + + private HustenObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static HustenObservationContainment getInstance() { + return new HustenObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/InlandAuslandDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/InlandAuslandDefiningCode.java new file mode 100644 index 000000000..c094bf3f8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/InlandAuslandDefiningCode.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum InlandAuslandDefiningCode implements EnumValueSet { + INLANDSREISE("Inlandsreise", "Die Person ist innerhalb des angegebenen Zeitraums im Inland gereist.", "local", "at0028"), + + INLANDS_UND_AUSLANDSREISE("Inlands- und Auslandsreise", "Die Person ist innerhalb des festgelegten Zeitraums sowohl im Inland als auch international gereist.", "local", "at0030"), + + AUSLANDREISE("Auslandreise", "Die Person ist innerhalb des angegebenen Zeitraums international gereist.", "local", "at0029"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + InlandAuslandDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservation.java new file mode 100644 index 000000000..7f38c7854 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservation.java @@ -0,0 +1,185 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.body_temperature.v2") +public class KorpertemperaturObservation { + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Temperatur + */ + @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude") + private Double temperaturMagnitude; + + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Temperatur + */ + @Path("/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units") + private String temperaturUnits; + + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Störfaktoren + */ + @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0066]") + private List storfaktoren; + + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Umgebungsbedingungen + */ + @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0056]") + private List umgebungsbedingungen; + + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Betätigung + */ + @Path("/data[at0002]/events[at0003]/state[at0029]/items[at0057]") + private Cluster betatigung; + + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/time + */ + @Path("/data[at0002]/events[at0003]/time|value") + private TemporalAccessor timeValue; + + /** + * Bericht/Symptome/Körpertemperatur/origin + */ + @Path("/data[at0002]/origin|value") + private TemporalAccessor originValue; + + /** + * Bericht/Symptome/Körpertemperatur/Strukturierte Lokalisation der Messung + */ + @Path("/protocol[at0020]/items[at0064]") + private List strukturierteLokalisationDerMessung; + + /** + * Bericht/Symptome/Körpertemperatur/Gerät + */ + @Path("/protocol[at0020]/items[at0059]") + private Cluster gerat; + + /** + * Bericht/Symptome/Körpertemperatur/Erweiterung + */ + @Path("/protocol[at0020]/items[at0062]") + private List erweiterung; + + /** + * Bericht/Symptome/Körpertemperatur/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Symptome/Körpertemperatur/language + */ + @Path("/language") + private Language language; + + public void setTemperaturMagnitude(Double temperaturMagnitude) { + this.temperaturMagnitude = temperaturMagnitude; + } + + public Double getTemperaturMagnitude() { + return this.temperaturMagnitude ; + } + + public void setTemperaturUnits(String temperaturUnits) { + this.temperaturUnits = temperaturUnits; + } + + public String getTemperaturUnits() { + return this.temperaturUnits ; + } + + public void setStorfaktoren(List storfaktoren) { + this.storfaktoren = storfaktoren; + } + + public List getStorfaktoren() { + return this.storfaktoren ; + } + + public void setUmgebungsbedingungen(List umgebungsbedingungen) { + this.umgebungsbedingungen = umgebungsbedingungen; + } + + public List getUmgebungsbedingungen() { + return this.umgebungsbedingungen ; + } + + public void setBetatigung(Cluster betatigung) { + this.betatigung = betatigung; + } + + public Cluster getBetatigung() { + return this.betatigung ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setStrukturierteLokalisationDerMessung( + List strukturierteLokalisationDerMessung) { + this.strukturierteLokalisationDerMessung = strukturierteLokalisationDerMessung; + } + + public List getStrukturierteLokalisationDerMessung() { + return this.strukturierteLokalisationDerMessung ; + } + + public void setGerat(Cluster gerat) { + this.gerat = gerat; + } + + public Cluster getGerat() { + return this.gerat ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java new file mode 100644 index 000000000..e3daa19ac --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java @@ -0,0 +1,49 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Double; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class KorpertemperaturObservationContainment extends Containment { + public SelectAqlField KORPERTEMPERATUR_OBSERVATION = new AqlFieldImp(KorpertemperaturObservation.class, "", "KorpertemperaturObservation", KorpertemperaturObservation.class, this); + + public SelectAqlField TEMPERATUR_MAGNITUDE = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|magnitude", "temperaturMagnitude", Double.class, this); + + public SelectAqlField TEMPERATUR_UNITS = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/data[at0001]/items[at0004]/value|units", "temperaturUnits", String.class, this); + + public ListSelectAqlField STORFAKTOREN = new ListAqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0066]", "storfaktoren", KorpertemperaturStorfaktorenElement.class, this); + + public ListSelectAqlField UMGEBUNGSBEDINGUNGEN = new ListAqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0056]", "umgebungsbedingungen", Cluster.class, this); + + public SelectAqlField BETATIGUNG = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/state[at0029]/items[at0057]", "betatigung", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/events[at0003]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(KorpertemperaturObservation.class, "/data[at0002]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField STRUKTURIERTE_LOKALISATION_DER_MESSUNG = new ListAqlFieldImp(KorpertemperaturObservation.class, "/protocol[at0020]/items[at0064]", "strukturierteLokalisationDerMessung", Cluster.class, this); + + public SelectAqlField GERAT = new AqlFieldImp(KorpertemperaturObservation.class, "/protocol[at0020]/items[at0059]", "gerat", Cluster.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(KorpertemperaturObservation.class, "/protocol[at0020]/items[at0062]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(KorpertemperaturObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(KorpertemperaturObservation.class, "/language", "language", Language.class, this); + + private KorpertemperaturObservationContainment() { + super("openEHR-EHR-OBSERVATION.body_temperature.v2"); + } + + public static KorpertemperaturObservationContainment getInstance() { + return new KorpertemperaturObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java new file mode 100644 index 000000000..7424e4c8c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java @@ -0,0 +1,22 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class KorpertemperaturStorfaktorenElement { + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Störfaktoren + */ + @Path("/value|value") + private String value; + + public void setValue(String value) { + this.value = value; + } + + public String getValue() { + return this.value ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/LetzteReiseDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/LetzteReiseDefiningCode.java new file mode 100644 index 000000000..f3959e80d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/LetzteReiseDefiningCode.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum LetzteReiseDefiningCode implements EnumValueSet { + NEIN("Nein", "Die Person ist nicht innerhalb des angegebenen Zeitraums gereist.", "local", "at0005"), + + UNBEKANNT("Unbekannt", "Es ist nicht bekannt, ob die Person innerhalb des angegebenen Zeitinraumss gereist ist.", "local", "at0027"), + + JA_NATIONAL("Ja - national", "Die Person ist innerhalb des angegebenen Zeitraums national gereist.", "local", "at0006"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + LetzteReiseDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningCode.java new file mode 100644 index 000000000..0a826e848 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningCode.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum MedikamentInVerwendungDefiningCode implements EnumValueSet { + NICHT_IN_VERWENDUNG("Nicht in Verwendung", "Die Person verwendet das Medikament zum Zeitpunkt des Ergebnis oder währendessen nicht oder hat es nicht verwendet.", "local", "at0032"), + + UNBEKANNT("Unbekannt", "Es ist unbekannt, ob die Person das Medikament zum Zeitpunkt des Ergebnis oder währendessen verwendet oder es verwendet hat.", "local", "at0033"), + + IN_VERWENDUNG("In Verwendung", "Die Person verwendet das Medikament zum Zeitpunkt des Ergebnis oder währendessen oder hat es verwendet.", "local", "at0031"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + MedikamentInVerwendungDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningCode.java new file mode 100644 index 000000000..ba1b09000 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningCode.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum MedikamentenklasseInVerwendungDefiningCode implements EnumValueSet { + IN_VERWENDUNG("In Verwendung", "Die Person verwendet die Medikamentenklasse zum Zeitpunkt des Ergebnis oder währendessen oder hat sie verwendet.", "local", "at0028"), + + UNBEKANNT("Unbekannt", "Es ist unbekannt, ob die Person die Medikamentenklasse zum Zeitpunkt des Ergebnis oder währendessen verwendet oder sie verwendet hat.", "local", "at0030"), + + NICHT_IN_VERWENDUNG("Nicht in Verwendung", "Die Person verwendet die Medikamentenklasse zum Zeitpunkt des Ergebnis oder währendessen nicht oder hat sie nicht verwendet.", "local", "at0029"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + MedikamentenklasseInVerwendungDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationCluster.java new file mode 100644 index 000000000..dd75ace5d --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationCluster.java @@ -0,0 +1,96 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.organisation_cc.v0") +public class OrganisationCluster { + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Identifier + */ + @Path("/items[at0018]") + private List identifier; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Name der Einrichtung + */ + @Path("/items[at0012 and name/value='Name der Einrichtung']/value|value") + private String nameDerEinrichtungValue; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Telefon + */ + @Path("/items[at0014]") + private List telefon; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Adresse + */ + @Path("/items[openEHR-EHR-CLUSTER.address_cc.v0]") + private List adresse; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Teil von + */ + @Path("/items[at0017]") + private List teilVon; + + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Kontakt + */ + @Path("/items[at0016]") + private List kontakt; + + public void setIdentifier(List identifier) { + this.identifier = identifier; + } + + public List getIdentifier() { + return this.identifier ; + } + + public void setNameDerEinrichtungValue(String nameDerEinrichtungValue) { + this.nameDerEinrichtungValue = nameDerEinrichtungValue; + } + + public String getNameDerEinrichtungValue() { + return this.nameDerEinrichtungValue ; + } + + public void setTelefon(List telefon) { + this.telefon = telefon; + } + + public List getTelefon() { + return this.telefon ; + } + + public void setAdresse(List adresse) { + this.adresse = adresse; + } + + public List getAdresse() { + return this.adresse ; + } + + public void setTeilVon(List teilVon) { + this.teilVon = teilVon; + } + + public List getTeilVon() { + return this.teilVon ; + } + + public void setKontakt(List kontakt) { + this.kontakt = kontakt; + } + + public List getKontakt() { + return this.kontakt ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationClusterContainment.java new file mode 100644 index 000000000..b93641306 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationClusterContainment.java @@ -0,0 +1,33 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class OrganisationClusterContainment extends Containment { + public SelectAqlField ORGANISATION_CLUSTER = new AqlFieldImp(OrganisationCluster.class, "", "OrganisationCluster", OrganisationCluster.class, this); + + public ListSelectAqlField IDENTIFIER = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0018]", "identifier", Cluster.class, this); + + public SelectAqlField NAME_DER_EINRICHTUNG_VALUE = new AqlFieldImp(OrganisationCluster.class, "/items[at0012]/value|value", "nameDerEinrichtungValue", String.class, this); + + public ListSelectAqlField TELEFON = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0014]", "telefon", Cluster.class, this); + + public ListSelectAqlField ADRESSE = new ListAqlFieldImp(OrganisationCluster.class, "/items[openEHR-EHR-CLUSTER.address_cc.v0]", "adresse", AdresseCluster.class, this); + + public ListSelectAqlField TEIL_VON = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0017]", "teilVon", Cluster.class, this); + + public ListSelectAqlField KONTAKT = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0016]", "kontakt", Cluster.class, this); + + private OrganisationClusterContainment() { + super("openEHR-EHR-CLUSTER.organisation_cc.v0"); + } + + public static OrganisationClusterContainment getInstance() { + return new OrganisationClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservation.java new file mode 100644 index 000000000..c1ce6f596 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservation.java @@ -0,0 +1,156 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.exposure_assessment.v0") +public class PersonenkontaktObservation { + /** + * Bericht/Kontakt/Personenkontakt/Beliebiges Ereignis/*Agent (en) + */ + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value") + private String agentEnValue; + + /** + * Bericht/Kontakt/Personenkontakt/Beliebiges Ereignis/*Presence of any exposure? (en) + */ + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code") + private PresenceOfAnyExposureEnDefiningCode presenceOfAnyExposureEnDefiningCode; + + /** + * Bericht/Kontakt/Personenkontakt/Beliebiges Ereignis/*Specific exposure (en)/*Exposure (en) + */ + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value") + private String exposureEnValue; + + /** + * Bericht/Kontakt/Personenkontakt/Beliebiges Ereignis/*Specific exposure (en)/Vorhandensein + */ + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code") + private VorhandenseinDefiningCode vorhandenseinDefiningCode; + + /** + * Bericht/Kontakt/Personenkontakt/Beliebiges Ereignis/Kommentar + */ + @Path("/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value") + private String kommentarValue; + + /** + * Bericht/Kontakt/Personenkontakt/Beliebiges Ereignis/time + */ + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + /** + * Bericht/Kontakt/Personenkontakt/origin + */ + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + /** + * Bericht/Kontakt/Personenkontakt/Erweiterung + */ + @Path("/protocol[at0004]/items[at0056]") + private List erweiterung; + + /** + * Bericht/Kontakt/Personenkontakt/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Kontakt/Personenkontakt/language + */ + @Path("/language") + private Language language; + + public void setAgentEnValue(String agentEnValue) { + this.agentEnValue = agentEnValue; + } + + public String getAgentEnValue() { + return this.agentEnValue ; + } + + public void setPresenceOfAnyExposureEnDefiningCode( + PresenceOfAnyExposureEnDefiningCode presenceOfAnyExposureEnDefiningCode) { + this.presenceOfAnyExposureEnDefiningCode = presenceOfAnyExposureEnDefiningCode; + } + + public PresenceOfAnyExposureEnDefiningCode getPresenceOfAnyExposureEnDefiningCode() { + return this.presenceOfAnyExposureEnDefiningCode ; + } + + public void setExposureEnValue(String exposureEnValue) { + this.exposureEnValue = exposureEnValue; + } + + public String getExposureEnValue() { + return this.exposureEnValue ; + } + + public void setVorhandenseinDefiningCode(VorhandenseinDefiningCode vorhandenseinDefiningCode) { + this.vorhandenseinDefiningCode = vorhandenseinDefiningCode; + } + + public VorhandenseinDefiningCode getVorhandenseinDefiningCode() { + return this.vorhandenseinDefiningCode ; + } + + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } + + public String getKommentarValue() { + return this.kommentarValue ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java new file mode 100644 index 000000000..0b85305c2 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class PersonenkontaktObservationContainment extends Containment { + public SelectAqlField PERSONENKONTAKT_OBSERVATION = new AqlFieldImp(PersonenkontaktObservation.class, "", "PersonenkontaktObservation", PersonenkontaktObservation.class, this); + + public SelectAqlField AGENT_EN_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0043]/value|value", "agentEnValue", String.class, this); + + public SelectAqlField PRESENCE_OF_ANY_EXPOSURE_EN_DEFINING_CODE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0057]/value|defining_code", "presenceOfAnyExposureEnDefiningCode", PresenceOfAnyExposureEnDefiningCode.class, this); + + public SelectAqlField EXPOSURE_EN_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0045]/value|value", "exposureEnValue", String.class, this); + + public SelectAqlField VORHANDENSEIN_DEFINING_CODE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0044]/items[at0046]/value|defining_code", "vorhandenseinDefiningCode", VorhandenseinDefiningCode.class, this); + + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/data[at0042]/items[at0055]/value|value", "kommentarValue", String.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(PersonenkontaktObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(PersonenkontaktObservation.class, "/protocol[at0004]/items[at0056]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(PersonenkontaktObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(PersonenkontaktObservation.class, "/language", "language", Language.class, this); + + private PersonenkontaktObservationContainment() { + super("openEHR-EHR-OBSERVATION.exposure_assessment.v0"); + } + + public static PersonenkontaktObservationContainment getInstance() { + return new PersonenkontaktObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningCode.java new file mode 100644 index 000000000..9e8551175 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningCode.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum PresenceOfAnyExposureEnDefiningCode implements EnumValueSet { + N_ABSENT_EN("*Absent (en)", "*Exposure is or has been absent at or during the event. (en)", "local", "at0059"), + + N_UNKNOWN_EN("*Unknown (en)", "*It is not known whether any exposure is or has been present or absent at or during the event. (en)", "local", "at0060"), + + N_PRESENT_EN("*Present (en)", "*Exposure is or has been present at or during the event. (en)", "local", "at0058"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + PresenceOfAnyExposureEnDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java new file mode 100644 index 000000000..0a1553005 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java @@ -0,0 +1,112 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.problem_diagnosis.v1") +public class ProblemDiagnoseEvaluation { + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/Name des Problems/ der Diagnose + */ + @Path("/data[at0001]/items[at0002]/value|value") + private String nameDesProblemsDerDiagnoseValue; + + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/Anatomische Stelle (strukturiert) + */ + @Path("/data[at0001]/items[at0039]") + private List anatomischeStelleStrukturiert; + + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/Spezifische Angaben + */ + @Path("/data[at0001]/items[at0043]") + private List spezifischeAngaben; + + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/Status + */ + @Path("/data[at0001]/items[at0046]") + private List status; + + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/Erweiterung + */ + @Path("/protocol[at0032]/items[at0071]") + private List erweiterung; + + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/language + */ + @Path("/language") + private Language language; + + public void setNameDesProblemsDerDiagnoseValue(String nameDesProblemsDerDiagnoseValue) { + this.nameDesProblemsDerDiagnoseValue = nameDesProblemsDerDiagnoseValue; + } + + public String getNameDesProblemsDerDiagnoseValue() { + return this.nameDesProblemsDerDiagnoseValue ; + } + + public void setAnatomischeStelleStrukturiert(List anatomischeStelleStrukturiert) { + this.anatomischeStelleStrukturiert = anatomischeStelleStrukturiert; + } + + public List getAnatomischeStelleStrukturiert() { + return this.anatomischeStelleStrukturiert ; + } + + public void setSpezifischeAngaben(List spezifischeAngaben) { + this.spezifischeAngaben = spezifischeAngaben; + } + + public List getSpezifischeAngaben() { + return this.spezifischeAngaben ; + } + + public void setStatus(List status) { + this.status = status; + } + + public List getStatus() { + return this.status ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java new file mode 100644 index 000000000..58f7eb77e --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java @@ -0,0 +1,37 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class ProblemDiagnoseEvaluationContainment extends Containment { + public SelectAqlField PROBLEM_DIAGNOSE_EVALUATION = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "", "ProblemDiagnoseEvaluation", ProblemDiagnoseEvaluation.class, this); + + public SelectAqlField NAME_DES_PROBLEMS_DER_DIAGNOSE_VALUE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0002]/value|value", "nameDesProblemsDerDiagnoseValue", String.class, this); + + public ListSelectAqlField ANATOMISCHE_STELLE_STRUKTURIERT = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0039]", "anatomischeStelleStrukturiert", Cluster.class, this); + + public ListSelectAqlField SPEZIFISCHE_ANGABEN = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0043]", "spezifischeAngaben", Cluster.class, this); + + public ListSelectAqlField STATUS = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0046]", "status", Cluster.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ProblemDiagnoseEvaluation.class, "/protocol[at0032]/items[at0071]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/language", "language", Language.class, this); + + private ProblemDiagnoseEvaluationContainment() { + super("openEHR-EHR-EVALUATION.problem_diagnosis.v1"); + } + + public static ProblemDiagnoseEvaluationContainment getInstance() { + return new ProblemDiagnoseEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java new file mode 100644 index 000000000..7d7d2fd44 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +public interface ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java new file mode 100644 index 000000000..36c5c60e9 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java @@ -0,0 +1,24 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_CODED_TEXT") +public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText implements ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/value/value + */ + @Path("|defining_code") + private DiagnostischeSicherheitDefiningCode diagnostischeSicherheitDefiningCode; + + public void setDiagnostischeSicherheitDefiningCode( + DiagnostischeSicherheitDefiningCode diagnostischeSicherheitDefiningCode) { + this.diagnostischeSicherheitDefiningCode = diagnostischeSicherheitDefiningCode; + } + + public DiagnostischeSicherheitDefiningCode getDiagnostischeSicherheitDefiningCode() { + return this.diagnostischeSicherheitDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java new file mode 100644 index 000000000..7df75cac2 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java @@ -0,0 +1,24 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("DV_TEXT") +public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText implements ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/value/value + */ + @Path("|value") + private String diagnostischeSicherheitValue; + + public void setDiagnostischeSicherheitValue(String diagnostischeSicherheitValue) { + this.diagnostischeSicherheitValue = diagnostischeSicherheitValue; + } + + public String getDiagnostischeSicherheitValue() { + return this.diagnostischeSicherheitValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java new file mode 100644 index 000000000..9de5a513a --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java @@ -0,0 +1,158 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +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.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1") +public class ProblemDiganoseCoronovirusEvaluation { + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Name des Problems/ der Diagnose + */ + @Path("/data[at0001]/items[at0002]/value|value") + private String nameDesProblemsDerDiagnoseValue; + + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Anatomische Stelle (strukturiert) + */ + @Path("/data[at0001]/items[at0039]") + private List anatomischeStelleStrukturiert; + + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Spezifische Angaben + */ + @Path("/data[at0001]/items[at0043]") + private List spezifischeAngaben; + + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Status + */ + @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.problem_qualifier.v1 and name/value='Status']") + private StatusCluster status; + + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Kommentar + */ + @Path("/data[at0001]/items[at0069]/value|value") + private String kommentarValue; + + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Zuletzt aktualisiert + */ + @Path("/protocol[at0032]/items[at0070]/value|value") + private TemporalAccessor zuletztAktualisiertValue; + + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Erweiterung + */ + @Path("/protocol[at0032]/items[at0071]") + private List erweiterung; + + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/language + */ + @Path("/language") + private Language language; + + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/value + */ + @Path("/data[at0001]/items[at0073]/value") + @Choice + private ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice diagnostischeSicherheit; + + public void setNameDesProblemsDerDiagnoseValue(String nameDesProblemsDerDiagnoseValue) { + this.nameDesProblemsDerDiagnoseValue = nameDesProblemsDerDiagnoseValue; + } + + public String getNameDesProblemsDerDiagnoseValue() { + return this.nameDesProblemsDerDiagnoseValue ; + } + + public void setAnatomischeStelleStrukturiert(List anatomischeStelleStrukturiert) { + this.anatomischeStelleStrukturiert = anatomischeStelleStrukturiert; + } + + public List getAnatomischeStelleStrukturiert() { + return this.anatomischeStelleStrukturiert ; + } + + public void setSpezifischeAngaben(List spezifischeAngaben) { + this.spezifischeAngaben = spezifischeAngaben; + } + + public List getSpezifischeAngaben() { + return this.spezifischeAngaben ; + } + + public void setStatus(StatusCluster status) { + this.status = status; + } + + public StatusCluster getStatus() { + return this.status ; + } + + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } + + public String getKommentarValue() { + return this.kommentarValue ; + } + + public void setZuletztAktualisiertValue(TemporalAccessor zuletztAktualisiertValue) { + this.zuletztAktualisiertValue = zuletztAktualisiertValue; + } + + public TemporalAccessor getZuletztAktualisiertValue() { + return this.zuletztAktualisiertValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setDiagnostischeSicherheit( + ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice diagnostischeSicherheit) { + this.diagnostischeSicherheit = diagnostischeSicherheit; + } + + public ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice getDiagnostischeSicherheit() { + return this.diagnostischeSicherheit ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java new file mode 100644 index 000000000..ce7aaf305 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java @@ -0,0 +1,44 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class ProblemDiganoseCoronovirusEvaluationContainment extends Containment { + public SelectAqlField PROBLEM_DIGANOSE_CORONOVIRUS_EVALUATION = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "", "ProblemDiganoseCoronovirusEvaluation", ProblemDiganoseCoronovirusEvaluation.class, this); + + public SelectAqlField NAME_DES_PROBLEMS_DER_DIAGNOSE_VALUE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0002]/value|value", "nameDesProblemsDerDiagnoseValue", String.class, this); + + public ListSelectAqlField ANATOMISCHE_STELLE_STRUKTURIERT = new ListAqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0039]", "anatomischeStelleStrukturiert", Cluster.class, this); + + public ListSelectAqlField SPEZIFISCHE_ANGABEN = new ListAqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0043]", "spezifischeAngaben", Cluster.class, this); + + public SelectAqlField STATUS = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.problem_qualifier.v1]", "status", StatusCluster.class, this); + + public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0069]/value|value", "kommentarValue", String.class, this); + + public SelectAqlField ZULETZT_AKTUALISIERT_VALUE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/protocol[at0032]/items[at0070]/value|value", "zuletztAktualisiertValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/protocol[at0032]/items[at0071]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/language", "language", Language.class, this); + + public SelectAqlField DIAGNOSTISCHE_SICHERHEIT = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0073]/value", "diagnostischeSicherheit", ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.class, this); + + private ProblemDiganoseCoronovirusEvaluationContainment() { + super("openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1"); + } + + public static ProblemDiganoseCoronovirusEvaluationContainment getInstance() { + return new ProblemDiganoseCoronovirusEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java new file mode 100644 index 000000000..7155db8c8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java @@ -0,0 +1,95 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; + +@Entity +public class ReisefallBeliebigesIntervallereignisIntervalEvent { + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Letzte Reise? + */ + @Path("/data[at0003]/items[at0004 and name/value='Letzte Reise?']/value|defining_code") + private LetzteReiseDefiningCode letzteReiseDefiningCode; + + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Inland/Ausland + */ + @Path("/data[at0003]/items[at0026]/value|defining_code") + private InlandAuslandDefiningCode inlandAuslandDefiningCode; + + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise + */ + @Path("/data[at0003]/items[at0008]") + private List bestimmteReise; + + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/math_function + */ + @Path("/math_function|defining_code") + private MathFunction mathFunctionDefiningCode; + + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/width + */ + @Path("/width|value") + private TemporalAmount widthValue; + + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/time + */ + @Path("/time|value") + private TemporalAccessor timeValue; + + public void setLetzteReiseDefiningCode(LetzteReiseDefiningCode letzteReiseDefiningCode) { + this.letzteReiseDefiningCode = letzteReiseDefiningCode; + } + + public LetzteReiseDefiningCode getLetzteReiseDefiningCode() { + return this.letzteReiseDefiningCode ; + } + + public void setInlandAuslandDefiningCode(InlandAuslandDefiningCode inlandAuslandDefiningCode) { + this.inlandAuslandDefiningCode = inlandAuslandDefiningCode; + } + + public InlandAuslandDefiningCode getInlandAuslandDefiningCode() { + return this.inlandAuslandDefiningCode ; + } + + public void setBestimmteReise(List bestimmteReise) { + this.bestimmteReise = bestimmteReise; + } + + public List getBestimmteReise() { + return this.bestimmteReise ; + } + + public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { + this.mathFunctionDefiningCode = mathFunctionDefiningCode; + } + + public MathFunction getMathFunctionDefiningCode() { + return this.mathFunctionDefiningCode ; + } + + public void setWidthValue(TemporalAmount widthValue) { + this.widthValue = widthValue; + } + + public TemporalAmount getWidthValue() { + return this.widthValue ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java new file mode 100644 index 000000000..3a5c711cb --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java @@ -0,0 +1,53 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class ReisefallBestimmteReiseCluster { + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel + */ + @Path("/items[at0010]") + private List bestimmtesReiseziel; + + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Zusätzliche Reisedetails + */ + @Path("/items[at0025]") + private List zusatzlicheReisedetails; + + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Rückreisedatum + */ + @Path("/items[at0019]/value|value") + private TemporalAccessor ruckreisedatumValue; + + public void setBestimmtesReiseziel( + List bestimmtesReiseziel) { + this.bestimmtesReiseziel = bestimmtesReiseziel; + } + + public List getBestimmtesReiseziel() { + return this.bestimmtesReiseziel ; + } + + public void setZusatzlicheReisedetails(List zusatzlicheReisedetails) { + this.zusatzlicheReisedetails = zusatzlicheReisedetails; + } + + public List getZusatzlicheReisedetails() { + return this.zusatzlicheReisedetails ; + } + + public void setRuckreisedatumValue(TemporalAccessor ruckreisedatumValue) { + this.ruckreisedatumValue = ruckreisedatumValue; + } + + public TemporalAccessor getRuckreisedatumValue() { + return this.ruckreisedatumValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java new file mode 100644 index 000000000..cc6803b7c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java @@ -0,0 +1,80 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class ReisefallBestimmtesReisezielCluster { + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/Land + */ + @Path("/items[at0011]/value|value") + private String landValue; + + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/Bundesland / Region + */ + @Path("/items[at0012]/value|value") + private String bundeslandRegionValue; + + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/Stadt + */ + @Path("/items[at0013]/value|value") + private String stadtValue; + + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/Bestimmte Gegend + */ + @Path("/items[at0031]/value|value") + private String bestimmteGegendValue; + + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/Zusätzliche Angaben zum Zielort + */ + @Path("/items[at0024]") + private List zusatzlicheAngabenZumZielort; + + public void setLandValue(String landValue) { + this.landValue = landValue; + } + + public String getLandValue() { + return this.landValue ; + } + + public void setBundeslandRegionValue(String bundeslandRegionValue) { + this.bundeslandRegionValue = bundeslandRegionValue; + } + + public String getBundeslandRegionValue() { + return this.bundeslandRegionValue ; + } + + public void setStadtValue(String stadtValue) { + this.stadtValue = stadtValue; + } + + public String getStadtValue() { + return this.stadtValue ; + } + + public void setBestimmteGegendValue(String bestimmteGegendValue) { + this.bestimmteGegendValue = bestimmteGegendValue; + } + + public String getBestimmteGegendValue() { + return this.bestimmteGegendValue ; + } + + public void setZusatzlicheAngabenZumZielort(List zusatzlicheAngabenZumZielort) { + this.zusatzlicheAngabenZumZielort = zusatzlicheAngabenZumZielort; + } + + public List getZusatzlicheAngabenZumZielort() { + return this.zusatzlicheAngabenZumZielort ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservation.java new file mode 100644 index 000000000..d87e429c8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservation.java @@ -0,0 +1,85 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.travel_event.v0") +public class ReisefallObservation { + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis + */ + @Path("/data[at0001]/events[at0002]") + private List beliebigesIntervallereignis; + + /** + * Bericht/Risikogebiet/Reisefall/origin + */ + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + /** + * Bericht/Risikogebiet/Reisefall/Erweiterung + */ + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + /** + * Bericht/Risikogebiet/Reisefall/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Risikogebiet/Reisefall/language + */ + @Path("/language") + private Language language; + + public void setBeliebigesIntervallereignis( + List beliebigesIntervallereignis) { + this.beliebigesIntervallereignis = beliebigesIntervallereignis; + } + + public List getBeliebigesIntervallereignis() { + return this.beliebigesIntervallereignis ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservationContainment.java new file mode 100644 index 000000000..b36d57b1c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservationContainment.java @@ -0,0 +1,33 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class ReisefallObservationContainment extends Containment { + public SelectAqlField REISEFALL_OBSERVATION = new AqlFieldImp(ReisefallObservation.class, "", "ReisefallObservation", ReisefallObservation.class, this); + + public ListSelectAqlField BELIEBIGES_INTERVALLEREIGNIS = new ListAqlFieldImp(ReisefallObservation.class, "/data[at0001]/events[at0002]", "beliebigesIntervallereignis", ReisefallBeliebigesIntervallereignisIntervalEvent.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(ReisefallObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(ReisefallObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(ReisefallObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(ReisefallObservation.class, "/language", "language", Language.class, this); + + private ReisefallObservationContainment() { + super("openEHR-EHR-OBSERVATION.travel_event.v0"); + } + + public static ReisefallObservationContainment getInstance() { + return new ReisefallObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservation.java new file mode 100644 index 000000000..d9557ebad --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservation.java @@ -0,0 +1,129 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class SchnupfenObservation { + /** + * Bericht/Symptome/Schnupfen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + /** + * Bericht/Symptome/Schnupfen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code") + private VorhandenDefiningCode vorhandenDefiningCode; + + /** + * Bericht/Symptome/Schnupfen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ + @Path("/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; + + /** + * Bericht/Symptome/Schnupfen/Beliebiges Ereignis/time + */ + @Path("/data[at0001]/events[at0002]/time|value") + private TemporalAccessor timeValue; + + /** + * Bericht/Symptome/Schnupfen/origin + */ + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + /** + * Bericht/Symptome/Schnupfen/Erweiterung + */ + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + /** + * Bericht/Symptome/Schnupfen/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Symptome/Schnupfen/language + */ + @Path("/language") + private Language language; + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setVorhandenDefiningCode(VorhandenDefiningCode vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } + + public VorhandenDefiningCode getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } + + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } + + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java new file mode 100644 index 000000000..f74ffbd34 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class SchnupfenObservationContainment extends Containment { + public SelectAqlField SCHNUPFEN_OBSERVATION = new AqlFieldImp(SchnupfenObservation.class, "", "SchnupfenObservation", SchnupfenObservation.class, this); + + public SelectAqlField BEZEICHNUNG_DES_SYMPTOMS_ODER_ANZEICHENS_VALUE = new AqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0004]/value|value", "bezeichnungDesSymptomsOderAnzeichensValue", String.class, this); + + public SelectAqlField VORHANDEN_DEFINING_CODE = new AqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0005]/value|defining_code", "vorhandenDefiningCode", VorhandenDefiningCode.class, this); + + public ListSelectAqlField DETAILLIERTE_ANGABEN_ZUM_SYMPTOM_ANZEICHEN = new ListAqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0022]/items[at0026]", "detaillierteAngabenZumSymptomAnzeichen", Cluster.class, this); + + public SelectAqlField TIME_VALUE = new AqlFieldImp(SchnupfenObservation.class, "/data[at0001]/events[at0002]/time|value", "timeValue", TemporalAccessor.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(SchnupfenObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(SchnupfenObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(SchnupfenObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(SchnupfenObservation.class, "/language", "language", Language.class, this); + + private SchnupfenObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static SchnupfenObservationContainment getInstance() { + return new SchnupfenObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortCluster.java new file mode 100644 index 000000000..cc90288f9 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortCluster.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.location.v1") +public class StandortCluster { + /** + * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Ortsbeschreibung/Standort/Standortbeschreibung + */ + @Path("/items[at0046]/value|value") + private String standortbeschreibungValue; + + /** + * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Ortsbeschreibung/Standort/Details + */ + @Path("/items[at0047]") + private List details; + + public void setStandortbeschreibungValue(String standortbeschreibungValue) { + this.standortbeschreibungValue = standortbeschreibungValue; + } + + public String getStandortbeschreibungValue() { + return this.standortbeschreibungValue ; + } + + public void setDetails(List details) { + this.details = details; + } + + public List getDetails() { + return this.details ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortClusterContainment.java new file mode 100644 index 000000000..5505cc2a4 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortClusterContainment.java @@ -0,0 +1,25 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class StandortClusterContainment extends Containment { + public SelectAqlField STANDORT_CLUSTER = new AqlFieldImp(StandortCluster.class, "", "StandortCluster", StandortCluster.class, this); + + public SelectAqlField STANDORTBESCHREIBUNG_VALUE = new AqlFieldImp(StandortCluster.class, "/items[at0046]/value|value", "standortbeschreibungValue", String.class, this); + + public ListSelectAqlField DETAILS = new ListAqlFieldImp(StandortCluster.class, "/items[at0047]", "details", Cluster.class, this); + + private StandortClusterContainment() { + super("openEHR-EHR-CLUSTER.location.v1"); + } + + public static StandortClusterContainment getInstance() { + return new StandortClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusCluster.java new file mode 100644 index 000000000..c3e6fc29c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusCluster.java @@ -0,0 +1,23 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.problem_qualifier.v1") +public class StatusCluster { + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Status/Diagnosestatus + */ + @Path("/items[at0004]/value|defining_code") + private DiagnosestatusDefiningCode diagnosestatusDefiningCode; + + public void setDiagnosestatusDefiningCode(DiagnosestatusDefiningCode diagnosestatusDefiningCode) { + this.diagnosestatusDefiningCode = diagnosestatusDefiningCode; + } + + public DiagnosestatusDefiningCode getDiagnosestatusDefiningCode() { + return this.diagnosestatusDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusClusterContainment.java new file mode 100644 index 000000000..07aa7ec27 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusClusterContainment.java @@ -0,0 +1,19 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class StatusClusterContainment extends Containment { + public SelectAqlField STATUS_CLUSTER = new AqlFieldImp(StatusCluster.class, "", "StatusCluster", StatusCluster.class, this); + + public SelectAqlField DIAGNOSESTATUS_DEFINING_CODE = new AqlFieldImp(StatusCluster.class, "/items[at0004]/value|defining_code", "diagnosestatusDefiningCode", DiagnosestatusDefiningCode.class, this); + + private StatusClusterContainment() { + super("openEHR-EHR-CLUSTER.problem_qualifier.v1"); + } + + public static StatusClusterContainment getInstance() { + return new StatusClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/VorhandenDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/VorhandenDefiningCode.java new file mode 100644 index 000000000..b3fbc34b9 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/VorhandenDefiningCode.java @@ -0,0 +1,41 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum VorhandenDefiningCode implements EnumValueSet { + NICHT_VORHANDEN("Nicht vorhanden", "Das spezifische Symptom oder Anzeichen ist nicht vorhanden.", "local", "at0024"), + + VORHANDEN("Vorhanden", "Das spezifische Symptom oder Anzeichen ist vorhanden.", "local", "at0023"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + VorhandenDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/VorhandenDefiningCode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/VorhandenDefiningCode2.java new file mode 100644 index 000000000..167f1fb28 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/VorhandenDefiningCode2.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum VorhandenDefiningCode2 implements EnumValueSet { + NICHT_VORHANDEN("Nicht vorhanden", "Das spezifische Symptom oder Anzeichen ist nicht vorhanden.", "local", "at0024"), + + VORHANDEN("Vorhanden", "Das spezifische Symptom oder Anzeichen ist vorhanden.", "local", "at0023"), + + UNBEKANNT("Unbekannt", "Es ist nicht bekannt, ob das Symptom oder Anzeichen vorhanden ist oder nicht.", "local", "at0027"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + VorhandenDefiningCode2(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/VorhandenseinDefiningCode.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/VorhandenseinDefiningCode.java new file mode 100644 index 000000000..53715356b --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/VorhandenseinDefiningCode.java @@ -0,0 +1,41 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum VorhandenseinDefiningCode implements EnumValueSet { + NICHT_VORHANDEN("Nicht vorhanden", "*The specific exposure is or has been absent at or during the event.(en)", "local", "at0049"), + + VORHANDEN("Vorhanden", "*The specific exposure is or has been present at or during the event.(en)", "local", "at0047"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + VorhandenseinDefiningCode(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java new file mode 100644 index 000000000..535be39e8 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/VorhandenseinDefiningCode2.java @@ -0,0 +1,43 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import java.lang.String; +import org.ehrbase.client.classgenerator.EnumValueSet; + +public enum VorhandenseinDefiningCode2 implements EnumValueSet { + VORHANDEN("Vorhanden", "Der Risikofaktor wurde bei der Person identifiziert.", "local", "at0018"), + + UNBESTIMMT("Unbestimmt", "Es ist nicht möglich festzustellen, ob der Risikofaktor vorhanden oder nicht vorhanden ist.", "local", "at0026"), + + NICHT_VORHANDEN("Nicht vorhanden", "Der Risikofaktor wurde bei der Person nicht festgestellt.", "local", "at0019"); + + private String value; + + private String description; + + private String terminologyId; + + private String code; + + VorhandenseinDefiningCode2(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/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java new file mode 100644 index 000000000..12452f03c --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java @@ -0,0 +1,4 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +public interface WeitereSymptomeBeliebigesEreignisChoice { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java new file mode 100644 index 000000000..fe8918824 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java @@ -0,0 +1,71 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; + +@Entity +@OptionFor("INTERVAL_EVENT") +public class WeitereSymptomeBeliebigesEreignisIntervalEvent implements WeitereSymptomeBeliebigesEreignisChoice { + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen + */ + @Path("/data[at0003]/items[at0022]") + private List spezifischesSymptomAnzeichen; + + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/time + */ + @Path("/time|value") + private TemporalAccessor timeValue; + + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/width + */ + @Path("/width|value") + private TemporalAmount widthValue; + + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/math_function + */ + @Path("/math_function|defining_code") + private MathFunction mathFunctionDefiningCode; + + public void setSpezifischesSymptomAnzeichen( + List spezifischesSymptomAnzeichen) { + this.spezifischesSymptomAnzeichen = spezifischesSymptomAnzeichen; + } + + public List getSpezifischesSymptomAnzeichen( + ) { + return this.spezifischesSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } + + public void setWidthValue(TemporalAmount widthValue) { + this.widthValue = widthValue; + } + + public TemporalAmount getWidthValue() { + return this.widthValue ; + } + + public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { + this.mathFunctionDefiningCode = mathFunctionDefiningCode; + } + + public MathFunction getMathFunctionDefiningCode() { + return this.mathFunctionDefiningCode ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java new file mode 100644 index 000000000..d790af394 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java @@ -0,0 +1,41 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import java.time.temporal.TemporalAccessor; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; + +@Entity +@OptionFor("POINT_EVENT") +public class WeitereSymptomeBeliebigesEreignisPointEvent implements WeitereSymptomeBeliebigesEreignisChoice { + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen + */ + @Path("/data[at0003]/items[at0022]") + private List spezifischesSymptomAnzeichen; + + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/time + */ + @Path("/time|value") + private TemporalAccessor timeValue; + + public void setSpezifischesSymptomAnzeichen( + List spezifischesSymptomAnzeichen) { + this.spezifischesSymptomAnzeichen = spezifischesSymptomAnzeichen; + } + + public List getSpezifischesSymptomAnzeichen( + ) { + return this.spezifischesSymptomAnzeichen ; + } + + public void setTimeValue(TemporalAccessor timeValue) { + this.timeValue = timeValue; + } + + public TemporalAccessor getTimeValue() { + return this.timeValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java new file mode 100644 index 000000000..2a1c53912 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java @@ -0,0 +1,87 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import java.util.List; +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.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +public class WeitereSymptomeObservation { + /** + * Bericht/Symptome/Weitere Symptome/origin + */ + @Path("/data[at0001]/origin|value") + private TemporalAccessor originValue; + + /** + * Bericht/Symptome/Weitere Symptome/Erweiterung + */ + @Path("/protocol[at0007]/items[at0021]") + private List erweiterung; + + /** + * Bericht/Symptome/Weitere Symptome/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Symptome/Weitere Symptome/language + */ + @Path("/language") + private Language language; + + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis + */ + @Path("/data[at0001]/events[at0002]") + @Choice + private List beliebigesEreignis; + + public void setOriginValue(TemporalAccessor originValue) { + this.originValue = originValue; + } + + public TemporalAccessor getOriginValue() { + return this.originValue ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setBeliebigesEreignis( + List beliebigesEreignis) { + this.beliebigesEreignis = beliebigesEreignis; + } + + public List getBeliebigesEreignis() { + return this.beliebigesEreignis ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java new file mode 100644 index 000000000..8c8b42648 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java @@ -0,0 +1,33 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.time.temporal.TemporalAccessor; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class WeitereSymptomeObservationContainment extends Containment { + public SelectAqlField WEITERE_SYMPTOME_OBSERVATION = new AqlFieldImp(WeitereSymptomeObservation.class, "", "WeitereSymptomeObservation", WeitereSymptomeObservation.class, this); + + public SelectAqlField ORIGIN_VALUE = new AqlFieldImp(WeitereSymptomeObservation.class, "/data[at0001]/origin|value", "originValue", TemporalAccessor.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(WeitereSymptomeObservation.class, "/protocol[at0007]/items[at0021]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(WeitereSymptomeObservation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(WeitereSymptomeObservation.class, "/language", "language", Language.class, this); + + public ListSelectAqlField BELIEBIGES_EREIGNIS = new ListAqlFieldImp(WeitereSymptomeObservation.class, "/data[at0001]/events[at0002]", "beliebigesEreignis", WeitereSymptomeBeliebigesEreignisChoice.class, this); + + private WeitereSymptomeObservationContainment() { + super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); + } + + public static WeitereSymptomeObservationContainment getInstance() { + return new WeitereSymptomeObservationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java new file mode 100644 index 000000000..039c5a8b6 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java @@ -0,0 +1,68 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +public class WeitereSymptomeSpezifischesSymptomAnzeichenCluster { + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. + */ + @Path("/items[at0004]/value|value") + private String bezeichnungDesSymptomsOderAnzeichensValue; + + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Vorhanden? + */ + @Path("/items[at0005]/value|defining_code") + private VorhandenDefiningCode2 vorhandenDefiningCode; + + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Detaillierte Angaben zum Symptom/Anzeichen + */ + @Path("/items[at0026]") + private List detaillierteAngabenZumSymptomAnzeichen; + + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Kommentar + */ + @Path("/items[at0035]/value|value") + private String kommentarValue; + + public void setBezeichnungDesSymptomsOderAnzeichensValue( + String bezeichnungDesSymptomsOderAnzeichensValue) { + this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; + } + + public String getBezeichnungDesSymptomsOderAnzeichensValue() { + return this.bezeichnungDesSymptomsOderAnzeichensValue ; + } + + public void setVorhandenDefiningCode(VorhandenDefiningCode2 vorhandenDefiningCode) { + this.vorhandenDefiningCode = vorhandenDefiningCode; + } + + public VorhandenDefiningCode2 getVorhandenDefiningCode() { + return this.vorhandenDefiningCode ; + } + + public void setDetaillierteAngabenZumSymptomAnzeichen( + List detaillierteAngabenZumSymptomAnzeichen) { + this.detaillierteAngabenZumSymptomAnzeichen = detaillierteAngabenZumSymptomAnzeichen; + } + + public List getDetaillierteAngabenZumSymptomAnzeichen() { + return this.detaillierteAngabenZumSymptomAnzeichen ; + } + + public void setKommentarValue(String kommentarValue) { + this.kommentarValue = kommentarValue; + } + + public String getKommentarValue() { + return this.kommentarValue ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluation.java new file mode 100644 index 000000000..1bba55525 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluation.java @@ -0,0 +1,99 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Long; +import java.lang.String; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +@Entity +@Archetype("openEHR-EHR-EVALUATION.living_arrangement.v0") +public class WohnsituationEvaluation { + /** + * Bericht/Allgemeine Angaben/Wohnsituation/Beschreibung + */ + @Path("/data[at0001]/items[at0003]/value|value") + private String beschreibungValue; + + /** + * Bericht/Allgemeine Angaben/Wohnsituation/Anzahl der Haushaltsmitglieder + */ + @Path("/data[at0001]/items[at0007]/value|magnitude") + private Long anzahlDerHaushaltsmitgliederMagnitude; + + /** + * Bericht/Allgemeine Angaben/Wohnsituation/Wohnstätte + */ + @Path("/data[at0001]/items[openEHR-EHR-CLUSTER.dwelling.v0]") + private List wohnstatte; + + /** + * Bericht/Allgemeine Angaben/Wohnsituation/Erweiterung + */ + @Path("/protocol[at0002]/items[at0011]") + private List erweiterung; + + /** + * Bericht/Allgemeine Angaben/Wohnsituation/subject + */ + @Path("/subject") + private PartyProxy subject; + + /** + * Bericht/Allgemeine Angaben/Wohnsituation/language + */ + @Path("/language") + private Language language; + + public void setBeschreibungValue(String beschreibungValue) { + this.beschreibungValue = beschreibungValue; + } + + public String getBeschreibungValue() { + return this.beschreibungValue ; + } + + public void setAnzahlDerHaushaltsmitgliederMagnitude(Long anzahlDerHaushaltsmitgliederMagnitude) { + this.anzahlDerHaushaltsmitgliederMagnitude = anzahlDerHaushaltsmitgliederMagnitude; + } + + public Long getAnzahlDerHaushaltsmitgliederMagnitude() { + return this.anzahlDerHaushaltsmitgliederMagnitude ; + } + + public void setWohnstatte(List wohnstatte) { + this.wohnstatte = wohnstatte; + } + + public List getWohnstatte() { + return this.wohnstatte ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setSubject(PartyProxy subject) { + this.subject = subject; + } + + public PartyProxy getSubject() { + return this.subject ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java new file mode 100644 index 000000000..212a3b88f --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java @@ -0,0 +1,36 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.Long; +import java.lang.String; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public class WohnsituationEvaluationContainment extends Containment { + public SelectAqlField WOHNSITUATION_EVALUATION = new AqlFieldImp(WohnsituationEvaluation.class, "", "WohnsituationEvaluation", WohnsituationEvaluation.class, this); + + public SelectAqlField BESCHREIBUNG_VALUE = new AqlFieldImp(WohnsituationEvaluation.class, "/data[at0001]/items[at0003]/value|value", "beschreibungValue", String.class, this); + + public SelectAqlField ANZAHL_DER_HAUSHALTSMITGLIEDER_MAGNITUDE = new AqlFieldImp(WohnsituationEvaluation.class, "/data[at0001]/items[at0007]/value|magnitude", "anzahlDerHaushaltsmitgliederMagnitude", Long.class, this); + + public ListSelectAqlField WOHNSTATTE = new ListAqlFieldImp(WohnsituationEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.dwelling.v0]", "wohnstatte", WohnstatteCluster.class, this); + + public ListSelectAqlField ERWEITERUNG = new ListAqlFieldImp(WohnsituationEvaluation.class, "/protocol[at0002]/items[at0011]", "erweiterung", Cluster.class, this); + + public SelectAqlField SUBJECT = new AqlFieldImp(WohnsituationEvaluation.class, "/subject", "subject", PartyProxy.class, this); + + public SelectAqlField LANGUAGE = new AqlFieldImp(WohnsituationEvaluation.class, "/language", "language", Language.class, this); + + private WohnsituationEvaluationContainment() { + super("openEHR-EHR-EVALUATION.living_arrangement.v0"); + } + + public static WohnsituationEvaluationContainment getInstance() { + return new WohnsituationEvaluationContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteCluster.java new file mode 100644 index 000000000..07950afa3 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteCluster.java @@ -0,0 +1,40 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Long; +import java.util.List; +import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.Path; + +@Entity +@Archetype("openEHR-EHR-CLUSTER.dwelling.v0") +public class WohnstatteCluster { + /** + * Bericht/Allgemeine Angaben/Wohnsituation/Wohnstätte/Anzahl der Schlafzimmer + */ + @Path("/items[at0028]/value|magnitude") + private Long anzahlDerSchlafzimmerMagnitude; + + /** + * Bericht/Allgemeine Angaben/Wohnsituation/Wohnstätte/Ergänzende Details + */ + @Path("/items[at0003]") + private List erganzendeDetails; + + public void setAnzahlDerSchlafzimmerMagnitude(Long anzahlDerSchlafzimmerMagnitude) { + this.anzahlDerSchlafzimmerMagnitude = anzahlDerSchlafzimmerMagnitude; + } + + public Long getAnzahlDerSchlafzimmerMagnitude() { + return this.anzahlDerSchlafzimmerMagnitude ; + } + + public void setErganzendeDetails(List erganzendeDetails) { + this.erganzendeDetails = erganzendeDetails; + } + + public List getErganzendeDetails() { + return this.erganzendeDetails ; + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java new file mode 100644 index 000000000..c3abc0fc5 --- /dev/null +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java @@ -0,0 +1,25 @@ +package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; + +import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Long; +import org.ehrbase.client.aql.containment.Containment; +import org.ehrbase.client.aql.field.AqlFieldImp; +import org.ehrbase.client.aql.field.ListAqlFieldImp; +import org.ehrbase.client.aql.field.ListSelectAqlField; +import org.ehrbase.client.aql.field.SelectAqlField; + +public class WohnstatteClusterContainment extends Containment { + public SelectAqlField WOHNSTATTE_CLUSTER = new AqlFieldImp(WohnstatteCluster.class, "", "WohnstatteCluster", WohnstatteCluster.class, this); + + public SelectAqlField ANZAHL_DER_SCHLAFZIMMER_MAGNITUDE = new AqlFieldImp(WohnstatteCluster.class, "/items[at0028]/value|magnitude", "anzahlDerSchlafzimmerMagnitude", Long.class, this); + + public ListSelectAqlField ERGANZENDE_DETAILS = new ListAqlFieldImp(WohnstatteCluster.class, "/items[at0003]", "erganzendeDetails", Cluster.class, this); + + private WohnstatteClusterContainment() { + super("openEHR-EHR-CLUSTER.dwelling.v0"); + } + + public static WohnstatteClusterContainment getInstance() { + return new WohnstatteClusterContainment(); + } +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java index 4e4df8843..e63c5a285 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java @@ -29,7 +29,7 @@ public class BewertungDesGesundheitsrisikosEvaluation { * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Spezifischer Risikofaktor/Vorhandensein */ @Path("/data[at0001]/items[at0016 and name/value='Spezifischer Risikofaktor']/items[at0017]/value|defining_code") - private VorhandenseinDefiningCode2 vorhandenseinDefiningCode; + private VorhandenseinDefiningCode2 spezifischerRisikofaktorVorhandenseinDefiningCode; /** * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Spezifischer Risikofaktor/Details @@ -47,7 +47,7 @@ public class BewertungDesGesundheitsrisikosEvaluation { * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Andere Risikofaktoren/Vorhandensein */ @Path("/data[at0001]/items[at0016 and name/value='Andere Risikofaktoren']/items[at0017]/value|defining_code") - private VorhandenseinDefiningCode2 vorhandenseinDefiningCode2; + private VorhandenseinDefiningCode2 andereRisikofaktorenVorhandenseinDefiningCode; /** * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Andere Risikofaktoren/Details @@ -108,12 +108,13 @@ public String getSpezifischerRisikofaktorRisikofaktorValue() { return this.spezifischerRisikofaktorRisikofaktorValue ; } - public void setVorhandenseinDefiningCode(VorhandenseinDefiningCode2 vorhandenseinDefiningCode) { - this.vorhandenseinDefiningCode = vorhandenseinDefiningCode; + public void setSpezifischerRisikofaktorVorhandenseinDefiningCode( + VorhandenseinDefiningCode2 spezifischerRisikofaktorVorhandenseinDefiningCode) { + this.spezifischerRisikofaktorVorhandenseinDefiningCode = spezifischerRisikofaktorVorhandenseinDefiningCode; } - public VorhandenseinDefiningCode2 getVorhandenseinDefiningCode() { - return this.vorhandenseinDefiningCode ; + public VorhandenseinDefiningCode2 getSpezifischerRisikofaktorVorhandenseinDefiningCode() { + return this.spezifischerRisikofaktorVorhandenseinDefiningCode ; } public void setSpezifischerRisikofaktorDetails(List spezifischerRisikofaktorDetails) { @@ -133,12 +134,13 @@ public String getAndereRisikofaktorenRisikofaktorValue() { return this.andereRisikofaktorenRisikofaktorValue ; } - public void setVorhandenseinDefiningCode2(VorhandenseinDefiningCode2 vorhandenseinDefiningCode2) { - this.vorhandenseinDefiningCode2 = vorhandenseinDefiningCode2; + public void setAndereRisikofaktorenVorhandenseinDefiningCode( + VorhandenseinDefiningCode2 andereRisikofaktorenVorhandenseinDefiningCode) { + this.andereRisikofaktorenVorhandenseinDefiningCode = andereRisikofaktorenVorhandenseinDefiningCode; } - public VorhandenseinDefiningCode2 getVorhandenseinDefiningCode2() { - return this.vorhandenseinDefiningCode2 ; + public VorhandenseinDefiningCode2 getAndereRisikofaktorenVorhandenseinDefiningCode() { + return this.andereRisikofaktorenVorhandenseinDefiningCode ; } public void setAndereRisikofaktorenDetails(List andereRisikofaktorenDetails) { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java index 651c5cee5..34186fca9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java @@ -18,13 +18,13 @@ public class BewertungDesGesundheitsrisikosEvaluationContainment extends Contain public SelectAqlField SPEZIFISCHER_RISIKOFAKTOR_RISIKOFAKTOR_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0013]/value|value", "spezifischerRisikofaktorRisikofaktorValue", String.class, this); - public SelectAqlField VORHANDENSEIN_DEFINING_CODE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0017]/value|defining_code", "vorhandenseinDefiningCode", VorhandenseinDefiningCode2.class, this); + public SelectAqlField SPEZIFISCHER_RISIKOFAKTOR_VORHANDENSEIN_DEFINING_CODE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0017]/value|defining_code", "spezifischerRisikofaktorVorhandenseinDefiningCode", VorhandenseinDefiningCode2.class, this); public ListSelectAqlField SPEZIFISCHER_RISIKOFAKTOR_DETAILS = new ListAqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0027]", "spezifischerRisikofaktorDetails", Cluster.class, this); public SelectAqlField ANDERE_RISIKOFAKTOREN_RISIKOFAKTOR_VALUE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0013]/value|value", "andereRisikofaktorenRisikofaktorValue", String.class, this); - public SelectAqlField VORHANDENSEIN_DEFINING_CODE2 = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0017]/value|defining_code", "vorhandenseinDefiningCode2", VorhandenseinDefiningCode2.class, this); + public SelectAqlField ANDERE_RISIKOFAKTOREN_VORHANDENSEIN_DEFINING_CODE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0017]/value|defining_code", "andereRisikofaktorenVorhandenseinDefiningCode", VorhandenseinDefiningCode2.class, this); public ListSelectAqlField ANDERE_RISIKOFAKTOREN_DETAILS = new ListAqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/data[at0001]/items[at0016]/items[at0027]", "andereRisikofaktorenDetails", Cluster.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java index 2f27488b7..6872f869e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java @@ -21,13 +21,13 @@ public class Covid19ExposureEvaluation { * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Care home has suspected/confirmed Covid-19/Risk factor */ @Path("/data[at0001]/items[at0016 and name/value='Care home has suspected/confirmed Covid-19']/items[at0013.1]/value|defining_code") - private RiskFactorDefiningCode riskFactorDefiningCode; + private RiskFactorDefiningCode careHomeHasSuspectedConfirmedCovid19RiskFactorDefiningCode; /** * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Care home has suspected/confirmed Covid-19/Presence */ @Path("/data[at0001]/items[at0016 and name/value='Care home has suspected/confirmed Covid-19']/items[at0017.1]/value|defining_code") - private PresenceDefiningCode2 presenceDefiningCode; + private PresenceDefiningCode2 careHomeHasSuspectedConfirmedCovid19PresenceDefiningCode; /** * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Care home has suspected/confirmed Covid-19/Detail @@ -39,13 +39,13 @@ public class Covid19ExposureEvaluation { * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Contact with confirmed case/Risk factor */ @Path("/data[at0001]/items[at0016 and name/value='Contact with confirmed case']/items[at0013.1]/value|defining_code") - private RiskFactorDefiningCode2 riskFactorDefiningCode2; + private RiskFactorDefiningCode2 contactWithConfirmedCaseRiskFactorDefiningCode; /** * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Contact with confirmed case/Presence */ @Path("/data[at0001]/items[at0016 and name/value='Contact with confirmed case']/items[at0017.1]/value|defining_code") - private PresenceDefiningCode2 presenceDefiningCode2; + private PresenceDefiningCode2 contactWithConfirmedCasePresenceDefiningCode; /** * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Contact with confirmed case/Detail @@ -57,13 +57,13 @@ public class Covid19ExposureEvaluation { * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Other residents/household members unwell/Risk factor */ @Path("/data[at0001]/items[at0016 and name/value='Other residents/household members unwell']/items[at0013.1]/value|defining_code") - private RiskFactorDefiningCode3 riskFactorDefiningCode3; + private RiskFactorDefiningCode3 otherResidentsHouseholdMembersUnwellRiskFactorDefiningCode; /** * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Other residents/household members unwell/Presence */ @Path("/data[at0001]/items[at0016 and name/value='Other residents/household members unwell']/items[at0017.1]/value|defining_code") - private PresenceDefiningCode2 presenceDefiningCode3; + private PresenceDefiningCode2 otherResidentsHouseholdMembersUnwellPresenceDefiningCode; /** * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Other residents/household members unwell/Detail @@ -103,20 +103,22 @@ public HealthRiskDefiningCode getHealthRiskDefiningCode() { return this.healthRiskDefiningCode ; } - public void setRiskFactorDefiningCode(RiskFactorDefiningCode riskFactorDefiningCode) { - this.riskFactorDefiningCode = riskFactorDefiningCode; + public void setCareHomeHasSuspectedConfirmedCovid19RiskFactorDefiningCode( + RiskFactorDefiningCode careHomeHasSuspectedConfirmedCovid19RiskFactorDefiningCode) { + this.careHomeHasSuspectedConfirmedCovid19RiskFactorDefiningCode = careHomeHasSuspectedConfirmedCovid19RiskFactorDefiningCode; } - public RiskFactorDefiningCode getRiskFactorDefiningCode() { - return this.riskFactorDefiningCode ; + public RiskFactorDefiningCode getCareHomeHasSuspectedConfirmedCovid19RiskFactorDefiningCode() { + return this.careHomeHasSuspectedConfirmedCovid19RiskFactorDefiningCode ; } - public void setPresenceDefiningCode(PresenceDefiningCode2 presenceDefiningCode) { - this.presenceDefiningCode = presenceDefiningCode; + public void setCareHomeHasSuspectedConfirmedCovid19PresenceDefiningCode( + PresenceDefiningCode2 careHomeHasSuspectedConfirmedCovid19PresenceDefiningCode) { + this.careHomeHasSuspectedConfirmedCovid19PresenceDefiningCode = careHomeHasSuspectedConfirmedCovid19PresenceDefiningCode; } - public PresenceDefiningCode2 getPresenceDefiningCode() { - return this.presenceDefiningCode ; + public PresenceDefiningCode2 getCareHomeHasSuspectedConfirmedCovid19PresenceDefiningCode() { + return this.careHomeHasSuspectedConfirmedCovid19PresenceDefiningCode ; } public void setCareHomeHasSuspectedConfirmedCovid19Detail( @@ -128,20 +130,22 @@ public List getCareHomeHasSuspectedConfirmedCovid19Detail() { return this.careHomeHasSuspectedConfirmedCovid19Detail ; } - public void setRiskFactorDefiningCode2(RiskFactorDefiningCode2 riskFactorDefiningCode2) { - this.riskFactorDefiningCode2 = riskFactorDefiningCode2; + public void setContactWithConfirmedCaseRiskFactorDefiningCode( + RiskFactorDefiningCode2 contactWithConfirmedCaseRiskFactorDefiningCode) { + this.contactWithConfirmedCaseRiskFactorDefiningCode = contactWithConfirmedCaseRiskFactorDefiningCode; } - public RiskFactorDefiningCode2 getRiskFactorDefiningCode2() { - return this.riskFactorDefiningCode2 ; + public RiskFactorDefiningCode2 getContactWithConfirmedCaseRiskFactorDefiningCode() { + return this.contactWithConfirmedCaseRiskFactorDefiningCode ; } - public void setPresenceDefiningCode2(PresenceDefiningCode2 presenceDefiningCode2) { - this.presenceDefiningCode2 = presenceDefiningCode2; + public void setContactWithConfirmedCasePresenceDefiningCode( + PresenceDefiningCode2 contactWithConfirmedCasePresenceDefiningCode) { + this.contactWithConfirmedCasePresenceDefiningCode = contactWithConfirmedCasePresenceDefiningCode; } - public PresenceDefiningCode2 getPresenceDefiningCode2() { - return this.presenceDefiningCode2 ; + public PresenceDefiningCode2 getContactWithConfirmedCasePresenceDefiningCode() { + return this.contactWithConfirmedCasePresenceDefiningCode ; } public void setContactWithConfirmedCaseDetail(List contactWithConfirmedCaseDetail) { @@ -152,20 +156,22 @@ public List getContactWithConfirmedCaseDetail() { return this.contactWithConfirmedCaseDetail ; } - public void setRiskFactorDefiningCode3(RiskFactorDefiningCode3 riskFactorDefiningCode3) { - this.riskFactorDefiningCode3 = riskFactorDefiningCode3; + public void setOtherResidentsHouseholdMembersUnwellRiskFactorDefiningCode( + RiskFactorDefiningCode3 otherResidentsHouseholdMembersUnwellRiskFactorDefiningCode) { + this.otherResidentsHouseholdMembersUnwellRiskFactorDefiningCode = otherResidentsHouseholdMembersUnwellRiskFactorDefiningCode; } - public RiskFactorDefiningCode3 getRiskFactorDefiningCode3() { - return this.riskFactorDefiningCode3 ; + public RiskFactorDefiningCode3 getOtherResidentsHouseholdMembersUnwellRiskFactorDefiningCode() { + return this.otherResidentsHouseholdMembersUnwellRiskFactorDefiningCode ; } - public void setPresenceDefiningCode3(PresenceDefiningCode2 presenceDefiningCode3) { - this.presenceDefiningCode3 = presenceDefiningCode3; + public void setOtherResidentsHouseholdMembersUnwellPresenceDefiningCode( + PresenceDefiningCode2 otherResidentsHouseholdMembersUnwellPresenceDefiningCode) { + this.otherResidentsHouseholdMembersUnwellPresenceDefiningCode = otherResidentsHouseholdMembersUnwellPresenceDefiningCode; } - public PresenceDefiningCode2 getPresenceDefiningCode3() { - return this.presenceDefiningCode3 ; + public PresenceDefiningCode2 getOtherResidentsHouseholdMembersUnwellPresenceDefiningCode() { + return this.otherResidentsHouseholdMembersUnwellPresenceDefiningCode ; } public void setOtherResidentsHouseholdMembersUnwellDetail( diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluationContainment.java index 90021c0a1..a04a45031 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluationContainment.java @@ -14,21 +14,21 @@ public class Covid19ExposureEvaluationContainment extends Containment { public SelectAqlField HEALTH_RISK_DEFINING_CODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0002.1]/value|defining_code", "healthRiskDefiningCode", HealthRiskDefiningCode.class, this); - public SelectAqlField RISK_FACTOR_DEFINING_CODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0013.1]/value|defining_code", "riskFactorDefiningCode", RiskFactorDefiningCode.class, this); + public SelectAqlField CARE_HOME_HAS_SUSPECTED_CONFIRMED_COVID19_RISK_FACTOR_DEFINING_CODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0013.1]/value|defining_code", "careHomeHasSuspectedConfirmedCovid19RiskFactorDefiningCode", RiskFactorDefiningCode.class, this); - public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0017.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode2.class, this); + public SelectAqlField CARE_HOME_HAS_SUSPECTED_CONFIRMED_COVID19_PRESENCE_DEFINING_CODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0017.1]/value|defining_code", "careHomeHasSuspectedConfirmedCovid19PresenceDefiningCode", PresenceDefiningCode2.class, this); public ListSelectAqlField CARE_HOME_HAS_SUSPECTED_CONFIRMED_COVID19_DETAIL = new ListAqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0027.1]", "careHomeHasSuspectedConfirmedCovid19Detail", Cluster.class, this); - public SelectAqlField RISK_FACTOR_DEFINING_CODE2 = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0013.1]/value|defining_code", "riskFactorDefiningCode2", RiskFactorDefiningCode2.class, this); + public SelectAqlField CONTACT_WITH_CONFIRMED_CASE_RISK_FACTOR_DEFINING_CODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0013.1]/value|defining_code", "contactWithConfirmedCaseRiskFactorDefiningCode", RiskFactorDefiningCode2.class, this); - public SelectAqlField PRESENCE_DEFINING_CODE2 = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0017.1]/value|defining_code", "presenceDefiningCode2", PresenceDefiningCode2.class, this); + public SelectAqlField CONTACT_WITH_CONFIRMED_CASE_PRESENCE_DEFINING_CODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0017.1]/value|defining_code", "contactWithConfirmedCasePresenceDefiningCode", PresenceDefiningCode2.class, this); public ListSelectAqlField CONTACT_WITH_CONFIRMED_CASE_DETAIL = new ListAqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0027.1]", "contactWithConfirmedCaseDetail", Cluster.class, this); - public SelectAqlField RISK_FACTOR_DEFINING_CODE3 = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0013.1]/value|defining_code", "riskFactorDefiningCode3", RiskFactorDefiningCode3.class, this); + public SelectAqlField OTHER_RESIDENTS_HOUSEHOLD_MEMBERS_UNWELL_RISK_FACTOR_DEFINING_CODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0013.1]/value|defining_code", "otherResidentsHouseholdMembersUnwellRiskFactorDefiningCode", RiskFactorDefiningCode3.class, this); - public SelectAqlField PRESENCE_DEFINING_CODE3 = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0017.1]/value|defining_code", "presenceDefiningCode3", PresenceDefiningCode2.class, this); + public SelectAqlField OTHER_RESIDENTS_HOUSEHOLD_MEMBERS_UNWELL_PRESENCE_DEFINING_CODE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0017.1]/value|defining_code", "otherResidentsHouseholdMembersUnwellPresenceDefiningCode", PresenceDefiningCode2.class, this); public ListSelectAqlField OTHER_RESIDENTS_HOUSEHOLD_MEMBERS_UNWELL_DETAIL = new ListAqlFieldImp(Covid19ExposureEvaluation.class, "/data[at0001]/items[at0016]/items[at0027.1]", "otherResidentsHouseholdMembersUnwellDetail", Cluster.class, this); diff --git a/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java b/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java index 6aa32c8f2..f61ef67cb 100644 --- a/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java +++ b/client/src/test/java/org/ehrbase/client/flattener/RoundTripTest.java @@ -140,6 +140,24 @@ public void testRoundTrip() throws IOException { "Extra path: encounter/body_temperature:1/any_event:1/temperature|magnitude, value: 11" })); + testCaseList.add( + new TestCase( + 5, + CompositionTestDataSimSDTJson.CORONA, + "Corona_Anamnese", + org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.CoronaAnamneseComposition.class, + new String[] {}, + new String[] {})); + + testCaseList.add( + new TestCase( + 6, + CompositionTestDataSimSDTJson.CORONA, + "Corona_Anamnese", + org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.CoronaAnamneseComposition.class, + new String[] {}, + new String[] {})); + SoftAssertions softly = new SoftAssertions(); for (TestCase testCase : testCaseList) { diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java index 772d0484b..35b17b247 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java @@ -285,6 +285,7 @@ private TypeSpec.Builder build(ClassGeneratorContext context, WebTemplateNode ne private Deque pushToUnfiltered( ClassGeneratorContext context, WebTemplateNode node) { + Deque filtersNodes = context.webTemplate.findFiltersNodes(node); if (!CollectionUtils.isEmpty(filtersNodes)) { filtersNodes.descendingIterator().forEachRemaining(context.unFilteredNodeDeque::push); diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorConfig.java b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorConfig.java index 9aaad542b..96e0fad7d 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorConfig.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGeneratorConfig.java @@ -19,4 +19,15 @@ package org.ehrbase.client.classgenerator; -public class ClassGeneratorConfig {} +public class ClassGeneratorConfig { + + private OptimizerSetting optimizerSetting = OptimizerSetting.NONE; + + public OptimizerSetting getOptimizerSetting() { + return optimizerSetting; + } + + public void setOptimizerSetting(OptimizerSetting optimizerSetting) { + this.optimizerSetting = optimizerSetting; + } +} diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java b/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java index 412d6dd0e..ea719fd6d 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java @@ -28,6 +28,7 @@ import java.util.Deque; import java.util.Iterator; +import java.util.List; import java.util.Objects; import java.util.Optional; @@ -51,7 +52,7 @@ public String buildClassName( } else { if (!node.isArchetype() && !isEnum) { - name = findLastArchetype(context.nodeDeque).getName() + TERM_DIVIDER + name; + name = findLastArchetype(context.unFilteredNodeDeque).getName() + TERM_DIVIDER + name; } } if (isChoice) { @@ -91,11 +92,20 @@ private String makeNameUnique(ClassGeneratorContext context, WebTemplateNode nod .count() > 0) { if (!Objects.equals(context.unFilteredNodeDeque.peek().getRmType(), "ELEMENT")) { - name = context.unFilteredNodeDeque.peek().getName() + TERM_DIVIDER + name; + if (config.getOptimizerSetting().equals(OptimizerSetting.ALL)&& !context.unFilteredNodeDeque.isEmpty()){ + name = findLastArchetype(context.unFilteredNodeDeque).getName() + TERM_DIVIDER + name; + } else { + name = context.unFilteredNodeDeque.peek().getName() + TERM_DIVIDER + name; +} } else { - WebTemplateNode poll = context.unFilteredNodeDeque.poll(); - name = context.unFilteredNodeDeque.peek().getName() + TERM_DIVIDER + name; - context.unFilteredNodeDeque.push(poll); + if (config.getOptimizerSetting().equals(OptimizerSetting.ALL)&& !context.unFilteredNodeDeque.isEmpty()){ + name = findLastArchetype(context.unFilteredNodeDeque).getName() + TERM_DIVIDER + name; + } else { + WebTemplateNode poll = context.unFilteredNodeDeque.poll(); + name = context.unFilteredNodeDeque.peek().getName() + TERM_DIVIDER + name; + context.unFilteredNodeDeque.push(poll); + } + } } @@ -112,6 +122,8 @@ private String replaceElementName(ClassGeneratorContext context, WebTemplateNode Optional.ofNullable(trueParent).map(WebTemplateNode::getRmType).orElse(null), "ELEMENT")) { name = trueParent.getName(); } + + return name; } @@ -148,7 +160,7 @@ public String buildFieldName(ClassGeneratorContext context, String path, WebTemp String attributeName = new FlatPath(path).getLast().getAttributeName(); if (!context.nodeDeque.isEmpty()) { - if (StringUtils.isBlank(attributeName) || attributeName.equals("value")) { + if (StringUtils.isBlank(attributeName) || List.of("defining_code","value").contains(attributeName) ) { name = makeNameUnique(context, node); } else { name = replaceElementName(context, node); diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java b/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java index 1f69379ff..3cc003d0b 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java @@ -48,10 +48,7 @@ public FlattFilter(ClassGeneratorConfig config) { @Override protected boolean skip(WebTemplateNode node, WebTemplate context, WebTemplateNode parent) { - if (!node.getChildren().isEmpty() - && node.getMax() == 1 - && !node.isArchetype() - && (!isEvent(node) || parent.getChildren().stream().filter(this::isEvent).count() == 1)) { + if (isTrivialNode(node, parent)) { return true; } else { if (parent != null) { @@ -83,6 +80,27 @@ protected boolean skip(WebTemplateNode node, WebTemplate context, WebTemplateNod } } + private boolean isTrivialNode(WebTemplateNode node, WebTemplateNode parent) { + + switch (config.getOptimizerSetting()) { + case ALL: + return !node.getChildren().isEmpty() + && node.getMax() == 1 + && !node.getRmType().equals("COMPOSITION") + && (!isEvent(node) || parent.getChildren().stream().filter(this::isEvent).count() == 1); + case SECTION: + return !node.getChildren().isEmpty() + && node.getMax() == 1 + && (!node.isArchetype() || node.getRmType().equals("SECTION")) + && (!isEvent(node) || parent.getChildren().stream().filter(this::isEvent).count() == 1); + default: + return !node.getChildren().isEmpty() + && node.getMax() == 1 + && !node.isArchetype() + && (!isEvent(node) || parent.getChildren().stream().filter(this::isEvent).count() == 1); + } + } + private boolean isEvent(WebTemplateNode node) { RMTypeInfo typeInfo = ARCHIE_RM_INFO_LOOKUP.getTypeInfo(node.getRmType()); return typeInfo != null && Event.class.isAssignableFrom(typeInfo.getJavaClass()); diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/OptimizerSetting.java b/generator/src/main/java/org/ehrbase/client/classgenerator/OptimizerSetting.java new file mode 100644 index 000000000..f4bc56991 --- /dev/null +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/OptimizerSetting.java @@ -0,0 +1,26 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.client.classgenerator; + +public enum OptimizerSetting { + NONE, + SECTION, + ALL; +} diff --git a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java index 3f9ddcc63..df6ef2401 100644 --- a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java +++ b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java @@ -807,6 +807,58 @@ public void testGenerateCorona() throws IOException, XmlException { writeFiles(generate); } + @Test + public void testGenerateCoronaOptimizerSettingSection() throws IOException, XmlException { + OPERATIONALTEMPLATE template = + TemplateDocument.Factory.parse(OperationalTemplateTestData.CORONA_ANAMNESE.getStream()) + .getTemplate(); + ClassGeneratorConfig config = new ClassGeneratorConfig(); + config.setOptimizerSetting(OptimizerSetting.SECTION); + ClassGenerator cut = new ClassGenerator(config); + ClassGeneratorResult generate = + cut.generate( + PACKAGE_NAME.replace("example", "exampleoptimizersettingsection"), + new OPTParser(template).parse()); + + List fieldSpecs = + generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs) + .flatMap(List::stream) + .collect(Collectors.toList()); + + assertThat(fieldSpecs).size().isEqualTo(292); + + writeFiles(generate); + } + + @Test + public void testGenerateCoronaOptimizerSettingAll() throws IOException, XmlException { + OPERATIONALTEMPLATE template = + TemplateDocument.Factory.parse(OperationalTemplateTestData.CORONA_ANAMNESE.getStream()) + .getTemplate(); + ClassGeneratorConfig config = new ClassGeneratorConfig(); + config.setOptimizerSetting(OptimizerSetting.ALL); + ClassGenerator cut = new ClassGenerator(config); + ClassGeneratorResult generate = + cut.generate( + PACKAGE_NAME.replace("example", "exampleoptimizersettingall"), + new OPTParser(template).parse()); + + List fieldSpecs = + generate.getClasses().values().stream() + .flatMap(Collection::stream) + .filter(t -> !t.kind.equals(TypeSpec.Kind.ENUM)) + .map(t -> t.fieldSpecs) + .flatMap(List::stream) + .collect(Collectors.toList()); + + assertThat(fieldSpecs).size().isEqualTo(274); + + writeFiles(generate); + } + @Test public void testGenerateSchwangerschaftsstatus() throws IOException, XmlException { OPERATIONALTEMPLATE template = diff --git a/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java b/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java index 78920b642..fe033fa9b 100644 --- a/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java +++ b/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java @@ -51,19 +51,19 @@ public class Filter implements WebTemplateFilter { @Override public FilteredWebTemplate filter(WebTemplate webTemplate) { FilteredWebTemplate clone = new FilteredWebTemplate(webTemplate); - Pair, Map>> filter = filter(clone.getTree(), webTemplate, null); + Pair, Map, Deque>> filter = filter(clone.getTree(), webTemplate, null); clone.setTree(filter.getLeft().get(0)); clone.setFilteredNodeMap(filter.getRight()); return clone; } - protected Pair< List, Map> > filter(WebTemplateNode node, WebTemplate context, WebTemplateNode parent) { + protected Pair< List, Map, Deque> > filter(WebTemplateNode node, WebTemplate context, WebTemplateNode parent) { WebTemplateNode oldNode = new WebTemplateNode(node); preHandle(node); List nodes; List filteredChildren = new ArrayList<>(); - Map > nodeMap = new HashMap<>(); + Map,Deque > nodeMap = new HashMap<>(); node.getChildren().stream().map(n -> filter(n, context, node)).forEach(p -> { filteredChildren.addAll(p.getLeft()); nodeMap.putAll(p.getRight()); @@ -73,11 +73,11 @@ protected Pair< List, Map(child.getAqlPath(),child.getRmType())).addLast(oldNode); } } else { nodes = Collections.singletonList(node); - nodeMap.put(node,new ArrayDeque<>()); + nodeMap.put(new ImmutablePair<>(node.getAqlPath(),node.getRmType()),new ArrayDeque<>()); } OPTParser.makeIdUnique(node); diff --git a/web-template/src/main/java/org/ehrbase/webtemplate/model/FilteredWebTemplate.java b/web-template/src/main/java/org/ehrbase/webtemplate/model/FilteredWebTemplate.java index 001630561..9ad357c67 100644 --- a/web-template/src/main/java/org/ehrbase/webtemplate/model/FilteredWebTemplate.java +++ b/web-template/src/main/java/org/ehrbase/webtemplate/model/FilteredWebTemplate.java @@ -20,9 +20,12 @@ package org.ehrbase.webtemplate.model; import net.minidev.json.annotate.JsonIgnore; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; import java.util.Deque; import java.util.Map; +import java.util.Objects; public class FilteredWebTemplate extends WebTemplate{ @@ -31,13 +34,14 @@ public FilteredWebTemplate(WebTemplate other) { } @JsonIgnore - private Map> filteredNodeMap; + public Map, Deque> filteredNodeMap; - public void setFilteredNodeMap(Map> filteredNodeMap) { + public void setFilteredNodeMap(Map, Deque> filteredNodeMap) { this.filteredNodeMap = filteredNodeMap; } public Deque findFiltersNodes(WebTemplateNode node){ - return filteredNodeMap.get(node); + + return filteredNodeMap.get(new ImmutablePair<>(node.getAqlPath(),node.getRmType())); } } diff --git a/web-template/src/test/java/org/ehrbase/webtemplate/parser/OPTParserTest.java b/web-template/src/test/java/org/ehrbase/webtemplate/parser/OPTParserTest.java index 814b957ca..5dfbfe0f7 100644 --- a/web-template/src/test/java/org/ehrbase/webtemplate/parser/OPTParserTest.java +++ b/web-template/src/test/java/org/ehrbase/webtemplate/parser/OPTParserTest.java @@ -27,6 +27,7 @@ import org.ehrbase.test_data.operationaltemplate.OperationalTemplateTestData; import org.ehrbase.test_data.webtemplate.WebTemplateTestData; import org.ehrbase.webtemplate.filter.Filter; +import org.ehrbase.webtemplate.model.FilteredWebTemplate; import org.ehrbase.webtemplate.model.WebTemplate; import org.ehrbase.webtemplate.model.WebTemplateInput; import org.ehrbase.webtemplate.model.WebTemplateInputValue; From 2b3a278aa0e6374a520083c56c57feb313c41218 Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Fri, 4 Dec 2020 16:17:03 +0100 Subject: [PATCH 34/54] add feederAudit to each entity see https://github.com/ehrbase/project_management/issues/424 --- .../definition/AdresseCluster.java | 15 +++++ .../definition/AdresseClusterContainment.java | 3 + ...erichtBeliebigesEreignisIntervalEvent.java | 15 +++++ .../BerichtBeliebigesEreignisPointEvent.java | 15 +++++ ...htSpezifischesSymptomAnzeichenCluster.java | 15 +++++ .../definition/BeschaftigungCluster.java | 15 +++++ .../BeschaftigungClusterContainment.java | 3 + ...ertungDesGesundheitsrisikosEvaluation.java | 15 +++++ ...sundheitsrisikosEvaluationContainment.java | 3 + ...enstleistungAktuelleAktivitatActivity.java | 15 +++++ .../definition/DienstleistungInstruction.java | 15 +++++ .../DienstleistungInstructionContainment.java | 3 + ...creeningSpezifischeMedikamenteCluster.java | 15 +++++ ...storieBeliebigesEreignisIntervalEvent.java | 15 +++++ ...eHistorieBeliebigesEreignisPointEvent.java | 15 +++++ .../GeschichteHistorieObservation.java | 15 +++++ ...chichteHistorieObservationContainment.java | 3 + .../HistorieDerReiseObservation.java | 15 +++++ ...istorieDerReiseObservationContainment.java | 3 + .../definition/OrganisationCluster.java | 15 +++++ .../OrganisationClusterContainment.java | 3 + .../definition/ProblemDiagnoseEvaluation.java | 15 +++++ .../ProblemDiagnoseEvaluationContainment.java | 3 + ...iebigesIntervallereignisIntervalEvent.java | 15 +++++ .../ReisefallBestimmteReiseCluster.java | 15 +++++ .../ReisefallBestimmtesReisezielCluster.java | 15 +++++ .../definition/ReisefallObservation.java | 15 +++++ .../ReisefallObservationContainment.java | 3 + .../definition/WohnsituationEvaluation.java | 15 +++++ .../WohnsituationEvaluationContainment.java | 3 + .../definition/WohnstatteCluster.java | 15 +++++ .../WohnstatteClusterContainment.java | 3 + .../definition/AdresseCluster.java | 15 +++++ .../definition/AdresseClusterContainment.java | 3 + ...AndereAktuelleErkrankungenObservation.java | 15 +++++ ...lleErkrankungenObservationContainment.java | 3 + ...ltInGesundheitseinrichtungObservation.java | 15 +++++ ...eitseinrichtungObservationContainment.java | 3 + .../definition/BeschaftigungCluster.java | 15 +++++ .../BeschaftigungClusterContainment.java | 3 + ...ertungDesGesundheitsrisikosEvaluation.java | 15 +++++ ...sundheitsrisikosEvaluationContainment.java | 3 + .../ChronischeErkrankungenObservation.java | 15 +++++ ...cheErkrankungenObservationContainment.java | 3 + ...enstleistungAktuelleAktivitatActivity.java | 15 +++++ .../definition/DienstleistungInstruction.java | 15 +++++ .../DienstleistungInstructionContainment.java | 3 + .../definition/DurchfallObservation.java | 15 +++++ .../DurchfallObservationContainment.java | 3 + ...derErhohteKorpertemperaturObservation.java | 15 +++++ ...orpertemperaturObservationContainment.java | 3 + ...genZumMedikationsScreeningObservation.java | 15 +++++ ...ationsScreeningObservationContainment.java | 3 + ...creeningSpezifischeMedikamenteCluster.java | 15 +++++ ...storieBeliebigesEreignisIntervalEvent.java | 15 +++++ ...eHistorieBeliebigesEreignisPointEvent.java | 15 +++++ .../GeschichteHistorieObservation.java | 15 +++++ ...chichteHistorieObservationContainment.java | 3 + .../GestorterGeruchssinnObservation.java | 15 +++++ ...rterGeruchssinnObservationContainment.java | 3 + .../GestorterGeschmackssinnObservation.java | 15 +++++ ...rGeschmackssinnObservationContainment.java | 3 + .../GesundheitsbezogenerBerufEvaluation.java | 15 +++++ ...tsbezogenerBerufEvaluationContainment.java | 3 + .../definition/HeiserkeitObservation.java | 15 +++++ .../HeiserkeitObservationContainment.java | 3 + .../HistorieDerReiseObservation.java | 15 +++++ ...istorieDerReiseObservationContainment.java | 3 + .../definition/HustenObservation.java | 15 +++++ .../HustenObservationContainment.java | 3 + .../KorpertemperaturObservation.java | 15 +++++ ...orpertemperaturObservationContainment.java | 3 + .../definition/OrganisationCluster.java | 15 +++++ .../OrganisationClusterContainment.java | 3 + .../PersonenkontaktObservation.java | 15 +++++ ...PersonenkontaktObservationContainment.java | 3 + .../definition/ProblemDiagnoseEvaluation.java | 15 +++++ .../ProblemDiagnoseEvaluationContainment.java | 3 + .../ProblemDiganoseCoronovirusEvaluation.java | 15 +++++ ...anoseCoronovirusEvaluationContainment.java | 3 + ...iebigesIntervallereignisIntervalEvent.java | 15 +++++ .../ReisefallBestimmteReiseCluster.java | 15 +++++ .../ReisefallBestimmtesReisezielCluster.java | 15 +++++ .../definition/ReisefallObservation.java | 15 +++++ .../ReisefallObservationContainment.java | 3 + .../definition/SchnupfenObservation.java | 15 +++++ .../SchnupfenObservationContainment.java | 3 + .../definition/StandortCluster.java | 15 +++++ .../StandortClusterContainment.java | 3 + .../definition/StatusCluster.java | 15 +++++ .../definition/StatusClusterContainment.java | 3 + ...mptomeBeliebigesEreignisIntervalEvent.java | 15 +++++ ...eSymptomeBeliebigesEreignisPointEvent.java | 15 +++++ .../WeitereSymptomeObservation.java | 15 +++++ ...WeitereSymptomeObservationContainment.java | 3 + ...meSpezifischesSymptomAnzeichenCluster.java | 15 +++++ .../definition/WohnsituationEvaluation.java | 15 +++++ .../WohnsituationEvaluationContainment.java | 3 + .../definition/WohnstatteCluster.java | 15 +++++ .../WohnstatteClusterContainment.java | 3 + .../KorpergewichtAnyEventEnIntervalEvent.java | 15 +++++ .../KorpergewichtAnyEventEnPointEvent.java | 15 +++++ .../KorpergewichtBirthEnPointEvent.java | 15 +++++ .../definition/KorpergewichtObservation.java | 15 +++++ .../KorpergewichtObservationContainment.java | 3 + .../KohlendioxidpartialdruckCluster.java | 15 +++++ ...ndioxidpartialdruckClusterContainment.java | 3 + .../definition/LaborergebnisObservation.java | 15 +++++ .../LaborergebnisObservationContainment.java | 3 + .../definition/PhWertCluster.java | 15 +++++ .../definition/PhWertClusterContainment.java | 3 + .../SauerstoffpartialdruckCluster.java | 15 +++++ ...erstoffpartialdruckClusterContainment.java | 3 + .../SauerstoffsattigungCluster.java | 15 +++++ ...SauerstoffsattigungClusterContainment.java | 3 + .../definition/AdresseCluster.java | 15 +++++ .../definition/AdresseClusterContainment.java | 3 + .../definition/AllgemeineAngabenSection.java | 15 +++++ .../AllgemeineAngabenSectionContainment.java | 3 + ...AndereAktuelleErkrankungenObservation.java | 15 +++++ ...lleErkrankungenObservationContainment.java | 3 + ...ltInGesundheitseinrichtungObservation.java | 15 +++++ ...eitseinrichtungObservationContainment.java | 3 + .../definition/BeschaftigungCluster.java | 15 +++++ .../BeschaftigungClusterContainment.java | 3 + ...ertungDesGesundheitsrisikosEvaluation.java | 15 +++++ ...sundheitsrisikosEvaluationContainment.java | 3 + .../ChronischeErkrankungenObservation.java | 15 +++++ ...cheErkrankungenObservationContainment.java | 3 + ...enstleistungAktuelleAktivitatActivity.java | 15 +++++ .../definition/DienstleistungInstruction.java | 15 +++++ .../DienstleistungInstructionContainment.java | 3 + .../definition/DurchfallObservation.java | 15 +++++ .../DurchfallObservationContainment.java | 3 + ...derErhohteKorpertemperaturObservation.java | 15 +++++ ...orpertemperaturObservationContainment.java | 3 + ...genZumMedikationsScreeningObservation.java | 15 +++++ ...ationsScreeningObservationContainment.java | 3 + ...creeningSpezifischeMedikamenteCluster.java | 15 +++++ ...storieBeliebigesEreignisIntervalEvent.java | 15 +++++ ...eHistorieBeliebigesEreignisPointEvent.java | 15 +++++ .../GeschichteHistorieObservation.java | 15 +++++ ...chichteHistorieObservationContainment.java | 3 + .../GestorterGeruchssinnObservation.java | 15 +++++ ...rterGeruchssinnObservationContainment.java | 3 + .../GestorterGeschmackssinnObservation.java | 15 +++++ ...rGeschmackssinnObservationContainment.java | 3 + .../GesundheitsbezogenerBerufEvaluation.java | 15 +++++ ...tsbezogenerBerufEvaluationContainment.java | 3 + .../definition/HeiserkeitObservation.java | 15 +++++ .../HeiserkeitObservationContainment.java | 3 + .../HistorieDerReiseObservation.java | 15 +++++ ...istorieDerReiseObservationContainment.java | 3 + .../definition/HustenObservation.java | 15 +++++ .../HustenObservationContainment.java | 3 + .../definition/KontaktSection.java | 15 +++++ .../definition/KontaktSectionContainment.java | 3 + .../KorpertemperaturObservation.java | 15 +++++ ...orpertemperaturObservationContainment.java | 3 + .../definition/OrganisationCluster.java | 15 +++++ .../OrganisationClusterContainment.java | 3 + .../PersonenkontaktObservation.java | 15 +++++ ...PersonenkontaktObservationContainment.java | 3 + .../definition/ProblemDiagnoseEvaluation.java | 15 +++++ .../ProblemDiagnoseEvaluationContainment.java | 3 + .../ProblemDiganoseCoronovirusEvaluation.java | 15 +++++ ...anoseCoronovirusEvaluationContainment.java | 3 + ...iebigesIntervallereignisIntervalEvent.java | 15 +++++ .../ReisefallBestimmteReiseCluster.java | 15 +++++ .../ReisefallBestimmtesReisezielCluster.java | 15 +++++ .../definition/ReisefallObservation.java | 15 +++++ .../ReisefallObservationContainment.java | 3 + .../definition/RisikogebietSection.java | 15 +++++ .../RisikogebietSectionContainment.java | 3 + .../definition/SchnupfenObservation.java | 15 +++++ .../SchnupfenObservationContainment.java | 3 + .../definition/StandortCluster.java | 15 +++++ .../StandortClusterContainment.java | 3 + .../definition/StatusCluster.java | 15 +++++ .../definition/StatusClusterContainment.java | 3 + .../definition/SymptomeSection.java | 15 +++++ .../SymptomeSectionContainment.java | 3 + ...mptomeBeliebigesEreignisIntervalEvent.java | 15 +++++ ...eSymptomeBeliebigesEreignisPointEvent.java | 15 +++++ .../WeitereSymptomeObservation.java | 15 +++++ ...WeitereSymptomeObservationContainment.java | 3 + ...meSpezifischesSymptomAnzeichenCluster.java | 15 +++++ .../definition/WohnsituationEvaluation.java | 15 +++++ .../WohnsituationEvaluationContainment.java | 3 + .../definition/WohnstatteCluster.java | 15 +++++ .../WohnstatteClusterContainment.java | 3 + .../AnatomischeLokalisationCluster.java | 15 +++++ ...omischeLokalisationClusterContainment.java | 3 + .../definition/AtiopathogeneseCluster.java | 15 +++++ .../AtiopathogeneseClusterContainment.java | 3 + .../definition/DiagnosedetailsCluster.java | 15 +++++ .../DiagnosedetailsClusterContainment.java | 3 + .../definition/FallidentifikationCluster.java | 15 +++++ .../FallidentifikationClusterContainment.java | 3 + .../definition/ProblemDiagnoseEvaluation.java | 15 +++++ .../ProblemDiagnoseEvaluationContainment.java | 3 + ...loodPressureTrainingSampleObservation.java | 15 +++++ ...eTrainingSampleObservationContainment.java | 3 + .../DeviceDetailsTrainingSampleCluster.java | 15 +++++ ...tailsTrainingSampleClusterContainment.java | 3 + .../BodyTemperatureAnyEventIntervalEvent.java | 15 +++++ .../BodyTemperatureAnyEventPointEvent.java | 15 +++++ .../BodyTemperatureObservation.java | 15 +++++ ...BodyTemperatureObservationContainment.java | 3 + .../definition/EpisodeofcareAdminEntry.java | 15 +++++ .../EpisodeofcareAdminEntryContainment.java | 3 + .../EpisodeofcareDiagnosisCluster.java | 15 +++++ .../definition/AbdomenSymptomCluster.java | 15 +++++ .../AbdomenSymptomClusterContainment.java | 3 + .../definition/AcvpuScaleObservation.java | 15 +++++ .../AcvpuScaleObservationContainment.java | 3 + .../definition/AllergiesEvaluation.java | 15 +++++ .../AllergiesEvaluationContainment.java | 3 + .../definition/AssessmentSection.java | 15 +++++ .../AssessmentSectionContainment.java | 3 + .../definition/BackgroundSection.java | 15 +++++ .../BackgroundSectionContainment.java | 3 + .../definition/BloodPressureObservation.java | 15 +++++ .../BloodPressureObservationContainment.java | 3 + .../definition/ChestSymptomCluster.java | 15 +++++ .../ChestSymptomClusterContainment.java | 3 + .../definition/Covid19ExposureEvaluation.java | 15 +++++ .../Covid19ExposureEvaluationContainment.java | 3 + .../definition/CovidNotesEvaluation.java | 15 +++++ .../CovidNotesEvaluationContainment.java | 3 + .../definition/CovidSection.java | 15 +++++ .../definition/CovidSectionContainment.java | 3 + .../definition/CovidSymptomsObservation.java | 15 +++++ .../CovidSymptomsObservationContainment.java | 3 + .../definition/DenwisObservation.java | 15 +++++ .../DenwisObservationContainment.java | 3 + .../definition/FirstSymptomsCluster.java | 15 +++++ .../FirstSymptomsClusterContainment.java | 3 + .../definition/FrailtyObservation.java | 15 +++++ .../FrailtyObservationContainment.java | 3 + .../definition/HeightObservation.java | 15 +++++ .../HeightObservationContainment.java | 3 + .../definition/KeyCovidSymptomCluster.java | 15 +++++ .../KeyCovidSymptomClusterContainment.java | 3 + .../LatestCovid19TestObservation.java | 15 +++++ ...testCovid19TestObservationContainment.java | 3 + ...tCovid19TestTestRequestDetailsCluster.java | 15 +++++ .../definition/MedicationEvaluation.java | 15 +++++ .../MedicationEvaluationContainment.java | 3 + .../definition/NeuroSymptomCluster.java | 15 +++++ .../NeuroSymptomClusterContainment.java | 3 + .../definition/News2ScoreObservation.java | 15 +++++ .../News2ScoreObservationContainment.java | 3 + .../definition/News2Section.java | 15 +++++ .../definition/News2SectionContainment.java | 3 + .../definition/OtherSymptomCluster.java | 15 +++++ .../OtherSymptomClusterContainment.java | 3 + .../definition/PastHistoryEvaluation.java | 15 +++++ .../PastHistoryEvaluationContainment.java | 3 + .../definition/PulseObservation.java | 15 +++++ .../PulseObservationContainment.java | 3 + .../definition/PulseOximetryObservation.java | 15 +++++ .../PulseOximetryObservationContainment.java | 3 + .../definition/RecommendationEvaluation.java | 15 +++++ .../RecommendationEvaluationContainment.java | 3 + .../definition/RespirationsObservation.java | 15 +++++ .../RespirationsObservationContainment.java | 3 + .../definition/ResponseSection.java | 15 +++++ .../ResponseSectionContainment.java | 3 + .../SepsisScreeningObservation.java | 15 +++++ ...SepsisScreeningObservationContainment.java | 3 + .../definition/SepsisSection.java | 15 +++++ .../definition/SepsisSectionContainment.java | 3 + .../definition/ServiceAction.java | 15 +++++ .../definition/ServiceActionContainment.java | 3 + ...ServiceRequestCurrentActivityActivity.java | 15 +++++ .../definition/ServiceRequestInstruction.java | 15 +++++ .../ServiceRequestInstructionContainment.java | 3 + .../definition/SituationSection.java | 15 +++++ .../SituationSectionContainment.java | 3 + .../definition/StoryHistoryObservation.java | 15 +++++ .../StoryHistoryObservationContainment.java | 3 + .../definition/TemperatureObservation.java | 15 +++++ .../TemperatureObservationContainment.java | 3 + .../definition/WeightObservation.java | 15 +++++ .../WeightObservationContainment.java | 3 + .../definition/AbteilungsfallCluster.java | 15 +++++ .../AbteilungsfallClusterContainment.java | 3 + .../definition/DetailsZumBettCluster.java | 15 +++++ .../DetailsZumBettClusterContainment.java | 3 + .../definition/StandortCluster.java | 15 +++++ .../StandortClusterContainment.java | 3 + .../definition/VersorgungsfallCluster.java | 15 +++++ .../VersorgungsfallClusterContainment.java | 3 + .../definition/VersorgungsortAdminEntry.java | 15 +++++ .../VersorgungsortAdminEntryContainment.java | 3 + .../SchwangerschaftsstatusObservation.java | 15 +++++ ...erschaftsstatusObservationContainment.java | 3 + .../definition/AntibiogrammCluster.java | 15 +++++ .../AntibiogrammClusterContainment.java | 3 + .../definition/ErregerdetailsCluster.java | 15 +++++ .../ErregerdetailsClusterContainment.java | 3 + ...gerdetailsResistenzmechanismusCluster.java | 15 +++++ .../definition/ErregertypisierungCluster.java | 15 +++++ .../ErregertypisierungClusterContainment.java | 3 + ...EventsummaryBeteiligtePersonenCluster.java | 15 +++++ .../definition/EventsummaryCluster.java | 15 +++++ .../EventsummaryClusterContainment.java | 3 + .../LaboranalytResultatCluster.java | 15 +++++ ...LaboranalytResultatClusterContainment.java | 3 + .../definition/SmicsErgebnisObservation.java | 15 +++++ .../SmicsErgebnisObservationContainment.java | 3 + .../definition/StandortCluster.java | 15 +++++ .../StandortClusterContainment.java | 3 + .../definition/AufnahmedatenAdminEntry.java | 15 +++++ .../AufnahmedatenAdminEntryContainment.java | 3 + .../EntlassungsdatenAdminEntry.java | 15 +++++ ...EntlassungsdatenAdminEntryContainment.java | 3 + .../definition/TestAllTypesAction.java | 15 +++++ .../TestAllTypesActionContainment.java | 3 + .../definition/TestAllTypesAdminEntry.java | 15 +++++ .../TestAllTypesAdminEntryContainment.java | 3 + .../definition/TestAllTypesCluster.java | 15 +++++ .../TestAllTypesClusterContainment.java | 3 + .../definition/TestAllTypesEvaluation.java | 15 +++++ .../TestAllTypesEvaluationContainment.java | 3 + .../definition/TestAllTypesInstruction.java | 15 +++++ .../TestAllTypesInstructionContainment.java | 3 + .../definition/TestAllTypesObservation.java | 15 +++++ .../TestAllTypesObservationContainment.java | 3 + .../definition/TestAllTypesSection.java | 15 +++++ .../TestAllTypesSectionContainment.java | 3 + .../AnatomischeLokalisationCluster.java | 15 +++++ ...omischeLokalisationClusterContainment.java | 3 + .../definition/BefundObservation.java | 15 +++++ .../BefundObservationContainment.java | 3 + .../definition/EinsenderstandortCluster.java | 15 +++++ .../EinsenderstandortClusterContainment.java | 3 + .../definition/EmpfangerstandortCluster.java | 15 +++++ .../EmpfangerstandortClusterContainment.java | 3 + .../definition/FallidentifikationCluster.java | 15 +++++ .../FallidentifikationClusterContainment.java | 3 + .../definition/KulturCluster.java | 15 +++++ .../definition/KulturClusterContainment.java | 3 + .../definition/ProVirusCluster.java | 15 +++++ .../ProVirusClusterContainment.java | 3 + .../definition/ProbeCluster.java | 15 +++++ .../definition/ProbeClusterContainment.java | 3 + .../client/classgenerator/FlattFilter.java | 12 +++- .../classgenerator/ClassGeneratorTest.java | 62 ++++++++++++++----- .../ehrbase/webtemplate/filter/Filter.java | 16 +++-- 351 files changed, 3441 insertions(+), 21 deletions(-) diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseCluster.java index b2627f10b..b042e6438 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; @@ -20,6 +21,12 @@ public class AdresseCluster { @Path("/items[at0015]/value|value") private String landValue; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Adresse/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setStadtValue(String stadtValue) { this.stadtValue = stadtValue; } @@ -35,4 +42,12 @@ public void setLandValue(String landValue) { public String getLandValue() { return this.landValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseClusterContainment.java index c2706e05b..125a4fde3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; @@ -12,6 +13,8 @@ public class AdresseClusterContainment extends Containment { public SelectAqlField LAND_VALUE = new AqlFieldImp(AdresseCluster.class, "/items[at0015]/value|value", "landValue", String.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AdresseCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private AdresseClusterContainment() { super("openEHR-EHR-CLUSTER.address_cc.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisIntervalEvent.java index 64766abb7..8c484ab18 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisIntervalEvent.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; @@ -17,6 +18,12 @@ public class BerichtBeliebigesEreignisIntervalEvent implements BerichtBeliebiges @Path("/data[at0003]/items[at0022]") private List spezifischesSymptomAnzeichen; + /** + * Bericht/Beliebiges Ereignis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Beliebiges Ereignis/time */ @@ -44,6 +51,14 @@ public List getSpezifischesSymptomAn return this.spezifischesSymptomAnzeichen ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setTimeValue(TemporalAccessor timeValue) { this.timeValue = timeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisPointEvent.java index 45938cfc9..d69c4e5e6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisPointEvent.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.time.temporal.TemporalAccessor; import java.util.List; import org.ehrbase.client.annotations.Entity; @@ -15,6 +16,12 @@ public class BerichtBeliebigesEreignisPointEvent implements BerichtBeliebigesEre @Path("/data[at0003]/items[at0022]") private List spezifischesSymptomAnzeichen; + /** + * Bericht/Beliebiges Ereignis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Beliebiges Ereignis/time */ @@ -30,6 +37,14 @@ public List getSpezifischesSymptomAn return this.spezifischesSymptomAnzeichen ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setTimeValue(TemporalAccessor timeValue) { this.timeValue = timeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtSpezifischesSymptomAnzeichenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtSpezifischesSymptomAnzeichenCluster.java index b15f53eea..6fb703326 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtSpezifischesSymptomAnzeichenCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtSpezifischesSymptomAnzeichenCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; @@ -32,6 +33,12 @@ public class BerichtSpezifischesSymptomAnzeichenCluster { @Path("/items[at0035]/value|value") private String kommentarValue; + /** + * Bericht/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBezeichnungDesSymptomsOderAnzeichensValue( String bezeichnungDesSymptomsOderAnzeichensValue) { this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; @@ -65,4 +72,12 @@ public void setKommentarValue(String kommentarValue) { public String getKommentarValue() { return this.kommentarValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungCluster.java index b54ceb3da..966c18184 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; @@ -28,6 +29,12 @@ public class BeschaftigungCluster { @Path("/items[at0018]") private List zusatzlicheAngaben; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBerufsbezeichnungRolleValue(String berufsbezeichnungRolleValue) { this.berufsbezeichnungRolleValue = berufsbezeichnungRolleValue; } @@ -51,4 +58,12 @@ public void setZusatzlicheAngaben(List zusatzlicheAngaben) { public List getZusatzlicheAngaben() { return this.zusatzlicheAngaben ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java index 9c95e2435..5b43d49c2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; @@ -17,6 +18,8 @@ public class BeschaftigungClusterContainment extends Containment { public ListSelectAqlField ZUSATZLICHE_ANGABEN = new ListAqlFieldImp(BeschaftigungCluster.class, "/items[at0018]", "zusatzlicheAngaben", Cluster.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(BeschaftigungCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private BeschaftigungClusterContainment() { super("openEHR-EHR-CLUSTER.occupation_record.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java index 75a6b21d1..4224817b3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -91,6 +92,12 @@ public class BewertungDesGesundheitsrisikosEvaluation { @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setGesundheitsrisikoValue(String gesundheitsrisikoValue) { this.gesundheitsrisikoValue = gesundheitsrisikoValue; } @@ -200,4 +207,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java index b7724c9dd..54ea20e57 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -40,6 +41,8 @@ public class BewertungDesGesundheitsrisikosEvaluationContainment extends Contain public SelectAqlField LANGUAGE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private BewertungDesGesundheitsrisikosEvaluationContainment() { super("openEHR-EHR-EVALUATION.health_risk.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java index f872d2347..caf119ddd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; import java.lang.String; @@ -51,6 +52,12 @@ public class DienstleistungAktuelleAktivitatActivity { @Path("/timing") private DvParsable timing; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setNameDerDienstleistungValue(String nameDerDienstleistungValue) { this.nameDerDienstleistungValue = nameDerDienstleistungValue; } @@ -107,4 +114,12 @@ public void setTiming(DvParsable timing) { public DvParsable getTiming() { return this.timing ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstruction.java index 65f13ab1c..caadcfef9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstruction.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class DienstleistungInstruction { @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Allgemeine Angaben/Dienstleistung/expiry_time */ @@ -132,6 +139,14 @@ public Language getLanguage() { return this.language ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setExpiryTimeValue(TemporalAccessor expiryTimeValue) { this.expiryTimeValue = expiryTimeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java index 006c0b5a3..71fb134d8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class DienstleistungInstructionContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(DienstleistungInstruction.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(DienstleistungInstruction.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public SelectAqlField EXPIRY_TIME_VALUE = new AqlFieldImp(DienstleistungInstruction.class, "/expiry_time|value", "expiryTimeValue", TemporalAccessor.class, this); private DienstleistungInstructionContainment() { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java index c39f48f6b..f3923986a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -18,6 +19,12 @@ public class FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster { @Path("/items[at0024]/value|defining_code") private MedikamentInVerwendungDefiningCode medikamentInVerwendungDefiningCode; + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Spezifische Medikamente/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setNameDesMedikamentsValue(String nameDesMedikamentsValue) { this.nameDesMedikamentsValue = nameDesMedikamentsValue; } @@ -34,4 +41,12 @@ public void setMedikamentInVerwendungDefiningCode( public MedikamentInVerwendungDefiningCode getMedikamentInVerwendungDefiningCode() { return this.medikamentInVerwendungDefiningCode ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java index cee9e27c9..587c31393 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; @@ -24,6 +25,12 @@ public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements Geschi @Path("/data[at0003]/items[at0006]") private List strukturierteAngabe; + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Geschichte/Historie/Beliebiges Ereignis/time */ @@ -58,6 +65,14 @@ public List getStrukturierteAngabe() { return this.strukturierteAngabe ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setTimeValue(TemporalAccessor timeValue) { this.timeValue = timeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java index 217ea352f..0a3118dbf 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -22,6 +23,12 @@ public class GeschichteHistorieBeliebigesEreignisPointEvent implements Geschicht @Path("/data[at0003]/items[at0006]") private List strukturierteAngabe; + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Geschichte/Historie/Beliebiges Ereignis/time */ @@ -44,6 +51,14 @@ public List getStrukturierteAngabe() { return this.strukturierteAngabe ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setTimeValue(TemporalAccessor timeValue) { this.timeValue = timeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java index 5a2e768b9..392c09b41 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -37,6 +38,12 @@ public class GeschichteHistorieObservation { @Path("/language") private Language language; + /** + * Bericht/Geschichte/Historie/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Geschichte/Historie/Beliebiges Ereignis */ @@ -76,6 +83,14 @@ public Language getLanguage() { return this.language ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setBeliebigesEreignis( List beliebigesEreignis) { this.beliebigesEreignis = beliebigesEreignis; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java index b2972af23..54b8625ca 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -21,6 +22,8 @@ public class GeschichteHistorieObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(GeschichteHistorieObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(GeschichteHistorieObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public ListSelectAqlField BELIEBIGES_EREIGNIS = new ListAqlFieldImp(GeschichteHistorieObservation.class, "/data[at0001]/events[at0002]", "beliebigesEreignis", GeschichteHistorieBeliebigesEreignisChoice.class, this); private GeschichteHistorieObservationContainment() { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java index 56a8f08c4..71a14b83a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -67,6 +68,12 @@ public class HistorieDerReiseObservation { @Path("/language") private Language language; + /** + * Bericht/Risikogebiet/Historie der Reise/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setAufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode( AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode) { this.aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode = aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode; @@ -140,4 +147,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java index cb3c9fbdd..df4548f85 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -32,6 +33,8 @@ public class HistorieDerReiseObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(HistorieDerReiseObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(HistorieDerReiseObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private HistorieDerReiseObservationContainment() { super("openEHR-EHR-OBSERVATION.travel_history.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationCluster.java index 84fd21c9e..b0bfd5dce 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; @@ -46,6 +47,12 @@ public class OrganisationCluster { @Path("/items[at0016]") private List kontakt; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setIdentifier(List identifier) { this.identifier = identifier; } @@ -93,4 +100,12 @@ public void setKontakt(List kontakt) { public List getKontakt() { return this.kontakt ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationClusterContainment.java index 11790ce35..7a1565476 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; @@ -23,6 +24,8 @@ public class OrganisationClusterContainment extends Containment { public ListSelectAqlField KONTAKT = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0016]", "kontakt", Cluster.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(OrganisationCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private OrganisationClusterContainment() { super("openEHR-EHR-CLUSTER.organisation_cc.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java index cec933a13..57daed5d9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -54,6 +55,12 @@ public class ProblemDiagnoseEvaluation { @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setNameDesProblemsDerDiagnoseValue(String nameDesProblemsDerDiagnoseValue) { this.nameDesProblemsDerDiagnoseValue = nameDesProblemsDerDiagnoseValue; } @@ -109,4 +116,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java index bc0013de2..159b6ea8a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -27,6 +28,8 @@ public class ProblemDiagnoseEvaluationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private ProblemDiagnoseEvaluationContainment() { super("openEHR-EHR-EVALUATION.problem_diagnosis.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java index 89dfb153b..7db878276 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; @@ -39,6 +40,12 @@ public class ReisefallBeliebigesIntervallereignisIntervalEvent { @Path("/width|value") private TemporalAmount widthValue; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/time */ @@ -85,6 +92,14 @@ public TemporalAmount getWidthValue() { return this.widthValue ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setTimeValue(TemporalAccessor timeValue) { this.timeValue = timeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java index 948e35c6a..a7c22c025 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -26,6 +27,12 @@ public class ReisefallBestimmteReiseCluster { @Path("/items[at0019]/value|value") private TemporalAccessor ruckreisedatumValue; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBestimmtesReiseziel( List bestimmtesReiseziel) { this.bestimmtesReiseziel = bestimmtesReiseziel; @@ -50,4 +57,12 @@ public void setRuckreisedatumValue(TemporalAccessor ruckreisedatumValue) { public TemporalAccessor getRuckreisedatumValue() { return this.ruckreisedatumValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java index 21d52641d..7be030889 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; @@ -38,6 +39,12 @@ public class ReisefallBestimmtesReisezielCluster { @Path("/items[at0024]") private List zusatzlicheAngabenZumZielort; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setLandValue(String landValue) { this.landValue = landValue; } @@ -77,4 +84,12 @@ public void setZusatzlicheAngabenZumZielort(List zusatzlicheAngabenZumZ public List getZusatzlicheAngabenZumZielort() { return this.zusatzlicheAngabenZumZielort ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservation.java index 7ecd26fa8..b090fc0aa 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -42,6 +43,12 @@ public class ReisefallObservation { @Path("/language") private Language language; + /** + * Bericht/Risikogebiet/Reisefall/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBeliebigesIntervallereignis( List beliebigesIntervallereignis) { this.beliebigesIntervallereignis = beliebigesIntervallereignis; @@ -82,4 +89,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservationContainment.java index 8bf83ff21..58aef3cc3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -23,6 +24,8 @@ public class ReisefallObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(ReisefallObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(ReisefallObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private ReisefallObservationContainment() { super("openEHR-EHR-OBSERVATION.travel_event.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluation.java index f1b66fba4..901412c57 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Long; @@ -49,6 +50,12 @@ public class WohnsituationEvaluation { @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Wohnsituation/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBeschreibungValue(String beschreibungValue) { this.beschreibungValue = beschreibungValue; } @@ -96,4 +103,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java index aafb1b412..e3e934282 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Long; @@ -26,6 +27,8 @@ public class WohnsituationEvaluationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(WohnsituationEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(WohnsituationEvaluation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private WohnsituationEvaluationContainment() { super("openEHR-EHR-EVALUATION.living_arrangement.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteCluster.java index cb2562a13..401d613bc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.Long; import java.util.List; @@ -22,6 +23,12 @@ public class WohnstatteCluster { @Path("/items[at0003]") private List erganzendeDetails; + /** + * Bericht/Allgemeine Angaben/Wohnsituation/Wohnstätte/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setAnzahlDerSchlafzimmerMagnitude(Long anzahlDerSchlafzimmerMagnitude) { this.anzahlDerSchlafzimmerMagnitude = anzahlDerSchlafzimmerMagnitude; } @@ -37,4 +44,12 @@ public void setErganzendeDetails(List erganzendeDetails) { public List getErganzendeDetails() { return this.erganzendeDetails ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java index 0cbef3d3f..9150952ac 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.Long; import org.ehrbase.client.aql.containment.Containment; @@ -15,6 +16,8 @@ public class WohnstatteClusterContainment extends Containment { public ListSelectAqlField ERGANZENDE_DETAILS = new ListAqlFieldImp(WohnstatteCluster.class, "/items[at0003]", "erganzendeDetails", Cluster.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(WohnstatteCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private WohnstatteClusterContainment() { super("openEHR-EHR-CLUSTER.dwelling.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseCluster.java index 7fb49ca4b..a6ddf7e6e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; @@ -20,6 +21,12 @@ public class AdresseCluster { @Path("/items[at0015]/value|value") private String landValue; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Adresse/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setStadtValue(String stadtValue) { this.stadtValue = stadtValue; } @@ -35,4 +42,12 @@ public void setLandValue(String landValue) { public String getLandValue() { return this.landValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseClusterContainment.java index 9de619695..43f189961 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; @@ -12,6 +13,8 @@ public class AdresseClusterContainment extends Containment { public SelectAqlField LAND_VALUE = new AqlFieldImp(AdresseCluster.class, "/items[at0015]/value|value", "landValue", String.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AdresseCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private AdresseClusterContainment() { super("openEHR-EHR-CLUSTER.address_cc.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java index e1111af14..bcd0e2052 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class AndereAktuelleErkrankungenObservation { @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBezeichnungDesSymptomsOderAnzeichensValue( String bezeichnungDesSymptomsOderAnzeichensValue) { this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; @@ -126,4 +133,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java index 8a60d5b56..882d99a5f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class AndereAktuelleErkrankungenObservationContainment extends Containmen public SelectAqlField LANGUAGE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private AndereAktuelleErkrankungenObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java index ab9544b7d..d633de51a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -73,6 +74,12 @@ public class AufenthaltInGesundheitseinrichtungObservation { @Path("/language") private Language language; + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setAgentEnValue(String agentEnValue) { this.agentEnValue = agentEnValue; } @@ -153,4 +160,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java index 7c7bea57f..fe89a25bd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -34,6 +35,8 @@ public class AufenthaltInGesundheitseinrichtungObservationContainment extends Co public SelectAqlField LANGUAGE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private AufenthaltInGesundheitseinrichtungObservationContainment() { super("openEHR-EHR-OBSERVATION.exposure_assessment.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungCluster.java index 767779ebd..b7ca56783 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; @@ -28,6 +29,12 @@ public class BeschaftigungCluster { @Path("/items[at0018]") private List zusatzlicheAngaben; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBerufsbezeichnungRolleValue(String berufsbezeichnungRolleValue) { this.berufsbezeichnungRolleValue = berufsbezeichnungRolleValue; } @@ -51,4 +58,12 @@ public void setZusatzlicheAngaben(List zusatzlicheAngaben) { public List getZusatzlicheAngaben() { return this.zusatzlicheAngaben ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java index f54a9979b..8a11c1cd1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; @@ -17,6 +18,8 @@ public class BeschaftigungClusterContainment extends Containment { public ListSelectAqlField ZUSATZLICHE_ANGABEN = new ListAqlFieldImp(BeschaftigungCluster.class, "/items[at0018]", "zusatzlicheAngaben", Cluster.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(BeschaftigungCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private BeschaftigungClusterContainment() { super("openEHR-EHR-CLUSTER.occupation_record.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java index fa5aa6de4..32465e057 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -91,6 +92,12 @@ public class BewertungDesGesundheitsrisikosEvaluation { @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setGesundheitsrisikoValue(String gesundheitsrisikoValue) { this.gesundheitsrisikoValue = gesundheitsrisikoValue; } @@ -198,4 +205,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java index 37fb572e8..7e6b9a178 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -40,6 +41,8 @@ public class BewertungDesGesundheitsrisikosEvaluationContainment extends Contain public SelectAqlField LANGUAGE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private BewertungDesGesundheitsrisikosEvaluationContainment() { super("openEHR-EHR-EVALUATION.health_risk.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java index d2bc9c713..71e6f9867 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class ChronischeErkrankungenObservation { @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBezeichnungDesSymptomsOderAnzeichensValue( String bezeichnungDesSymptomsOderAnzeichensValue) { this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; @@ -126,4 +133,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java index 2007bd62c..45feaf36f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class ChronischeErkrankungenObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private ChronischeErkrankungenObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java index 6fa3ed456..9dabb2747 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; import java.lang.String; @@ -51,6 +52,12 @@ public class DienstleistungAktuelleAktivitatActivity { @Path("/timing") private DvParsable timing; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setNameDerDienstleistungValue(String nameDerDienstleistungValue) { this.nameDerDienstleistungValue = nameDerDienstleistungValue; } @@ -107,4 +114,12 @@ public void setTiming(DvParsable timing) { public DvParsable getTiming() { return this.timing ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstruction.java index 0799149f6..1999a75ab 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstruction.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class DienstleistungInstruction { @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Allgemeine Angaben/Dienstleistung/expiry_time */ @@ -132,6 +139,14 @@ public Language getLanguage() { return this.language ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setExpiryTimeValue(TemporalAccessor expiryTimeValue) { this.expiryTimeValue = expiryTimeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java index f85cee468..3329acd33 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class DienstleistungInstructionContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(DienstleistungInstruction.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(DienstleistungInstruction.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public SelectAqlField EXPIRY_TIME_VALUE = new AqlFieldImp(DienstleistungInstruction.class, "/expiry_time|value", "expiryTimeValue", TemporalAccessor.class, this); private DienstleistungInstructionContainment() { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservation.java index 6b6251a9e..54deaff4d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class DurchfallObservation { @Path("/language") private Language language; + /** + * Bericht/Symptome/Durchfall/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBezeichnungDesSymptomsOderAnzeichensValue( String bezeichnungDesSymptomsOderAnzeichensValue) { this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; @@ -126,4 +133,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservationContainment.java index f890dc9b3..99c10bbb4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class DurchfallObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(DurchfallObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(DurchfallObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private DurchfallObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java index d752d93bd..de2e7c31c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class FieberOderErhohteKorpertemperaturObservation { @Path("/language") private Language language; + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBezeichnungDesSymptomsOderAnzeichensValue( String bezeichnungDesSymptomsOderAnzeichensValue) { this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; @@ -126,4 +133,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java index 818a7f99f..3d89fb664 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class FieberOderErhohteKorpertemperaturObservationContainment extends Con public SelectAqlField LANGUAGE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private FieberOderErhohteKorpertemperaturObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java index 4bb44b935..0105e1117 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +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; @@ -68,6 +69,12 @@ public class FragebogenZumMedikationsScreeningObservation { @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setMedikamenteInVerwendung(DvCodedText medikamenteInVerwendung) { this.medikamenteInVerwendung = medikamenteInVerwendung; } @@ -143,4 +150,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java index 2ed4af857..7e62e27e4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +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; @@ -33,6 +34,8 @@ public class FragebogenZumMedikationsScreeningObservationContainment extends Con public SelectAqlField LANGUAGE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private FragebogenZumMedikationsScreeningObservationContainment() { super("openEHR-EHR-OBSERVATION.medication_use.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java index 563623a65..19df7f22e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -18,6 +19,12 @@ public class FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster { @Path("/items[at0024]/value|defining_code") private MedikamentInVerwendungDefiningCode medikamentInVerwendungDefiningCode; + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Spezifische Medikamente/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setNameDesMedikamentsValue(String nameDesMedikamentsValue) { this.nameDesMedikamentsValue = nameDesMedikamentsValue; } @@ -34,4 +41,12 @@ public void setMedikamentInVerwendungDefiningCode( public MedikamentInVerwendungDefiningCode getMedikamentInVerwendungDefiningCode() { return this.medikamentInVerwendungDefiningCode ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java index f44fb0f82..67fe00e73 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; @@ -24,6 +25,12 @@ public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements Geschi @Path("/data[at0003]/items[at0006]") private List strukturierteAngabe; + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Geschichte/Historie/Beliebiges Ereignis/time */ @@ -58,6 +65,14 @@ public List getStrukturierteAngabe() { return this.strukturierteAngabe ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setTimeValue(TemporalAccessor timeValue) { this.timeValue = timeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java index 09f0cc693..c00f5c7dc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -22,6 +23,12 @@ public class GeschichteHistorieBeliebigesEreignisPointEvent implements Geschicht @Path("/data[at0003]/items[at0006]") private List strukturierteAngabe; + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Geschichte/Historie/Beliebiges Ereignis/time */ @@ -44,6 +51,14 @@ public List getStrukturierteAngabe() { return this.strukturierteAngabe ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setTimeValue(TemporalAccessor timeValue) { this.timeValue = timeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java index 9f5c5a3b7..3c45d9ee7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -37,6 +38,12 @@ public class GeschichteHistorieObservation { @Path("/language") private Language language; + /** + * Bericht/Geschichte/Historie/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Geschichte/Historie/Beliebiges Ereignis */ @@ -76,6 +83,14 @@ public Language getLanguage() { return this.language ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setBeliebigesEreignis( List beliebigesEreignis) { this.beliebigesEreignis = beliebigesEreignis; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java index e8cf757bf..a0e29eaf8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -21,6 +22,8 @@ public class GeschichteHistorieObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(GeschichteHistorieObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(GeschichteHistorieObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public ListSelectAqlField BELIEBIGES_EREIGNIS = new ListAqlFieldImp(GeschichteHistorieObservation.class, "/data[at0001]/events[at0002]", "beliebigesEreignis", GeschichteHistorieBeliebigesEreignisChoice.class, this); private GeschichteHistorieObservationContainment() { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java index 50e883b5e..73ddbd8e2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class GestorterGeruchssinnObservation { @Path("/language") private Language language; + /** + * Bericht/Symptome/Gestörter Geruchssinn/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBezeichnungDesSymptomsOderAnzeichensValue( String bezeichnungDesSymptomsOderAnzeichensValue) { this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; @@ -126,4 +133,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java index 753929d53..f19802036 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class GestorterGeruchssinnObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private GestorterGeruchssinnObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java index bc3f86be8..bd64f6009 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class GestorterGeschmackssinnObservation { @Path("/language") private Language language; + /** + * Bericht/Symptome/Gestörter Geschmackssinn/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBezeichnungDesSymptomsOderAnzeichensValue( String bezeichnungDesSymptomsOderAnzeichensValue) { this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; @@ -126,4 +133,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java index e4e9c4d77..2013c0724 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class GestorterGeschmackssinnObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private GestorterGeschmackssinnObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java index 20d1ff442..466180a47 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -48,6 +49,12 @@ public class GesundheitsbezogenerBerufEvaluation { @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBeschaftigungsstatusValue(String beschaftigungsstatusValue) { this.beschaftigungsstatusValue = beschaftigungsstatusValue; } @@ -95,4 +102,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java index 666f46612..a4511aa64 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -25,6 +26,8 @@ public class GesundheitsbezogenerBerufEvaluationContainment extends Containment public SelectAqlField LANGUAGE = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private GesundheitsbezogenerBerufEvaluationContainment() { super("openEHR-EHR-EVALUATION.occupation_summary.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservation.java index 547c9414a..093189e10 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class HeiserkeitObservation { @Path("/language") private Language language; + /** + * Bericht/Symptome/Heiserkeit/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBezeichnungDesSymptomsOderAnzeichensValue( String bezeichnungDesSymptomsOderAnzeichensValue) { this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; @@ -126,4 +133,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java index afe0739ea..b0d93f2f1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class HeiserkeitObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(HeiserkeitObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(HeiserkeitObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private HeiserkeitObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java index 7f4e3533d..f3362c899 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -60,6 +61,12 @@ public class HistorieDerReiseObservation { @Path("/language") private Language language; + /** + * Bericht/Risikogebiet/Historie der Reise/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setAufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode( AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode) { this.aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode = aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode; @@ -125,4 +132,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java index c8a4c9b3a..b49b12cbb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -29,6 +30,8 @@ public class HistorieDerReiseObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(HistorieDerReiseObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(HistorieDerReiseObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private HistorieDerReiseObservationContainment() { super("openEHR-EHR-OBSERVATION.travel_history.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservation.java index f0299402c..ab6a23f61 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class HustenObservation { @Path("/language") private Language language; + /** + * Bericht/Symptome/Husten/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBezeichnungDesSymptomsOderAnzeichensValue( String bezeichnungDesSymptomsOderAnzeichensValue) { this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; @@ -126,4 +133,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservationContainment.java index 90a5fd719..0f6a982fe 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class HustenObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(HustenObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(HustenObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private HustenObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservation.java index 7f38c7854..780e00c82 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Double; @@ -86,6 +87,12 @@ public class KorpertemperaturObservation { @Path("/language") private Language language; + /** + * Bericht/Symptome/Körpertemperatur/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setTemperaturMagnitude(Double temperaturMagnitude) { this.temperaturMagnitude = temperaturMagnitude; } @@ -182,4 +189,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java index e3daa19ac..c2dd24e46 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Double; @@ -39,6 +40,8 @@ public class KorpertemperaturObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(KorpertemperaturObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(KorpertemperaturObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private KorpertemperaturObservationContainment() { super("openEHR-EHR-OBSERVATION.body_temperature.v2"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationCluster.java index dd75ace5d..9ac451b8b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; @@ -46,6 +47,12 @@ public class OrganisationCluster { @Path("/items[at0016]") private List kontakt; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setIdentifier(List identifier) { this.identifier = identifier; } @@ -93,4 +100,12 @@ public void setKontakt(List kontakt) { public List getKontakt() { return this.kontakt ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationClusterContainment.java index b93641306..b993d1ce0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; @@ -23,6 +24,8 @@ public class OrganisationClusterContainment extends Containment { public ListSelectAqlField KONTAKT = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0016]", "kontakt", Cluster.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(OrganisationCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private OrganisationClusterContainment() { super("openEHR-EHR-CLUSTER.organisation_cc.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservation.java index c1ce6f596..1ab598a5b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -73,6 +74,12 @@ public class PersonenkontaktObservation { @Path("/language") private Language language; + /** + * Bericht/Kontakt/Personenkontakt/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setAgentEnValue(String agentEnValue) { this.agentEnValue = agentEnValue; } @@ -153,4 +160,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java index 0b85305c2..566a66946 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -34,6 +35,8 @@ public class PersonenkontaktObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(PersonenkontaktObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(PersonenkontaktObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private PersonenkontaktObservationContainment() { super("openEHR-EHR-OBSERVATION.exposure_assessment.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java index 0a1553005..2e2db4bb9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -54,6 +55,12 @@ public class ProblemDiagnoseEvaluation { @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setNameDesProblemsDerDiagnoseValue(String nameDesProblemsDerDiagnoseValue) { this.nameDesProblemsDerDiagnoseValue = nameDesProblemsDerDiagnoseValue; } @@ -109,4 +116,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java index 58f7eb77e..ab1464bc8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -27,6 +28,8 @@ public class ProblemDiagnoseEvaluationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private ProblemDiagnoseEvaluationContainment() { super("openEHR-EHR-EVALUATION.problem_diagnosis.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java index 9de5a513a..015f85fb2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -68,6 +69,12 @@ public class ProblemDiganoseCoronovirusEvaluation { @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/value */ @@ -147,6 +154,14 @@ public Language getLanguage() { return this.language ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setDiagnostischeSicherheit( ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice diagnostischeSicherheit) { this.diagnostischeSicherheit = diagnostischeSicherheit; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java index ce7aaf305..c7d2c86c1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -32,6 +33,8 @@ public class ProblemDiganoseCoronovirusEvaluationContainment extends Containment public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public SelectAqlField DIAGNOSTISCHE_SICHERHEIT = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0073]/value", "diagnostischeSicherheit", ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.class, this); private ProblemDiganoseCoronovirusEvaluationContainment() { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java index 7155db8c8..6c7e15cbe 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; @@ -39,6 +40,12 @@ public class ReisefallBeliebigesIntervallereignisIntervalEvent { @Path("/width|value") private TemporalAmount widthValue; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/time */ @@ -85,6 +92,14 @@ public TemporalAmount getWidthValue() { return this.widthValue ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setTimeValue(TemporalAccessor timeValue) { this.timeValue = timeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java index 3a5c711cb..e4b4cf295 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -26,6 +27,12 @@ public class ReisefallBestimmteReiseCluster { @Path("/items[at0019]/value|value") private TemporalAccessor ruckreisedatumValue; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBestimmtesReiseziel( List bestimmtesReiseziel) { this.bestimmtesReiseziel = bestimmtesReiseziel; @@ -50,4 +57,12 @@ public void setRuckreisedatumValue(TemporalAccessor ruckreisedatumValue) { public TemporalAccessor getRuckreisedatumValue() { return this.ruckreisedatumValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java index cc6803b7c..d33319a71 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; @@ -38,6 +39,12 @@ public class ReisefallBestimmtesReisezielCluster { @Path("/items[at0024]") private List zusatzlicheAngabenZumZielort; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setLandValue(String landValue) { this.landValue = landValue; } @@ -77,4 +84,12 @@ public void setZusatzlicheAngabenZumZielort(List zusatzlicheAngabenZumZ public List getZusatzlicheAngabenZumZielort() { return this.zusatzlicheAngabenZumZielort ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservation.java index d87e429c8..899f7d833 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -42,6 +43,12 @@ public class ReisefallObservation { @Path("/language") private Language language; + /** + * Bericht/Risikogebiet/Reisefall/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBeliebigesIntervallereignis( List beliebigesIntervallereignis) { this.beliebigesIntervallereignis = beliebigesIntervallereignis; @@ -82,4 +89,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservationContainment.java index b36d57b1c..a186b2461 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -23,6 +24,8 @@ public class ReisefallObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(ReisefallObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(ReisefallObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private ReisefallObservationContainment() { super("openEHR-EHR-OBSERVATION.travel_event.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservation.java index d9557ebad..8d3bd7c9a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class SchnupfenObservation { @Path("/language") private Language language; + /** + * Bericht/Symptome/Schnupfen/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBezeichnungDesSymptomsOderAnzeichensValue( String bezeichnungDesSymptomsOderAnzeichensValue) { this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; @@ -126,4 +133,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java index f74ffbd34..18e47d52c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class SchnupfenObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(SchnupfenObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(SchnupfenObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private SchnupfenObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortCluster.java index cc90288f9..0d69d5df6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; @@ -22,6 +23,12 @@ public class StandortCluster { @Path("/items[at0047]") private List details; + /** + * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Ortsbeschreibung/Standort/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setStandortbeschreibungValue(String standortbeschreibungValue) { this.standortbeschreibungValue = standortbeschreibungValue; } @@ -37,4 +44,12 @@ public void setDetails(List details) { public List getDetails() { return this.details ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortClusterContainment.java index 5505cc2a4..5140c774c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; @@ -15,6 +16,8 @@ public class StandortClusterContainment extends Containment { public ListSelectAqlField DETAILS = new ListAqlFieldImp(StandortCluster.class, "/items[at0047]", "details", Cluster.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(StandortCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private StandortClusterContainment() { super("openEHR-EHR-CLUSTER.location.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusCluster.java index c3e6fc29c..032471019 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -13,6 +14,12 @@ public class StatusCluster { @Path("/items[at0004]/value|defining_code") private DiagnosestatusDefiningCode diagnosestatusDefiningCode; + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Status/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setDiagnosestatusDefiningCode(DiagnosestatusDefiningCode diagnosestatusDefiningCode) { this.diagnosestatusDefiningCode = diagnosestatusDefiningCode; } @@ -20,4 +27,12 @@ public void setDiagnosestatusDefiningCode(DiagnosestatusDefiningCode diagnosesta public DiagnosestatusDefiningCode getDiagnosestatusDefiningCode() { return this.diagnosestatusDefiningCode ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusClusterContainment.java index 07aa7ec27..303c0cb0f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; @@ -9,6 +10,8 @@ public class StatusClusterContainment extends Containment { public SelectAqlField DIAGNOSESTATUS_DEFINING_CODE = new AqlFieldImp(StatusCluster.class, "/items[at0004]/value|defining_code", "diagnosestatusDefiningCode", DiagnosestatusDefiningCode.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(StatusCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private StatusClusterContainment() { super("openEHR-EHR-CLUSTER.problem_qualifier.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java index fe8918824..94dd8ad69 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; @@ -17,6 +18,12 @@ public class WeitereSymptomeBeliebigesEreignisIntervalEvent implements WeitereSy @Path("/data[at0003]/items[at0022]") private List spezifischesSymptomAnzeichen; + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/time */ @@ -45,6 +52,14 @@ public List getSpezifischesS return this.spezifischesSymptomAnzeichen ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setTimeValue(TemporalAccessor timeValue) { this.timeValue = timeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java index d790af394..e59dafe23 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.time.temporal.TemporalAccessor; import java.util.List; import org.ehrbase.client.annotations.Entity; @@ -15,6 +16,12 @@ public class WeitereSymptomeBeliebigesEreignisPointEvent implements WeitereSympt @Path("/data[at0003]/items[at0022]") private List spezifischesSymptomAnzeichen; + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/time */ @@ -31,6 +38,14 @@ public List getSpezifischesS return this.spezifischesSymptomAnzeichen ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setTimeValue(TemporalAccessor timeValue) { this.timeValue = timeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java index 2a1c53912..7e4140fc6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -37,6 +38,12 @@ public class WeitereSymptomeObservation { @Path("/language") private Language language; + /** + * Bericht/Symptome/Weitere Symptome/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis */ @@ -76,6 +83,14 @@ public Language getLanguage() { return this.language ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setBeliebigesEreignis( List beliebigesEreignis) { this.beliebigesEreignis = beliebigesEreignis; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java index 8c8b42648..547c87ddc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -21,6 +22,8 @@ public class WeitereSymptomeObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(WeitereSymptomeObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(WeitereSymptomeObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public ListSelectAqlField BELIEBIGES_EREIGNIS = new ListAqlFieldImp(WeitereSymptomeObservation.class, "/data[at0001]/events[at0002]", "beliebigesEreignis", WeitereSymptomeBeliebigesEreignisChoice.class, this); private WeitereSymptomeObservationContainment() { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java index 039c5a8b6..85a5b71ac 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; @@ -32,6 +33,12 @@ public class WeitereSymptomeSpezifischesSymptomAnzeichenCluster { @Path("/items[at0035]/value|value") private String kommentarValue; + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBezeichnungDesSymptomsOderAnzeichensValue( String bezeichnungDesSymptomsOderAnzeichensValue) { this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; @@ -65,4 +72,12 @@ public void setKommentarValue(String kommentarValue) { public String getKommentarValue() { return this.kommentarValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluation.java index 1bba55525..744287d46 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Long; @@ -49,6 +50,12 @@ public class WohnsituationEvaluation { @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Wohnsituation/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBeschreibungValue(String beschreibungValue) { this.beschreibungValue = beschreibungValue; } @@ -96,4 +103,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java index 212a3b88f..3de244544 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Long; @@ -26,6 +27,8 @@ public class WohnsituationEvaluationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(WohnsituationEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(WohnsituationEvaluation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private WohnsituationEvaluationContainment() { super("openEHR-EHR-EVALUATION.living_arrangement.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteCluster.java index 07950afa3..fec7d340d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.Long; import java.util.List; @@ -22,6 +23,12 @@ public class WohnstatteCluster { @Path("/items[at0003]") private List erganzendeDetails; + /** + * Bericht/Allgemeine Angaben/Wohnsituation/Wohnstätte/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setAnzahlDerSchlafzimmerMagnitude(Long anzahlDerSchlafzimmerMagnitude) { this.anzahlDerSchlafzimmerMagnitude = anzahlDerSchlafzimmerMagnitude; } @@ -37,4 +44,12 @@ public void setErganzendeDetails(List erganzendeDetails) { public List getErganzendeDetails() { return this.erganzendeDetails ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java index c3abc0fc5..0bf29c578 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.Long; import org.ehrbase.client.aql.containment.Containment; @@ -15,6 +16,8 @@ public class WohnstatteClusterContainment extends Containment { public ListSelectAqlField ERGANZENDE_DETAILS = new ListAqlFieldImp(WohnstatteCluster.class, "/items[at0003]", "erganzendeDetails", Cluster.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(WohnstatteCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private WohnstatteClusterContainment() { super("openEHR-EHR-CLUSTER.dwelling.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java index 8980dad4f..2f86d8d46 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.Double; import java.lang.String; import java.time.temporal.TemporalAccessor; @@ -43,6 +44,12 @@ public class KorpergewichtAnyEventEnIntervalEvent implements KorpergewichtAnyEve @Path("/state[at0008]/items[at0025]") private List confoundingFactorsEn; + /** + * Bericht/Körpergewicht/*Any event(en)/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Körpergewicht/*Any event(en)/time */ @@ -102,6 +109,14 @@ public List getConfoundingFactorsEn() return this.confoundingFactorsEn ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setTimeValue(TemporalAccessor timeValue) { this.timeValue = timeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java index 6fec062ec..e1f485792 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.Double; import java.lang.String; import java.time.temporal.TemporalAccessor; @@ -41,6 +42,12 @@ public class KorpergewichtAnyEventEnPointEvent implements KorpergewichtAnyEventE @Path("/state[at0008]/items[at0025]") private List confoundingFactorsEn; + /** + * Bericht/Körpergewicht/*Any event(en)/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Körpergewicht/*Any event(en)/time */ @@ -88,6 +95,14 @@ public List getConfoundingFactorsEn() return this.confoundingFactorsEn ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setTimeValue(TemporalAccessor timeValue) { this.timeValue = timeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java index ac04d8480..c67b6dc66 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.Double; import java.lang.String; import java.time.temporal.TemporalAccessor; @@ -39,6 +40,12 @@ public class KorpergewichtBirthEnPointEvent { @Path("/state[at0008]/items[at0025]") private List confoundingFactorsEn; + /** + * Bericht/Körpergewicht/*Birth(en)/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Körpergewicht/*Birth(en)/time */ @@ -86,6 +93,14 @@ public List getConfoundingFactorsEn() return this.confoundingFactorsEn ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setTimeValue(TemporalAccessor timeValue) { this.timeValue = timeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java index fa6a93f40..45f792335 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -49,6 +50,12 @@ public class KorpergewichtObservation { @Path("/language") private Language language; + /** + * Bericht/Körpergewicht/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Körpergewicht/*Any event(en) */ @@ -104,6 +111,14 @@ public Language getLanguage() { return this.language ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setAnyEventEn(List anyEventEn) { this.anyEventEn = anyEventEn; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java index ce524c13b..0efddbd0a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -25,6 +26,8 @@ public class KorpergewichtObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(KorpergewichtObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(KorpergewichtObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public ListSelectAqlField ANY_EVENT_EN = new ListAqlFieldImp(KorpergewichtObservation.class, "/data[at0002]/events[at0003]", "anyEventEn", KorpergewichtAnyEventEnChoice.class, this); private KorpergewichtObservationContainment() { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java index e9dfd5bd8..f8480ad9f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.Double; import java.lang.String; @@ -41,6 +42,12 @@ public class KohlendioxidpartialdruckCluster { @Path("/items[at0005]/value|value") private String ergebnisStatusValue; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Kohlendioxidpartialdruck/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setUntersuchterAnalytDefiningCode( UntersuchterAnalytDefiningCode untersuchterAnalytDefiningCode) { this.untersuchterAnalytDefiningCode = untersuchterAnalytDefiningCode; @@ -81,4 +88,12 @@ public void setErgebnisStatusValue(String ergebnisStatusValue) { public String getErgebnisStatusValue() { return this.ergebnisStatusValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckClusterContainment.java index 61bcc6d16..ed04c8f29 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.Double; import java.lang.String; @@ -22,6 +23,8 @@ public class KohlendioxidpartialdruckClusterContainment extends Containment { public SelectAqlField ERGEBNIS_STATUS_VALUE = new AqlFieldImp(KohlendioxidpartialdruckCluster.class, "/items[at0005]/value|value", "ergebnisStatusValue", String.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(KohlendioxidpartialdruckCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private KohlendioxidpartialdruckClusterContainment() { super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java index dc78665bd..aef5d84eb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -108,6 +109,12 @@ public class LaborergebnisObservation { @Path("/language") private Language language; + /** + * Befund der Blutgasanalyse/Laborergebnis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setLabortestBezeichnungDefiningCode( LabortestBezeichnungDefiningCode labortestBezeichnungDefiningCode) { this.labortestBezeichnungDefiningCode = labortestBezeichnungDefiningCode; @@ -239,4 +246,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservationContainment.java index 75527aaf1..534bc7abb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -45,6 +46,8 @@ public class LaborergebnisObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(LaborergebnisObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(LaborergebnisObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private LaborergebnisObservationContainment() { super("openEHR-EHR-OBSERVATION.laboratory_test_result.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java index 122d725e0..25e44e3e6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.Double; import java.lang.String; @@ -41,6 +42,12 @@ public class PhWertCluster { @Path("/items[at0005]/value|value") private String ergebnisStatusValue; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/pH-Wert/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setUntersuchterAnalytDefiningCode( UntersuchterAnalytDefiningCode3 untersuchterAnalytDefiningCode) { this.untersuchterAnalytDefiningCode = untersuchterAnalytDefiningCode; @@ -81,4 +88,12 @@ public void setErgebnisStatusValue(String ergebnisStatusValue) { public String getErgebnisStatusValue() { return this.ergebnisStatusValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertClusterContainment.java index 0c1d88771..936e04a74 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.Double; import java.lang.String; @@ -22,6 +23,8 @@ public class PhWertClusterContainment extends Containment { public SelectAqlField ERGEBNIS_STATUS_VALUE = new AqlFieldImp(PhWertCluster.class, "/items[at0005]/value|value", "ergebnisStatusValue", String.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(PhWertCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private PhWertClusterContainment() { super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java index 8da6dd59f..7c13a7e9f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.Double; import java.lang.String; @@ -41,6 +42,12 @@ public class SauerstoffpartialdruckCluster { @Path("/items[at0005]/value|value") private String ergebnisStatusValue; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Sauerstoffpartialdruck/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setUntersuchterAnalytDefiningCode( UntersuchterAnalytDefiningCode2 untersuchterAnalytDefiningCode) { this.untersuchterAnalytDefiningCode = untersuchterAnalytDefiningCode; @@ -81,4 +88,12 @@ public void setErgebnisStatusValue(String ergebnisStatusValue) { public String getErgebnisStatusValue() { return this.ergebnisStatusValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckClusterContainment.java index d3d3cd454..ac722d4b1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.Double; import java.lang.String; @@ -22,6 +23,8 @@ public class SauerstoffpartialdruckClusterContainment extends Containment { public SelectAqlField ERGEBNIS_STATUS_VALUE = new AqlFieldImp(SauerstoffpartialdruckCluster.class, "/items[at0005]/value|value", "ergebnisStatusValue", String.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(SauerstoffpartialdruckCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private SauerstoffpartialdruckClusterContainment() { super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java index 994538039..f613fc5c4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.Double; import java.lang.String; @@ -41,6 +42,12 @@ public class SauerstoffsattigungCluster { @Path("/items[at0005]/value|value") private String ergebnisStatusValue; + /** + * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Sauerstoffsättigung/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setUntersuchterAnalytDefiningCode( UntersuchterAnalytDefiningCode4 untersuchterAnalytDefiningCode) { this.untersuchterAnalytDefiningCode = untersuchterAnalytDefiningCode; @@ -81,4 +88,12 @@ public void setErgebnisStatusValue(String ergebnisStatusValue) { public String getErgebnisStatusValue() { return this.ergebnisStatusValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungClusterContainment.java index f97680f20..a361f92e0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.Double; import java.lang.String; @@ -22,6 +23,8 @@ public class SauerstoffsattigungClusterContainment extends Containment { public SelectAqlField ERGEBNIS_STATUS_VALUE = new AqlFieldImp(SauerstoffsattigungCluster.class, "/items[at0005]/value|value", "ergebnisStatusValue", String.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(SauerstoffsattigungCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private SauerstoffsattigungClusterContainment() { super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java index 5a29ba5b1..45caaadfb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; @@ -20,6 +21,12 @@ public class AdresseCluster { @Path("/items[at0015]/value|value") private String landValue; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Adresse/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setStadtValue(String stadtValue) { this.stadtValue = stadtValue; } @@ -35,4 +42,12 @@ public void setLandValue(String landValue) { public String getLandValue() { return this.landValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseClusterContainment.java index f8f98504b..58674111e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; @@ -12,6 +13,8 @@ public class AdresseClusterContainment extends Containment { public SelectAqlField LAND_VALUE = new AqlFieldImp(AdresseCluster.class, "/items[at0015]/value|value", "landValue", String.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AdresseCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private AdresseClusterContainment() { super("openEHR-EHR-CLUSTER.address_cc.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java index 20b192bdf..f477b2506 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; @@ -62,6 +63,12 @@ public class AllgemeineAngabenSection { @Path("/items[openEHR-EHR-INSTRUCTION.service_request.v1]") private List dienstleistung; + /** + * Bericht/Allgemeine Angaben/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setAndereAktuelleErkrankungen( AndereAktuelleErkrankungenObservation andereAktuelleErkrankungen) { this.andereAktuelleErkrankungen = andereAktuelleErkrankungen; @@ -138,4 +145,12 @@ public void setDienstleistung(List dienstleistung) { public List getDienstleistung() { return this.dienstleistung ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSectionContainment.java index 1606a7207..3153f838c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSectionContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -27,6 +28,8 @@ public class AllgemeineAngabenSectionContainment extends Containment { public ListSelectAqlField DIENSTLEISTUNG = new ListAqlFieldImp(AllgemeineAngabenSection.class, "/items[openEHR-EHR-INSTRUCTION.service_request.v1]", "dienstleistung", DienstleistungInstruction.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AllgemeineAngabenSection.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private AllgemeineAngabenSectionContainment() { super("openEHR-EHR-SECTION.adhoc.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java index cd6051e8c..f5f12b093 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class AndereAktuelleErkrankungenObservation { @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBezeichnungDesSymptomsOderAnzeichensValue( String bezeichnungDesSymptomsOderAnzeichensValue) { this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; @@ -126,4 +133,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java index 436b28080..b59f04b52 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class AndereAktuelleErkrankungenObservationContainment extends Containmen public SelectAqlField LANGUAGE = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AndereAktuelleErkrankungenObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private AndereAktuelleErkrankungenObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java index 352b7eee8..9b2169618 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -73,6 +74,12 @@ public class AufenthaltInGesundheitseinrichtungObservation { @Path("/language") private Language language; + /** + * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setAgentEnValue(String agentEnValue) { this.agentEnValue = agentEnValue; } @@ -153,4 +160,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java index 15fe2e055..c7178ed6f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -34,6 +35,8 @@ public class AufenthaltInGesundheitseinrichtungObservationContainment extends Co public SelectAqlField LANGUAGE = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AufenthaltInGesundheitseinrichtungObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private AufenthaltInGesundheitseinrichtungObservationContainment() { super("openEHR-EHR-OBSERVATION.exposure_assessment.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java index 554405ca2..effe3f2db 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; @@ -28,6 +29,12 @@ public class BeschaftigungCluster { @Path("/items[at0018]") private List zusatzlicheAngaben; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBerufsbezeichnungRolleValue(String berufsbezeichnungRolleValue) { this.berufsbezeichnungRolleValue = berufsbezeichnungRolleValue; } @@ -51,4 +58,12 @@ public void setZusatzlicheAngaben(List zusatzlicheAngaben) { public List getZusatzlicheAngaben() { return this.zusatzlicheAngaben ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java index f11fdc160..e1c9e73d7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; @@ -17,6 +18,8 @@ public class BeschaftigungClusterContainment extends Containment { public ListSelectAqlField ZUSATZLICHE_ANGABEN = new ListAqlFieldImp(BeschaftigungCluster.class, "/items[at0018]", "zusatzlicheAngaben", Cluster.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(BeschaftigungCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private BeschaftigungClusterContainment() { super("openEHR-EHR-CLUSTER.occupation_record.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java index e63c5a285..e91b3d791 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -91,6 +92,12 @@ public class BewertungDesGesundheitsrisikosEvaluation { @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setGesundheitsrisikoValue(String gesundheitsrisikoValue) { this.gesundheitsrisikoValue = gesundheitsrisikoValue; } @@ -198,4 +205,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java index 34186fca9..92cbe617f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -40,6 +41,8 @@ public class BewertungDesGesundheitsrisikosEvaluationContainment extends Contain public SelectAqlField LANGUAGE = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(BewertungDesGesundheitsrisikosEvaluation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private BewertungDesGesundheitsrisikosEvaluationContainment() { super("openEHR-EHR-EVALUATION.health_risk.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java index 5acfec869..983eb988a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class ChronischeErkrankungenObservation { @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Chronische Erkrankungen/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBezeichnungDesSymptomsOderAnzeichensValue( String bezeichnungDesSymptomsOderAnzeichensValue) { this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; @@ -126,4 +133,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java index 43b886c6d..1d99a7567 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class ChronischeErkrankungenObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(ChronischeErkrankungenObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private ChronischeErkrankungenObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java index ec45b5b18..da2563fac 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; import java.lang.String; @@ -51,6 +52,12 @@ public class DienstleistungAktuelleAktivitatActivity { @Path("/timing") private DvParsable timing; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setNameDerDienstleistungValue(String nameDerDienstleistungValue) { this.nameDerDienstleistungValue = nameDerDienstleistungValue; } @@ -107,4 +114,12 @@ public void setTiming(DvParsable timing) { public DvParsable getTiming() { return this.timing ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java index 9d2c77b18..8910593ad 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class DienstleistungInstruction { @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Allgemeine Angaben/Dienstleistung/expiry_time */ @@ -132,6 +139,14 @@ public Language getLanguage() { return this.language ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setExpiryTimeValue(TemporalAccessor expiryTimeValue) { this.expiryTimeValue = expiryTimeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java index 86f98dad8..f8c17693e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstructionContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class DienstleistungInstructionContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(DienstleistungInstruction.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(DienstleistungInstruction.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public SelectAqlField EXPIRY_TIME_VALUE = new AqlFieldImp(DienstleistungInstruction.class, "/expiry_time|value", "expiryTimeValue", TemporalAccessor.class, this); private DienstleistungInstructionContainment() { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java index 207ffdd1b..8e5edc8e6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class DurchfallObservation { @Path("/language") private Language language; + /** + * Bericht/Symptome/Durchfall/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBezeichnungDesSymptomsOderAnzeichensValue( String bezeichnungDesSymptomsOderAnzeichensValue) { this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; @@ -126,4 +133,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java index 7bdb007a1..f402e0d8d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class DurchfallObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(DurchfallObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(DurchfallObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private DurchfallObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java index 7448dcbd3..678ad973e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class FieberOderErhohteKorpertemperaturObservation { @Path("/language") private Language language; + /** + * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBezeichnungDesSymptomsOderAnzeichensValue( String bezeichnungDesSymptomsOderAnzeichensValue) { this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; @@ -126,4 +133,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java index 833a9d289..8fe215647 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class FieberOderErhohteKorpertemperaturObservationContainment extends Con public SelectAqlField LANGUAGE = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(FieberOderErhohteKorpertemperaturObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private FieberOderErhohteKorpertemperaturObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java index 97fadc4bd..6e08c292d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +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; @@ -68,6 +69,12 @@ public class FragebogenZumMedikationsScreeningObservation { @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setMedikamenteInVerwendung(DvCodedText medikamenteInVerwendung) { this.medikamenteInVerwendung = medikamenteInVerwendung; } @@ -143,4 +150,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java index 4853ed137..5672883c5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +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; @@ -33,6 +34,8 @@ public class FragebogenZumMedikationsScreeningObservationContainment extends Con public SelectAqlField LANGUAGE = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(FragebogenZumMedikationsScreeningObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private FragebogenZumMedikationsScreeningObservationContainment() { super("openEHR-EHR-OBSERVATION.medication_use.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java index 058ba2b9d..045b5d53d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -18,6 +19,12 @@ public class FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster { @Path("/items[at0024]/value|defining_code") private MedikamentInVerwendungDefiningCode medikamentInVerwendungDefiningCode; + /** + * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Spezifische Medikamente/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setNameDesMedikamentsValue(String nameDesMedikamentsValue) { this.nameDesMedikamentsValue = nameDesMedikamentsValue; } @@ -34,4 +41,12 @@ public void setMedikamentInVerwendungDefiningCode( public MedikamentInVerwendungDefiningCode getMedikamentInVerwendungDefiningCode() { return this.medikamentInVerwendungDefiningCode ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java index 3a557bda7..af96deef0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; @@ -24,6 +25,12 @@ public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements Geschi @Path("/data[at0003]/items[at0006]") private List strukturierteAngabe; + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Geschichte/Historie/Beliebiges Ereignis/time */ @@ -58,6 +65,14 @@ public List getStrukturierteAngabe() { return this.strukturierteAngabe ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setTimeValue(TemporalAccessor timeValue) { this.timeValue = timeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java index 15a3f94cd..5ec17627c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -22,6 +23,12 @@ public class GeschichteHistorieBeliebigesEreignisPointEvent implements Geschicht @Path("/data[at0003]/items[at0006]") private List strukturierteAngabe; + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Geschichte/Historie/Beliebiges Ereignis/time */ @@ -44,6 +51,14 @@ public List getStrukturierteAngabe() { return this.strukturierteAngabe ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setTimeValue(TemporalAccessor timeValue) { this.timeValue = timeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java index 84735903e..8e8648918 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -37,6 +38,12 @@ public class GeschichteHistorieObservation { @Path("/language") private Language language; + /** + * Bericht/Geschichte/Historie/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Geschichte/Historie/Beliebiges Ereignis */ @@ -76,6 +83,14 @@ public Language getLanguage() { return this.language ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setBeliebigesEreignis( List beliebigesEreignis) { this.beliebigesEreignis = beliebigesEreignis; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java index 5cc4f0c20..ad9b45d19 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -21,6 +22,8 @@ public class GeschichteHistorieObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(GeschichteHistorieObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(GeschichteHistorieObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public ListSelectAqlField BELIEBIGES_EREIGNIS = new ListAqlFieldImp(GeschichteHistorieObservation.class, "/data[at0001]/events[at0002]", "beliebigesEreignis", GeschichteHistorieBeliebigesEreignisChoice.class, this); private GeschichteHistorieObservationContainment() { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java index 0263e4855..eb5f37211 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class GestorterGeruchssinnObservation { @Path("/language") private Language language; + /** + * Bericht/Symptome/Gestörter Geruchssinn/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBezeichnungDesSymptomsOderAnzeichensValue( String bezeichnungDesSymptomsOderAnzeichensValue) { this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; @@ -126,4 +133,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java index eac3965fa..358526ea5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class GestorterGeruchssinnObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(GestorterGeruchssinnObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private GestorterGeruchssinnObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java index 17e6cebdb..297a24e86 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class GestorterGeschmackssinnObservation { @Path("/language") private Language language; + /** + * Bericht/Symptome/Gestörter Geschmackssinn/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBezeichnungDesSymptomsOderAnzeichensValue( String bezeichnungDesSymptomsOderAnzeichensValue) { this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; @@ -126,4 +133,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java index b39fc7247..ccd0d770c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class GestorterGeschmackssinnObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(GestorterGeschmackssinnObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private GestorterGeschmackssinnObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java index db7427df5..5a3f0a4e4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -48,6 +49,12 @@ public class GesundheitsbezogenerBerufEvaluation { @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBeschaftigungsstatusValue(String beschaftigungsstatusValue) { this.beschaftigungsstatusValue = beschaftigungsstatusValue; } @@ -95,4 +102,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java index 8383c0a16..5b42da15f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -25,6 +26,8 @@ public class GesundheitsbezogenerBerufEvaluationContainment extends Containment public SelectAqlField LANGUAGE = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(GesundheitsbezogenerBerufEvaluation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private GesundheitsbezogenerBerufEvaluationContainment() { super("openEHR-EHR-EVALUATION.occupation_summary.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java index 2a5814d8d..ebff29e6a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class HeiserkeitObservation { @Path("/language") private Language language; + /** + * Bericht/Symptome/Heiserkeit/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBezeichnungDesSymptomsOderAnzeichensValue( String bezeichnungDesSymptomsOderAnzeichensValue) { this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; @@ -126,4 +133,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java index cbe61fa5f..0695e1edc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class HeiserkeitObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(HeiserkeitObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(HeiserkeitObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private HeiserkeitObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java index c5cddf593..3c70ee3d1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -60,6 +61,12 @@ public class HistorieDerReiseObservation { @Path("/language") private Language language; + /** + * Bericht/Risikogebiet/Historie der Reise/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setAufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode( AufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontak_ aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode) { this.aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode = aufenthaltInDenLetzten14TageInEinemDerRisikogebieteFurCoronainfektionOderKontaktZuMenschenDieDortWarenDefiningCode; @@ -125,4 +132,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java index 50ae4316c..3028203bd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -29,6 +30,8 @@ public class HistorieDerReiseObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(HistorieDerReiseObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(HistorieDerReiseObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private HistorieDerReiseObservationContainment() { super("openEHR-EHR-OBSERVATION.travel_history.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java index 5486742aa..7cc4b63e2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class HustenObservation { @Path("/language") private Language language; + /** + * Bericht/Symptome/Husten/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBezeichnungDesSymptomsOderAnzeichensValue( String bezeichnungDesSymptomsOderAnzeichensValue) { this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; @@ -126,4 +133,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservationContainment.java index a4e03a368..bacbfef8e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class HustenObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(HustenObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(HustenObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private HustenObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java index f4037a912..8127be81b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -19,6 +20,12 @@ public class KontaktSection { @Path("/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0 and name/value='Aufenthalt in Gesundheitseinrichtung']") private AufenthaltInGesundheitseinrichtungObservation aufenthaltInGesundheitseinrichtung; + /** + * Bericht/Kontakt/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setPersonenkontakt(PersonenkontaktObservation personenkontakt) { this.personenkontakt = personenkontakt; } @@ -35,4 +42,12 @@ public void setAufenthaltInGesundheitseinrichtung( public AufenthaltInGesundheitseinrichtungObservation getAufenthaltInGesundheitseinrichtung() { return this.aufenthaltInGesundheitseinrichtung ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSectionContainment.java index cd530a6dd..673a4938c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSectionContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; @@ -11,6 +12,8 @@ public class KontaktSectionContainment extends Containment { public SelectAqlField AUFENTHALT_IN_GESUNDHEITSEINRICHTUNG = new AqlFieldImp(KontaktSection.class, "/items[openEHR-EHR-OBSERVATION.exposure_assessment.v0]", "aufenthaltInGesundheitseinrichtung", AufenthaltInGesundheitseinrichtungObservation.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(KontaktSection.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private KontaktSectionContainment() { super("openEHR-EHR-SECTION.adhoc.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java index 5b4eb4425..20e817354 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Double; @@ -86,6 +87,12 @@ public class KorpertemperaturObservation { @Path("/language") private Language language; + /** + * Bericht/Symptome/Körpertemperatur/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setTemperaturMagnitude(Double temperaturMagnitude) { this.temperaturMagnitude = temperaturMagnitude; } @@ -182,4 +189,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java index 4ac95d65f..f7c247e22 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Double; @@ -39,6 +40,8 @@ public class KorpertemperaturObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(KorpertemperaturObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(KorpertemperaturObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private KorpertemperaturObservationContainment() { super("openEHR-EHR-OBSERVATION.body_temperature.v2"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java index 8449f4698..b8f0bcac9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; @@ -46,6 +47,12 @@ public class OrganisationCluster { @Path("/items[at0016]") private List kontakt; + /** + * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setIdentifier(List identifier) { this.identifier = identifier; } @@ -93,4 +100,12 @@ public void setKontakt(List kontakt) { public List getKontakt() { return this.kontakt ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java index 995a412fa..0d4bb1424 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; @@ -23,6 +24,8 @@ public class OrganisationClusterContainment extends Containment { public ListSelectAqlField KONTAKT = new ListAqlFieldImp(OrganisationCluster.class, "/items[at0016]", "kontakt", Cluster.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(OrganisationCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private OrganisationClusterContainment() { super("openEHR-EHR-CLUSTER.organisation_cc.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java index dd3748be5..26055e72b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -73,6 +74,12 @@ public class PersonenkontaktObservation { @Path("/language") private Language language; + /** + * Bericht/Kontakt/Personenkontakt/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setAgentEnValue(String agentEnValue) { this.agentEnValue = agentEnValue; } @@ -153,4 +160,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java index 0945a5d9a..2aa502a95 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -34,6 +35,8 @@ public class PersonenkontaktObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(PersonenkontaktObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(PersonenkontaktObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private PersonenkontaktObservationContainment() { super("openEHR-EHR-OBSERVATION.exposure_assessment.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java index feb999272..61a5a7d90 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -54,6 +55,12 @@ public class ProblemDiagnoseEvaluation { @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Problem/Diagnose/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setNameDesProblemsDerDiagnoseValue(String nameDesProblemsDerDiagnoseValue) { this.nameDesProblemsDerDiagnoseValue = nameDesProblemsDerDiagnoseValue; } @@ -109,4 +116,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java index fc547d363..84a358556 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -27,6 +28,8 @@ public class ProblemDiagnoseEvaluationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private ProblemDiagnoseEvaluationContainment() { super("openEHR-EHR-EVALUATION.problem_diagnosis.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java index b3f138278..47357e34c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -68,6 +69,12 @@ public class ProblemDiganoseCoronovirusEvaluation { @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/value */ @@ -147,6 +154,14 @@ public Language getLanguage() { return this.language ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setDiagnostischeSicherheit( ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice diagnostischeSicherheit) { this.diagnostischeSicherheit = diagnostischeSicherheit; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java index e34ec2001..201462543 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -32,6 +33,8 @@ public class ProblemDiganoseCoronovirusEvaluationContainment extends Containment public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public SelectAqlField DIAGNOSTISCHE_SICHERHEIT = new AqlFieldImp(ProblemDiganoseCoronovirusEvaluation.class, "/data[at0001]/items[at0073]/value", "diagnostischeSicherheit", ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.class, this); private ProblemDiganoseCoronovirusEvaluationContainment() { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java index ffd5a1cdb..34b893197 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; @@ -39,6 +40,12 @@ public class ReisefallBeliebigesIntervallereignisIntervalEvent { @Path("/width|value") private TemporalAmount widthValue; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/time */ @@ -85,6 +92,14 @@ public TemporalAmount getWidthValue() { return this.widthValue ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setTimeValue(TemporalAccessor timeValue) { this.timeValue = timeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java index 75e698e71..6b32c1be1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -26,6 +27,12 @@ public class ReisefallBestimmteReiseCluster { @Path("/items[at0019]/value|value") private TemporalAccessor ruckreisedatumValue; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBestimmtesReiseziel( List bestimmtesReiseziel) { this.bestimmtesReiseziel = bestimmtesReiseziel; @@ -50,4 +57,12 @@ public void setRuckreisedatumValue(TemporalAccessor ruckreisedatumValue) { public TemporalAccessor getRuckreisedatumValue() { return this.ruckreisedatumValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java index 1949b5d3b..0384ad35a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; @@ -38,6 +39,12 @@ public class ReisefallBestimmtesReisezielCluster { @Path("/items[at0024]") private List zusatzlicheAngabenZumZielort; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setLandValue(String landValue) { this.landValue = landValue; } @@ -77,4 +84,12 @@ public void setZusatzlicheAngabenZumZielort(List zusatzlicheAngabenZumZ public List getZusatzlicheAngabenZumZielort() { return this.zusatzlicheAngabenZumZielort ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java index 5a9bfb44b..b09ed4420 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -42,6 +43,12 @@ public class ReisefallObservation { @Path("/language") private Language language; + /** + * Bericht/Risikogebiet/Reisefall/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBeliebigesIntervallereignis( List beliebigesIntervallereignis) { this.beliebigesIntervallereignis = beliebigesIntervallereignis; @@ -82,4 +89,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java index 5964ada00..dbb22434e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -23,6 +24,8 @@ public class ReisefallObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(ReisefallObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(ReisefallObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private ReisefallObservationContainment() { super("openEHR-EHR-OBSERVATION.travel_event.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java index a4cb420ae..3d6899a96 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; @@ -20,6 +21,12 @@ public class RisikogebietSection { @Path("/items[openEHR-EHR-OBSERVATION.travel_event.v0]") private List reisefall; + /** + * Bericht/Risikogebiet/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setHistorieDerReise(List historieDerReise) { this.historieDerReise = historieDerReise; } @@ -35,4 +42,12 @@ public void setReisefall(List reisefall) { public List getReisefall() { return this.reisefall ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSectionContainment.java index 94fd30af1..a15b32413 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSectionContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -13,6 +14,8 @@ public class RisikogebietSectionContainment extends Containment { public ListSelectAqlField REISEFALL = new ListAqlFieldImp(RisikogebietSection.class, "/items[openEHR-EHR-OBSERVATION.travel_event.v0]", "reisefall", ReisefallObservation.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(RisikogebietSection.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private RisikogebietSectionContainment() { super("openEHR-EHR-SECTION.adhoc.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java index ad7192538..125b301e0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class SchnupfenObservation { @Path("/language") private Language language; + /** + * Bericht/Symptome/Schnupfen/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBezeichnungDesSymptomsOderAnzeichensValue( String bezeichnungDesSymptomsOderAnzeichensValue) { this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; @@ -126,4 +133,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java index 05af8ef1b..1649408eb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class SchnupfenObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(SchnupfenObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(SchnupfenObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private SchnupfenObservationContainment() { super("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java index 931051903..29e9afed5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; @@ -22,6 +23,12 @@ public class StandortCluster { @Path("/items[at0047]") private List details; + /** + * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Ortsbeschreibung/Standort/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setStandortbeschreibungValue(String standortbeschreibungValue) { this.standortbeschreibungValue = standortbeschreibungValue; } @@ -37,4 +44,12 @@ public void setDetails(List details) { public List getDetails() { return this.details ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortClusterContainment.java index 07b79556f..dca3cd8f2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; @@ -15,6 +16,8 @@ public class StandortClusterContainment extends Containment { public ListSelectAqlField DETAILS = new ListAqlFieldImp(StandortCluster.class, "/items[at0047]", "details", Cluster.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(StandortCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private StandortClusterContainment() { super("openEHR-EHR-CLUSTER.location.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java index 877b6ae68..c11b1dc8a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -13,6 +14,12 @@ public class StatusCluster { @Path("/items[at0004]/value|defining_code") private DiagnosestatusDefiningCode diagnosestatusDefiningCode; + /** + * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Status/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setDiagnosestatusDefiningCode(DiagnosestatusDefiningCode diagnosestatusDefiningCode) { this.diagnosestatusDefiningCode = diagnosestatusDefiningCode; } @@ -20,4 +27,12 @@ public void setDiagnosestatusDefiningCode(DiagnosestatusDefiningCode diagnosesta public DiagnosestatusDefiningCode getDiagnosestatusDefiningCode() { return this.diagnosestatusDefiningCode ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusClusterContainment.java index 0758bd30d..11b3467fc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; @@ -9,6 +10,8 @@ public class StatusClusterContainment extends Containment { public SelectAqlField DIAGNOSESTATUS_DEFINING_CODE = new AqlFieldImp(StatusCluster.class, "/items[at0004]/value|defining_code", "diagnosestatusDefiningCode", DiagnosestatusDefiningCode.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(StatusCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private StatusClusterContainment() { super("openEHR-EHR-CLUSTER.problem_qualifier.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java index b8bac2c91..0838b5152 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -61,6 +62,12 @@ public class SymptomeSection { @Path("/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0 and name/value='Weitere Symptome']") private WeitereSymptomeObservation weitereSymptome; + /** + * Bericht/Symptome/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setHusten(HustenObservation husten) { this.husten = husten; } @@ -134,4 +141,12 @@ public void setWeitereSymptome(WeitereSymptomeObservation weitereSymptome) { public WeitereSymptomeObservation getWeitereSymptome() { return this.weitereSymptome ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSectionContainment.java index a15572738..f08c69282 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSectionContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; @@ -25,6 +26,8 @@ public class SymptomeSectionContainment extends Containment { public SelectAqlField WEITERE_SYMPTOME = new AqlFieldImp(SymptomeSection.class, "/items[openEHR-EHR-OBSERVATION.symptom_sign_screening.v0]", "weitereSymptome", WeitereSymptomeObservation.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(SymptomeSection.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private SymptomeSectionContainment() { super("openEHR-EHR-SECTION.adhoc.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java index 716b4f5a9..cfda8a0b0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; @@ -17,6 +18,12 @@ public class WeitereSymptomeBeliebigesEreignisIntervalEvent implements WeitereSy @Path("/data[at0003]/items[at0022]") private List spezifischesSymptomAnzeichen; + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/time */ @@ -45,6 +52,14 @@ public List getSpezifischesS return this.spezifischesSymptomAnzeichen ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setTimeValue(TemporalAccessor timeValue) { this.timeValue = timeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java index 4cb671bc9..7130e067b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.time.temporal.TemporalAccessor; import java.util.List; import org.ehrbase.client.annotations.Entity; @@ -15,6 +16,12 @@ public class WeitereSymptomeBeliebigesEreignisPointEvent implements WeitereSympt @Path("/data[at0003]/items[at0022]") private List spezifischesSymptomAnzeichen; + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/time */ @@ -31,6 +38,14 @@ public List getSpezifischesS return this.spezifischesSymptomAnzeichen ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setTimeValue(TemporalAccessor timeValue) { this.timeValue = timeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java index 370eeae5e..d6af404f9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -37,6 +38,12 @@ public class WeitereSymptomeObservation { @Path("/language") private Language language; + /** + * Bericht/Symptome/Weitere Symptome/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis */ @@ -76,6 +83,14 @@ public Language getLanguage() { return this.language ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setBeliebigesEreignis( List beliebigesEreignis) { this.beliebigesEreignis = beliebigesEreignis; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java index e6f84b771..7eb7bd063 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -21,6 +22,8 @@ public class WeitereSymptomeObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(WeitereSymptomeObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(WeitereSymptomeObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public ListSelectAqlField BELIEBIGES_EREIGNIS = new ListAqlFieldImp(WeitereSymptomeObservation.class, "/data[at0001]/events[at0002]", "beliebigesEreignis", WeitereSymptomeBeliebigesEreignisChoice.class, this); private WeitereSymptomeObservationContainment() { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java index acb9adcd7..bec1a66f2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; @@ -32,6 +33,12 @@ public class WeitereSymptomeSpezifischesSymptomAnzeichenCluster { @Path("/items[at0035]/value|value") private String kommentarValue; + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBezeichnungDesSymptomsOderAnzeichensValue( String bezeichnungDesSymptomsOderAnzeichensValue) { this.bezeichnungDesSymptomsOderAnzeichensValue = bezeichnungDesSymptomsOderAnzeichensValue; @@ -65,4 +72,12 @@ public void setKommentarValue(String kommentarValue) { public String getKommentarValue() { return this.kommentarValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java index 7ff36433a..f2565ea5d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Long; @@ -49,6 +50,12 @@ public class WohnsituationEvaluation { @Path("/language") private Language language; + /** + * Bericht/Allgemeine Angaben/Wohnsituation/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBeschreibungValue(String beschreibungValue) { this.beschreibungValue = beschreibungValue; } @@ -96,4 +103,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java index cbc31e8f4..ac2af4b3b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Long; @@ -26,6 +27,8 @@ public class WohnsituationEvaluationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(WohnsituationEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(WohnsituationEvaluation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private WohnsituationEvaluationContainment() { super("openEHR-EHR-EVALUATION.living_arrangement.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java index 09ecff954..73682abe1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.Long; import java.util.List; @@ -22,6 +23,12 @@ public class WohnstatteCluster { @Path("/items[at0003]") private List erganzendeDetails; + /** + * Bericht/Allgemeine Angaben/Wohnsituation/Wohnstätte/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setAnzahlDerSchlafzimmerMagnitude(Long anzahlDerSchlafzimmerMagnitude) { this.anzahlDerSchlafzimmerMagnitude = anzahlDerSchlafzimmerMagnitude; } @@ -37,4 +44,12 @@ public void setErganzendeDetails(List erganzendeDetails) { public List getErganzendeDetails() { return this.erganzendeDetails ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java index cc1d048f6..756365d97 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.Long; import org.ehrbase.client.aql.containment.Containment; @@ -15,6 +16,8 @@ public class WohnstatteClusterContainment extends Containment { public ListSelectAqlField ERGANZENDE_DETAILS = new ListAqlFieldImp(WohnstatteCluster.class, "/items[at0003]", "erganzendeDetails", Cluster.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(WohnstatteCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private WohnstatteClusterContainment() { super("openEHR-EHR-CLUSTER.dwelling.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java index 1cdff1c0e..5d85a9a05 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; @@ -34,6 +35,12 @@ public class AnatomischeLokalisationCluster { @Path("/items[at0054]") private List multimedialeDarstellung; + /** + * COVID-19-Diagnose/Problem/Diagnose/Anatomische Lokalisation/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setNameDerKorperstelleValue(String nameDerKorperstelleValue) { this.nameDerKorperstelleValue = nameDerKorperstelleValue; } @@ -65,4 +72,12 @@ public void setMultimedialeDarstellung(List multimedialeDarstellung) { public List getMultimedialeDarstellung() { return this.multimedialeDarstellung ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationClusterContainment.java index 2024cf025..c80b9effd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; @@ -19,6 +20,8 @@ public class AnatomischeLokalisationClusterContainment extends Containment { public ListSelectAqlField MULTIMEDIALE_DARSTELLUNG = new ListAqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0054]", "multimedialeDarstellung", Cluster.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AnatomischeLokalisationCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private AnatomischeLokalisationClusterContainment() { super("openEHR-EHR-CLUSTER.anatomical_location.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java index 4c06fefb8..01ece3e33 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; @@ -20,6 +21,12 @@ public class AtiopathogeneseCluster { @Path("/items[at0017]") private List beschreibungDesEntstehens; + /** + * COVID-19-Diagnose/Problem/Diagnose/Ätiopathogenese/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setAtiologieDerKrankheit( List atiologieDerKrankheit) { this.atiologieDerKrankheit = atiologieDerKrankheit; @@ -37,4 +44,12 @@ public void setBeschreibungDesEntstehens( public List getBeschreibungDesEntstehens() { return this.beschreibungDesEntstehens ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseClusterContainment.java index 1537a1842..b63727419 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -13,6 +14,8 @@ public class AtiopathogeneseClusterContainment extends Containment { public ListSelectAqlField BESCHREIBUNG_DES_ENTSTEHENS = new ListAqlFieldImp(AtiopathogeneseCluster.class, "/items[at0017]", "beschreibungDesEntstehens", AtiopathogeneseBeschreibungDesEntstehensElement.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AtiopathogeneseCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private AtiopathogeneseClusterContainment() { super("openEHR-EHR-CLUSTER.etiology.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java index c9d6cc4de..17ecebcfc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.Boolean; import java.lang.String; import org.ehrbase.client.annotations.Archetype; @@ -33,6 +34,12 @@ public class DiagnosedetailsCluster { @Path("/items[at0017]/value|value") private Boolean vorhandenBeiEntlassungValue; + /** + * COVID-19-Diagnose/Problem/Diagnose/Diagnosedetails/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBegrundungVonAusnahmenValue(String begrundungVonAusnahmenValue) { this.begrundungVonAusnahmenValue = begrundungVonAusnahmenValue; } @@ -64,4 +71,12 @@ public void setVorhandenBeiEntlassungValue(Boolean vorhandenBeiEntlassungValue) public Boolean isVorhandenBeiEntlassungValue() { return this.vorhandenBeiEntlassungValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsClusterContainment.java index 711fc365e..530d3f298 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.Boolean; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; @@ -17,6 +18,8 @@ public class DiagnosedetailsClusterContainment extends Containment { public SelectAqlField VORHANDEN_BEI_ENTLASSUNG_VALUE = new AqlFieldImp(DiagnosedetailsCluster.class, "/items[at0017]/value|value", "vorhandenBeiEntlassungValue", Boolean.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(DiagnosedetailsCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private DiagnosedetailsClusterContainment() { super("openEHR-EHR-CLUSTER.diagnose_details.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java index 46103794b..39add828a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; @@ -14,6 +15,12 @@ public class FallidentifikationCluster { @Path("/items[at0001]/value|value") private String fallKennungValue; + /** + * COVID-19-Diagnose/context/Fallidentifikation/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setFallKennungValue(String fallKennungValue) { this.fallKennungValue = fallKennungValue; } @@ -21,4 +28,12 @@ public void setFallKennungValue(String fallKennungValue) { public String getFallKennungValue() { return this.fallKennungValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationClusterContainment.java index de91985e6..264935997 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; @@ -10,6 +11,8 @@ public class FallidentifikationClusterContainment extends Containment { public SelectAqlField FALL_KENNUNG_VALUE = new AqlFieldImp(FallidentifikationCluster.class, "/items[at0001]/value|value", "fallKennungValue", String.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(FallidentifikationCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private FallidentifikationClusterContainment() { super("openEHR-EHR-CLUSTER.case_identification.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java index 3a25c4e21..0e79f115e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -104,6 +105,12 @@ public class ProblemDiagnoseEvaluation { @Path("/language") private Language language; + /** + * COVID-19-Diagnose/Problem/Diagnose/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * COVID-19-Diagnose/Problem/Diagnose/value */ @@ -241,6 +248,14 @@ public Language getLanguage() { return this.language ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setDiagnostischeSicherheit( ProblemDiagnoseDiagnostischeSicherheitChoice diagnostischeSicherheit) { this.diagnostischeSicherheit = diagnostischeSicherheit; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluationContainment.java index 0f6791fce..95f2b3122 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -44,6 +45,8 @@ public class ProblemDiagnoseEvaluationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public SelectAqlField DIAGNOSTISCHE_SICHERHEIT = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0073]/value", "diagnostischeSicherheit", ProblemDiagnoseDiagnostischeSicherheitChoice.class, this); public SelectAqlField SCHWEREGRAD = new AqlFieldImp(ProblemDiagnoseEvaluation.class, "/data[at0001]/items[at0005]/value", "schweregrad", ProblemDiagnoseSchweregradChoice.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java index 3f77b440d..a6a62ae5e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Double; @@ -140,6 +141,12 @@ public class BloodPressureTrainingSampleObservation { @Path("/language") private Language language; + /** + * Encounter (training sample)/Blood pressure (Training sample)/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setSystolicMagnitude(Double systolicMagnitude) { this.systolicMagnitude = systolicMagnitude; } @@ -309,4 +316,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java index 3b944c814..4d9ad8441 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Double; @@ -57,6 +58,8 @@ public class BloodPressureTrainingSampleObservationContainment extends Containme public SelectAqlField LANGUAGE = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(BloodPressureTrainingSampleObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private BloodPressureTrainingSampleObservationContainment() { super("openEHR-EHR-OBSERVATION.sample_blood_pressure.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java index 77b271519..2288b0f35 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.time.temporal.TemporalAccessor; @@ -64,6 +65,12 @@ public class DeviceDetailsTrainingSampleCluster { @Path("/items[at0008]/items[at0011]/value|value") private String servicedByValue; + /** + * Encounter (training sample)/context/Admin detail/Device details (training sample)/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setNameValue(String nameValue) { this.nameValue = nameValue; } @@ -135,4 +142,12 @@ public void setServicedByValue(String servicedByValue) { public String getServicedByValue() { return this.servicedByValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java index 1f0d8e94f..f6861656e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.time.temporal.TemporalAccessor; @@ -28,6 +29,8 @@ public class DeviceDetailsTrainingSampleClusterContainment extends Containment { public SelectAqlField SERVICED_BY_VALUE = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/items[at0008]/items[at0011]/value|value", "servicedByValue", String.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(DeviceDetailsTrainingSampleCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private DeviceDetailsTrainingSampleClusterContainment() { super("openEHR-EHR-CLUSTER.sample_device.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java index 0ada3cd0f..46578f4bb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.Double; import java.lang.Long; @@ -52,6 +53,12 @@ public class BodyTemperatureAnyEventIntervalEvent implements BodyTemperatureAnyE @Path("/state[at0029]/items[at0057]") private Cluster exertion; + /** + * Encounter/Body temperature/Any event/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Encounter/Body temperature/Any event/time */ @@ -125,6 +132,14 @@ public Cluster getExertion() { return this.exertion ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setTimeValue(TemporalAccessor timeValue) { this.timeValue = timeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java index 25a6579c7..2d5719e4f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.Double; import java.lang.Long; @@ -50,6 +51,12 @@ public class BodyTemperatureAnyEventPointEvent implements BodyTemperatureAnyEven @Path("/state[at0029]/items[at0057]") private Cluster exertion; + /** + * Encounter/Body temperature/Any event/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Encounter/Body temperature/Any event/time */ @@ -111,6 +118,14 @@ public Cluster getExertion() { return this.exertion ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setTimeValue(TemporalAccessor timeValue) { this.timeValue = timeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java index a6de3ad23..7054d68c7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -49,6 +50,12 @@ public class BodyTemperatureObservation { @Path("/language") private Language language; + /** + * Encounter/Body temperature/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Encounter/Body temperature/value */ @@ -111,6 +118,14 @@ public Language getLanguage() { return this.language ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setLocationOfMeasurement( BodyTemperatureLocationOfMeasurementChoice locationOfMeasurement) { this.locationOfMeasurement = locationOfMeasurement; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservationContainment.java index e44fbd1f6..ad7dd8199 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -25,6 +26,8 @@ public class BodyTemperatureObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(BodyTemperatureObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(BodyTemperatureObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public SelectAqlField LOCATION_OF_MEASUREMENT = new AqlFieldImp(BodyTemperatureObservation.class, "/protocol[at0020]/items[at0021]/value", "locationOfMeasurement", BodyTemperatureLocationOfMeasurementChoice.class, this); public ListSelectAqlField ANY_EVENT = new ListAqlFieldImp(BodyTemperatureObservation.class, "/data[at0002]/events[at0003]", "anyEvent", BodyTemperatureAnyEventChoice.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java index 8f86d50d9..f023a37a2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Boolean; import java.lang.String; @@ -92,6 +93,12 @@ public class EpisodeofcareAdminEntry { @Path("/language") private Language language; + /** + * EpisodeOfCare/Episodeofcare/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setIdentifier(List identifier) { this.identifier = identifier; } @@ -195,4 +202,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntryContainment.java index 5eb5cabde..cefd96ea7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntryContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntryContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Boolean; import java.lang.String; @@ -41,6 +42,8 @@ public class EpisodeofcareAdminEntryContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(EpisodeofcareAdminEntry.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private EpisodeofcareAdminEntryContainment() { super("openEHR-EHR-ADMIN_ENTRY.episodeofcare.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java index 45ce44de3..611bbc57b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datavalues.DvEHRURI; import java.lang.Long; import java.lang.String; @@ -26,6 +27,12 @@ public class EpisodeofcareDiagnosisCluster { @Path("/items[at0021]/value|magnitude") private Long rankMagnitude; + /** + * EpisodeOfCare/Episodeofcare/diagnosis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setDiagnosisEntry(DvEHRURI diagnosisEntry) { this.diagnosisEntry = diagnosisEntry; } @@ -49,4 +56,12 @@ public void setRankMagnitude(Long rankMagnitude) { public Long getRankMagnitude() { return this.rankMagnitude ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java index a8eaadf04..f4858a5c7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +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; @@ -46,6 +47,12 @@ public class AbdomenSymptomCluster { @Path("/items[at0.1 and name/value='Presence']/value|defining_code") private PresenceDefiningCode presenceDefiningCode; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Abdomen symptom/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setSymptomSignName(DvCodedText symptomSignName) { this.symptomSignName = symptomSignName; } @@ -93,4 +100,12 @@ public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { public PresenceDefiningCode getPresenceDefiningCode() { return this.presenceDefiningCode ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomClusterContainment.java index 806d86e34..f29339544 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +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; @@ -23,6 +24,8 @@ public class AbdomenSymptomClusterContainment extends Containment { public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(AbdomenSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AbdomenSymptomCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private AbdomenSymptomClusterContainment() { super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java index 997ee7d76..79bb527b4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.generic.PartyProxy; @@ -55,6 +56,12 @@ public class AcvpuScaleObservation { @Path("/language") private Language language; + /** + * open_eREACT-Care/Assessment/NEWS2/ACVPU scale/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setAcvpuDefiningCode(AcvpuDefiningCode acvpuDefiningCode) { this.acvpuDefiningCode = acvpuDefiningCode; } @@ -110,4 +117,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservationContainment.java index 5a2da7e1f..24f0ef029 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.generic.PartyProxy; @@ -28,6 +29,8 @@ public class AcvpuScaleObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(AcvpuScaleObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AcvpuScaleObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private AcvpuScaleObservationContainment() { super("openEHR-EHR-OBSERVATION.acvpu.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java index 96bd2f8a9..acd37d54d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -36,6 +37,12 @@ public class AllergiesEvaluation { @Path("/language") private Language language; + /** + * open_eREACT-Care/Background/Allergies/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setSynopsisValue(String synopsisValue) { this.synopsisValue = synopsisValue; } @@ -67,4 +74,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluationContainment.java index eb96cf87f..476d8b0dd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -21,6 +22,8 @@ public class AllergiesEvaluationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(AllergiesEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AllergiesEvaluation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private AllergiesEvaluationContainment() { super("openEHR-EHR-EVALUATION.clinical_synopsis.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java index 9699a1681..245460f41 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -31,6 +32,12 @@ public class AssessmentSection { @Path("/items[openEHR-EHR-SECTION.adhoc.v1 and name/value='NEWS2']") private News2Section news2; + /** + * open_eREACT-Care/Assessment/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setDenwis(DenwisObservation denwis) { this.denwis = denwis; } @@ -62,4 +69,12 @@ public void setNews2(News2Section news2) { public News2Section getNews2() { return this.news2 ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSectionContainment.java index 6ec7c205e..7acd8080d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSectionContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; @@ -15,6 +16,8 @@ public class AssessmentSectionContainment extends Containment { public SelectAqlField NEWS2 = new AqlFieldImp(AssessmentSection.class, "/items[openEHR-EHR-SECTION.adhoc.v1]", "news2", News2Section.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AssessmentSection.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private AssessmentSectionContainment() { super("openEHR-EHR-SECTION.adhoc.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java index 3dbf7d5cc..be18b40d2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -43,6 +44,12 @@ public class BackgroundSection { @Path("/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Allergies']") private AllergiesEvaluation allergies; + /** + * open_eREACT-Care/Background/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setHeight(HeightObservation height) { this.height = height; } @@ -90,4 +97,12 @@ public void setAllergies(AllergiesEvaluation allergies) { public AllergiesEvaluation getAllergies() { return this.allergies ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSectionContainment.java index 30369facf..0e918b59d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSectionContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; @@ -19,6 +20,8 @@ public class BackgroundSectionContainment extends Containment { public SelectAqlField ALLERGIES = new AqlFieldImp(BackgroundSection.class, "/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1]", "allergies", AllergiesEvaluation.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(BackgroundSection.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private BackgroundSectionContainment() { super("openEHR-EHR-SECTION.adhoc.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java index 1a6d4cee4..c1ffab110 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Double; @@ -86,6 +87,12 @@ public class BloodPressureObservation { @Path("/language") private Language language; + /** + * open_eREACT-Care/Assessment/NEWS2/Blood pressure/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setSystolicMagnitude(Double systolicMagnitude) { this.systolicMagnitude = systolicMagnitude; } @@ -181,4 +188,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservationContainment.java index e983654f9..a8130f12f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Double; @@ -39,6 +40,8 @@ public class BloodPressureObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(BloodPressureObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(BloodPressureObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private BloodPressureObservationContainment() { super("openEHR-EHR-OBSERVATION.blood_pressure.v2"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java index 6bd179bae..1062f848e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +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; @@ -46,6 +47,12 @@ public class ChestSymptomCluster { @Path("/items[at0.1 and name/value='Presence']/value|defining_code") private PresenceDefiningCode presenceDefiningCode; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Chest symptom/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setSymptomSignName(DvCodedText symptomSignName) { this.symptomSignName = symptomSignName; } @@ -93,4 +100,12 @@ public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { public PresenceDefiningCode getPresenceDefiningCode() { return this.presenceDefiningCode ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomClusterContainment.java index b9276dc44..bba6fff35 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +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; @@ -23,6 +24,8 @@ public class ChestSymptomClusterContainment extends Containment { public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(ChestSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(ChestSymptomCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private ChestSymptomClusterContainment() { super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java index 6872f869e..250703de0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.util.List; @@ -95,6 +96,12 @@ public class Covid19ExposureEvaluation { @Path("/language") private Language language; + /** + * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setHealthRiskDefiningCode(HealthRiskDefiningCode healthRiskDefiningCode) { this.healthRiskDefiningCode = healthRiskDefiningCode; } @@ -214,4 +221,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluationContainment.java index a04a45031..3363435e9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import org.ehrbase.client.aql.containment.Containment; @@ -40,6 +41,8 @@ public class Covid19ExposureEvaluationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(Covid19ExposureEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(Covid19ExposureEvaluation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private Covid19ExposureEvaluationContainment() { super("openEHR-EHR-EVALUATION.health_risk-covid.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java index 247d7138b..0561ec7fc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -36,6 +37,12 @@ public class CovidNotesEvaluation { @Path("/language") private Language language; + /** + * open_eREACT-Care/Assessment/Covid/Covid notes/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setSynopsisValue(String synopsisValue) { this.synopsisValue = synopsisValue; } @@ -67,4 +74,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluationContainment.java index c24e3bf4e..47241ab2d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -21,6 +22,8 @@ public class CovidNotesEvaluationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(CovidNotesEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(CovidNotesEvaluation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private CovidNotesEvaluationContainment() { super("openEHR-EHR-EVALUATION.clinical_synopsis.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java index fd4b566c6..06677947e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -31,6 +32,12 @@ public class CovidSection { @Path("/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1 and name/value='Covid notes']") private CovidNotesEvaluation covidNotes; + /** + * open_eREACT-Care/Assessment/Covid/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setCovidSymptoms(CovidSymptomsObservation covidSymptoms) { this.covidSymptoms = covidSymptoms; } @@ -62,4 +69,12 @@ public void setCovidNotes(CovidNotesEvaluation covidNotes) { public CovidNotesEvaluation getCovidNotes() { return this.covidNotes ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSectionContainment.java index 8449d844e..2d56f8707 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSectionContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; @@ -15,6 +16,8 @@ public class CovidSectionContainment extends Containment { public SelectAqlField COVID_NOTES = new AqlFieldImp(CovidSection.class, "/items[openEHR-EHR-EVALUATION.clinical_synopsis.v1]", "covidNotes", CovidNotesEvaluation.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(CovidSection.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private CovidSectionContainment() { super("openEHR-EHR-SECTION.adhoc.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java index 70e85a210..7fdedd9ca 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -85,6 +86,12 @@ public class CovidSymptomsObservation { @Path("/language") private Language language; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setStoryValue(String storyValue) { this.storyValue = storyValue; } @@ -180,4 +187,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservationContainment.java index 38c324465..a777daf94 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -38,6 +39,8 @@ public class CovidSymptomsObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(CovidSymptomsObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(CovidSymptomsObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private CovidSymptomsObservationContainment() { super("openEHR-EHR-OBSERVATION.story.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java index 367dee31e..4f99f0ffa 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; @@ -172,6 +173,12 @@ public class DenwisObservation { @Path("/language") private Language language; + /** + * open_eREACT-Care/Assessment/DENWIS/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setQ1Breathing(DvOrdinal q1Breathing) { this.q1Breathing = q1Breathing; } @@ -382,4 +389,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservationContainment.java index cc7287566..44f47e3ca 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; @@ -69,6 +70,8 @@ public class DenwisObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(DenwisObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(DenwisObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private DenwisObservationContainment() { super("openEHR-EHR-OBSERVATION.denwis.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java index 3959d4c04..0ee38a1eb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.DvCodedText; import java.lang.String; @@ -73,6 +74,12 @@ public class FirstSymptomsCluster { @Path("/items[at0.1]/value|defining_code") private PresenceDefiningCode presenceDefiningCode; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/First symptoms/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setSymptomSignName(DvCodedText symptomSignName) { this.symptomSignName = symptomSignName; } @@ -152,4 +159,12 @@ public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { public PresenceDefiningCode getPresenceDefiningCode() { return this.presenceDefiningCode ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java index 7acf0e35c..876cea98b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.DvCodedText; import java.lang.String; @@ -34,6 +35,8 @@ public class FirstSymptomsClusterContainment extends Containment { public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(FirstSymptomsCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(FirstSymptomsCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private FirstSymptomsClusterContainment() { super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java index a827f1d67..fc5ce602e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; import com.nedap.archie.rm.generic.PartyProxy; @@ -49,6 +50,12 @@ public class FrailtyObservation { @Path("/language") private Language language; + /** + * open_eREACT-Care/Background/Frailty/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setAssessment(DvOrdinal assessment) { this.assessment = assessment; } @@ -96,4 +103,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservationContainment.java index 5af020b9b..0f74483ea 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; import com.nedap.archie.rm.generic.PartyProxy; @@ -26,6 +27,8 @@ public class FrailtyObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(FrailtyObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(FrailtyObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private FrailtyObservationContainment() { super("openEHR-EHR-OBSERVATION.clinical_frailty_scale.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java index e5a2d7226..6aa0739dd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.generic.PartyProxy; @@ -69,6 +70,12 @@ public class HeightObservation { @Path("/language") private Language language; + /** + * open_eREACT-Care/Background/Height/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setHeightLengthMagnitude(Double heightLengthMagnitude) { this.heightLengthMagnitude = heightLengthMagnitude; } @@ -140,4 +147,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservationContainment.java index 6e7a8e2b5..5468563a8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.generic.PartyProxy; @@ -34,6 +35,8 @@ public class HeightObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(HeightObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(HeightObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private HeightObservationContainment() { super("openEHR-EHR-OBSERVATION.height.v2"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java index 764b121d4..c681da229 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +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; @@ -46,6 +47,12 @@ public class KeyCovidSymptomCluster { @Path("/items[at0.1 and name/value='Presence']/value|defining_code") private PresenceDefiningCode presenceDefiningCode; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Key Covid symptom/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setSymptomSignName(DvCodedText symptomSignName) { this.symptomSignName = symptomSignName; } @@ -93,4 +100,12 @@ public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { public PresenceDefiningCode getPresenceDefiningCode() { return this.presenceDefiningCode ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomClusterContainment.java index 8f97a9b77..b77530659 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +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; @@ -23,6 +24,8 @@ public class KeyCovidSymptomClusterContainment extends Containment { public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(KeyCovidSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(KeyCovidSymptomCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private KeyCovidSymptomClusterContainment() { super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java index 1e14e47dc..458a462d7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -104,6 +105,12 @@ public class LatestCovid19TestObservation { @Path("/language") private Language language; + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Any event/value */ @@ -232,6 +239,14 @@ public Language getLanguage() { return this.language ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setOverallTestStatus(LatestCovid19TestOverallTestStatusChoice overallTestStatus) { this.overallTestStatus = overallTestStatus; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservationContainment.java index 7a8edbedf..072eb520a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -44,6 +45,8 @@ public class LatestCovid19TestObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(LatestCovid19TestObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(LatestCovid19TestObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public SelectAqlField OVERALL_TEST_STATUS = new AqlFieldImp(LatestCovid19TestObservation.class, "/data[at0001]/events[at0002]/data[at0003]/items[at0073]/value", "overallTestStatus", LatestCovid19TestOverallTestStatusChoice.class, this); private LatestCovid19TestObservationContainment() { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java index d7de1b867..0cc6f1eab 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.util.List; import org.ehrbase.client.annotations.Entity; @@ -19,6 +20,12 @@ public class LatestCovid19TestTestRequestDetailsCluster { @Path("/items[at0035]") private List distributionList; + /** + * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Test request details/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setRequester(Cluster requester) { this.requester = requester; } @@ -34,4 +41,12 @@ public void setDistributionList(List distributionList) { public List getDistributionList() { return this.distributionList ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java index 6bee3e49e..35e2a8a50 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -36,6 +37,12 @@ public class MedicationEvaluation { @Path("/language") private Language language; + /** + * open_eREACT-Care/Background/Medication/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setSynopsisValue(String synopsisValue) { this.synopsisValue = synopsisValue; } @@ -67,4 +74,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluationContainment.java index a279c542c..4aa5fc53a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -21,6 +22,8 @@ public class MedicationEvaluationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(MedicationEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(MedicationEvaluation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private MedicationEvaluationContainment() { super("openEHR-EHR-EVALUATION.clinical_synopsis.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java index 54b5ef07d..526dd6ee4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +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; @@ -46,6 +47,12 @@ public class NeuroSymptomCluster { @Path("/items[at0.1 and name/value='Presence']/value|defining_code") private PresenceDefiningCode presenceDefiningCode; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Neuro symptom/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setSymptomSignName(DvCodedText symptomSignName) { this.symptomSignName = symptomSignName; } @@ -93,4 +100,12 @@ public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { public PresenceDefiningCode getPresenceDefiningCode() { return this.presenceDefiningCode ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomClusterContainment.java index 198ad488a..a5beca01c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +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; @@ -23,6 +24,8 @@ public class NeuroSymptomClusterContainment extends Containment { public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(NeuroSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(NeuroSymptomCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private NeuroSymptomClusterContainment() { super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java index 99f16f22a..16d2bb6bc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; import com.nedap.archie.rm.generic.PartyProxy; @@ -104,6 +105,12 @@ public class News2ScoreObservation { @Path("/language") private Language language; + /** + * open_eREACT-Care/Assessment/NEWS2/NEWS2 Score/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setRespirationRate(DvOrdinal respirationRate) { this.respirationRate = respirationRate; } @@ -224,4 +231,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservationContainment.java index e4924dfb2..bc45ca8f3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; import com.nedap.archie.rm.generic.PartyProxy; @@ -45,6 +46,8 @@ public class News2ScoreObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(News2ScoreObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(News2ScoreObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private News2ScoreObservationContainment() { super("openEHR-EHR-OBSERVATION.news2.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java index e2fa3c652..a70ee4802 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -49,6 +50,12 @@ public class News2Section { @Path("/items[openEHR-EHR-OBSERVATION.news2.v1]") private News2ScoreObservation news2Score; + /** + * open_eREACT-Care/Assessment/NEWS2/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setTemperature(TemperatureObservation temperature) { this.temperature = temperature; } @@ -104,4 +111,12 @@ public void setNews2Score(News2ScoreObservation news2Score) { public News2ScoreObservation getNews2Score() { return this.news2Score ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2SectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2SectionContainment.java index b33bbc2f5..7e04ae0a2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2SectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2SectionContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; @@ -21,6 +22,8 @@ public class News2SectionContainment extends Containment { public SelectAqlField NEWS2_SCORE = new AqlFieldImp(News2Section.class, "/items[openEHR-EHR-OBSERVATION.news2.v1]", "news2Score", News2ScoreObservation.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(News2Section.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private News2SectionContainment() { super("openEHR-EHR-SECTION.adhoc.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java index dcdbae453..d807f67f8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; @@ -46,6 +47,12 @@ public class OtherSymptomCluster { @Path("/items[at0.1 and name/value='Presence']/value|defining_code") private PresenceDefiningCode presenceDefiningCode; + /** + * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Other symptom/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setSymptomSignNameValue(String symptomSignNameValue) { this.symptomSignNameValue = symptomSignNameValue; } @@ -93,4 +100,12 @@ public void setPresenceDefiningCode(PresenceDefiningCode presenceDefiningCode) { public PresenceDefiningCode getPresenceDefiningCode() { return this.presenceDefiningCode ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomClusterContainment.java index 2a2afe576..b0ee3e0ee 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; @@ -23,6 +24,8 @@ public class OtherSymptomClusterContainment extends Containment { public SelectAqlField PRESENCE_DEFINING_CODE = new AqlFieldImp(OtherSymptomCluster.class, "/items[at0.1]/value|defining_code", "presenceDefiningCode", PresenceDefiningCode.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(OtherSymptomCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private OtherSymptomClusterContainment() { super("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java index a4aed6fe4..943887c42 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -36,6 +37,12 @@ public class PastHistoryEvaluation { @Path("/language") private Language language; + /** + * open_eREACT-Care/Background/Past history/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setSynopsisValue(String synopsisValue) { this.synopsisValue = synopsisValue; } @@ -67,4 +74,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluationContainment.java index 1621376cf..278e90b81 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -21,6 +22,8 @@ public class PastHistoryEvaluationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(PastHistoryEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(PastHistoryEvaluation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private PastHistoryEvaluationContainment() { super("openEHR-EHR-EVALUATION.clinical_synopsis.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java index 43498f62c..2b0501b6f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Double; @@ -68,6 +69,12 @@ public class PulseObservation { @Path("/language") private Language language; + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setPulseRateMagnitude(Double pulseRateMagnitude) { this.pulseRateMagnitude = pulseRateMagnitude; } @@ -139,4 +146,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservationContainment.java index fb7f4eb2a..fff5ff35d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Double; @@ -33,6 +34,8 @@ public class PulseObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(PulseObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(PulseObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private PulseObservationContainment() { super("openEHR-EHR-OBSERVATION.pulse.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java index 9abd3d6a3..d0c7fa3a9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.quantity.DvProportion; import com.nedap.archie.rm.generic.PartyProxy; @@ -79,6 +80,12 @@ public class PulseOximetryObservation { @Path("/language") private Language language; + /** + * open_eREACT-Care/Assessment/NEWS2/Pulse oximetry/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setSpo(DvProportion spo) { this.spo = spo; } @@ -166,4 +173,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservationContainment.java index 6a5967d4d..206faa7c7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.quantity.DvProportion; import com.nedap.archie.rm.generic.PartyProxy; @@ -36,6 +37,8 @@ public class PulseOximetryObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(PulseOximetryObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(PulseOximetryObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private PulseOximetryObservationContainment() { super("openEHR-EHR-OBSERVATION.pulse_oximetry.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java index 271f76038..a60a9e23d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.util.List; @@ -35,6 +36,12 @@ public class RecommendationEvaluation { @Path("/language") private Language language; + /** + * open_eREACT-Care/Response/Recommendation/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setRecommendation(List recommendation) { this.recommendation = recommendation; } @@ -66,4 +73,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluationContainment.java index ebfa5a3bd..be32f9737 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import org.ehrbase.client.aql.containment.Containment; @@ -20,6 +21,8 @@ public class RecommendationEvaluationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(RecommendationEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(RecommendationEvaluation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private RecommendationEvaluationContainment() { super("openEHR-EHR-EVALUATION.recommendation.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java index 50691ad33..2bfdc19cb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Double; @@ -68,6 +69,12 @@ public class RespirationsObservation { @Path("/language") private Language language; + /** + * open_eREACT-Care/Assessment/NEWS2/Respirations/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setRateMagnitude(Double rateMagnitude) { this.rateMagnitude = rateMagnitude; } @@ -139,4 +146,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservationContainment.java index fa07ce9f9..581b0df65 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Double; @@ -33,6 +34,8 @@ public class RespirationsObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(RespirationsObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(RespirationsObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private RespirationsObservationContainment() { super("openEHR-EHR-OBSERVATION.respiration.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java index 543aaf4d0..c463a1e9a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; @@ -26,6 +27,12 @@ public class ResponseSection { @Path("/items[openEHR-EHR-ACTION.service.v0]") private List service; + /** + * open_eREACT-Care/Response/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setRecommendation(RecommendationEvaluation recommendation) { this.recommendation = recommendation; } @@ -49,4 +56,12 @@ public void setService(List service) { public List getService() { return this.service ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSectionContainment.java index b382f757e..7ee88fc71 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSectionContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -15,6 +16,8 @@ public class ResponseSectionContainment extends Containment { public ListSelectAqlField SERVICE = new ListAqlFieldImp(ResponseSection.class, "/items[openEHR-EHR-ACTION.service.v0]", "service", ServiceAction.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(ResponseSection.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private ResponseSectionContainment() { super("openEHR-EHR-SECTION.adhoc.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java index 100c49eb1..877452042 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -72,6 +73,12 @@ public class SepsisScreeningObservation { @Path("/language") private Language language; + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setRiskFactorsForSepsis( List riskFactorsForSepsis) { this.riskFactorsForSepsis = riskFactorsForSepsis; @@ -153,4 +160,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservationContainment.java index 272af5b11..e3282a9a3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -33,6 +34,8 @@ public class SepsisScreeningObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(SepsisScreeningObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(SepsisScreeningObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private SepsisScreeningObservationContainment() { super("openEHR-EHR-OBSERVATION.sepsis_screening_tool.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java index f68e5b12c..119702aba 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -13,6 +14,12 @@ public class SepsisSection { @Path("/items[openEHR-EHR-OBSERVATION.sepsis_screening_tool.v0 and name/value='Sepsis screening']") private SepsisScreeningObservation sepsisScreening; + /** + * open_eREACT-Care/Assessment/Sepsis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setSepsisScreening(SepsisScreeningObservation sepsisScreening) { this.sepsisScreening = sepsisScreening; } @@ -20,4 +27,12 @@ public void setSepsisScreening(SepsisScreeningObservation sepsisScreening) { public SepsisScreeningObservation getSepsisScreening() { return this.sepsisScreening ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSectionContainment.java index 20516876a..75725e202 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSectionContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; @@ -9,6 +10,8 @@ public class SepsisSectionContainment extends Containment { public SelectAqlField SEPSIS_SCREENING = new AqlFieldImp(SepsisSection.class, "/items[openEHR-EHR-OBSERVATION.sepsis_screening_tool.v0]", "sepsisScreening", SepsisScreeningObservation.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(SepsisSection.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private SepsisSectionContainment() { super("openEHR-EHR-SECTION.adhoc.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java index 105b12aa9..b6e8bb6ba 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +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; @@ -63,6 +64,12 @@ public class ServiceAction { @Path("/language") private Language language; + /** + * open_eREACT-Care/Response/Service/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * open_eREACT-Care/Response/Service/time */ @@ -151,6 +158,14 @@ public Language getLanguage() { return this.language ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setTimeValue(TemporalAccessor timeValue) { this.timeValue = timeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java index 233da778c..29fd1c396 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceActionContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +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; @@ -32,6 +33,8 @@ public class ServiceActionContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(ServiceAction.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(ServiceAction.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(ServiceAction.class, "/time|value", "timeValue", TemporalAccessor.class, this); public SelectAqlField CAREFLOW_STEP_DEFINING_CODE = new AqlFieldImp(ServiceAction.class, "/ism_transition/careflow_step|defining_code", "careflowStepDefiningCode", CareflowStepDefiningCode.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java index b770f13c9..60a98c15e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +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.datavalues.encapsulated.DvParsable; @@ -71,6 +72,12 @@ public class ServiceRequestCurrentActivityActivity { @Path("/timing") private DvParsable timing; + /** + * open_eREACT-Care/Response/Service request/Current Activity/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setServiceName(DvCodedText serviceName) { this.serviceName = serviceName; } @@ -150,4 +157,12 @@ public void setTiming(DvParsable timing) { public DvParsable getTiming() { return this.timing ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java index 397102251..3f28ceb79 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class ServiceRequestInstruction { @Path("/language") private Language language; + /** + * open_eREACT-Care/Response/Service request/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * open_eREACT-Care/Response/Service request/expiry_time */ @@ -131,6 +138,14 @@ public Language getLanguage() { return this.language ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setExpiryTimeValue(TemporalAccessor expiryTimeValue) { this.expiryTimeValue = expiryTimeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstructionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstructionContainment.java index 4efc80642..0c8d51483 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstructionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstructionContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class ServiceRequestInstructionContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(ServiceRequestInstruction.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(ServiceRequestInstruction.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public SelectAqlField EXPIRY_TIME_VALUE = new AqlFieldImp(ServiceRequestInstruction.class, "/expiry_time|value", "expiryTimeValue", TemporalAccessor.class, this); private ServiceRequestInstructionContainment() { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java index 4a2d11476..252d28d39 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -13,6 +14,12 @@ public class SituationSection { @Path("/items[openEHR-EHR-OBSERVATION.story.v1]") private StoryHistoryObservation storyHistory; + /** + * open_eREACT-Care/Situation/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setStoryHistory(StoryHistoryObservation storyHistory) { this.storyHistory = storyHistory; } @@ -20,4 +27,12 @@ public void setStoryHistory(StoryHistoryObservation storyHistory) { public StoryHistoryObservation getStoryHistory() { return this.storyHistory ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSectionContainment.java index dbbc9ec4f..9faac824b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSectionContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.SelectAqlField; @@ -9,6 +10,8 @@ public class SituationSectionContainment extends Containment { public SelectAqlField STORY_HISTORY = new AqlFieldImp(SituationSection.class, "/items[openEHR-EHR-OBSERVATION.story.v1]", "storyHistory", StoryHistoryObservation.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(SituationSection.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private SituationSectionContainment() { super("openEHR-EHR-SECTION.adhoc.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java index 0092e932f..dd71adc8b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class StoryHistoryObservation { @Path("/language") private Language language; + /** + * open_eREACT-Care/Situation/Story/History/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setSoftSigns(List softSigns) { this.softSigns = softSigns; } @@ -124,4 +131,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservationContainment.java index 0f1758a3b..3e22ba489 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class StoryHistoryObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(StoryHistoryObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(StoryHistoryObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private StoryHistoryObservationContainment() { super("openEHR-EHR-OBSERVATION.story.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java index 77e9c23f6..cc9e05483 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datastructures.Element; import com.nedap.archie.rm.generic.PartyProxy; @@ -74,6 +75,12 @@ public class TemperatureObservation { @Path("/language") private Language language; + /** + * open_eREACT-Care/Assessment/NEWS2/Temperature/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setTemperatureMagnitude(Double temperatureMagnitude) { this.temperatureMagnitude = temperatureMagnitude; } @@ -153,4 +160,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservationContainment.java index 36c4cf756..b71205226 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datastructures.Element; import com.nedap.archie.rm.generic.PartyProxy; @@ -34,6 +35,8 @@ public class TemperatureObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(TemperatureObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(TemperatureObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private TemperatureObservationContainment() { super("openEHR-EHR-OBSERVATION.body_temperature.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java index b4eaffb7f..8eee1062f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.generic.PartyProxy; @@ -69,6 +70,12 @@ public class WeightObservation { @Path("/language") private Language language; + /** + * open_eREACT-Care/Background/Weight/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setWeightMagnitude(Double weightMagnitude) { this.weightMagnitude = weightMagnitude; } @@ -140,4 +147,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservationContainment.java index cc1af55b6..3ae9f8f1a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datastructures.ItemTree; import com.nedap.archie.rm.generic.PartyProxy; @@ -34,6 +35,8 @@ public class WeightObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(WeightObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(WeightObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private WeightObservationContainment() { super("openEHR-EHR-OBSERVATION.body_weight.v2"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java index 02607b646..14425e2ed 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; @@ -14,6 +15,12 @@ public class AbteilungsfallCluster { @Path("/items[at0001 and name/value='Zugehörige Abteilungsfall-Kennung']/value|value") private String zugehorigeAbteilungsfallKennungValue; + /** + * Patientenaufenthalt/context/Abteilungsfall/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setZugehorigeAbteilungsfallKennungValue(String zugehorigeAbteilungsfallKennungValue) { this.zugehorigeAbteilungsfallKennungValue = zugehorigeAbteilungsfallKennungValue; } @@ -21,4 +28,12 @@ public void setZugehorigeAbteilungsfallKennungValue(String zugehorigeAbteilungsf public String getZugehorigeAbteilungsfallKennungValue() { return this.zugehorigeAbteilungsfallKennungValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallClusterContainment.java index 64a9ce533..4565b1fed 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; @@ -10,6 +11,8 @@ public class AbteilungsfallClusterContainment extends Containment { public SelectAqlField ZUGEHORIGE_ABTEILUNGSFALL_KENNUNG_VALUE = new AqlFieldImp(AbteilungsfallCluster.class, "/items[at0001]/value|value", "zugehorigeAbteilungsfallKennungValue", String.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AbteilungsfallCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private AbteilungsfallClusterContainment() { super("openEHR-EHR-CLUSTER.case_identification.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java index 3922b5ec7..bbfbeae4f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.DvIdentifier; import java.lang.String; @@ -59,6 +60,12 @@ public class DetailsZumBettCluster { @Path("/items[at0027]") private List multimedia; + /** + * Patientenaufenthalt/Versorgungsort/Standort/Details zum Bett/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setGeratenameValue(String geratenameValue) { this.geratenameValue = geratenameValue; } @@ -122,4 +129,12 @@ public void setMultimedia(List multimedia) { public List getMultimedia() { return this.multimedia ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettClusterContainment.java index b92011443..0e278c4de 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.DvIdentifier; import java.lang.String; @@ -28,6 +29,8 @@ public class DetailsZumBettClusterContainment extends Containment { public ListSelectAqlField MULTIMEDIA = new ListAqlFieldImp(DetailsZumBettCluster.class, "/items[at0027]", "multimedia", Cluster.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(DetailsZumBettCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private DetailsZumBettClusterContainment() { super("openEHR-EHR-CLUSTER.device.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java index 23463c016..91792b1e5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; @@ -68,6 +69,12 @@ public class StandortCluster { @Path("/items[openEHR-EHR-CLUSTER.device.v1 and name/value='Details zum Bett']") private DetailsZumBettCluster detailsZumBett; + /** + * Patientenaufenthalt/Versorgungsort/Standort/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setStandorttypValue(String standorttypValue) { this.standorttypValue = standorttypValue; } @@ -148,4 +155,12 @@ public void setDetailsZumBett(DetailsZumBettCluster detailsZumBett) { public DetailsZumBettCluster getDetailsZumBett() { return this.detailsZumBett ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortClusterContainment.java index 631cb838d..79a693428 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; @@ -28,6 +29,8 @@ public class StandortClusterContainment extends Containment { public SelectAqlField DETAILS_ZUM_BETT = new AqlFieldImp(StandortCluster.class, "/items[openEHR-EHR-CLUSTER.device.v1]", "detailsZumBett", DetailsZumBettCluster.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(StandortCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private StandortClusterContainment() { super("openEHR-EHR-CLUSTER.location.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java index 1cfd56038..d8a2a35a6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; @@ -14,6 +15,12 @@ public class VersorgungsfallCluster { @Path("/items[at0001 and name/value='Zugehörige Versorgungsfall-Kennung']/value|value") private String zugehorigeVersorgungsfallKennungValue; + /** + * Patientenaufenthalt/context/Versorgungsfall/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setZugehorigeVersorgungsfallKennungValue( String zugehorigeVersorgungsfallKennungValue) { this.zugehorigeVersorgungsfallKennungValue = zugehorigeVersorgungsfallKennungValue; @@ -22,4 +29,12 @@ public void setZugehorigeVersorgungsfallKennungValue( public String getZugehorigeVersorgungsfallKennungValue() { return this.zugehorigeVersorgungsfallKennungValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallClusterContainment.java index d1f5b4a3a..c596d1fb7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; @@ -10,6 +11,8 @@ public class VersorgungsfallClusterContainment extends Containment { public SelectAqlField ZUGEHORIGE_VERSORGUNGSFALL_KENNUNG_VALUE = new AqlFieldImp(VersorgungsfallCluster.class, "/items[at0001]/value|value", "zugehorigeVersorgungsfallKennungValue", String.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(VersorgungsfallCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private VersorgungsfallClusterContainment() { super("openEHR-EHR-CLUSTER.case_identification.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java index 21034307e..fdc7a38ff 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; import java.time.temporal.TemporalAccessor; @@ -53,6 +54,12 @@ public class VersorgungsortAdminEntry { @Path("/language") private Language language; + /** + * Patientenaufenthalt/Versorgungsort/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBeginnValue(TemporalAccessor beginnValue) { this.beginnValue = beginnValue; } @@ -108,4 +115,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntryContainment.java index 2b82cce8d..43a5a85ff 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntryContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntryContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; import java.time.temporal.TemporalAccessor; @@ -25,6 +26,8 @@ public class VersorgungsortAdminEntryContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(VersorgungsortAdminEntry.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(VersorgungsortAdminEntry.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private VersorgungsortAdminEntryContainment() { super("openEHR-EHR-ADMIN_ENTRY.hospitalization.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java index e81adaae0..dfccac12c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -48,6 +49,12 @@ public class SchwangerschaftsstatusObservation { @Path("/language") private Language language; + /** + * Schwangerschaftsstatus/Schwangerschaftsstatus/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setStatusDefiningCode(StatusDefiningCode2 statusDefiningCode) { this.statusDefiningCode = statusDefiningCode; } @@ -95,4 +102,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservationContainment.java index 24d7573d7..b70ce71cd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; @@ -25,6 +26,8 @@ public class SchwangerschaftsstatusObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(SchwangerschaftsstatusObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private SchwangerschaftsstatusObservationContainment() { super("openEHR-EHR-OBSERVATION.pregnancy_status.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java index d6fa69e30..60b31c9da 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; @@ -14,6 +15,12 @@ public class AntibiogrammCluster { @Path("/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]") private List laboranalytResultat; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Antibiogramm/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setLaboranalytResultat(List laboranalytResultat) { this.laboranalytResultat = laboranalytResultat; } @@ -21,4 +28,12 @@ public void setLaboranalytResultat(List laboranalytR public List getLaboranalytResultat() { return this.laboranalytResultat ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammClusterContainment.java index fa4e766e2..bf4f58a62 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -11,6 +12,8 @@ public class AntibiogrammClusterContainment extends Containment { public ListSelectAqlField LABORANALYT_RESULTAT = new ListAqlFieldImp(AntibiogrammCluster.class, "/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]", "laboranalytResultat", LaboranalytResultatCluster.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AntibiogrammCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private AntibiogrammClusterContainment() { super("openEHR-EHR-CLUSTER.laboratory_test_panel.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java index 9a2c9f545..1928a0e76 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; import java.lang.Double; @@ -72,6 +73,12 @@ public class ErregerdetailsCluster { @Path("/items[at0059]") private List weitereErganzungen; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setKeimSubtyp(List keimSubtyp) { this.keimSubtyp = keimSubtyp; } @@ -152,4 +159,12 @@ public void setWeitereErganzungen(List weitereErganzungen) { public List getWeitereErganzungen() { return this.weitereErganzungen ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsClusterContainment.java index 08183a74a..347a68e9b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.quantity.DvOrdinal; import java.lang.Double; @@ -33,6 +34,8 @@ public class ErregerdetailsClusterContainment extends Containment { public ListSelectAqlField WEITERE_ERGANZUNGEN = new ListAqlFieldImp(ErregerdetailsCluster.class, "/items[at0059]", "weitereErganzungen", Cluster.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(ErregerdetailsCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private ErregerdetailsClusterContainment() { super("openEHR-EHR-CLUSTER.erregerdetails.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java index 8fff07812..758ffaf17 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -12,6 +13,12 @@ public class ErregerdetailsResistenzmechanismusCluster { @Path("/items[at0017]/value|value") private String resistenzmechanismusBezeichnungValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Resistenzmechanismus/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setResistenzmechanismusBezeichnungValue(String resistenzmechanismusBezeichnungValue) { this.resistenzmechanismusBezeichnungValue = resistenzmechanismusBezeichnungValue; } @@ -19,4 +26,12 @@ public void setResistenzmechanismusBezeichnungValue(String resistenzmechanismusB public String getResistenzmechanismusBezeichnungValue() { return this.resistenzmechanismusBezeichnungValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java index 2f43aa75f..6a7233930 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import java.util.List; import org.ehrbase.client.annotations.Archetype; @@ -33,6 +34,12 @@ public class ErregertypisierungCluster { @Path("/items[at0002]/value|value") private String kommentarValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregertypisierung/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setArtDerTypisierung( List artDerTypisierung) { this.artDerTypisierung = artDerTypisierung; @@ -65,4 +72,12 @@ public void setKommentarValue(String kommentarValue) { public String getKommentarValue() { return this.kommentarValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungClusterContainment.java index 8b62923a3..b4715df12 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; @@ -18,6 +19,8 @@ public class ErregertypisierungClusterContainment extends Containment { public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ErregertypisierungCluster.class, "/items[at0002]/value|value", "kommentarValue", String.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(ErregertypisierungCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private ErregertypisierungClusterContainment() { super("openEHR-EHR-CLUSTER.molekulare_typisierung.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java index d42c85396..18b18d42e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import java.util.List; import org.ehrbase.client.annotations.Entity; @@ -19,6 +20,12 @@ public class EventsummaryBeteiligtePersonenCluster { @Path("/items[at0010]") private List idDerPerson; + /** + * SmICS Befund/context/Eventsummary/Beteiligte Personen/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setArtDerPersonValue(String artDerPersonValue) { this.artDerPersonValue = artDerPersonValue; } @@ -34,4 +41,12 @@ public void setIdDerPerson(List idDerPerson) { public List getIdDerPerson() { return this.idDerPerson ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java index 45b605e33..74c1079ed 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import java.util.List; import org.ehrbase.client.annotations.Archetype; @@ -39,6 +40,12 @@ public class EventsummaryCluster { @Path("/items[at0006]/value|value") private String kommentarValue; + /** + * SmICS Befund/context/Eventsummary/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setFallidentifikationValue(String fallidentifikationValue) { this.fallidentifikationValue = fallidentifikationValue; } @@ -79,4 +86,12 @@ public void setKommentarValue(String kommentarValue) { public String getKommentarValue() { return this.kommentarValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryClusterContainment.java index 952e87af9..82a178c66 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; @@ -20,6 +21,8 @@ public class EventsummaryClusterContainment extends Containment { public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(EventsummaryCluster.class, "/items[at0006]/value|value", "kommentarValue", String.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(EventsummaryCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private EventsummaryClusterContainment() { super("openEHR-EHR-CLUSTER.eventsummary.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java index 239a55d7d..e35bf7b8e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.Double; import java.lang.String; @@ -47,6 +48,12 @@ public class LaboranalytResultatCluster { @Path("/items[at0003]/value|value") private String kommentarValue; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Antibiogramm/Laboranalyt-Resultat/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setAntibiotikumDefiningCode(AntibiotikumDefiningCode antibiotikumDefiningCode) { this.antibiotikumDefiningCode = antibiotikumDefiningCode; } @@ -94,4 +101,12 @@ public void setKommentarValue(String kommentarValue) { public String getKommentarValue() { return this.kommentarValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatClusterContainment.java index 9321467ee..c46973f08 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.Double; import java.lang.String; @@ -24,6 +25,8 @@ public class LaboranalytResultatClusterContainment extends Containment { public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(LaboranalytResultatCluster.class, "/items[at0003]/value|value", "kommentarValue", String.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(LaboranalytResultatCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private LaboranalytResultatClusterContainment() { super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java index ad515b26f..9c36496b9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Boolean; import java.lang.String; @@ -140,6 +141,12 @@ public class SmicsErgebnisObservation { @Path("/language") private Language language; + /** + * SmICS Befund/SmICS-Ergebnis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setSmicsErgebniskategorieDefiningCode( SmicsErgebniskategorieDefiningCode smicsErgebniskategorieDefiningCode) { this.smicsErgebniskategorieDefiningCode = smicsErgebniskategorieDefiningCode; @@ -311,4 +318,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservationContainment.java index e563259ff..fa1893c74 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Boolean; import java.lang.String; @@ -57,6 +58,8 @@ public class SmicsErgebnisObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(SmicsErgebnisObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(SmicsErgebnisObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private SmicsErgebnisObservationContainment() { super("openEHR-EHR-OBSERVATION.smics_befund.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java index 31bb030b6..dcf23ec8b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; @@ -46,6 +47,12 @@ public class StandortCluster { @Path("/items[at0047]") private List details; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Standort/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setStandorttypValue(String standorttypValue) { this.standorttypValue = standorttypValue; } @@ -93,4 +100,12 @@ public void setDetails(List details) { public List getDetails() { return this.details ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortClusterContainment.java index 8e8f17e87..4d84604fd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; @@ -23,6 +24,8 @@ public class StandortClusterContainment extends Containment { public ListSelectAqlField DETAILS = new ListAqlFieldImp(StandortCluster.class, "/items[at0047]", "details", Cluster.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(StandortCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private StandortClusterContainment() { super("openEHR-EHR-CLUSTER.location.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java index b5fc22641..dd4514905 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -55,6 +56,12 @@ public class AufnahmedatenAdminEntry { @Path("/language") private Language language; + /** + * Stationärer Versorgungsfall/Aufnahmedaten/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setVersorgungsfallgrundValue(String versorgungsfallgrundValue) { this.versorgungsfallgrundValue = versorgungsfallgrundValue; } @@ -110,4 +117,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntryContainment.java index 9f9ade2a5..b321d03f2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntryContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntryContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -28,6 +29,8 @@ public class AufnahmedatenAdminEntryContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(AufnahmedatenAdminEntry.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AufnahmedatenAdminEntry.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private AufnahmedatenAdminEntryContainment() { super("openEHR-EHR-ADMIN_ENTRY.admission.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java index 4d043fa4a..274e75019 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -61,6 +62,12 @@ public class EntlassungsdatenAdminEntry { @Path("/language") private Language language; + /** + * Stationärer Versorgungsfall/Entlassungsdaten/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setArtDerEntlassungValue(String artDerEntlassungValue) { this.artDerEntlassungValue = artDerEntlassungValue; } @@ -125,4 +132,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntryContainment.java index dadff48ee..fd0ee82c9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntryContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntryContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -30,6 +31,8 @@ public class EntlassungsdatenAdminEntryContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(EntlassungsdatenAdminEntry.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private EntlassungsdatenAdminEntryContainment() { super("openEHR-EHR-ADMIN_ENTRY.discharge_summary.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java index 09517700b..26ab04010 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; import java.util.List; @@ -30,6 +31,12 @@ public class TestAllTypesAction { @Path("/language") private Language language; + /** + * Test all types/Test all types/section 2/section 3/Test all types/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Test all types/Test all types/section 2/section 3/Test all types/time */ @@ -78,6 +85,14 @@ public Language getLanguage() { return this.language ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setTimeValue(TemporalAccessor timeValue) { this.timeValue = timeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java index fa574922d..e20c6b9d0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesActionContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.generic.PartyProxy; import java.time.temporal.TemporalAccessor; import org.ehrbase.client.aql.containment.Containment; @@ -19,6 +20,8 @@ public class TestAllTypesActionContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesAction.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(TestAllTypesAction.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public SelectAqlField TIME_VALUE = new AqlFieldImp(TestAllTypesAction.class, "/time|value", "timeValue", TemporalAccessor.class, this); public SelectAqlField CAREFLOW_STEP_DEFINING_CODE = new AqlFieldImp(TestAllTypesAction.class, "/ism_transition/careflow_step|defining_code", "careflowStepDefiningCode", CareflowStepDefiningCode.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java index 2a0d19273..dde160783 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Long; import org.ehrbase.client.annotations.Archetype; @@ -28,6 +29,12 @@ public class TestAllTypesAdminEntry { @Path("/language") private Language language; + /** + * Test all types/Test all types/section 2/Test all types/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setCount3Magnitude(Long count3Magnitude) { this.count3Magnitude = count3Magnitude; } @@ -51,4 +58,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java index d024d2456..ed0425fe1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntryContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Long; import org.ehrbase.client.aql.containment.Containment; @@ -16,6 +17,8 @@ public class TestAllTypesAdminEntryContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesAdminEntry.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(TestAllTypesAdminEntry.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private TestAllTypesAdminEntryContainment() { super("openEHR-EHR-ADMIN_ENTRY.test_all_types.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java index c610d8fa3..d80b11201 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.Boolean; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; @@ -14,6 +15,12 @@ public class TestAllTypesCluster { @Path("/items[at0001]/items[at0002]/items[at0003]/value|value") private Boolean boolean2Value; + /** + * Test all types/Test all types/section 2/section 3/Test all types/Test all types/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setBoolean2Value(Boolean boolean2Value) { this.boolean2Value = boolean2Value; } @@ -21,4 +28,12 @@ public void setBoolean2Value(Boolean boolean2Value) { public Boolean isBoolean2Value() { return this.boolean2Value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java index a2012313d..d7f15da5b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.Boolean; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; @@ -10,6 +11,8 @@ public class TestAllTypesClusterContainment extends Containment { public SelectAqlField BOOLEAN2_VALUE = new AqlFieldImp(TestAllTypesCluster.class, "/items[at0001]/items[at0002]/items[at0003]/value|value", "boolean2Value", Boolean.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(TestAllTypesCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private TestAllTypesClusterContainment() { super("openEHR-EHR-CLUSTER.test_all_types.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java index b6b432174..8c430aa96 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Boolean; import java.lang.Double; @@ -124,6 +125,12 @@ public class TestAllTypesEvaluation { @Path("/language") private Language language; + /** + * Test all types/Test all types/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Test all types/Test all types/value */ @@ -275,6 +282,14 @@ public Language getLanguage() { return this.language ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setChoice(TestAllTypesChoiceChoice choice) { this.choice = choice; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java index 2bd2f2deb..d662e6d15 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Boolean; import java.lang.Double; @@ -51,6 +52,8 @@ public class TestAllTypesEvaluationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesEvaluation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(TestAllTypesEvaluation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public SelectAqlField CHOICE = new AqlFieldImp(TestAllTypesEvaluation.class, "/data[at0001]/items[at0009]/value", "choice", TestAllTypesChoiceChoice.class, this); private TestAllTypesEvaluationContainment() { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java index 1b666206d..ffcf710fc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -49,6 +50,12 @@ public class TestAllTypesInstruction { @Path("/language") private Language language; + /** + * Test all types/Test all types/section 2/section 3/Test all types/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * Test all types/Test all types/section 2/section 3/Test all types/expiry_time */ @@ -103,6 +110,14 @@ public Language getLanguage() { return this.language ; } + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setExpiryTimeValue(TemporalAccessor expiryTimeValue) { this.expiryTimeValue = expiryTimeValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java index 055f8f3b2..7aa4222b7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstructionContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; @@ -25,6 +26,8 @@ public class TestAllTypesInstructionContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesInstruction.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(TestAllTypesInstruction.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public SelectAqlField EXPIRY_TIME_VALUE = new AqlFieldImp(TestAllTypesInstruction.class, "/expiry_time|value", "expiryTimeValue", TemporalAccessor.class, this); private TestAllTypesInstructionContainment() { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java index bbc02351c..994328670 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datavalues.DvCodedText; import com.nedap.archie.rm.datavalues.DvIdentifier; import com.nedap.archie.rm.datavalues.encapsulated.DvMultimedia; @@ -148,6 +149,12 @@ public class TestAllTypesObservation { @Path("/language") private Language language; + /** + * Test all types/Test all types/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setTextValue(String textValue) { this.textValue = textValue; } @@ -315,4 +322,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java index 168c1f2dd..f3d13d398 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datavalues.DvCodedText; import com.nedap.archie.rm.datavalues.DvIdentifier; import com.nedap.archie.rm.datavalues.encapsulated.DvMultimedia; @@ -64,6 +65,8 @@ public class TestAllTypesObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(TestAllTypesObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(TestAllTypesObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private TestAllTypesObservationContainment() { super("openEHR-EHR-OBSERVATION.test_all_types.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java index 7a426646f..53e833ef3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; @@ -26,6 +27,12 @@ public class TestAllTypesSection { @Path("/items[at0001]/items[openEHR-EHR-ADMIN_ENTRY.test_all_types.v1]") private List section2TestAllTypes; + /** + * Test all types/Test all types/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setSection3TestAllTypes(List section3TestAllTypes) { this.section3TestAllTypes = section3TestAllTypes; } @@ -49,4 +56,12 @@ public void setSection2TestAllTypes(List section2TestAll public List getSection2TestAllTypes() { return this.section2TestAllTypes ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSectionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSectionContainment.java index 7bedd1cf3..6d0e5283b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSectionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSectionContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -15,6 +16,8 @@ public class TestAllTypesSectionContainment extends Containment { public ListSelectAqlField SECTION2_TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesSection.class, "/items[at0001]/items[openEHR-EHR-ADMIN_ENTRY.test_all_types.v1]", "section2TestAllTypes", TestAllTypesAdminEntry.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(TestAllTypesSection.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private TestAllTypesSectionContainment() { super("openEHR-EHR-SECTION.test_all_types.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java index 8ed9b07ca..58e1dae43 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; @@ -28,6 +29,12 @@ public class AnatomischeLokalisationCluster { @Path("/items[at0054]") private List multimedialeDarstellung; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/Anatomische Lokalisation/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setNameDerKorperstelleValue(String nameDerKorperstelleValue) { this.nameDerKorperstelleValue = nameDerKorperstelleValue; } @@ -51,4 +58,12 @@ public void setMultimedialeDarstellung(List multimedialeDarstellung) { public List getMultimedialeDarstellung() { return this.multimedialeDarstellung ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationClusterContainment.java index 346c112b8..5fab4b5a4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; @@ -17,6 +18,8 @@ public class AnatomischeLokalisationClusterContainment extends Containment { public ListSelectAqlField MULTIMEDIALE_DARSTELLUNG = new ListAqlFieldImp(AnatomischeLokalisationCluster.class, "/items[at0054]", "multimedialeDarstellung", Cluster.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(AnatomischeLokalisationCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private AnatomischeLokalisationClusterContainment() { super("openEHR-EHR-CLUSTER.anatomical_location.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java index 3eed12b9a..04d05740b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.DvIdentifier; import com.nedap.archie.rm.generic.PartyProxy; @@ -122,6 +123,12 @@ public class BefundObservation { @Path("/language") private Language language; + /** + * Virologischer Befund/Befund/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setLabortestBezeichnungValue(String labortestBezeichnungValue) { this.labortestBezeichnungValue = labortestBezeichnungValue; } @@ -267,4 +274,12 @@ public void setLanguage(Language language) { public Language getLanguage() { return this.language ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservationContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservationContainment.java index 5aa5a3f8f..dcc642db4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservationContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservationContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.DvIdentifier; import com.nedap.archie.rm.generic.PartyProxy; @@ -51,6 +52,8 @@ public class BefundObservationContainment extends Containment { public SelectAqlField LANGUAGE = new AqlFieldImp(BefundObservation.class, "/language", "language", Language.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(BefundObservation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private BefundObservationContainment() { super("openEHR-EHR-OBSERVATION.laboratory_test_result.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java index 53e4cb42d..8f245d818 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; @@ -34,6 +35,12 @@ public class EinsenderstandortCluster { @Path("/items[at0047]") private List details; + /** + * Virologischer Befund/Befund/Details der Testanforderung/Einsenderstandort/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setStandorttypValue(String standorttypValue) { this.standorttypValue = standorttypValue; } @@ -65,4 +72,12 @@ public void setDetails(List details) { public List getDetails() { return this.details ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortClusterContainment.java index febd0e937..2e0f509b3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; @@ -19,6 +20,8 @@ public class EinsenderstandortClusterContainment extends Containment { public ListSelectAqlField DETAILS = new ListAqlFieldImp(EinsenderstandortCluster.class, "/items[at0047]", "details", Cluster.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(EinsenderstandortCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private EinsenderstandortClusterContainment() { super("openEHR-EHR-CLUSTER.location.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java index 3da962ea0..f85743d31 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; @@ -34,6 +35,12 @@ public class EmpfangerstandortCluster { @Path("/items[at0047]") private List details; + /** + * Virologischer Befund/Befund/Empfängerstandort/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setStandorttypValue(String standorttypValue) { this.standorttypValue = standorttypValue; } @@ -65,4 +72,12 @@ public void setDetails(List details) { public List getDetails() { return this.details ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortClusterContainment.java index 112508ffd..881812e40 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; @@ -19,6 +20,8 @@ public class EmpfangerstandortClusterContainment extends Containment { public ListSelectAqlField DETAILS = new ListAqlFieldImp(EmpfangerstandortCluster.class, "/items[at0047]", "details", Cluster.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(EmpfangerstandortCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private EmpfangerstandortClusterContainment() { super("openEHR-EHR-CLUSTER.location.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java index b397992a9..66abe1dd8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; @@ -14,6 +15,12 @@ public class FallidentifikationCluster { @Path("/items[at0001]/value|value") private String fallKennungValue; + /** + * Virologischer Befund/context/Fallidentifikation/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setFallKennungValue(String fallKennungValue) { this.fallKennungValue = fallKennungValue; } @@ -21,4 +28,12 @@ public void setFallKennungValue(String fallKennungValue) { public String getFallKennungValue() { return this.fallKennungValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationClusterContainment.java index a34b7a70c..2017fb03b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; @@ -10,6 +11,8 @@ public class FallidentifikationClusterContainment extends Containment { public SelectAqlField FALL_KENNUNG_VALUE = new AqlFieldImp(FallidentifikationCluster.class, "/items[at0001]/value|value", "fallKennungValue", String.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(FallidentifikationCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private FallidentifikationClusterContainment() { super("openEHR-EHR-CLUSTER.case_identification.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java index 8a2fca9ba..ea4eec148 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.util.List; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; @@ -14,6 +15,12 @@ public class KulturCluster { @Path("/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1 and name/value='Pro Virus']") private List proVirus; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Kultur/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setProVirus(List proVirus) { this.proVirus = proVirus; } @@ -21,4 +28,12 @@ public void setProVirus(List proVirus) { public List getProVirus() { return this.proVirus ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturClusterContainment.java index 54b358bc0..70b989aa9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -11,6 +12,8 @@ public class KulturClusterContainment extends Containment { public ListSelectAqlField PRO_VIRUS = new ListAqlFieldImp(KulturCluster.class, "/items[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1]", "proVirus", ProVirusCluster.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(KulturCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private KulturClusterContainment() { super("openEHR-EHR-CLUSTER.laboratory_test_panel.v0"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java index ed6179180..e997c55c3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.DvIdentifier; import java.lang.Double; @@ -61,6 +62,12 @@ public class ProVirusCluster { @Path("/items[at0003]/value|value") private String kommentarValue; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Kultur/Pro Virus/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setAnalyseergebnisReihenfolgeMagnitude(Long analyseergebnisReihenfolgeMagnitude) { this.analyseergebnisReihenfolgeMagnitude = analyseergebnisReihenfolgeMagnitude; } @@ -124,4 +131,12 @@ public void setKommentarValue(String kommentarValue) { public String getKommentarValue() { return this.kommentarValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusClusterContainment.java index d9c4b1f9b..4a5a97b2f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.DvIdentifier; import java.lang.Double; @@ -30,6 +31,8 @@ public class ProVirusClusterContainment extends Containment { public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ProVirusCluster.class, "/items[at0003]/value|value", "kommentarValue", String.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(ProVirusCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private ProVirusClusterContainment() { super("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1"); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java index fb8bd869e..6ba0c941a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.DvIdentifier; import java.lang.String; @@ -120,6 +121,12 @@ public class ProbeCluster { @Path("/items[at0045]/value|value") private String kommentarValue; + /** + * Virologischer Befund/Befund/Jedes Ereignis/Probe/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setProbenartValue(String probenartValue) { this.probenartValue = probenartValue; } @@ -264,4 +271,12 @@ public void setKommentarValue(String kommentarValue) { public String getKommentarValue() { return this.kommentarValue ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeClusterContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeClusterContainment.java index c8c87764e..3f5749a93 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeClusterContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeClusterContainment.java @@ -1,5 +1,6 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.datavalues.DvIdentifier; import java.lang.String; @@ -49,6 +50,8 @@ public class ProbeClusterContainment extends Containment { public SelectAqlField KOMMENTAR_VALUE = new AqlFieldImp(ProbeCluster.class, "/items[at0045]/value|value", "kommentarValue", String.class, this); + public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(ProbeCluster.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + private ProbeClusterContainment() { super("openEHR-EHR-CLUSTER.specimen.v1"); } diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java b/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java index 3cc003d0b..26034674e 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java @@ -19,6 +19,7 @@ package org.ehrbase.client.classgenerator; +import com.nedap.archie.rm.archetyped.Locatable; import com.nedap.archie.rm.datastructures.Event; import com.nedap.archie.rminfo.RMTypeInfo; import org.apache.commons.collections4.SetUtils; @@ -30,6 +31,7 @@ import org.ehrbase.webtemplate.parser.config.RmIntrospectConfig; import java.util.Collections; +import java.util.Deque; import java.util.List; import java.util.Map; import java.util.Optional; @@ -47,7 +49,9 @@ public FlattFilter(ClassGeneratorConfig config) { } @Override - protected boolean skip(WebTemplateNode node, WebTemplate context, WebTemplateNode parent) { + protected boolean skip(WebTemplateNode node, WebTemplate context, Deque deque ) { + WebTemplateNode parent = deque.peek(); + if (isTrivialNode(node, parent)) { return true; } else { @@ -70,6 +74,12 @@ protected boolean skip(WebTemplateNode node, WebTemplate context, WebTemplateNod attributeNames.add("lower_included"); attributeNames.add("upper_included"); + deque.poll(); + if(!isTrivialNode(parent,deque.peek()) && Locatable.class.isAssignableFrom( typeInfo.getJavaClass())){ + attributeNames.add("feeder_audit"); + } + deque.push(parent); + SetUtils.SetView difference = SetUtils.difference(typeInfo.getAttributes().keySet(), attributeNames); if (difference.contains(node.getName())) { diff --git a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java index df6ef2401..91576384c 100644 --- a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java +++ b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java @@ -134,7 +134,9 @@ public void testGenerate() throws IOException, XmlException { new Tuple( "participations", "java.util.List"), new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), - new Tuple("location", "java.lang.String")); + new Tuple("location", "java.lang.String"), + new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), + new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit")); writeFiles(generate); } @@ -252,6 +254,10 @@ public void testGenerateAltEvents() throws IOException, XmlException { "org.ehrbase.client.classgenerator.shareddefinition.Category"), new Tuple( "participations", "java.util.List"), + new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), + new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), + new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), + new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit")); writeFiles(generate); @@ -334,7 +340,9 @@ public void testGenerateEpisode() throws IOException, XmlException { "lowerValue", "lowerIncluded", "upperIncluded", - "healthCareFacility"); + "healthCareFacility", + "feederAudit", + "feederAudit"); writeFiles(generate); } @@ -435,7 +443,16 @@ public void testGenerateSmICS() throws IOException, XmlException { "settingDefiningCode", "feederAudit", "location", - "categoryDefiningCode"); + "categoryDefiningCode", + "feederAudit", + "feederAudit", + "feederAudit", + "feederAudit", + "feederAudit", + "feederAudit", + "feederAudit", + "feederAudit", + "feederAudit"); writeFiles(generate); } @@ -456,7 +473,7 @@ public void testGenerateD4LQuestionnaire() throws IOException, XmlException { .flatMap(List::stream) .collect(Collectors.toList()); - assertThat(fieldSpecs).size().isEqualTo(248); + assertThat(fieldSpecs).size().isEqualTo(285); } @Test @@ -475,7 +492,7 @@ public void testGeneratePatientenaufenthalt() throws IOException, XmlException { .flatMap(List::stream) .collect(Collectors.toList()); - assertThat(fieldSpecs).size().isEqualTo(42); + assertThat(fieldSpecs).size().isEqualTo(47); writeFiles(generate); } @@ -495,7 +512,7 @@ public void testGenerateStationaererVersorgungsfall() throws IOException, XmlExc .flatMap(List::stream) .collect(Collectors.toList()); - assertThat(fieldSpecs).size().isEqualTo(33); + assertThat(fieldSpecs).size().isEqualTo(35); writeFiles(generate); } @@ -569,7 +586,12 @@ public void testGenerateBefundDerBlutgasanalyse() throws IOException, XmlExcepti "probendetail", "subject", "originValue", - "laborWelchesDenUntersuchungsauftragAnnimmt"); + "laborWelchesDenUntersuchungsauftragAnnimmt", + "feederAudit", + "feederAudit", + "feederAudit", + "feederAudit", + "feederAudit"); writeFiles(generate); } @@ -663,6 +685,9 @@ public void testGenerateMultiOccurrence() throws IOException, XmlException { "java.util.List"), new Tuple( "participations", "java.util.List"), + new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), + new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), + new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit")); writeFiles(generate); @@ -684,7 +709,7 @@ public void testGenerateAllTypes() throws IOException, XmlException { .flatMap(List::stream) .collect(Collectors.toList()); - assertThat(fieldSpecs).size().isEqualTo(80L); + assertThat(fieldSpecs).size().isEqualTo(87L); writeFiles(generate); } @@ -781,7 +806,15 @@ public void testGenerateVirologyFinding() throws IOException, XmlException { "settingDefiningCode", "feederAudit", "location", - "categoryDefiningCode"); + "categoryDefiningCode", + "feederAudit", + "feederAudit", + "feederAudit", + "feederAudit", + "feederAudit", + "feederAudit", + "feederAudit", + "feederAudit"); writeFiles(generate); } @@ -802,7 +835,7 @@ public void testGenerateCorona() throws IOException, XmlException { .flatMap(List::stream) .collect(Collectors.toList()); - assertThat(fieldSpecs).size().isEqualTo(296); + assertThat(fieldSpecs).size().isEqualTo(340); writeFiles(generate); } @@ -828,7 +861,7 @@ public void testGenerateCoronaOptimizerSettingSection() throws IOException, XmlE .flatMap(List::stream) .collect(Collectors.toList()); - assertThat(fieldSpecs).size().isEqualTo(292); + assertThat(fieldSpecs).size().isEqualTo(332); writeFiles(generate); } @@ -854,7 +887,7 @@ public void testGenerateCoronaOptimizerSettingAll() throws IOException, XmlExcep .flatMap(List::stream) .collect(Collectors.toList()); - assertThat(fieldSpecs).size().isEqualTo(274); + assertThat(fieldSpecs).size().isEqualTo(296); writeFiles(generate); } @@ -900,7 +933,8 @@ public void testGenerateSchwangerschaftsstatus() throws IOException, XmlExceptio "originValue", "language", "erweiterungen", - "statusDefiningCode"); + "statusDefiningCode", + "feederAudit"); Optional status1 = generate.getClasses().values().stream() @@ -939,7 +973,7 @@ public void testGenerateReactCare() throws IOException, XmlException { .flatMap(List::stream) .collect(Collectors.toList()); - assertThat(fieldSpecs).size().isEqualTo(352); + assertThat(fieldSpecs).size().isEqualTo(390); writeFiles(generate); } diff --git a/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java b/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java index fe033fa9b..47e15ba08 100644 --- a/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java +++ b/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java @@ -51,26 +51,29 @@ public class Filter implements WebTemplateFilter { @Override public FilteredWebTemplate filter(WebTemplate webTemplate) { FilteredWebTemplate clone = new FilteredWebTemplate(webTemplate); - Pair, Map, Deque>> filter = filter(clone.getTree(), webTemplate, null); + Pair, Map, Deque>> filter = filter(clone.getTree(), webTemplate, new ArrayDeque<>()); clone.setTree(filter.getLeft().get(0)); clone.setFilteredNodeMap(filter.getRight()); return clone; } - protected Pair< List, Map, Deque> > filter(WebTemplateNode node, WebTemplate context, WebTemplateNode parent) { - WebTemplateNode oldNode = new WebTemplateNode(node); + protected Pair< List, Map, Deque> > filter(WebTemplateNode node, WebTemplate context, Deque deque) { + + WebTemplateNode oldNode = new WebTemplateNode(node); preHandle(node); List nodes; List filteredChildren = new ArrayList<>(); Map,Deque > nodeMap = new HashMap<>(); - node.getChildren().stream().map(n -> filter(n, context, node)).forEach(p -> { + deque.push(node); + node.getChildren().stream().map(n -> filter(n, context, deque)).forEach(p -> { filteredChildren.addAll(p.getLeft()); nodeMap.putAll(p.getRight()); }); + deque.poll(); node.getChildren().clear(); node.getChildren().addAll(filteredChildren); - if (skip(node, context, parent)) { + if (skip(node, context, deque)) { nodes = filteredChildren; for( WebTemplateNode child: filteredChildren){ nodeMap.get(new ImmutablePair<>(child.getAqlPath(),child.getRmType())).addLast(oldNode); @@ -101,7 +104,8 @@ protected void preHandle(WebTemplateNode node) { } } - protected boolean skip(WebTemplateNode node, WebTemplate context, WebTemplateNode parent) { + protected boolean skip(WebTemplateNode node, WebTemplate context, Deque deque ) { + WebTemplateNode parent = deque.peek(); if (node.isArchetypeSlot()){ return true; } From 83d37ba594e16a1bbaf9e2fe8420797cc0adc216 Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Tue, 8 Dec 2020 12:49:23 +0100 Subject: [PATCH 35/54] generate interfaces for dtos see https://github.com/ehrbase/project_management/issues/424 --- .../interfaces/CompositionEntity.java | 79 +++++++++++++++++++ .../interfaces/EntryEntity.java | 34 ++++++++ .../interfaces/EventEntity.java | 28 +++++++ .../interfaces/IntervalEventEntity.java | 40 ++++++++++ .../interfaces/LocatableEntity.java | 28 +++++++ .../interfaces/PointEventEntity.java | 23 ++++++ .../classgenerator/interfaces/RMEntity.java | 23 ++++++ .../CoronaAnamneseComposition.java | 13 +-- .../CoronaAnamneseCompositionContainment.java | 2 +- .../definition/AdresseCluster.java | 3 +- ...erichtBeliebigesEreignisIntervalEvent.java | 18 ++++- .../BerichtBeliebigesEreignisPointEvent.java | 3 +- ...htSpezifischesSymptomAnzeichenCluster.java | 3 +- .../definition/BeschaftigungCluster.java | 3 +- ...ertungDesGesundheitsrisikosEvaluation.java | 3 +- ...enstleistungAktuelleAktivitatActivity.java | 3 +- ...leistungGrundFurDieAnforderungElement.java | 18 ++++- .../definition/DienstleistungInstruction.java | 3 +- ...creeningSpezifischeMedikamenteCluster.java | 3 +- ...storieBeliebigesEreignisIntervalEvent.java | 18 ++++- ...eHistorieBeliebigesEreignisPointEvent.java | 3 +- .../GeschichteHistorieGeschichteElement.java | 18 ++++- .../GeschichteHistorieObservation.java | 3 +- .../HistorieDerReiseObservation.java | 3 +- .../KorpertemperaturStorfaktorenElement.java | 25 ++++-- .../definition/OrganisationCluster.java | 3 +- .../definition/ProblemDiagnoseEvaluation.java | 3 +- ...rusDiagnostischeSicherheitDvCodedText.java | 3 +- ...onovirusDiagnostischeSicherheitDvText.java | 3 +- ...iebigesIntervallereignisIntervalEvent.java | 18 ++++- .../ReisefallBestimmteReiseCluster.java | 3 +- .../ReisefallBestimmtesReisezielCluster.java | 3 +- .../definition/ReisefallObservation.java | 3 +- .../definition/WohnsituationEvaluation.java | 3 +- .../definition/WohnstatteCluster.java | 3 +- .../CoronaAnamneseComposition.java | 3 +- .../definition/AdresseCluster.java | 3 +- ...AndereAktuelleErkrankungenObservation.java | 3 +- ...ltInGesundheitseinrichtungObservation.java | 3 +- .../definition/BeschaftigungCluster.java | 3 +- ...ertungDesGesundheitsrisikosEvaluation.java | 3 +- .../ChronischeErkrankungenObservation.java | 3 +- ...enstleistungAktuelleAktivitatActivity.java | 3 +- ...leistungGrundFurDieAnforderungElement.java | 18 ++++- .../definition/DienstleistungInstruction.java | 3 +- .../definition/DurchfallObservation.java | 3 +- ...derErhohteKorpertemperaturObservation.java | 3 +- ...genZumMedikationsScreeningObservation.java | 3 +- ...creeningSpezifischeMedikamenteCluster.java | 3 +- ...storieBeliebigesEreignisIntervalEvent.java | 18 ++++- ...eHistorieBeliebigesEreignisPointEvent.java | 3 +- .../GeschichteHistorieGeschichteElement.java | 18 ++++- .../GeschichteHistorieObservation.java | 3 +- .../GestorterGeruchssinnObservation.java | 3 +- .../GestorterGeschmackssinnObservation.java | 3 +- .../GesundheitsbezogenerBerufEvaluation.java | 3 +- .../definition/HeiserkeitObservation.java | 3 +- .../HistorieDerReiseObservation.java | 3 +- .../definition/HustenObservation.java | 3 +- .../KorpertemperaturObservation.java | 3 +- .../KorpertemperaturStorfaktorenElement.java | 18 ++++- .../definition/OrganisationCluster.java | 3 +- .../PersonenkontaktObservation.java | 3 +- .../definition/ProblemDiagnoseEvaluation.java | 3 +- ...rusDiagnostischeSicherheitDvCodedText.java | 3 +- ...onovirusDiagnostischeSicherheitDvText.java | 3 +- .../ProblemDiganoseCoronovirusEvaluation.java | 3 +- ...iebigesIntervallereignisIntervalEvent.java | 18 ++++- .../ReisefallBestimmteReiseCluster.java | 3 +- .../ReisefallBestimmtesReisezielCluster.java | 3 +- .../definition/ReisefallObservation.java | 3 +- .../definition/SchnupfenObservation.java | 3 +- .../definition/StandortCluster.java | 3 +- .../definition/StatusCluster.java | 3 +- ...mptomeBeliebigesEreignisIntervalEvent.java | 18 ++++- ...eSymptomeBeliebigesEreignisPointEvent.java | 3 +- .../WeitereSymptomeObservation.java | 3 +- ...meSpezifischesSymptomAnzeichenCluster.java | 3 +- .../definition/WohnsituationEvaluation.java | 3 +- .../definition/WohnstatteCluster.java | 3 +- .../AlternativeEventsComposition.java | 3 +- .../KorpergewichtAnyEventEnIntervalEvent.java | 18 ++++- .../KorpergewichtAnyEventEnPointEvent.java | 3 +- .../KorpergewichtBirthEnPointEvent.java | 3 +- ...pergewichtConfoundingFactorsEnElement.java | 18 ++++- .../definition/KorpergewichtObservation.java | 3 +- .../BefundDerBlutgasanalyseComposition.java | 3 +- .../KohlendioxidpartialdruckCluster.java | 3 +- .../definition/LaborergebnisObservation.java | 3 +- .../definition/PhWertCluster.java | 3 +- .../SauerstoffpartialdruckCluster.java | 3 +- .../SauerstoffsattigungCluster.java | 3 +- .../CoronaAnamneseComposition.java | 3 +- .../definition/AdresseCluster.java | 3 +- .../definition/AllgemeineAngabenSection.java | 3 +- ...AndereAktuelleErkrankungenObservation.java | 3 +- ...ltInGesundheitseinrichtungObservation.java | 3 +- .../definition/BeschaftigungCluster.java | 3 +- ...ertungDesGesundheitsrisikosEvaluation.java | 3 +- .../ChronischeErkrankungenObservation.java | 3 +- ...enstleistungAktuelleAktivitatActivity.java | 3 +- ...leistungGrundFurDieAnforderungElement.java | 18 ++++- .../definition/DienstleistungInstruction.java | 3 +- .../definition/DurchfallObservation.java | 3 +- ...derErhohteKorpertemperaturObservation.java | 3 +- ...genZumMedikationsScreeningObservation.java | 3 +- ...creeningSpezifischeMedikamenteCluster.java | 3 +- ...storieBeliebigesEreignisIntervalEvent.java | 18 ++++- ...eHistorieBeliebigesEreignisPointEvent.java | 3 +- .../GeschichteHistorieGeschichteElement.java | 18 ++++- .../GeschichteHistorieObservation.java | 3 +- .../GestorterGeruchssinnObservation.java | 3 +- .../GestorterGeschmackssinnObservation.java | 3 +- .../GesundheitsbezogenerBerufEvaluation.java | 3 +- .../definition/HeiserkeitObservation.java | 3 +- .../HistorieDerReiseObservation.java | 3 +- .../definition/HustenObservation.java | 3 +- .../definition/KontaktSection.java | 3 +- .../KorpertemperaturObservation.java | 3 +- .../KorpertemperaturStorfaktorenElement.java | 18 ++++- .../definition/OrganisationCluster.java | 3 +- .../PersonenkontaktObservation.java | 3 +- .../definition/ProblemDiagnoseEvaluation.java | 3 +- ...rusDiagnostischeSicherheitDvCodedText.java | 3 +- ...onovirusDiagnostischeSicherheitDvText.java | 3 +- .../ProblemDiganoseCoronovirusEvaluation.java | 3 +- ...iebigesIntervallereignisIntervalEvent.java | 18 ++++- .../ReisefallBestimmteReiseCluster.java | 3 +- .../ReisefallBestimmtesReisezielCluster.java | 3 +- .../definition/ReisefallObservation.java | 3 +- .../definition/RisikogebietSection.java | 3 +- .../definition/SchnupfenObservation.java | 3 +- .../definition/StandortCluster.java | 3 +- .../definition/StatusCluster.java | 3 +- .../definition/SymptomeSection.java | 3 +- ...mptomeBeliebigesEreignisIntervalEvent.java | 18 ++++- ...eSymptomeBeliebigesEreignisPointEvent.java | 3 +- .../WeitereSymptomeObservation.java | 3 +- ...meSpezifischesSymptomAnzeichenCluster.java | 3 +- .../definition/WohnsituationEvaluation.java | 3 +- .../definition/WohnstatteCluster.java | 3 +- .../DiagnoseComposition.java | 3 +- .../AnatomischeLokalisationCluster.java | 3 +- ...thogeneseAtiologieDerKrankheitElement.java | 18 ++++- ...eneseBeschreibungDesEntstehensElement.java | 18 ++++- .../definition/AtiopathogeneseCluster.java | 3 +- .../AtiopathogeneseValueDvCodedText.java | 3 +- .../AtiopathogeneseValueDvText.java | 3 +- .../definition/DiagnosedetailsCluster.java | 3 +- .../definition/FallidentifikationCluster.java | 3 +- ...oseDiagnostischeSicherheitDvCodedText.java | 3 +- ...DiagnoseDiagnostischeSicherheitDvText.java | 3 +- .../definition/ProblemDiagnoseEvaluation.java | 3 +- ...ProblemDiagnoseSchweregradDvCodedText.java | 3 +- .../ProblemDiagnoseSchweregradDvText.java | 3 +- ...aseBloodPressureSimpleDeV0Composition.java | 3 +- ...loodPressureTrainingSampleObservation.java | 3 +- .../DeviceDetailsTrainingSampleCluster.java | 3 +- ...EhrbaseMultiOccurrenceDeV1Composition.java | 3 +- .../BodyTemperatureAnyEventIntervalEvent.java | 17 +++- .../BodyTemperatureAnyEventPointEvent.java | 3 +- ...odyTemperatureBodyExposureDvCodedText.java | 3 +- .../BodyTemperatureBodyExposureDvText.java | 3 +- ...atureLocationOfMeasurementDvCodedText.java | 3 +- ...emperatureLocationOfMeasurementDvText.java | 3 +- .../BodyTemperatureObservation.java | 3 +- .../EpisodeOfCareComposition.java | 3 +- .../definition/EpisodeofcareAdminEntry.java | 3 +- .../EpisodeofcareDiagnosisCluster.java | 3 +- .../EpisodeofcareIdentifierElement.java | 18 ++++- .../definition/EpisodeofcareTeamElement.java | 18 ++++- .../OpenEREACTCareComposition.java | 3 +- .../definition/AbdomenSymptomCluster.java | 3 +- .../definition/AcvpuScaleObservation.java | 3 +- .../definition/AllergiesEvaluation.java | 3 +- .../definition/AssessmentSection.java | 3 +- .../definition/BackgroundSection.java | 3 +- .../definition/BloodPressureObservation.java | 3 +- .../definition/ChestSymptomCluster.java | 3 +- .../definition/Covid19ExposureEvaluation.java | 3 +- .../definition/CovidNotesEvaluation.java | 3 +- .../definition/CovidSection.java | 3 +- .../definition/CovidSymptomsObservation.java | 3 +- .../DenwisAgitationIndicatorElement.java | 18 ++++- .../DenwisBreathingIndicatorElement.java | 18 ++++- .../DenwisCirculationIndicatorElement.java | 18 ++++- .../DenwisMentationIndicatorElement.java | 18 ++++- ...DenwisNurseSubjectiveIndicatorElement.java | 18 ++++- .../definition/DenwisObservation.java | 3 +- .../DenwisPainIndicatorElement.java | 18 ++++- .../DenwisPatientIndicatorElement.java | 18 ++++- .../DenwisTemperatureIndicatorElement.java | 18 ++++- .../DenwisTrajectoryIndicatorElement.java | 18 ++++- .../definition/DenwisValueDvCodedText.java | 3 +- .../definition/DenwisValueDvCodedText2.java | 3 +- .../definition/DenwisValueDvCodedText3.java | 3 +- .../definition/DenwisValueDvCodedText4.java | 3 +- .../definition/DenwisValueDvCodedText5.java | 3 +- .../definition/DenwisValueDvCodedText6.java | 3 +- .../definition/DenwisValueDvText.java | 3 +- .../definition/DenwisValueDvText2.java | 3 +- .../definition/DenwisValueDvText3.java | 3 +- .../definition/DenwisValueDvText4.java | 3 +- .../definition/DenwisValueDvText5.java | 3 +- .../definition/DenwisValueDvText6.java | 3 +- .../definition/FirstSymptomsCluster.java | 3 +- .../definition/FrailtyObservation.java | 3 +- .../definition/HeightObservation.java | 3 +- .../definition/KeyCovidSymptomCluster.java | 3 +- .../LatestCovid19TestObservation.java | 3 +- ...vid19TestOverallTestStatusDvCodedText.java | 3 +- ...estCovid19TestOverallTestStatusDvText.java | 3 +- ...tCovid19TestTestRequestDetailsCluster.java | 3 +- .../definition/MedicationEvaluation.java | 3 +- .../definition/NeuroSymptomCluster.java | 3 +- .../definition/News2ScoreObservation.java | 3 +- .../definition/News2Section.java | 3 +- .../definition/OtherSymptomCluster.java | 3 +- .../definition/PastHistoryEvaluation.java | 3 +- .../definition/PulseObservation.java | 3 +- .../definition/PulseOximetryObservation.java | 3 +- .../definition/RecommendationEvaluation.java | 3 +- .../RecommendationRecommendationElement.java | 18 ++++- .../definition/RespirationsObservation.java | 3 +- .../definition/ResponseSection.java | 3 +- .../SepsisScreening999FlagElement.java | 18 ++++- .../SepsisScreeningAmberFlagAcuteElement.java | 18 ++++- ...reeningLikelySourceOfInfectionElement.java | 18 ++++- .../SepsisScreeningObservation.java | 3 +- .../SepsisScreeningRedFlagAcuteElement.java | 18 ++++- ...sScreeningRiskFactorsForSepsisElement.java | 18 ++++- .../SepsisScreeningValueDvCodedText.java | 3 +- .../SepsisScreeningValueDvText.java | 3 +- .../definition/SepsisSection.java | 3 +- .../definition/ServiceAction.java | 3 +- ...ServiceRequestCurrentActivityActivity.java | 3 +- .../definition/ServiceRequestInstruction.java | 3 +- ...ServiceRequestReasonForRequestElement.java | 18 ++++- .../definition/SituationSection.java | 3 +- .../definition/StoryHistoryObservation.java | 3 +- .../StoryHistorySoftSignsElement.java | 18 ++++- .../definition/TemperatureObservation.java | 3 +- .../definition/WeightObservation.java | 3 +- .../PatientenaufenthaltComposition.java | 3 +- .../definition/AbteilungsfallCluster.java | 3 +- .../definition/DetailsZumBettCluster.java | 3 +- .../definition/StandortCluster.java | 3 +- .../definition/VersorgungsfallCluster.java | 3 +- .../definition/VersorgungsortAdminEntry.java | 3 +- .../SchwangerschaftsstatusComposition.java | 3 +- .../SchwangerschaftsstatusObservation.java | 3 +- .../SmICSBefundComposition.java | 3 +- .../definition/AntibiogrammCluster.java | 3 +- .../definition/ErregerdetailsCluster.java | 3 +- .../ErregerdetailsKeimSubtypElement.java | 18 ++++- ...gerdetailsResistenzmechanismusCluster.java | 3 +- ...ertypisierungArtDerTypisierungElement.java | 18 ++++- .../definition/ErregertypisierungCluster.java | 3 +- .../ErregertypisierungErgebnisElement.java | 18 ++++- ...EventsummaryBeteiligtePersonenCluster.java | 3 +- .../definition/EventsummaryCluster.java | 3 +- .../EventsummaryIdDerPersonElement.java | 18 ++++- .../EventsummaryValueDvIdentifier.java | 3 +- .../definition/EventsummaryValueDvUri.java | 3 +- .../LaboranalytResultatCluster.java | 3 +- ...ebnisAnzahlDerErregernachweiseElement.java | 18 ++++- .../definition/SmicsErgebnisObservation.java | 3 +- .../definition/StandortCluster.java | 3 +- ...StationarerVersorgungsfallComposition.java | 3 +- .../definition/AufnahmedatenAdminEntry.java | 3 +- .../EntlassungsdatenAdminEntry.java | 3 +- .../TestAllTypesEnV1Composition.java | 33 ++++---- ...estAllTypesEnV1CompositionContainment.java | 6 +- .../definition/TestAllTypesAction.java | 3 +- .../definition/TestAllTypesAdminEntry.java | 3 +- .../definition/TestAllTypesChoiceDvCount.java | 3 +- .../TestAllTypesChoiceDvQuantity.java | 3 +- .../definition/TestAllTypesCluster.java | 3 +- .../definition/TestAllTypesEvaluation.java | 3 +- .../definition/TestAllTypesInstruction.java | 3 +- .../definition/TestAllTypesObservation.java | 3 +- .../definition/TestAllTypesSection.java | 3 +- .../VirologischerBefundComposition.java | 3 +- .../AnatomischeLokalisationCluster.java | 3 +- .../definition/BefundAnforderungElement.java | 18 ++++- .../definition/BefundObservation.java | 3 +- .../definition/EinsenderstandortCluster.java | 3 +- .../definition/EmpfangerstandortCluster.java | 3 +- .../definition/FallidentifikationCluster.java | 3 +- .../definition/KulturCluster.java | 3 +- .../definition/ProVirusCluster.java | 3 +- .../definition/ProbeCluster.java | 3 +- .../client/classgenerator/ClassGenerator.java | 73 +++++++++++------ .../classgenerator/DefaultNamingStrategy.java | 14 +++- .../client/classgenerator/FlattFilter.java | 3 +- .../classgenerator/ClassGeneratorTest.java | 44 +++++------ serialisation/pom.xml | 4 - .../ehrbase/serialisation/walker/Walker.java | 76 ++++++++++++------ test-coverage/pom.xml | 4 - .../ehrbase/webtemplate/filter/Filter.java | 2 +- .../webtemplate/model/WebTemplateNode.java | 6 ++ .../ehrbase/webtemplate/parser/OPTParser.java | 4 +- 302 files changed, 1710 insertions(+), 398 deletions(-) create mode 100644 client/src/main/java/org/ehrbase/client/classgenerator/interfaces/CompositionEntity.java create mode 100644 client/src/main/java/org/ehrbase/client/classgenerator/interfaces/EntryEntity.java create mode 100644 client/src/main/java/org/ehrbase/client/classgenerator/interfaces/EventEntity.java create mode 100644 client/src/main/java/org/ehrbase/client/classgenerator/interfaces/IntervalEventEntity.java create mode 100644 client/src/main/java/org/ehrbase/client/classgenerator/interfaces/LocatableEntity.java create mode 100644 client/src/main/java/org/ehrbase/client/classgenerator/interfaces/PointEventEntity.java create mode 100644 client/src/main/java/org/ehrbase/client/classgenerator/interfaces/RMEntity.java diff --git a/client/src/main/java/org/ehrbase/client/classgenerator/interfaces/CompositionEntity.java b/client/src/main/java/org/ehrbase/client/classgenerator/interfaces/CompositionEntity.java new file mode 100644 index 000000000..f11a49a9e --- /dev/null +++ b/client/src/main/java/org/ehrbase/client/classgenerator/interfaces/CompositionEntity.java @@ -0,0 +1,79 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.client.classgenerator.interfaces; + +import com.nedap.archie.rm.generic.Participation; +import com.nedap.archie.rm.generic.PartyIdentified; +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.classgenerator.shareddefinition.Category; +import org.ehrbase.client.classgenerator.shareddefinition.Language; +import org.ehrbase.client.classgenerator.shareddefinition.Setting; +import org.ehrbase.client.classgenerator.shareddefinition.Territory; +import org.ehrbase.client.openehrclient.VersionUid; + +import java.time.temporal.TemporalAccessor; +import java.util.List; + +public interface CompositionEntity extends LocatableEntity { + + void setParticipations(List participations); + + List getParticipations(); + + void setHealthCareFacility(PartyIdentified healthCareFacility); + + PartyIdentified getHealthCareFacility(); + + void setComposer(PartyProxy composer); + + PartyProxy getComposer(); + + void setLanguage(Language language); + + Language getLanguage(); + + void setCategoryDefiningCode(Category categoryDefiningCode); + + Category getCategoryDefiningCode(); + + void setTerritory(Territory territory); + + Territory getTerritory(); + + VersionUid getVersionUid(); + + void setVersionUid(VersionUid versionUid); + + void setStartTimeValue(TemporalAccessor startTimeValue); + + TemporalAccessor getStartTimeValue(); + + void setEndTimeValue(TemporalAccessor endTimeValue); + + TemporalAccessor getEndTimeValue(); + + void setLocation(String location); + + String getLocation(); + + void setSettingDefiningCode(Setting settingDefiningCode); + + Setting getSettingDefiningCode(); +} diff --git a/client/src/main/java/org/ehrbase/client/classgenerator/interfaces/EntryEntity.java b/client/src/main/java/org/ehrbase/client/classgenerator/interfaces/EntryEntity.java new file mode 100644 index 000000000..34b29354b --- /dev/null +++ b/client/src/main/java/org/ehrbase/client/classgenerator/interfaces/EntryEntity.java @@ -0,0 +1,34 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.client.classgenerator.interfaces; + +import com.nedap.archie.rm.generic.PartyProxy; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; +import org.ehrbase.client.classgenerator.shareddefinition.Language; + +public interface EntryEntity extends LocatableEntity { + void setSubject(PartyProxy subject); + + PartyProxy getSubject(); + + void setLanguage(Language language); + + Language getLanguage(); +} diff --git a/client/src/main/java/org/ehrbase/client/classgenerator/interfaces/EventEntity.java b/client/src/main/java/org/ehrbase/client/classgenerator/interfaces/EventEntity.java new file mode 100644 index 000000000..2fb896c58 --- /dev/null +++ b/client/src/main/java/org/ehrbase/client/classgenerator/interfaces/EventEntity.java @@ -0,0 +1,28 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.client.classgenerator.interfaces; + +import java.time.temporal.TemporalAccessor; + +public interface EventEntity { + void setTimeValue(TemporalAccessor timeValue); + + TemporalAccessor getTimeValue(); +} diff --git a/client/src/main/java/org/ehrbase/client/classgenerator/interfaces/IntervalEventEntity.java b/client/src/main/java/org/ehrbase/client/classgenerator/interfaces/IntervalEventEntity.java new file mode 100644 index 000000000..d3ce15e63 --- /dev/null +++ b/client/src/main/java/org/ehrbase/client/classgenerator/interfaces/IntervalEventEntity.java @@ -0,0 +1,40 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.client.classgenerator.interfaces; + +import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; + +import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAmount; + +public interface IntervalEventEntity extends LocatableEntity, EventEntity { + + void setWidthValue(TemporalAmount widthValue); + + TemporalAmount getWidthValue(); + + void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode); + + MathFunction getMathFunctionDefiningCode(); + + void setSampleCount(Long sampleCount); + + Long getSampleCount(); +} diff --git a/client/src/main/java/org/ehrbase/client/classgenerator/interfaces/LocatableEntity.java b/client/src/main/java/org/ehrbase/client/classgenerator/interfaces/LocatableEntity.java new file mode 100644 index 000000000..6c680edd7 --- /dev/null +++ b/client/src/main/java/org/ehrbase/client/classgenerator/interfaces/LocatableEntity.java @@ -0,0 +1,28 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.client.classgenerator.interfaces; + +import com.nedap.archie.rm.archetyped.FeederAudit; + +public interface LocatableEntity extends RMEntity{ + // void setFeederAudit(FeederAudit feederAudit); + +// FeederAudit getFeederAudit(); +} diff --git a/client/src/main/java/org/ehrbase/client/classgenerator/interfaces/PointEventEntity.java b/client/src/main/java/org/ehrbase/client/classgenerator/interfaces/PointEventEntity.java new file mode 100644 index 000000000..7985bdbe1 --- /dev/null +++ b/client/src/main/java/org/ehrbase/client/classgenerator/interfaces/PointEventEntity.java @@ -0,0 +1,23 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.client.classgenerator.interfaces; + +public interface PointEventEntity extends EventEntity{ +} diff --git a/client/src/main/java/org/ehrbase/client/classgenerator/interfaces/RMEntity.java b/client/src/main/java/org/ehrbase/client/classgenerator/interfaces/RMEntity.java new file mode 100644 index 000000000..8fe057757 --- /dev/null +++ b/client/src/main/java/org/ehrbase/client/classgenerator/interfaces/RMEntity.java @@ -0,0 +1,23 @@ +/* + * + * * Copyright (c) 2020 Stefan Spiska (Vitasystems GmbH) and Hannover Medical School + * * This file is part of Project EHRbase + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.ehrbase.client.classgenerator.interfaces; + +public interface RMEntity { +} diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/CoronaAnamneseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/CoronaAnamneseComposition.java index 681f0606a..913a36064 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/CoronaAnamneseComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/CoronaAnamneseComposition.java @@ -33,6 +33,7 @@ import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.VorhandenDefiningCode; import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.VorhandenseinDefiningCode; import org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition.WohnsituationEvaluation; +import org.ehrbase.client.classgenerator.interfaces.CompositionEntity; import org.ehrbase.client.classgenerator.shareddefinition.Category; import org.ehrbase.client.classgenerator.shareddefinition.Language; import org.ehrbase.client.classgenerator.shareddefinition.Setting; @@ -42,7 +43,7 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.report.v1") @Template("Corona_Anamnese") -public class CoronaAnamneseComposition { +public class CoronaAnamneseComposition implements CompositionEntity { /** * Bericht/context/Bericht ID */ @@ -941,7 +942,7 @@ public class CoronaAnamneseComposition { * Bericht/language */ @Path("/language") - private Language berichtLanguage; + private Language language; /** * Bericht/feeder_audit @@ -2239,12 +2240,12 @@ public PartyProxy getComposer() { return this.composer ; } - public void setBerichtLanguage(Language berichtLanguage) { - this.berichtLanguage = berichtLanguage; + public void setLanguage(Language language) { + this.language = language; } - public Language getBerichtLanguage() { - return this.berichtLanguage ; + public Language getLanguage() { + return this.language ; } public void setFeederAudit(FeederAudit feederAudit) { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java index 123b0e1be..c77720373 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/CoronaAnamneseCompositionContainment.java @@ -337,7 +337,7 @@ public class CoronaAnamneseCompositionContainment extends Containment { public SelectAqlField COMPOSER = new AqlFieldImp(CoronaAnamneseComposition.class, "/composer", "composer", PartyProxy.class, this); - public SelectAqlField BERICHT_LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/language", "berichtLanguage", Language.class, this); + public SelectAqlField LANGUAGE = new AqlFieldImp(CoronaAnamneseComposition.class, "/language", "language", Language.class, this); public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(CoronaAnamneseComposition.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseCluster.java index b042e6438..450ae59d7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseCluster.java @@ -5,10 +5,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.address_cc.v0") -public class AdresseCluster { +public class AdresseCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Adresse/Stadt */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisIntervalEvent.java index 8c484ab18..c5bde4a37 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisIntervalEvent.java @@ -1,17 +1,19 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import java.lang.Long; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.IntervalEventEntity; import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity @OptionFor("INTERVAL_EVENT") -public class BerichtBeliebigesEreignisIntervalEvent implements BerichtBeliebigesEreignisChoice { +public class BerichtBeliebigesEreignisIntervalEvent implements IntervalEventEntity, BerichtBeliebigesEreignisChoice { /** * Bericht/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen */ @@ -42,6 +44,12 @@ public class BerichtBeliebigesEreignisIntervalEvent implements BerichtBeliebiges @Path("/math_function|defining_code") private MathFunction mathFunctionDefiningCode; + /** + * Bericht/Beliebiges Ereignis/sample_count + */ + @Path("/sample_count") + private Long sampleCount; + public void setSpezifischesSymptomAnzeichen( List spezifischesSymptomAnzeichen) { this.spezifischesSymptomAnzeichen = spezifischesSymptomAnzeichen; @@ -82,4 +90,12 @@ public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { public MathFunction getMathFunctionDefiningCode() { return this.mathFunctionDefiningCode ; } + + public void setSampleCount(Long sampleCount) { + this.sampleCount = sampleCount; + } + + public Long getSampleCount() { + return this.sampleCount ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisPointEvent.java index d69c4e5e6..61f933550 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisPointEvent.java @@ -6,10 +6,11 @@ import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.PointEventEntity; @Entity @OptionFor("POINT_EVENT") -public class BerichtBeliebigesEreignisPointEvent implements BerichtBeliebigesEreignisChoice { +public class BerichtBeliebigesEreignisPointEvent implements PointEventEntity, BerichtBeliebigesEreignisChoice { /** * Bericht/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtSpezifischesSymptomAnzeichenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtSpezifischesSymptomAnzeichenCluster.java index 6fb703326..f5d879c25 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtSpezifischesSymptomAnzeichenCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtSpezifischesSymptomAnzeichenCluster.java @@ -6,9 +6,10 @@ import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class BerichtSpezifischesSymptomAnzeichenCluster { +public class BerichtSpezifischesSymptomAnzeichenCluster implements LocatableEntity { /** * Bericht/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungCluster.java index 966c18184..7cef9954f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungCluster.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.occupation_record.v1") -public class BeschaftigungCluster { +public class BeschaftigungCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Berufsbezeichnung/Rolle */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java index 4224817b3..6ce2569fc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-EVALUATION.health_risk.v1") -public class BewertungDesGesundheitsrisikosEvaluation { +public class BewertungDesGesundheitsrisikosEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Gesundheitsrisiko */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java index caf119ddd..5fe643cf4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java @@ -7,9 +7,10 @@ import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class DienstleistungAktuelleAktivitatActivity { +public class DienstleistungAktuelleAktivitatActivity implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Name der Dienstleistung */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java index d92029974..f8f1b56af 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java @@ -1,17 +1,25 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class DienstleistungGrundFurDieAnforderungElement { +public class DienstleistungGrundFurDieAnforderungElement implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Grund für die Anforderung */ @Path("/value|value") private String value; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(String value) { this.value = value; } @@ -19,4 +27,12 @@ public void setValue(String value) { public String getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstruction.java index caadcfef9..260d7c53f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstruction.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-INSTRUCTION.service_request.v1") -public class DienstleistungInstruction { +public class DienstleistungInstruction implements EntryEntity { /** * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java index f3923986a..e8aa1ce2c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java @@ -4,9 +4,10 @@ import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster { +public class FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Spezifische Medikamente/Name des Medikaments */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java index 587c31393..ef60db3fb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java @@ -2,17 +2,19 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Long; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.IntervalEventEntity; import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity @OptionFor("INTERVAL_EVENT") -public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements GeschichteHistorieBeliebigesEreignisChoice { +public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements IntervalEventEntity, GeschichteHistorieBeliebigesEreignisChoice { /** * Bericht/Geschichte/Historie/Beliebiges Ereignis/Geschichte */ @@ -49,6 +51,12 @@ public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements Geschi @Path("/math_function|defining_code") private MathFunction mathFunctionDefiningCode; + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/sample_count + */ + @Path("/sample_count") + private Long sampleCount; + public void setGeschichte(List geschichte) { this.geschichte = geschichte; } @@ -96,4 +104,12 @@ public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { public MathFunction getMathFunctionDefiningCode() { return this.mathFunctionDefiningCode ; } + + public void setSampleCount(Long sampleCount) { + this.sampleCount = sampleCount; + } + + public Long getSampleCount() { + return this.sampleCount ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java index 0a3118dbf..c2aa4d691 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.PointEventEntity; @Entity @OptionFor("POINT_EVENT") -public class GeschichteHistorieBeliebigesEreignisPointEvent implements GeschichteHistorieBeliebigesEreignisChoice { +public class GeschichteHistorieBeliebigesEreignisPointEvent implements PointEventEntity, GeschichteHistorieBeliebigesEreignisChoice { /** * Bericht/Geschichte/Historie/Beliebiges Ereignis/Geschichte */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java index 2d6a980e3..a988d24ae 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java @@ -1,17 +1,25 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class GeschichteHistorieGeschichteElement { +public class GeschichteHistorieGeschichteElement implements LocatableEntity { /** * Bericht/Geschichte/Historie/Beliebiges Ereignis/Geschichte */ @Path("/value|value") private String value; + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(String value) { this.value = value; } @@ -19,4 +27,12 @@ public void setValue(String value) { public String getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java index 392c09b41..1e204d998 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java @@ -9,11 +9,12 @@ 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; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.story.v1") -public class GeschichteHistorieObservation { +public class GeschichteHistorieObservation implements EntryEntity { /** * Bericht/Geschichte/Historie/origin */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java index 71a14b83a..ed68a57a2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.travel_history.v0") -public class HistorieDerReiseObservation { +public class HistorieDerReiseObservation implements EntryEntity { /** * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Aufenthalt in den letzten 14 Tage in einem der Risikogebiete für Coronainfektion oder Kontakt zu Menschen, die dort waren */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java index b826c579b..05bcf8db1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java @@ -1,22 +1,33 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; -import java.lang.String; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class KorpertemperaturStorfaktorenElement { - /** - * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Störfaktoren - */ +public class KorpertemperaturStorfaktorenElement implements LocatableEntity { + /** Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Störfaktoren */ @Path("/value|value") private String value; + /** Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/feeder_audit */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(String value) { - this.value = value; + this.value = value; } public String getValue() { - return this.value ; + return this.value; + } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationCluster.java index b0bfd5dce..ffa7ca632 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationCluster.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.organisation_cc.v0") -public class OrganisationCluster { +public class OrganisationCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Identifier */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java index 57daed5d9..36a67a0c2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java @@ -8,11 +8,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-EVALUATION.problem_diagnosis.v1") -public class ProblemDiagnoseEvaluation { +public class ProblemDiagnoseEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Problem/Diagnose/Name des Problems/ der Diagnose */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java index 8d4960a7c..06e0f439d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java @@ -3,10 +3,11 @@ 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 @OptionFor("DV_CODED_TEXT") -public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText implements ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { +public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText implements RMEntity, ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { /** * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java index 28805d892..37522387e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java @@ -4,10 +4,11 @@ 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 @OptionFor("DV_TEXT") -public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText implements ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { +public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText implements RMEntity, ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { /** * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java index 7db878276..9ca4d66e3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java @@ -1,15 +1,17 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import java.lang.Long; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.IntervalEventEntity; import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity -public class ReisefallBeliebigesIntervallereignisIntervalEvent { +public class ReisefallBeliebigesIntervallereignisIntervalEvent implements IntervalEventEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Letzte Reise? */ @@ -34,6 +36,12 @@ public class ReisefallBeliebigesIntervallereignisIntervalEvent { @Path("/math_function|defining_code") private MathFunction mathFunctionDefiningCode; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/sample_count + */ + @Path("/sample_count") + private Long sampleCount; + /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/width */ @@ -84,6 +92,14 @@ public MathFunction getMathFunctionDefiningCode() { return this.mathFunctionDefiningCode ; } + public void setSampleCount(Long sampleCount) { + this.sampleCount = sampleCount; + } + + public Long getSampleCount() { + return this.sampleCount ; + } + public void setWidthValue(TemporalAmount widthValue) { this.widthValue = widthValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java index a7c22c025..2320ce70f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java @@ -6,9 +6,10 @@ import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class ReisefallBestimmteReiseCluster { +public class ReisefallBestimmteReiseCluster implements LocatableEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java index 7be030889..c7da04d56 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java @@ -6,9 +6,10 @@ import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class ReisefallBestimmtesReisezielCluster { +public class ReisefallBestimmtesReisezielCluster implements LocatableEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/Land */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservation.java index b090fc0aa..47b507fe8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservation.java @@ -8,11 +8,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.travel_event.v0") -public class ReisefallObservation { +public class ReisefallObservation implements EntryEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluation.java index 901412c57..f3bd617de 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-EVALUATION.living_arrangement.v0") -public class WohnsituationEvaluation { +public class WohnsituationEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Wohnsituation/Beschreibung */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteCluster.java index 401d613bc..54b70b4d3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteCluster.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.dwelling.v0") -public class WohnstatteCluster { +public class WohnstatteCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Wohnsituation/Wohnstätte/Anzahl der Schlafzimmer */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/CoronaAnamneseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/CoronaAnamneseComposition.java index 74a210fa2..73ec06779 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/CoronaAnamneseComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/CoronaAnamneseComposition.java @@ -36,6 +36,7 @@ import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.SchnupfenObservation; import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.WeitereSymptomeObservation; import org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition.WohnsituationEvaluation; +import org.ehrbase.client.classgenerator.interfaces.CompositionEntity; import org.ehrbase.client.classgenerator.shareddefinition.Category; import org.ehrbase.client.classgenerator.shareddefinition.Language; import org.ehrbase.client.classgenerator.shareddefinition.Setting; @@ -45,7 +46,7 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.report.v1") @Template("Corona_Anamnese") -public class CoronaAnamneseComposition { +public class CoronaAnamneseComposition implements CompositionEntity { /** * Bericht/context/Bericht ID */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseCluster.java index a6ddf7e6e..5156ef2c6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseCluster.java @@ -5,10 +5,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.address_cc.v0") -public class AdresseCluster { +public class AdresseCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Adresse/Stadt */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java index bcd0e2052..c69a93d77 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class AndereAktuelleErkrankungenObservation { +public class AndereAktuelleErkrankungenObservation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java index d633de51a..300f1031d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.exposure_assessment.v0") -public class AufenthaltInGesundheitseinrichtungObservation { +public class AufenthaltInGesundheitseinrichtungObservation implements EntryEntity { /** * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Beliebiges Ereignis/*Agent (en) */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungCluster.java index b7ca56783..4a933bc7f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungCluster.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.occupation_record.v1") -public class BeschaftigungCluster { +public class BeschaftigungCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Berufsbezeichnung/Rolle */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java index 32465e057..294be6f52 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-EVALUATION.health_risk.v1") -public class BewertungDesGesundheitsrisikosEvaluation { +public class BewertungDesGesundheitsrisikosEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Gesundheitsrisiko */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java index 71e6f9867..80b7728b4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class ChronischeErkrankungenObservation { +public class ChronischeErkrankungenObservation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Chronische Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java index 9dabb2747..489770636 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java @@ -7,9 +7,10 @@ import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class DienstleistungAktuelleAktivitatActivity { +public class DienstleistungAktuelleAktivitatActivity implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Name der Dienstleistung */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java index 4c367ee23..1a4a1f00e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java @@ -1,17 +1,25 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class DienstleistungGrundFurDieAnforderungElement { +public class DienstleistungGrundFurDieAnforderungElement implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Grund für die Anforderung */ @Path("/value|value") private String value; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(String value) { this.value = value; } @@ -19,4 +27,12 @@ public void setValue(String value) { public String getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstruction.java index 1999a75ab..9b0fcf0ce 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstruction.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-INSTRUCTION.service_request.v1") -public class DienstleistungInstruction { +public class DienstleistungInstruction implements EntryEntity { /** * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservation.java index 54deaff4d..59de6b124 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class DurchfallObservation { +public class DurchfallObservation implements EntryEntity { /** * Bericht/Symptome/Durchfall/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java index de2e7c31c..5d676b1c0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class FieberOderErhohteKorpertemperaturObservation { +public class FieberOderErhohteKorpertemperaturObservation implements EntryEntity { /** * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java index 0105e1117..107f67b38 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java @@ -10,11 +10,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.medication_use.v0") -public class FragebogenZumMedikationsScreeningObservation { +public class FragebogenZumMedikationsScreeningObservation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Medikamente in Verwendung? */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java index 19df7f22e..5f87210ec 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java @@ -4,9 +4,10 @@ import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster { +public class FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Spezifische Medikamente/Name des Medikaments */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java index 67fe00e73..8eac7f15b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java @@ -2,17 +2,19 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Long; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.IntervalEventEntity; import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity @OptionFor("INTERVAL_EVENT") -public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements GeschichteHistorieBeliebigesEreignisChoice { +public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements IntervalEventEntity, GeschichteHistorieBeliebigesEreignisChoice { /** * Bericht/Geschichte/Historie/Beliebiges Ereignis/Geschichte */ @@ -49,6 +51,12 @@ public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements Geschi @Path("/math_function|defining_code") private MathFunction mathFunctionDefiningCode; + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/sample_count + */ + @Path("/sample_count") + private Long sampleCount; + public void setGeschichte(List geschichte) { this.geschichte = geschichte; } @@ -96,4 +104,12 @@ public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { public MathFunction getMathFunctionDefiningCode() { return this.mathFunctionDefiningCode ; } + + public void setSampleCount(Long sampleCount) { + this.sampleCount = sampleCount; + } + + public Long getSampleCount() { + return this.sampleCount ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java index c00f5c7dc..9da3a1378 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.PointEventEntity; @Entity @OptionFor("POINT_EVENT") -public class GeschichteHistorieBeliebigesEreignisPointEvent implements GeschichteHistorieBeliebigesEreignisChoice { +public class GeschichteHistorieBeliebigesEreignisPointEvent implements PointEventEntity, GeschichteHistorieBeliebigesEreignisChoice { /** * Bericht/Geschichte/Historie/Beliebiges Ereignis/Geschichte */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java index f34066616..c5149b85c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java @@ -1,17 +1,25 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class GeschichteHistorieGeschichteElement { +public class GeschichteHistorieGeschichteElement implements LocatableEntity { /** * Bericht/Geschichte/Historie/Beliebiges Ereignis/Geschichte */ @Path("/value|value") private String value; + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(String value) { this.value = value; } @@ -19,4 +27,12 @@ public void setValue(String value) { public String getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java index 3c45d9ee7..2eaafe522 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java @@ -9,11 +9,12 @@ 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; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.story.v1") -public class GeschichteHistorieObservation { +public class GeschichteHistorieObservation implements EntryEntity { /** * Bericht/Geschichte/Historie/origin */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java index 73ddbd8e2..fd1905836 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class GestorterGeruchssinnObservation { +public class GestorterGeruchssinnObservation implements EntryEntity { /** * Bericht/Symptome/Gestörter Geruchssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java index bd64f6009..aec8b96a2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class GestorterGeschmackssinnObservation { +public class GestorterGeschmackssinnObservation implements EntryEntity { /** * Bericht/Symptome/Gestörter Geschmackssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java index 466180a47..606ba8a63 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java @@ -8,11 +8,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-EVALUATION.occupation_summary.v1") -public class GesundheitsbezogenerBerufEvaluation { +public class GesundheitsbezogenerBerufEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigungsstatus */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservation.java index 093189e10..b31f9dc73 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class HeiserkeitObservation { +public class HeiserkeitObservation implements EntryEntity { /** * Bericht/Symptome/Heiserkeit/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java index f3362c899..4aee9ed1f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java @@ -8,11 +8,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.travel_history.v0") -public class HistorieDerReiseObservation { +public class HistorieDerReiseObservation implements EntryEntity { /** * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Aufenthalt in den letzten 14 Tage in einem der Risikogebiete für Coronainfektion oder Kontakt zu Menschen, die dort waren */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservation.java index ab6a23f61..7bdc058c5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class HustenObservation { +public class HustenObservation implements EntryEntity { /** * Bericht/Symptome/Husten/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservation.java index 780e00c82..125d5958d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservation.java @@ -10,11 +10,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.body_temperature.v2") -public class KorpertemperaturObservation { +public class KorpertemperaturObservation implements EntryEntity { /** * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Temperatur */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java index 7424e4c8c..43f957717 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java @@ -1,17 +1,25 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class KorpertemperaturStorfaktorenElement { +public class KorpertemperaturStorfaktorenElement implements LocatableEntity { /** * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Störfaktoren */ @Path("/value|value") private String value; + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(String value) { this.value = value; } @@ -19,4 +27,12 @@ public void setValue(String value) { public String getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationCluster.java index 9ac451b8b..477858c0d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationCluster.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.organisation_cc.v0") -public class OrganisationCluster { +public class OrganisationCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Identifier */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservation.java index 1ab598a5b..4fdce78e8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.exposure_assessment.v0") -public class PersonenkontaktObservation { +public class PersonenkontaktObservation implements EntryEntity { /** * Bericht/Kontakt/Personenkontakt/Beliebiges Ereignis/*Agent (en) */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java index 2e2db4bb9..606d29d23 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java @@ -8,11 +8,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-EVALUATION.problem_diagnosis.v1") -public class ProblemDiagnoseEvaluation { +public class ProblemDiagnoseEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Problem/Diagnose/Name des Problems/ der Diagnose */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java index 36c5c60e9..39a1a3b2b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java @@ -3,10 +3,11 @@ 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 @OptionFor("DV_CODED_TEXT") -public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText implements ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { +public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText implements RMEntity, ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { /** * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java index 7df75cac2..4e0cddb91 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java @@ -4,10 +4,11 @@ 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 @OptionFor("DV_TEXT") -public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText implements ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { +public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText implements RMEntity, ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { /** * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java index 015f85fb2..8919e29ea 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java @@ -10,11 +10,12 @@ 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; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1") -public class ProblemDiganoseCoronovirusEvaluation { +public class ProblemDiganoseCoronovirusEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Name des Problems/ der Diagnose */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java index 6c7e15cbe..22c2cc2c1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java @@ -1,15 +1,17 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import java.lang.Long; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.IntervalEventEntity; import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity -public class ReisefallBeliebigesIntervallereignisIntervalEvent { +public class ReisefallBeliebigesIntervallereignisIntervalEvent implements IntervalEventEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Letzte Reise? */ @@ -34,6 +36,12 @@ public class ReisefallBeliebigesIntervallereignisIntervalEvent { @Path("/math_function|defining_code") private MathFunction mathFunctionDefiningCode; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/sample_count + */ + @Path("/sample_count") + private Long sampleCount; + /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/width */ @@ -84,6 +92,14 @@ public MathFunction getMathFunctionDefiningCode() { return this.mathFunctionDefiningCode ; } + public void setSampleCount(Long sampleCount) { + this.sampleCount = sampleCount; + } + + public Long getSampleCount() { + return this.sampleCount ; + } + public void setWidthValue(TemporalAmount widthValue) { this.widthValue = widthValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java index e4b4cf295..2d4962d4a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java @@ -6,9 +6,10 @@ import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class ReisefallBestimmteReiseCluster { +public class ReisefallBestimmteReiseCluster implements LocatableEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java index d33319a71..bc60471fe 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java @@ -6,9 +6,10 @@ import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class ReisefallBestimmtesReisezielCluster { +public class ReisefallBestimmtesReisezielCluster implements LocatableEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/Land */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservation.java index 899f7d833..68f40274b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservation.java @@ -8,11 +8,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.travel_event.v0") -public class ReisefallObservation { +public class ReisefallObservation implements EntryEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservation.java index 8d3bd7c9a..26db7590a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class SchnupfenObservation { +public class SchnupfenObservation implements EntryEntity { /** * Bericht/Symptome/Schnupfen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortCluster.java index 0d69d5df6..d725cf952 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortCluster.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") -public class StandortCluster { +public class StandortCluster implements LocatableEntity { /** * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Ortsbeschreibung/Standort/Standortbeschreibung */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusCluster.java index 032471019..fb9de207d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusCluster.java @@ -4,10 +4,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.problem_qualifier.v1") -public class StatusCluster { +public class StatusCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Status/Diagnosestatus */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java index 94dd8ad69..4914ddced 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java @@ -1,17 +1,19 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import java.lang.Long; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.IntervalEventEntity; import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity @OptionFor("INTERVAL_EVENT") -public class WeitereSymptomeBeliebigesEreignisIntervalEvent implements WeitereSymptomeBeliebigesEreignisChoice { +public class WeitereSymptomeBeliebigesEreignisIntervalEvent implements IntervalEventEntity, WeitereSymptomeBeliebigesEreignisChoice { /** * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen */ @@ -42,6 +44,12 @@ public class WeitereSymptomeBeliebigesEreignisIntervalEvent implements WeitereSy @Path("/math_function|defining_code") private MathFunction mathFunctionDefiningCode; + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/sample_count + */ + @Path("/sample_count") + private Long sampleCount; + public void setSpezifischesSymptomAnzeichen( List spezifischesSymptomAnzeichen) { this.spezifischesSymptomAnzeichen = spezifischesSymptomAnzeichen; @@ -83,4 +91,12 @@ public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { public MathFunction getMathFunctionDefiningCode() { return this.mathFunctionDefiningCode ; } + + public void setSampleCount(Long sampleCount) { + this.sampleCount = sampleCount; + } + + public Long getSampleCount() { + return this.sampleCount ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java index e59dafe23..783a6402d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java @@ -6,10 +6,11 @@ import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.PointEventEntity; @Entity @OptionFor("POINT_EVENT") -public class WeitereSymptomeBeliebigesEreignisPointEvent implements WeitereSymptomeBeliebigesEreignisChoice { +public class WeitereSymptomeBeliebigesEreignisPointEvent implements PointEventEntity, WeitereSymptomeBeliebigesEreignisChoice { /** * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java index 7e4140fc6..79f71117c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java @@ -9,11 +9,12 @@ 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; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class WeitereSymptomeObservation { +public class WeitereSymptomeObservation implements EntryEntity { /** * Bericht/Symptome/Weitere Symptome/origin */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java index 85a5b71ac..5d36270f5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java @@ -6,9 +6,10 @@ import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class WeitereSymptomeSpezifischesSymptomAnzeichenCluster { +public class WeitereSymptomeSpezifischesSymptomAnzeichenCluster implements LocatableEntity { /** * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluation.java index 744287d46..55f4e0c88 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-EVALUATION.living_arrangement.v0") -public class WohnsituationEvaluation { +public class WohnsituationEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Wohnsituation/Beschreibung */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteCluster.java index fec7d340d..13c1522da 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteCluster.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.dwelling.v0") -public class WohnstatteCluster { +public class WohnstatteCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Wohnsituation/Wohnstätte/Anzahl der Schlafzimmer */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java index 5a4a2b726..e8e265eba 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java @@ -14,6 +14,7 @@ import org.ehrbase.client.annotations.Path; import org.ehrbase.client.annotations.Template; import org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition.KorpergewichtObservation; +import org.ehrbase.client.classgenerator.interfaces.CompositionEntity; import org.ehrbase.client.classgenerator.shareddefinition.Category; import org.ehrbase.client.classgenerator.shareddefinition.Language; import org.ehrbase.client.classgenerator.shareddefinition.Setting; @@ -23,7 +24,7 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.report.v1") @Template("AlternativeEvents") -public class AlternativeEventsComposition { +public class AlternativeEventsComposition implements CompositionEntity { /** * Bericht/context/Bericht ID */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java index 2f86d8d46..b6fba6092 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.Double; +import java.lang.Long; import java.lang.String; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; @@ -9,11 +10,12 @@ import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.IntervalEventEntity; import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity @OptionFor("INTERVAL_EVENT") -public class KorpergewichtAnyEventEnIntervalEvent implements KorpergewichtAnyEventEnChoice { +public class KorpergewichtAnyEventEnIntervalEvent implements IntervalEventEntity, KorpergewichtAnyEventEnChoice { /** * Bericht/Körpergewicht/*Any event(en)/Gewicht */ @@ -68,6 +70,12 @@ public class KorpergewichtAnyEventEnIntervalEvent implements KorpergewichtAnyEve @Path("/math_function|defining_code") private MathFunction mathFunctionDefiningCode; + /** + * Bericht/Körpergewicht/*Any event(en)/sample_count + */ + @Path("/sample_count") + private Long sampleCount; + public void setGewichtMagnitude(Double gewichtMagnitude) { this.gewichtMagnitude = gewichtMagnitude; } @@ -140,4 +148,12 @@ public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { public MathFunction getMathFunctionDefiningCode() { return this.mathFunctionDefiningCode ; } + + public void setSampleCount(Long sampleCount) { + this.sampleCount = sampleCount; + } + + public Long getSampleCount() { + return this.sampleCount ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java index e1f485792..16a789d11 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java @@ -8,10 +8,11 @@ import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.PointEventEntity; @Entity @OptionFor("POINT_EVENT") -public class KorpergewichtAnyEventEnPointEvent implements KorpergewichtAnyEventEnChoice { +public class KorpergewichtAnyEventEnPointEvent implements PointEventEntity, KorpergewichtAnyEventEnChoice { /** * Bericht/Körpergewicht/*Any event(en)/Gewicht */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java index c67b6dc66..cb8c92a72 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java @@ -7,9 +7,10 @@ import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.PointEventEntity; @Entity -public class KorpergewichtBirthEnPointEvent { +public class KorpergewichtBirthEnPointEvent implements PointEventEntity { /** * Bericht/Körpergewicht/*Birth(en)/Gewicht */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java index 6649dac6a..f2f291a43 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java @@ -1,17 +1,25 @@ package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class KorpergewichtConfoundingFactorsEnElement { +public class KorpergewichtConfoundingFactorsEnElement implements LocatableEntity { /** * Bericht/Körpergewicht/*Birth(en)/*Confounding factors(en) */ @Path("/value|value") private String value; + /** + * Bericht/Körpergewicht/*Birth(en)/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(String value) { this.value = value; } @@ -19,4 +27,12 @@ public void setValue(String value) { public String getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java index 45f792335..d1a197f7c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java @@ -9,11 +9,12 @@ 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; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.body_weight.v2") -public class KorpergewichtObservation { +public class KorpergewichtObservation implements EntryEntity { /** * Bericht/Körpergewicht/*Birth(en) */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java index 4cc48fe5e..af733ea41 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java @@ -15,6 +15,7 @@ import org.ehrbase.client.annotations.Template; import org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition.LaborergebnisObservation; import org.ehrbase.client.classgenerator.examples.befundderblutgasanalysecomposition.definition.StatusDefiningCode; +import org.ehrbase.client.classgenerator.interfaces.CompositionEntity; import org.ehrbase.client.classgenerator.shareddefinition.Category; import org.ehrbase.client.classgenerator.shareddefinition.Language; import org.ehrbase.client.classgenerator.shareddefinition.Setting; @@ -24,7 +25,7 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.registereintrag.v1") @Template("Befund der Blutgasanalyse") -public class BefundDerBlutgasanalyseComposition { +public class BefundDerBlutgasanalyseComposition implements CompositionEntity { /** * Befund der Blutgasanalyse/context/Erweiterung */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java index f8480ad9f..45d771ce8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java @@ -8,10 +8,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") -public class KohlendioxidpartialdruckCluster { +public class KohlendioxidpartialdruckCluster implements LocatableEntity { /** * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Kohlendioxidpartialdruck/untersuchter Analyt */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java index aef5d84eb..89ed92182 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java @@ -8,11 +8,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.laboratory_test_result.v1") -public class LaborergebnisObservation { +public class LaborergebnisObservation implements EntryEntity { /** * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Labortest-Bezeichnung */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java index 25e44e3e6..ec40e8b0d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java @@ -8,10 +8,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") -public class PhWertCluster { +public class PhWertCluster implements LocatableEntity { /** * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/pH-Wert/untersuchter Analyt */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java index 7c13a7e9f..8486544c1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java @@ -8,10 +8,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") -public class SauerstoffpartialdruckCluster { +public class SauerstoffpartialdruckCluster implements LocatableEntity { /** * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Sauerstoffpartialdruck/untersuchter Analyt */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java index f613fc5c4..275a7d8c8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java @@ -8,10 +8,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") -public class SauerstoffsattigungCluster { +public class SauerstoffsattigungCluster implements LocatableEntity { /** * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Sauerstoffsättigung/untersuchter Analyt */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java index 06d57cacb..5f0d728cd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java @@ -18,6 +18,7 @@ import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.KontaktSection; import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.RisikogebietSection; import org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition.SymptomeSection; +import org.ehrbase.client.classgenerator.interfaces.CompositionEntity; import org.ehrbase.client.classgenerator.shareddefinition.Category; import org.ehrbase.client.classgenerator.shareddefinition.Language; import org.ehrbase.client.classgenerator.shareddefinition.Setting; @@ -27,7 +28,7 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.report.v1") @Template("Corona_Anamnese") -public class CoronaAnamneseComposition { +public class CoronaAnamneseComposition implements CompositionEntity { /** * Bericht/context/Bericht ID */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java index 45caaadfb..978e2b1c7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java @@ -5,10 +5,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.address_cc.v0") -public class AdresseCluster { +public class AdresseCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Adresse/Stadt */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java index f477b2506..9c288e79c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java @@ -5,10 +5,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") -public class AllgemeineAngabenSection { +public class AllgemeineAngabenSection implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java index f5f12b093..44e908097 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class AndereAktuelleErkrankungenObservation { +public class AndereAktuelleErkrankungenObservation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java index 9b2169618..483553b27 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.exposure_assessment.v0") -public class AufenthaltInGesundheitseinrichtungObservation { +public class AufenthaltInGesundheitseinrichtungObservation implements EntryEntity { /** * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Beliebiges Ereignis/*Agent (en) */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java index effe3f2db..552866500 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.occupation_record.v1") -public class BeschaftigungCluster { +public class BeschaftigungCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Berufsbezeichnung/Rolle */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java index e91b3d791..a20793e3c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-EVALUATION.health_risk.v1") -public class BewertungDesGesundheitsrisikosEvaluation { +public class BewertungDesGesundheitsrisikosEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Gesundheitsrisiko */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java index 983eb988a..a6d094324 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class ChronischeErkrankungenObservation { +public class ChronischeErkrankungenObservation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Chronische Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java index da2563fac..6323af0e6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java @@ -7,9 +7,10 @@ import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class DienstleistungAktuelleAktivitatActivity { +public class DienstleistungAktuelleAktivitatActivity implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Name der Dienstleistung */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java index 2b77f9b6d..d561c0a8a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java @@ -1,17 +1,25 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class DienstleistungGrundFurDieAnforderungElement { +public class DienstleistungGrundFurDieAnforderungElement implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Grund für die Anforderung */ @Path("/value|value") private String value; + /** + * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(String value) { this.value = value; } @@ -19,4 +27,12 @@ public void setValue(String value) { public String getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java index 8910593ad..b725a3d37 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-INSTRUCTION.service_request.v1") -public class DienstleistungInstruction { +public class DienstleistungInstruction implements EntryEntity { /** * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java index 8e5edc8e6..365637f9f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class DurchfallObservation { +public class DurchfallObservation implements EntryEntity { /** * Bericht/Symptome/Durchfall/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java index 678ad973e..13b4520bb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class FieberOderErhohteKorpertemperaturObservation { +public class FieberOderErhohteKorpertemperaturObservation implements EntryEntity { /** * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java index 6e08c292d..a92d4883b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java @@ -10,11 +10,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.medication_use.v0") -public class FragebogenZumMedikationsScreeningObservation { +public class FragebogenZumMedikationsScreeningObservation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Medikamente in Verwendung? */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java index 045b5d53d..396c8e284 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java @@ -4,9 +4,10 @@ import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster { +public class FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Spezifische Medikamente/Name des Medikaments */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java index af96deef0..e9653bb82 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java @@ -2,17 +2,19 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Long; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.IntervalEventEntity; import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity @OptionFor("INTERVAL_EVENT") -public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements GeschichteHistorieBeliebigesEreignisChoice { +public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements IntervalEventEntity, GeschichteHistorieBeliebigesEreignisChoice { /** * Bericht/Geschichte/Historie/Beliebiges Ereignis/Geschichte */ @@ -49,6 +51,12 @@ public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements Geschi @Path("/math_function|defining_code") private MathFunction mathFunctionDefiningCode; + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/sample_count + */ + @Path("/sample_count") + private Long sampleCount; + public void setGeschichte(List geschichte) { this.geschichte = geschichte; } @@ -96,4 +104,12 @@ public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { public MathFunction getMathFunctionDefiningCode() { return this.mathFunctionDefiningCode ; } + + public void setSampleCount(Long sampleCount) { + this.sampleCount = sampleCount; + } + + public Long getSampleCount() { + return this.sampleCount ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java index 5ec17627c..003931571 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.PointEventEntity; @Entity @OptionFor("POINT_EVENT") -public class GeschichteHistorieBeliebigesEreignisPointEvent implements GeschichteHistorieBeliebigesEreignisChoice { +public class GeschichteHistorieBeliebigesEreignisPointEvent implements PointEventEntity, GeschichteHistorieBeliebigesEreignisChoice { /** * Bericht/Geschichte/Historie/Beliebiges Ereignis/Geschichte */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java index 1949eea1d..870f05ade 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java @@ -1,17 +1,25 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class GeschichteHistorieGeschichteElement { +public class GeschichteHistorieGeschichteElement implements LocatableEntity { /** * Bericht/Geschichte/Historie/Beliebiges Ereignis/Geschichte */ @Path("/value|value") private String value; + /** + * Bericht/Geschichte/Historie/Beliebiges Ereignis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(String value) { this.value = value; } @@ -19,4 +27,12 @@ public void setValue(String value) { public String getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java index 8e8648918..a00a80147 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java @@ -9,11 +9,12 @@ 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; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.story.v1") -public class GeschichteHistorieObservation { +public class GeschichteHistorieObservation implements EntryEntity { /** * Bericht/Geschichte/Historie/origin */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java index eb5f37211..d824ec683 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class GestorterGeruchssinnObservation { +public class GestorterGeruchssinnObservation implements EntryEntity { /** * Bericht/Symptome/Gestörter Geruchssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java index 297a24e86..7a345a844 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class GestorterGeschmackssinnObservation { +public class GestorterGeschmackssinnObservation implements EntryEntity { /** * Bericht/Symptome/Gestörter Geschmackssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java index 5a3f0a4e4..82f473863 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java @@ -8,11 +8,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-EVALUATION.occupation_summary.v1") -public class GesundheitsbezogenerBerufEvaluation { +public class GesundheitsbezogenerBerufEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigungsstatus */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java index ebff29e6a..a7c95e23c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class HeiserkeitObservation { +public class HeiserkeitObservation implements EntryEntity { /** * Bericht/Symptome/Heiserkeit/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java index 3c70ee3d1..db46168b6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java @@ -8,11 +8,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.travel_history.v0") -public class HistorieDerReiseObservation { +public class HistorieDerReiseObservation implements EntryEntity { /** * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Aufenthalt in den letzten 14 Tage in einem der Risikogebiete für Coronainfektion oder Kontakt zu Menschen, die dort waren */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java index 7cc4b63e2..2e63d4f83 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class HustenObservation { +public class HustenObservation implements EntryEntity { /** * Bericht/Symptome/Husten/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java index 8127be81b..b4e8509a0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java @@ -4,10 +4,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") -public class KontaktSection { +public class KontaktSection implements LocatableEntity { /** * Bericht/Kontakt/Personenkontakt */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java index 20e817354..dba5a97bd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java @@ -10,11 +10,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.body_temperature.v2") -public class KorpertemperaturObservation { +public class KorpertemperaturObservation implements EntryEntity { /** * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Temperatur */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java index 2c1f79c2b..77f1a9378 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java @@ -1,17 +1,25 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class KorpertemperaturStorfaktorenElement { +public class KorpertemperaturStorfaktorenElement implements LocatableEntity { /** * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Störfaktoren */ @Path("/value|value") private String value; + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(String value) { this.value = value; } @@ -19,4 +27,12 @@ public void setValue(String value) { public String getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java index b8f0bcac9..52e60d3e9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.organisation_cc.v0") -public class OrganisationCluster { +public class OrganisationCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Identifier */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java index 26055e72b..83a427e9f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.exposure_assessment.v0") -public class PersonenkontaktObservation { +public class PersonenkontaktObservation implements EntryEntity { /** * Bericht/Kontakt/Personenkontakt/Beliebiges Ereignis/*Agent (en) */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java index 61a5a7d90..6d963ee3e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java @@ -8,11 +8,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-EVALUATION.problem_diagnosis.v1") -public class ProblemDiagnoseEvaluation { +public class ProblemDiagnoseEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Problem/Diagnose/Name des Problems/ der Diagnose */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java index 03952da5d..645e7b2a8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java @@ -3,10 +3,11 @@ 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 @OptionFor("DV_CODED_TEXT") -public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText implements ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { +public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText implements RMEntity, ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { /** * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java index af04cb668..f94644b3d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java @@ -4,10 +4,11 @@ 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 @OptionFor("DV_TEXT") -public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText implements ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { +public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText implements RMEntity, ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { /** * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java index 47357e34c..5420522c1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java @@ -10,11 +10,12 @@ 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; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1") -public class ProblemDiganoseCoronovirusEvaluation { +public class ProblemDiganoseCoronovirusEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Name des Problems/ der Diagnose */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java index 34b893197..c0ee56dc4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java @@ -1,15 +1,17 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import java.lang.Long; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.IntervalEventEntity; import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity -public class ReisefallBeliebigesIntervallereignisIntervalEvent { +public class ReisefallBeliebigesIntervallereignisIntervalEvent implements IntervalEventEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Letzte Reise? */ @@ -34,6 +36,12 @@ public class ReisefallBeliebigesIntervallereignisIntervalEvent { @Path("/math_function|defining_code") private MathFunction mathFunctionDefiningCode; + /** + * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/sample_count + */ + @Path("/sample_count") + private Long sampleCount; + /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/width */ @@ -84,6 +92,14 @@ public MathFunction getMathFunctionDefiningCode() { return this.mathFunctionDefiningCode ; } + public void setSampleCount(Long sampleCount) { + this.sampleCount = sampleCount; + } + + public Long getSampleCount() { + return this.sampleCount ; + } + public void setWidthValue(TemporalAmount widthValue) { this.widthValue = widthValue; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java index 6b32c1be1..c0c96a6c6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java @@ -6,9 +6,10 @@ import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class ReisefallBestimmteReiseCluster { +public class ReisefallBestimmteReiseCluster implements LocatableEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java index 0384ad35a..82f79792e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java @@ -6,9 +6,10 @@ import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class ReisefallBestimmtesReisezielCluster { +public class ReisefallBestimmtesReisezielCluster implements LocatableEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/Land */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java index b09ed4420..282301e7f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java @@ -8,11 +8,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.travel_event.v0") -public class ReisefallObservation { +public class ReisefallObservation implements EntryEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java index 3d6899a96..fddb5493c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java @@ -5,10 +5,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") -public class RisikogebietSection { +public class RisikogebietSection implements LocatableEntity { /** * Bericht/Risikogebiet/Historie der Reise */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java index 125b301e0..0cdaf3403 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class SchnupfenObservation { +public class SchnupfenObservation implements EntryEntity { /** * Bericht/Symptome/Schnupfen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java index 29e9afed5..dff306a4b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") -public class StandortCluster { +public class StandortCluster implements LocatableEntity { /** * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Ortsbeschreibung/Standort/Standortbeschreibung */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java index c11b1dc8a..30a015c2a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java @@ -4,10 +4,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.problem_qualifier.v1") -public class StatusCluster { +public class StatusCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Status/Diagnosestatus */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java index 0838b5152..a5a1cf8d4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java @@ -4,10 +4,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") -public class SymptomeSection { +public class SymptomeSection implements LocatableEntity { /** * Bericht/Symptome/Husten */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java index cfda8a0b0..839ba412b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java @@ -1,17 +1,19 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import java.lang.Long; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.IntervalEventEntity; import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity @OptionFor("INTERVAL_EVENT") -public class WeitereSymptomeBeliebigesEreignisIntervalEvent implements WeitereSymptomeBeliebigesEreignisChoice { +public class WeitereSymptomeBeliebigesEreignisIntervalEvent implements IntervalEventEntity, WeitereSymptomeBeliebigesEreignisChoice { /** * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen */ @@ -42,6 +44,12 @@ public class WeitereSymptomeBeliebigesEreignisIntervalEvent implements WeitereSy @Path("/math_function|defining_code") private MathFunction mathFunctionDefiningCode; + /** + * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/sample_count + */ + @Path("/sample_count") + private Long sampleCount; + public void setSpezifischesSymptomAnzeichen( List spezifischesSymptomAnzeichen) { this.spezifischesSymptomAnzeichen = spezifischesSymptomAnzeichen; @@ -83,4 +91,12 @@ public void setMathFunctionDefiningCode(MathFunction mathFunctionDefiningCode) { public MathFunction getMathFunctionDefiningCode() { return this.mathFunctionDefiningCode ; } + + public void setSampleCount(Long sampleCount) { + this.sampleCount = sampleCount; + } + + public Long getSampleCount() { + return this.sampleCount ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java index 7130e067b..bd2a146dc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java @@ -6,10 +6,11 @@ import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.PointEventEntity; @Entity @OptionFor("POINT_EVENT") -public class WeitereSymptomeBeliebigesEreignisPointEvent implements WeitereSymptomeBeliebigesEreignisChoice { +public class WeitereSymptomeBeliebigesEreignisPointEvent implements PointEventEntity, WeitereSymptomeBeliebigesEreignisChoice { /** * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java index d6af404f9..d136e9323 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java @@ -9,11 +9,12 @@ 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; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") -public class WeitereSymptomeObservation { +public class WeitereSymptomeObservation implements EntryEntity { /** * Bericht/Symptome/Weitere Symptome/origin */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java index bec1a66f2..4909d2458 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java @@ -6,9 +6,10 @@ import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class WeitereSymptomeSpezifischesSymptomAnzeichenCluster { +public class WeitereSymptomeSpezifischesSymptomAnzeichenCluster implements LocatableEntity { /** * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java index f2565ea5d..3b3acdee5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-EVALUATION.living_arrangement.v0") -public class WohnsituationEvaluation { +public class WohnsituationEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Wohnsituation/Beschreibung */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java index 73682abe1..7e737c3ed 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.dwelling.v0") -public class WohnstatteCluster { +public class WohnstatteCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Wohnsituation/Wohnstätte/Anzahl der Schlafzimmer */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java index ba4abc458..d5ebae2b9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java @@ -14,6 +14,7 @@ import org.ehrbase.client.annotations.Template; import org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition.FallidentifikationCluster; import org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition.ProblemDiagnoseEvaluation; +import org.ehrbase.client.classgenerator.interfaces.CompositionEntity; import org.ehrbase.client.classgenerator.shareddefinition.Category; import org.ehrbase.client.classgenerator.shareddefinition.Language; import org.ehrbase.client.classgenerator.shareddefinition.Setting; @@ -23,7 +24,7 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.report.v1") @Template("Diagnose") -public class DiagnoseComposition { +public class DiagnoseComposition implements CompositionEntity { /** * COVID-19-Diagnose/context/Bericht ID */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java index 5d85a9a05..9ceb57083 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.anatomical_location.v1") -public class AnatomischeLokalisationCluster { +public class AnatomischeLokalisationCluster implements LocatableEntity { /** * COVID-19-Diagnose/Problem/Diagnose/Anatomische Lokalisation/Name der Körperstelle */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java index 99b22db4d..8c53ebb7f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java @@ -1,11 +1,19 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class AtiopathogeneseAtiologieDerKrankheitElement { +public class AtiopathogeneseAtiologieDerKrankheitElement implements LocatableEntity { + /** + * COVID-19-Diagnose/Problem/Diagnose/Ätiopathogenese/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * COVID-19-Diagnose/Problem/Diagnose/Ätiopathogenese/value */ @@ -13,6 +21,14 @@ public class AtiopathogeneseAtiologieDerKrankheitElement { @Choice private AtiopathogeneseValueChoice value; + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setValue(AtiopathogeneseValueChoice value) { this.value = value; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java index f3b1fea14..bd295a268 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java @@ -1,17 +1,25 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class AtiopathogeneseBeschreibungDesEntstehensElement { +public class AtiopathogeneseBeschreibungDesEntstehensElement implements LocatableEntity { /** * COVID-19-Diagnose/Problem/Diagnose/Ätiopathogenese/Beschreibung des Entstehens */ @Path("/value|value") private String value; + /** + * COVID-19-Diagnose/Problem/Diagnose/Ätiopathogenese/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(String value) { this.value = value; } @@ -19,4 +27,12 @@ public void setValue(String value) { public String getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java index 01ece3e33..941595839 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java @@ -5,10 +5,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.etiology.v1") -public class AtiopathogeneseCluster { +public class AtiopathogeneseCluster implements LocatableEntity { /** * COVID-19-Diagnose/Problem/Diagnose/Ätiopathogenese/Ätiologie der Krankheit */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java index 9350c5b03..0e473dfaa 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java @@ -3,10 +3,11 @@ 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 @OptionFor("DV_CODED_TEXT") -public class AtiopathogeneseValueDvCodedText implements AtiopathogeneseValueChoice { +public class AtiopathogeneseValueDvCodedText implements RMEntity, AtiopathogeneseValueChoice { /** * COVID-19-Diagnose/Problem/Diagnose/Ätiopathogenese/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java index 5717310b4..c588f9512 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java @@ -4,10 +4,11 @@ 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 @OptionFor("DV_TEXT") -public class AtiopathogeneseValueDvText implements AtiopathogeneseValueChoice { +public class AtiopathogeneseValueDvText implements RMEntity, AtiopathogeneseValueChoice { /** * COVID-19-Diagnose/Problem/Diagnose/Ätiopathogenese/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java index 17ecebcfc..8374a91ba 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java @@ -6,10 +6,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.diagnose_details.v0") -public class DiagnosedetailsCluster { +public class DiagnosedetailsCluster implements LocatableEntity { /** * COVID-19-Diagnose/Problem/Diagnose/Diagnosedetails/Begründung von Ausnahmen */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java index 39add828a..2d22aec59 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java @@ -5,10 +5,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.case_identification.v0") -public class FallidentifikationCluster { +public class FallidentifikationCluster implements LocatableEntity { /** * COVID-19-Diagnose/context/Fallidentifikation/Fall-Kennung */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java index 1e2bf0f09..194d9913e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java @@ -3,10 +3,11 @@ 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 @OptionFor("DV_CODED_TEXT") -public class ProblemDiagnoseDiagnostischeSicherheitDvCodedText implements ProblemDiagnoseDiagnostischeSicherheitChoice { +public class ProblemDiagnoseDiagnostischeSicherheitDvCodedText implements RMEntity, ProblemDiagnoseDiagnostischeSicherheitChoice { /** * COVID-19-Diagnose/Problem/Diagnose/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java index 8b131aae1..9d92d6a7b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java @@ -4,10 +4,11 @@ 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 @OptionFor("DV_TEXT") -public class ProblemDiagnoseDiagnostischeSicherheitDvText implements ProblemDiagnoseDiagnostischeSicherheitChoice { +public class ProblemDiagnoseDiagnostischeSicherheitDvText implements RMEntity, ProblemDiagnoseDiagnostischeSicherheitChoice { /** * COVID-19-Diagnose/Problem/Diagnose/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java index 0e79f115e..044a5a606 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java @@ -10,11 +10,12 @@ 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; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-EVALUATION.problem_diagnosis.v1") -public class ProblemDiagnoseEvaluation { +public class ProblemDiagnoseEvaluation implements EntryEntity { /** * COVID-19-Diagnose/Problem/Diagnose/Name des Problems/ der Diagnose */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java index 2043b3bf4..d7d4b6fe1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java @@ -3,10 +3,11 @@ 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 @OptionFor("DV_CODED_TEXT") -public class ProblemDiagnoseSchweregradDvCodedText implements ProblemDiagnoseSchweregradChoice { +public class ProblemDiagnoseSchweregradDvCodedText implements RMEntity, ProblemDiagnoseSchweregradChoice { /** * COVID-19-Diagnose/Problem/Diagnose/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java index 153c60eae..39358fb7e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java @@ -4,10 +4,11 @@ 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 @OptionFor("DV_TEXT") -public class ProblemDiagnoseSchweregradDvText implements ProblemDiagnoseSchweregradChoice { +public class ProblemDiagnoseSchweregradDvText implements RMEntity, ProblemDiagnoseSchweregradChoice { /** * COVID-19-Diagnose/Problem/Diagnose/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java index 71ba25c7e..6a7e02cb2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java @@ -14,6 +14,7 @@ import org.ehrbase.client.annotations.Template; import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.BloodPressureTrainingSampleObservation; import org.ehrbase.client.classgenerator.examples.ehrbasebloodpressuresimpledev0composition.definition.DeviceDetailsTrainingSampleCluster; +import org.ehrbase.client.classgenerator.interfaces.CompositionEntity; import org.ehrbase.client.classgenerator.shareddefinition.Category; import org.ehrbase.client.classgenerator.shareddefinition.Language; import org.ehrbase.client.classgenerator.shareddefinition.Setting; @@ -23,7 +24,7 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.sample_encounter.v1") @Template("ehrbase_blood_pressure_simple.de.v0") -public class EhrbaseBloodPressureSimpleDeV0Composition { +public class EhrbaseBloodPressureSimpleDeV0Composition implements CompositionEntity { /** * Encounter (training sample)/context/Admin detail/Device details (training sample) */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java index a6a62ae5e..5f01cde16 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java @@ -10,11 +10,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.sample_blood_pressure.v1") -public class BloodPressureTrainingSampleObservation { +public class BloodPressureTrainingSampleObservation implements EntryEntity { /** * Encounter (training sample)/Blood pressure (Training sample)/Baseline reading/Systolic */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java index 2288b0f35..e6b2f6792 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.sample_device.v1") -public class DeviceDetailsTrainingSampleCluster { +public class DeviceDetailsTrainingSampleCluster implements LocatableEntity { /** * Encounter (training sample)/context/Admin detail/Device details (training sample)/Name */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java index 696f59437..091061934 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java @@ -14,6 +14,7 @@ import org.ehrbase.client.annotations.Path; import org.ehrbase.client.annotations.Template; import org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition.BodyTemperatureObservation; +import org.ehrbase.client.classgenerator.interfaces.CompositionEntity; import org.ehrbase.client.classgenerator.shareddefinition.Category; import org.ehrbase.client.classgenerator.shareddefinition.Language; import org.ehrbase.client.classgenerator.shareddefinition.Setting; @@ -23,7 +24,7 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.encounter.v1") @Template("ehrbase_multi_occurrence.de.v1") -public class EhrbaseMultiOccurrenceDeV1Composition { +public class EhrbaseMultiOccurrenceDeV1Composition implements CompositionEntity { /** * Encounter/context/Extension */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java index 46578f4bb..48104719c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java @@ -12,11 +12,12 @@ import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.IntervalEventEntity; import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity @OptionFor("INTERVAL_EVENT") -public class BodyTemperatureAnyEventIntervalEvent implements BodyTemperatureAnyEventChoice { +public class BodyTemperatureAnyEventIntervalEvent implements IntervalEventEntity, BodyTemperatureAnyEventChoice { /** * Encounter/Body temperature/Any event/Temperature */ @@ -77,6 +78,12 @@ public class BodyTemperatureAnyEventIntervalEvent implements BodyTemperatureAnyE @Path("/math_function|defining_code") private MathFunction mathFunctionDefiningCode; + /** + * Encounter/Body temperature/Any event/sample_count + */ + @Path("/sample_count") + private Long sampleCount; + /** * Encounter/Body temperature/Any event/value */ @@ -164,6 +171,14 @@ public MathFunction getMathFunctionDefiningCode() { return this.mathFunctionDefiningCode ; } + public void setSampleCount(Long sampleCount) { + this.sampleCount = sampleCount; + } + + public Long getSampleCount() { + return this.sampleCount ; + } + public void setBodyExposure(BodyTemperatureBodyExposureChoice bodyExposure) { this.bodyExposure = bodyExposure; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java index 2d5719e4f..12b3fc67c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java @@ -11,10 +11,11 @@ import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.PointEventEntity; @Entity @OptionFor("POINT_EVENT") -public class BodyTemperatureAnyEventPointEvent implements BodyTemperatureAnyEventChoice { +public class BodyTemperatureAnyEventPointEvent implements PointEventEntity, BodyTemperatureAnyEventChoice { /** * Encounter/Body temperature/Any event/Temperature */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvCodedText.java index 0ae1366d9..89e0fb44e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvCodedText.java @@ -3,10 +3,11 @@ 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 @OptionFor("DV_CODED_TEXT") -public class BodyTemperatureBodyExposureDvCodedText implements BodyTemperatureBodyExposureChoice { +public class BodyTemperatureBodyExposureDvCodedText implements RMEntity, BodyTemperatureBodyExposureChoice { /** * Encounter/Body temperature/Any event/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java index 9a21d32f4..e658d92ac 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java @@ -4,10 +4,11 @@ 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 @OptionFor("DV_TEXT") -public class BodyTemperatureBodyExposureDvText implements BodyTemperatureBodyExposureChoice { +public class BodyTemperatureBodyExposureDvText implements RMEntity, BodyTemperatureBodyExposureChoice { /** * Encounter/Body temperature/Any event/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvCodedText.java index 502e0fd1c..278a76c7c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvCodedText.java @@ -3,10 +3,11 @@ 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 @OptionFor("DV_CODED_TEXT") -public class BodyTemperatureLocationOfMeasurementDvCodedText implements BodyTemperatureLocationOfMeasurementChoice { +public class BodyTemperatureLocationOfMeasurementDvCodedText implements RMEntity, BodyTemperatureLocationOfMeasurementChoice { /** * Encounter/Body temperature/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java index 7d6296b22..264050390 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java @@ -4,10 +4,11 @@ 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 @OptionFor("DV_TEXT") -public class BodyTemperatureLocationOfMeasurementDvText implements BodyTemperatureLocationOfMeasurementChoice { +public class BodyTemperatureLocationOfMeasurementDvText implements RMEntity, BodyTemperatureLocationOfMeasurementChoice { /** * Encounter/Body temperature/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java index 7054d68c7..b445f2d45 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java @@ -9,11 +9,12 @@ 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; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.body_temperature.v2") -public class BodyTemperatureObservation { +public class BodyTemperatureObservation implements EntryEntity { /** * Encounter/Body temperature/origin */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java index fdbfb0bdf..503cc9181 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java @@ -13,6 +13,7 @@ import org.ehrbase.client.annotations.Path; import org.ehrbase.client.annotations.Template; import org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition.EpisodeofcareAdminEntry; +import org.ehrbase.client.classgenerator.interfaces.CompositionEntity; import org.ehrbase.client.classgenerator.shareddefinition.Category; import org.ehrbase.client.classgenerator.shareddefinition.Language; import org.ehrbase.client.classgenerator.shareddefinition.Setting; @@ -22,7 +23,7 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.versorgungsfall.v0") @Template("EpisodeOfCare") -public class EpisodeOfCareComposition { +public class EpisodeOfCareComposition implements CompositionEntity { /** * EpisodeOfCare/Episodeofcare */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java index f023a37a2..49c277c0a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java @@ -10,11 +10,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.episodeofcare.v0") -public class EpisodeofcareAdminEntry { +public class EpisodeofcareAdminEntry implements EntryEntity { /** * EpisodeOfCare/Episodeofcare/identifier */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java index 611bbc57b..086ddb11c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java @@ -6,9 +6,10 @@ import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class EpisodeofcareDiagnosisCluster { +public class EpisodeofcareDiagnosisCluster implements LocatableEntity { /** * EpisodeOfCare/Episodeofcare/diagnosis/diagnosis entry */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java index 76bde24a1..10a6984a3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java @@ -1,17 +1,25 @@ package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datavalues.DvIdentifier; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class EpisodeofcareIdentifierElement { +public class EpisodeofcareIdentifierElement implements LocatableEntity { /** * EpisodeOfCare/Episodeofcare/identifier */ @Path("/value") private DvIdentifier value; + /** + * EpisodeOfCare/Episodeofcare/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(DvIdentifier value) { this.value = value; } @@ -19,4 +27,12 @@ public void setValue(DvIdentifier value) { public DvIdentifier getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java index 45567e9e6..d60f0baf0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java @@ -1,17 +1,25 @@ package org.ehrbase.client.classgenerator.examples.episodeofcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.net.URI; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class EpisodeofcareTeamElement { +public class EpisodeofcareTeamElement implements LocatableEntity { /** * EpisodeOfCare/Episodeofcare/team */ @Path("/value|value") private URI value; + /** + * EpisodeOfCare/Episodeofcare/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(URI value) { this.value = value; } @@ -19,4 +27,12 @@ public void setValue(URI value) { public URI getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java index 77227faa7..4658efa13 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java @@ -17,6 +17,7 @@ import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.BackgroundSection; import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.ResponseSection; import org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition.SituationSection; +import org.ehrbase.client.classgenerator.interfaces.CompositionEntity; import org.ehrbase.client.classgenerator.shareddefinition.Category; import org.ehrbase.client.classgenerator.shareddefinition.Language; import org.ehrbase.client.classgenerator.shareddefinition.Setting; @@ -26,7 +27,7 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.encounter.v1") @Template("open_eREACT-Care") -public class OpenEREACTCareComposition { +public class OpenEREACTCareComposition implements CompositionEntity { /** * open_eREACT-Care/context/Extension */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java index f4858a5c7..957cbb799 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") -public class AbdomenSymptomCluster { +public class AbdomenSymptomCluster implements LocatableEntity { /** * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Abdomen symptom/Symptom/Sign name */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java index 79bb527b4..68d4808f5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.acvpu.v0") -public class AcvpuScaleObservation { +public class AcvpuScaleObservation implements EntryEntity { /** * open_eREACT-Care/Assessment/NEWS2/ACVPU scale/Any point in time event/ACVPU */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java index acd37d54d..4ad1c30ed 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java @@ -8,11 +8,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") -public class AllergiesEvaluation { +public class AllergiesEvaluation implements EntryEntity { /** * open_eREACT-Care/Background/Allergies/Synopsis */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java index 245460f41..6a7b2347b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java @@ -4,10 +4,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") -public class AssessmentSection { +public class AssessmentSection implements LocatableEntity { /** * open_eREACT-Care/Assessment/DENWIS */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java index be18b40d2..bd9a8c069 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java @@ -4,10 +4,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") -public class BackgroundSection { +public class BackgroundSection implements LocatableEntity { /** * open_eREACT-Care/Background/Height */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java index c1ffab110..30219a110 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java @@ -10,11 +10,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.blood_pressure.v2") -public class BloodPressureObservation { +public class BloodPressureObservation implements EntryEntity { /** * open_eREACT-Care/Assessment/NEWS2/Blood pressure/Any event/Systolic */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java index 1062f848e..4a2886926 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") -public class ChestSymptomCluster { +public class ChestSymptomCluster implements LocatableEntity { /** * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Chest symptom/Symptom/Sign name */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java index 250703de0..72ace1364 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java @@ -7,11 +7,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-EVALUATION.health_risk-covid.v0") -public class Covid19ExposureEvaluation { +public class Covid19ExposureEvaluation implements EntryEntity { /** * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Health risk */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java index 0561ec7fc..53d940802 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java @@ -8,11 +8,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") -public class CovidNotesEvaluation { +public class CovidNotesEvaluation implements EntryEntity { /** * open_eREACT-Care/Assessment/Covid/Covid notes/Synopsis */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java index 06677947e..cfeda1c12 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java @@ -4,10 +4,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") -public class CovidSection { +public class CovidSection implements LocatableEntity { /** * open_eREACT-Care/Assessment/Covid/Covid symptoms */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java index 7fdedd9ca..3d53dd0b6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.story.v1") -public class CovidSymptomsObservation { +public class CovidSymptomsObservation implements EntryEntity { /** * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Story */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java index c8e5f1318..993bfb5ff 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java @@ -1,11 +1,19 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class DenwisAgitationIndicatorElement { +public class DenwisAgitationIndicatorElement implements LocatableEntity { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * open_eREACT-Care/Assessment/DENWIS/Point in time/value */ @@ -13,6 +21,14 @@ public class DenwisAgitationIndicatorElement { @Choice private DenwisValueChoice2 value; + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setValue(DenwisValueChoice2 value) { this.value = value; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java index 7ad74c1c4..c6caa9b95 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java @@ -1,16 +1,24 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class DenwisBreathingIndicatorElement { +public class DenwisBreathingIndicatorElement implements LocatableEntity { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/Breathing indicator */ @Path("/value|defining_code") private BreathingIndicatorDefiningCode value; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(BreathingIndicatorDefiningCode value) { this.value = value; } @@ -18,4 +26,12 @@ public void setValue(BreathingIndicatorDefiningCode value) { public BreathingIndicatorDefiningCode getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java index 26e80539f..7936902ca 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java @@ -1,16 +1,24 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class DenwisCirculationIndicatorElement { +public class DenwisCirculationIndicatorElement implements LocatableEntity { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/Circulation indicator */ @Path("/value|defining_code") private CirculationIndicatorDefiningCode value; + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(CirculationIndicatorDefiningCode value) { this.value = value; } @@ -18,4 +26,12 @@ public void setValue(CirculationIndicatorDefiningCode value) { public CirculationIndicatorDefiningCode getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java index 84c8f55f6..5a1ac811a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java @@ -1,11 +1,19 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class DenwisMentationIndicatorElement { +public class DenwisMentationIndicatorElement implements LocatableEntity { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * open_eREACT-Care/Assessment/DENWIS/Point in time/value */ @@ -13,6 +21,14 @@ public class DenwisMentationIndicatorElement { @Choice private DenwisValueChoice2 value; + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setValue(DenwisValueChoice2 value) { this.value = value; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java index c360decb7..35e6f388b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java @@ -1,11 +1,19 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class DenwisNurseSubjectiveIndicatorElement { +public class DenwisNurseSubjectiveIndicatorElement implements LocatableEntity { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * open_eREACT-Care/Assessment/DENWIS/Point in time/value */ @@ -13,6 +21,14 @@ public class DenwisNurseSubjectiveIndicatorElement { @Choice private DenwisValueChoice6 value; + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setValue(DenwisValueChoice6 value) { this.value = value; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java index 4f99f0ffa..4ab45a40c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java @@ -12,11 +12,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.denwis.v0") -public class DenwisObservation { +public class DenwisObservation implements EntryEntity { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/Q1 Breathing */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java index 2045adb66..df47a6989 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java @@ -1,11 +1,19 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class DenwisPainIndicatorElement { +public class DenwisPainIndicatorElement implements LocatableEntity { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * open_eREACT-Care/Assessment/DENWIS/Point in time/value */ @@ -13,6 +21,14 @@ public class DenwisPainIndicatorElement { @Choice private DenwisValueChoice3 value; + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setValue(DenwisValueChoice3 value) { this.value = value; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java index e685db4da..6922cd06c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java @@ -1,11 +1,19 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class DenwisPatientIndicatorElement { +public class DenwisPatientIndicatorElement implements LocatableEntity { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * open_eREACT-Care/Assessment/DENWIS/Point in time/value */ @@ -13,6 +21,14 @@ public class DenwisPatientIndicatorElement { @Choice private DenwisValueChoice5 value; + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setValue(DenwisValueChoice5 value) { this.value = value; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java index 4ce30a77a..79ddaf745 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java @@ -1,11 +1,19 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class DenwisTemperatureIndicatorElement { +public class DenwisTemperatureIndicatorElement implements LocatableEntity { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * open_eREACT-Care/Assessment/DENWIS/Point in time/value */ @@ -13,6 +21,14 @@ public class DenwisTemperatureIndicatorElement { @Choice private DenwisValueChoice value; + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setValue(DenwisValueChoice value) { this.value = value; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java index 0c70baa8d..03c9ee12e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java @@ -1,11 +1,19 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class DenwisTrajectoryIndicatorElement { +public class DenwisTrajectoryIndicatorElement implements LocatableEntity { + /** + * open_eREACT-Care/Assessment/DENWIS/Point in time/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * open_eREACT-Care/Assessment/DENWIS/Point in time/value */ @@ -13,6 +21,14 @@ public class DenwisTrajectoryIndicatorElement { @Choice private DenwisValueChoice4 value; + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setValue(DenwisValueChoice4 value) { this.value = value; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java index 7130a5ff3..2a1a9da23 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java @@ -3,10 +3,11 @@ 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 @OptionFor("DV_CODED_TEXT") -public class DenwisValueDvCodedText implements DenwisValueChoice { +public class DenwisValueDvCodedText implements RMEntity, DenwisValueChoice { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java index d02ada70e..73bc92bad 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java @@ -3,10 +3,11 @@ 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 @OptionFor("DV_CODED_TEXT") -public class DenwisValueDvCodedText2 implements DenwisValueChoice2 { +public class DenwisValueDvCodedText2 implements RMEntity, DenwisValueChoice2 { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java index 73050fbc7..f853de21f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java @@ -3,10 +3,11 @@ 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 @OptionFor("DV_CODED_TEXT") -public class DenwisValueDvCodedText3 implements DenwisValueChoice3 { +public class DenwisValueDvCodedText3 implements RMEntity, DenwisValueChoice3 { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java index 905cb4515..935ab6203 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java @@ -3,10 +3,11 @@ 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 @OptionFor("DV_CODED_TEXT") -public class DenwisValueDvCodedText4 implements DenwisValueChoice4 { +public class DenwisValueDvCodedText4 implements RMEntity, DenwisValueChoice4 { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java index 83f99aca8..927376d22 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java @@ -3,10 +3,11 @@ 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 @OptionFor("DV_CODED_TEXT") -public class DenwisValueDvCodedText5 implements DenwisValueChoice5 { +public class DenwisValueDvCodedText5 implements RMEntity, DenwisValueChoice5 { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java index c35a151f2..a99d57ce0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java @@ -3,10 +3,11 @@ 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 @OptionFor("DV_CODED_TEXT") -public class DenwisValueDvCodedText6 implements DenwisValueChoice6 { +public class DenwisValueDvCodedText6 implements RMEntity, DenwisValueChoice6 { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java index 6b7c6a8fc..7147113d8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java @@ -4,10 +4,11 @@ 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 @OptionFor("DV_TEXT") -public class DenwisValueDvText implements DenwisValueChoice { +public class DenwisValueDvText implements RMEntity, DenwisValueChoice { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java index 111e22d17..e7d0d9c00 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java @@ -4,10 +4,11 @@ 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 @OptionFor("DV_TEXT") -public class DenwisValueDvText2 implements DenwisValueChoice2 { +public class DenwisValueDvText2 implements RMEntity, DenwisValueChoice2 { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java index bbf382bf4..9a442c7fa 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java @@ -4,10 +4,11 @@ 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 @OptionFor("DV_TEXT") -public class DenwisValueDvText3 implements DenwisValueChoice3 { +public class DenwisValueDvText3 implements RMEntity, DenwisValueChoice3 { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java index a7483b555..73d424609 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java @@ -4,10 +4,11 @@ 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 @OptionFor("DV_TEXT") -public class DenwisValueDvText4 implements DenwisValueChoice4 { +public class DenwisValueDvText4 implements RMEntity, DenwisValueChoice4 { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java index 1a856a235..687b8db99 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java @@ -4,10 +4,11 @@ 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 @OptionFor("DV_TEXT") -public class DenwisValueDvText5 implements DenwisValueChoice5 { +public class DenwisValueDvText5 implements RMEntity, DenwisValueChoice5 { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java index a768a4299..ce3b256fd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java @@ -4,10 +4,11 @@ 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 @OptionFor("DV_TEXT") -public class DenwisValueDvText6 implements DenwisValueChoice6 { +public class DenwisValueDvText6 implements RMEntity, DenwisValueChoice6 { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java index 0ee38a1eb..b6f84d860 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java @@ -10,10 +10,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") -public class FirstSymptomsCluster { +public class FirstSymptomsCluster implements LocatableEntity { /** * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/First symptoms/Symptom/Sign name */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java index fc5ce602e..acf81bdc8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.clinical_frailty_scale.v1") -public class FrailtyObservation { +public class FrailtyObservation implements EntryEntity { /** * open_eREACT-Care/Background/Frailty/Any point in time event/Assessment */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java index 6aa0739dd..110337f18 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java @@ -11,11 +11,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.height.v2") -public class HeightObservation { +public class HeightObservation implements EntryEntity { /** * open_eREACT-Care/Background/Height/Any event/Height/Length */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java index c681da229..109397750 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") -public class KeyCovidSymptomCluster { +public class KeyCovidSymptomCluster implements LocatableEntity { /** * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Key Covid symptom/Symptom/Sign name */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java index 458a462d7..7e5c5d683 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java @@ -10,11 +10,12 @@ 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; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.laboratory_test_result.v1") -public class LatestCovid19TestObservation { +public class LatestCovid19TestObservation implements EntryEntity { /** * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Any event/Test name */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvCodedText.java index d8cf5e406..9e22f2219 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvCodedText.java @@ -3,10 +3,11 @@ 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 @OptionFor("DV_CODED_TEXT") -public class LatestCovid19TestOverallTestStatusDvCodedText implements LatestCovid19TestOverallTestStatusChoice { +public class LatestCovid19TestOverallTestStatusDvCodedText implements RMEntity, LatestCovid19TestOverallTestStatusChoice { /** * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Any event/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java index e27ef3d7b..10b85f6d1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java @@ -4,10 +4,11 @@ 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 @OptionFor("DV_TEXT") -public class LatestCovid19TestOverallTestStatusDvText implements LatestCovid19TestOverallTestStatusChoice { +public class LatestCovid19TestOverallTestStatusDvText implements RMEntity, LatestCovid19TestOverallTestStatusChoice { /** * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Any event/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java index 0cc6f1eab..b20c8acee 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java @@ -5,9 +5,10 @@ import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class LatestCovid19TestTestRequestDetailsCluster { +public class LatestCovid19TestTestRequestDetailsCluster implements LocatableEntity { /** * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Test request details/Requester */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java index 35e2a8a50..cfcc7f33a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java @@ -8,11 +8,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") -public class MedicationEvaluation { +public class MedicationEvaluation implements EntryEntity { /** * open_eREACT-Care/Background/Medication/Synopsis */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java index 526dd6ee4..baa52c46f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") -public class NeuroSymptomCluster { +public class NeuroSymptomCluster implements LocatableEntity { /** * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Neuro symptom/Symptom/Sign name */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java index 16d2bb6bc..79977d8f2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java @@ -10,11 +10,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.news2.v1") -public class News2ScoreObservation { +public class News2ScoreObservation implements EntryEntity { /** * open_eREACT-Care/Assessment/NEWS2/NEWS2 Score/Any point in time event/Respiration rate */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java index a70ee4802..ffea28aae 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java @@ -4,10 +4,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") -public class News2Section { +public class News2Section implements LocatableEntity { /** * open_eREACT-Care/Assessment/NEWS2/Temperature */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java index d807f67f8..660c64f6f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") -public class OtherSymptomCluster { +public class OtherSymptomCluster implements LocatableEntity { /** * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Other symptom/Symptom/Sign name */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java index 943887c42..54dc7b97e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java @@ -8,11 +8,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") -public class PastHistoryEvaluation { +public class PastHistoryEvaluation implements EntryEntity { /** * open_eREACT-Care/Background/Past history/Synopsis */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java index 2b0501b6f..2a004c189 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java @@ -10,11 +10,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.pulse.v1") -public class PulseObservation { +public class PulseObservation implements EntryEntity { /** * open_eREACT-Care/Assessment/NEWS2/Pulse/Any event/Pulse Rate */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java index d0c7fa3a9..4a006a3f5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.pulse_oximetry.v1") -public class PulseOximetryObservation { +public class PulseOximetryObservation implements EntryEntity { /** * open_eREACT-Care/Assessment/NEWS2/Pulse oximetry/Any event/SpO₂ */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java index a60a9e23d..f6d35fa69 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java @@ -7,11 +7,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-EVALUATION.recommendation.v1") -public class RecommendationEvaluation { +public class RecommendationEvaluation implements EntryEntity { /** * open_eREACT-Care/Response/Recommendation/Recommendation */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java index aad1a8d6f..5237c3192 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java @@ -1,17 +1,25 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class RecommendationRecommendationElement { +public class RecommendationRecommendationElement implements LocatableEntity { /** * open_eREACT-Care/Response/Recommendation/Recommendation */ @Path("/value|value") private String value; + /** + * open_eREACT-Care/Response/Recommendation/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(String value) { this.value = value; } @@ -19,4 +27,12 @@ public void setValue(String value) { public String getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java index 2bfdc19cb..5aec7525d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java @@ -10,11 +10,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.respiration.v1") -public class RespirationsObservation { +public class RespirationsObservation implements EntryEntity { /** * open_eREACT-Care/Assessment/NEWS2/Respirations/Any event/Rate */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java index c463a1e9a..55170a5b0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java @@ -5,10 +5,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") -public class ResponseSection { +public class ResponseSection implements LocatableEntity { /** * open_eREACT-Care/Response/Recommendation */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java index a3b6aef6d..8ff487cb4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java @@ -1,16 +1,24 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class SepsisScreening999FlagElement { +public class SepsisScreening999FlagElement implements LocatableEntity { /** * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/999 Flag */ @Path("/value|defining_code") private N999FlagDefiningCode value; + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(N999FlagDefiningCode value) { this.value = value; } @@ -18,4 +26,12 @@ public void setValue(N999FlagDefiningCode value) { public N999FlagDefiningCode getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java index fe7c6704e..0bdd57c07 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java @@ -1,16 +1,24 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class SepsisScreeningAmberFlagAcuteElement { +public class SepsisScreeningAmberFlagAcuteElement implements LocatableEntity { /** * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/Amber flag (acute) */ @Path("/value|defining_code") private AmberFlagAcuteDefiningCode value; + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(AmberFlagAcuteDefiningCode value) { this.value = value; } @@ -18,4 +26,12 @@ public void setValue(AmberFlagAcuteDefiningCode value) { public AmberFlagAcuteDefiningCode getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java index 43d8ee998..7a66637fb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java @@ -1,11 +1,19 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class SepsisScreeningLikelySourceOfInfectionElement { +public class SepsisScreeningLikelySourceOfInfectionElement implements LocatableEntity { + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/value */ @@ -13,6 +21,14 @@ public class SepsisScreeningLikelySourceOfInfectionElement { @Choice private SepsisScreeningValueChoice value; + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setValue(SepsisScreeningValueChoice value) { this.value = value; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java index 877452042..640a1c759 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java @@ -8,11 +8,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.sepsis_screening_tool.v0") -public class SepsisScreeningObservation { +public class SepsisScreeningObservation implements EntryEntity { /** * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/Risk factors for sepsis */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java index 35f727326..869b97541 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java @@ -1,16 +1,24 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class SepsisScreeningRedFlagAcuteElement { +public class SepsisScreeningRedFlagAcuteElement implements LocatableEntity { /** * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/Red flag (acute) */ @Path("/value|defining_code") private RedFlagAcuteDefiningCode value; + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(RedFlagAcuteDefiningCode value) { this.value = value; } @@ -18,4 +26,12 @@ public void setValue(RedFlagAcuteDefiningCode value) { public RedFlagAcuteDefiningCode getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java index e06f630b9..ed044f07a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java @@ -1,16 +1,24 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class SepsisScreeningRiskFactorsForSepsisElement { +public class SepsisScreeningRiskFactorsForSepsisElement implements LocatableEntity { /** * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/Risk factors for sepsis */ @Path("/value|defining_code") private RiskFactorsForSepsisDefiningCode value; + /** + * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(RiskFactorsForSepsisDefiningCode value) { this.value = value; } @@ -18,4 +26,12 @@ public void setValue(RiskFactorsForSepsisDefiningCode value) { public RiskFactorsForSepsisDefiningCode getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java index ec8f3f96a..66e250afc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java @@ -3,10 +3,11 @@ 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 @OptionFor("DV_CODED_TEXT") -public class SepsisScreeningValueDvCodedText implements SepsisScreeningValueChoice { +public class SepsisScreeningValueDvCodedText implements RMEntity, SepsisScreeningValueChoice { /** * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java index 9beedc211..1fd375a65 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java @@ -4,10 +4,11 @@ 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 @OptionFor("DV_TEXT") -public class SepsisScreeningValueDvText implements SepsisScreeningValueChoice { +public class SepsisScreeningValueDvText implements RMEntity, SepsisScreeningValueChoice { /** * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java index 119702aba..bf138623a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java @@ -4,10 +4,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") -public class SepsisSection { +public class SepsisSection implements LocatableEntity { /** * open_eREACT-Care/Assessment/Sepsis/Sepsis screening */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java index b6e8bb6ba..582461bcc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java @@ -10,12 +10,13 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; import org.ehrbase.client.classgenerator.shareddefinition.Transition; @Entity @Archetype("openEHR-EHR-ACTION.service.v0") -public class ServiceAction { +public class ServiceAction implements EntryEntity { /** * open_eREACT-Care/Response/Service/Service name */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java index 60a98c15e..6983894de 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java @@ -9,9 +9,10 @@ import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class ServiceRequestCurrentActivityActivity { +public class ServiceRequestCurrentActivityActivity implements LocatableEntity { /** * open_eREACT-Care/Response/Service request/Current Activity/Service name */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java index 3f28ceb79..efd8cc977 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-INSTRUCTION.service_request.v1") -public class ServiceRequestInstruction { +public class ServiceRequestInstruction implements EntryEntity { /** * open_eREACT-Care/Response/Service request/Current Activity */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java index bee4e2dc4..6476ec000 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java @@ -1,17 +1,25 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datavalues.DvCodedText; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class ServiceRequestReasonForRequestElement { +public class ServiceRequestReasonForRequestElement implements LocatableEntity { /** * open_eREACT-Care/Response/Service request/Current Activity/Reason for request */ @Path("/value") private DvCodedText value; + /** + * open_eREACT-Care/Response/Service request/Current Activity/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(DvCodedText value) { this.value = value; } @@ -19,4 +27,12 @@ public void setValue(DvCodedText value) { public DvCodedText getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java index 252d28d39..190d05035 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java @@ -4,10 +4,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") -public class SituationSection { +public class SituationSection implements LocatableEntity { /** * open_eREACT-Care/Situation/Story/History */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java index dd71adc8b..19d6fec8a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.story.v1") -public class StoryHistoryObservation { +public class StoryHistoryObservation implements EntryEntity { /** * open_eREACT-Care/Situation/Story/History/Any event/Soft signs */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java index eba99cc51..4c503dffa 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java @@ -1,17 +1,25 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class StoryHistorySoftSignsElement { +public class StoryHistorySoftSignsElement implements LocatableEntity { /** * open_eREACT-Care/Situation/Story/History/Any event/Soft signs */ @Path("/value|value") private String value; + /** + * open_eREACT-Care/Situation/Story/History/Any event/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(String value) { this.value = value; } @@ -19,4 +27,12 @@ public void setValue(String value) { public String getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java index cc9e05483..5b4b6fb80 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java @@ -10,11 +10,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.body_temperature.v1") -public class TemperatureObservation { +public class TemperatureObservation implements EntryEntity { /** * open_eREACT-Care/Assessment/NEWS2/Temperature/Any event/Temperature */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java index 8eee1062f..6433e6b5c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java @@ -11,11 +11,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.body_weight.v2") -public class WeightObservation { +public class WeightObservation implements EntryEntity { /** * open_eREACT-Care/Background/Weight/Any event/Weight */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java index 9c457c5b0..210535330 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java @@ -15,6 +15,7 @@ import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.AbteilungsfallCluster; import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.VersorgungsfallCluster; import org.ehrbase.client.classgenerator.examples.patientenaufenthaltcomposition.definition.VersorgungsortAdminEntry; +import org.ehrbase.client.classgenerator.interfaces.CompositionEntity; import org.ehrbase.client.classgenerator.shareddefinition.Category; import org.ehrbase.client.classgenerator.shareddefinition.Language; import org.ehrbase.client.classgenerator.shareddefinition.Setting; @@ -24,7 +25,7 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.event_summary.v0") @Template("Patientenaufenthalt") -public class PatientenaufenthaltComposition { +public class PatientenaufenthaltComposition implements CompositionEntity { /** * Patientenaufenthalt/context/Versorgungsfall */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java index 14425e2ed..6de5db09d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java @@ -5,10 +5,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.case_identification.v0") -public class AbteilungsfallCluster { +public class AbteilungsfallCluster implements LocatableEntity { /** * Patientenaufenthalt/context/Abteilungsfall/Zugehörige Abteilungsfall-Kennung */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java index bbfbeae4f..930fbe85f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java @@ -8,10 +8,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.device.v1") -public class DetailsZumBettCluster { +public class DetailsZumBettCluster implements LocatableEntity { /** * Patientenaufenthalt/Versorgungsort/Standort/Details zum Bett/Gerätename */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java index 91792b1e5..6aec9bbad 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java @@ -5,10 +5,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") -public class StandortCluster { +public class StandortCluster implements LocatableEntity { /** * Patientenaufenthalt/Versorgungsort/Standort/Standorttyp */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java index d8a2a35a6..4bca9e5f1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java @@ -5,10 +5,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.case_identification.v0") -public class VersorgungsfallCluster { +public class VersorgungsfallCluster implements LocatableEntity { /** * Patientenaufenthalt/context/Versorgungsfall/Zugehörige Versorgungsfall-Kennung */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java index fdc7a38ff..f101e379f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java @@ -7,11 +7,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.hospitalization.v0") -public class VersorgungsortAdminEntry { +public class VersorgungsortAdminEntry implements EntryEntity { /** * Patientenaufenthalt/Versorgungsort/Beginn */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java index d8fdb71c6..5a04af5f4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java @@ -15,6 +15,7 @@ import org.ehrbase.client.annotations.Template; import org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition.SchwangerschaftsstatusObservation; import org.ehrbase.client.classgenerator.examples.schwangerschaftsstatuscomposition.definition.StatusDefiningCode; +import org.ehrbase.client.classgenerator.interfaces.CompositionEntity; import org.ehrbase.client.classgenerator.shareddefinition.Category; import org.ehrbase.client.classgenerator.shareddefinition.Language; import org.ehrbase.client.classgenerator.shareddefinition.Setting; @@ -24,7 +25,7 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.registereintrag.v1") @Template("Schwangerschaftsstatus") -public class SchwangerschaftsstatusComposition { +public class SchwangerschaftsstatusComposition implements CompositionEntity { /** * Schwangerschaftsstatus/context/Erweiterung */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java index dfccac12c..09868fbc0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java @@ -8,11 +8,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.pregnancy_status.v0") -public class SchwangerschaftsstatusObservation { +public class SchwangerschaftsstatusObservation implements EntryEntity { /** * Schwangerschaftsstatus/Schwangerschaftsstatus/Beliebiges Ereignis/Status */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java index bdb6183ab..3358d0ed7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java @@ -14,6 +14,7 @@ import org.ehrbase.client.annotations.Template; import org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition.EventsummaryCluster; import org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition.SmicsErgebnisObservation; +import org.ehrbase.client.classgenerator.interfaces.CompositionEntity; import org.ehrbase.client.classgenerator.shareddefinition.Category; import org.ehrbase.client.classgenerator.shareddefinition.Language; import org.ehrbase.client.classgenerator.shareddefinition.Setting; @@ -23,7 +24,7 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.report.v1") @Template("SmICS-Befund") -public class SmICSBefundComposition { +public class SmICSBefundComposition implements CompositionEntity { /** * SmICS Befund/context/Bericht ID */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java index 60b31c9da..1eb6d5ded 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java @@ -5,10 +5,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_panel.v0") -public class AntibiogrammCluster { +public class AntibiogrammCluster implements LocatableEntity { /** * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Antibiogramm/Laboranalyt-Resultat */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java index 1928a0e76..0873b4e26 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java @@ -9,10 +9,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.erregerdetails.v1") -public class ErregerdetailsCluster { +public class ErregerdetailsCluster implements LocatableEntity { /** * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Keim Subtyp */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java index 29717e567..af7eac933 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java @@ -1,17 +1,25 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class ErregerdetailsKeimSubtypElement { +public class ErregerdetailsKeimSubtypElement implements LocatableEntity { /** * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Keim Subtyp */ @Path("/value|value") private String value; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(String value) { this.value = value; } @@ -19,4 +27,12 @@ public void setValue(String value) { public String getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java index 758ffaf17..b0f1b6a28 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java @@ -4,9 +4,10 @@ import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class ErregerdetailsResistenzmechanismusCluster { +public class ErregerdetailsResistenzmechanismusCluster implements LocatableEntity { /** * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Resistenzmechanismus/Resistenzmechanismus Bezeichnung */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java index b7ae8683f..90878f9a5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java @@ -1,16 +1,24 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class ErregertypisierungArtDerTypisierungElement { +public class ErregertypisierungArtDerTypisierungElement implements LocatableEntity { /** * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregertypisierung/Art der Typisierung */ @Path("/value|defining_code") private ArtDerTypisierungDefiningCode value; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregertypisierung/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(ArtDerTypisierungDefiningCode value) { this.value = value; } @@ -18,4 +26,12 @@ public void setValue(ArtDerTypisierungDefiningCode value) { public ArtDerTypisierungDefiningCode getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java index 6a7233930..36364af24 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java @@ -6,10 +6,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.molekulare_typisierung.v0") -public class ErregertypisierungCluster { +public class ErregertypisierungCluster implements LocatableEntity { /** * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregertypisierung/Art der Typisierung */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java index f4a1d5c7c..49e62b658 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java @@ -1,17 +1,25 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datavalues.encapsulated.DvMultimedia; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class ErregertypisierungErgebnisElement { +public class ErregertypisierungErgebnisElement implements LocatableEntity { /** * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregertypisierung/Ergebnis */ @Path("/value") private DvMultimedia value; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregertypisierung/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(DvMultimedia value) { this.value = value; } @@ -19,4 +27,12 @@ public void setValue(DvMultimedia value) { public DvMultimedia getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java index 18b18d42e..a53408590 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java @@ -5,9 +5,10 @@ import java.util.List; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class EventsummaryBeteiligtePersonenCluster { +public class EventsummaryBeteiligtePersonenCluster implements LocatableEntity { /** * SmICS Befund/context/Eventsummary/Beteiligte Personen/Art der Person */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java index 74c1079ed..b9cedf235 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java @@ -6,10 +6,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.eventsummary.v0") -public class EventsummaryCluster { +public class EventsummaryCluster implements LocatableEntity { /** * SmICS Befund/context/Eventsummary/Fallidentifikation */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java index 5fa86d6df..c36815199 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java @@ -1,11 +1,19 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class EventsummaryIdDerPersonElement { +public class EventsummaryIdDerPersonElement implements LocatableEntity { + /** + * SmICS Befund/context/Eventsummary/Beteiligte Personen/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + /** * SmICS Befund/context/Eventsummary/Beteiligte Personen/value */ @@ -13,6 +21,14 @@ public class EventsummaryIdDerPersonElement { @Choice private EventsummaryValueChoice value; + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + public void setValue(EventsummaryValueChoice value) { this.value = value; } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java index e02f56f93..224e38e2f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java @@ -4,10 +4,11 @@ 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 @OptionFor("DV_IDENTIFIER") -public class EventsummaryValueDvIdentifier implements EventsummaryValueChoice { +public class EventsummaryValueDvIdentifier implements RMEntity, EventsummaryValueChoice { /** * SmICS Befund/context/Eventsummary/Beteiligte Personen/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java index ee9625cdd..a89c4f4d8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java @@ -4,10 +4,11 @@ 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 @OptionFor("DV_URI") -public class EventsummaryValueDvUri implements EventsummaryValueChoice { +public class EventsummaryValueDvUri implements RMEntity, EventsummaryValueChoice { /** * SmICS Befund/context/Eventsummary/Beteiligte Personen/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java index e35bf7b8e..470a0e10d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java @@ -8,10 +8,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") -public class LaboranalytResultatCluster { +public class LaboranalytResultatCluster implements LocatableEntity { /** * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Antibiogramm/Laboranalyt-Resultat/Antibiotikum */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java index 1c644c026..753c9676f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java @@ -1,17 +1,25 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.Long; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class SmicsErgebnisAnzahlDerErregernachweiseElement { +public class SmicsErgebnisAnzahlDerErregernachweiseElement implements LocatableEntity { /** * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Anzahl der Erregernachweise */ @Path("/value|magnitude") private Long value; + /** + * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(Long value) { this.value = value; } @@ -19,4 +27,12 @@ public void setValue(Long value) { public Long getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java index 9c36496b9..0f1b5da1e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java @@ -10,11 +10,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.smics_befund.v1") -public class SmicsErgebnisObservation { +public class SmicsErgebnisObservation implements EntryEntity { /** * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/SmICS Ergebniskategorie */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java index dcf23ec8b..10eee09b7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") -public class StandortCluster { +public class StandortCluster implements LocatableEntity { /** * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Standort/Standorttyp */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java index b913801af..9f712992f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java @@ -16,6 +16,7 @@ import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.AufnahmedatenAdminEntry; import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.EntlassungsdatenAdminEntry; import org.ehrbase.client.classgenerator.examples.stationarerversorgungsfallcomposition.definition.FalltypDefiningCode; +import org.ehrbase.client.classgenerator.interfaces.CompositionEntity; import org.ehrbase.client.classgenerator.shareddefinition.Category; import org.ehrbase.client.classgenerator.shareddefinition.Language; import org.ehrbase.client.classgenerator.shareddefinition.Setting; @@ -25,7 +26,7 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.fall.v0") @Template("Stationärer Versorgungsfall") -public class StationarerVersorgungsfallComposition { +public class StationarerVersorgungsfallComposition implements CompositionEntity { /** * Stationärer Versorgungsfall/context/Falltyp */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java index dd4514905..fa0299950 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.admission.v0") -public class AufnahmedatenAdminEntry { +public class AufnahmedatenAdminEntry implements EntryEntity { /** * Stationärer Versorgungsfall/Aufnahmedaten/Versorgungsfallgrund */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java index 274e75019..911db6698 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.discharge_summary.v0") -public class EntlassungsdatenAdminEntry { +public class EntlassungsdatenAdminEntry implements EntryEntity { /** * Stationärer Versorgungsfall/Entlassungsdaten/Art der Entlassung */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java index c04ca25d6..1d1574b59 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java @@ -16,6 +16,7 @@ import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesEvaluation; import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesObservation; import org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition.TestAllTypesSection; +import org.ehrbase.client.classgenerator.interfaces.CompositionEntity; import org.ehrbase.client.classgenerator.shareddefinition.Category; import org.ehrbase.client.classgenerator.shareddefinition.Language; import org.ehrbase.client.classgenerator.shareddefinition.Setting; @@ -25,7 +26,7 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.test_all_types.v1") @Template("test_all_types.en.v1") -public class TestAllTypesEnV1Composition { +public class TestAllTypesEnV1Composition implements CompositionEntity { /** * Test all types/context/context coded text */ @@ -72,19 +73,19 @@ public class TestAllTypesEnV1Composition { * Test all types/Test all types */ @Path("/content[openEHR-EHR-OBSERVATION.test_all_types.v1]") - private List testAllTypesTestAllTypes; + private List testAllTypes; /** * Test all types/Test all types */ @Path("/content[openEHR-EHR-EVALUATION.test_all_types.v1]") - private List testAllTypesTestAllTypes2; + private List testAllTypes2; /** * Test all types/Test all types */ @Path("/content[openEHR-EHR-SECTION.test_all_types.v1]") - private List testAllTypesTestAllTypes3; + private List testAllTypes3; /** * Test all types/composer @@ -176,28 +177,28 @@ public Setting getSettingDefiningCode() { return this.settingDefiningCode ; } - public void setTestAllTypesTestAllTypes(List testAllTypesTestAllTypes) { - this.testAllTypesTestAllTypes = testAllTypesTestAllTypes; + public void setTestAllTypes(List testAllTypes) { + this.testAllTypes = testAllTypes; } - public List getTestAllTypesTestAllTypes() { - return this.testAllTypesTestAllTypes ; + public List getTestAllTypes() { + return this.testAllTypes ; } - public void setTestAllTypesTestAllTypes2(List testAllTypesTestAllTypes2) { - this.testAllTypesTestAllTypes2 = testAllTypesTestAllTypes2; + public void setTestAllTypes2(List testAllTypes2) { + this.testAllTypes2 = testAllTypes2; } - public List getTestAllTypesTestAllTypes2() { - return this.testAllTypesTestAllTypes2 ; + public List getTestAllTypes2() { + return this.testAllTypes2 ; } - public void setTestAllTypesTestAllTypes3(List testAllTypesTestAllTypes3) { - this.testAllTypesTestAllTypes3 = testAllTypesTestAllTypes3; + public void setTestAllTypes3(List testAllTypes3) { + this.testAllTypes3 = testAllTypes3; } - public List getTestAllTypesTestAllTypes3() { - return this.testAllTypesTestAllTypes3 ; + public List getTestAllTypes3() { + return this.testAllTypes3 ; } public void setComposer(PartyProxy composer) { diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java index ddef03d1a..d4a2e730f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1CompositionContainment.java @@ -37,11 +37,11 @@ public class TestAllTypesEnV1CompositionContainment extends Containment { public SelectAqlField SETTING_DEFINING_CODE = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/context/setting|defining_code", "settingDefiningCode", Setting.class, this); - public ListSelectAqlField TEST_ALL_TYPES_TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-OBSERVATION.test_all_types.v1]", "testAllTypesTestAllTypes", TestAllTypesObservation.class, this); + public ListSelectAqlField TEST_ALL_TYPES = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-OBSERVATION.test_all_types.v1]", "testAllTypes", TestAllTypesObservation.class, this); - public ListSelectAqlField TEST_ALL_TYPES_TEST_ALL_TYPES2 = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-EVALUATION.test_all_types.v1]", "testAllTypesTestAllTypes2", TestAllTypesEvaluation.class, this); + public ListSelectAqlField TEST_ALL_TYPES2 = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-EVALUATION.test_all_types.v1]", "testAllTypes2", TestAllTypesEvaluation.class, this); - public ListSelectAqlField TEST_ALL_TYPES_TEST_ALL_TYPES3 = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-SECTION.test_all_types.v1]", "testAllTypesTestAllTypes3", TestAllTypesSection.class, this); + public ListSelectAqlField TEST_ALL_TYPES3 = new ListAqlFieldImp(TestAllTypesEnV1Composition.class, "/content[openEHR-EHR-SECTION.test_all_types.v1]", "testAllTypes3", TestAllTypesSection.class, this); public SelectAqlField COMPOSER = new AqlFieldImp(TestAllTypesEnV1Composition.class, "/composer", "composer", PartyProxy.class, this); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java index 26ab04010..7eb7f8090 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java @@ -7,12 +7,13 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; import org.ehrbase.client.classgenerator.shareddefinition.Transition; @Entity @Archetype("openEHR-EHR-ACTION.test_all_types.v1") -public class TestAllTypesAction { +public class TestAllTypesAction implements EntryEntity { /** * Test all types/Test all types/section 2/section 3/Test all types/Test all types */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java index dde160783..dcbb330da 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java @@ -6,11 +6,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.test_all_types.v1") -public class TestAllTypesAdminEntry { +public class TestAllTypesAdminEntry implements EntryEntity { /** * Test all types/Test all types/section 2/Test all types/count 3 */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java index 9691511e7..5c3128bb2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java @@ -4,10 +4,11 @@ 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 @OptionFor("DV_COUNT") -public class TestAllTypesChoiceDvCount implements TestAllTypesChoiceChoice { +public class TestAllTypesChoiceDvCount implements RMEntity, TestAllTypesChoiceChoice { /** * Test all types/Test all types/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java index 69d0750f9..5eff10429 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java @@ -5,10 +5,11 @@ 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 @OptionFor("DV_QUANTITY") -public class TestAllTypesChoiceDvQuantity implements TestAllTypesChoiceChoice { +public class TestAllTypesChoiceDvQuantity implements RMEntity, TestAllTypesChoiceChoice { /** * Test all types/Test all types/value/value */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java index d80b11201..2a3846a7e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java @@ -5,10 +5,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.test_all_types.v1") -public class TestAllTypesCluster { +public class TestAllTypesCluster implements LocatableEntity { /** * Test all types/Test all types/section 2/section 3/Test all types/Test all types/cluster 5/cluster 6/boolean 2 */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java index 8c430aa96..525f3d3e4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java @@ -12,11 +12,12 @@ 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; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-EVALUATION.test_all_types.v1") -public class TestAllTypesEvaluation { +public class TestAllTypesEvaluation implements EntryEntity { /** * Test all types/Test all types/uri */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java index ffcf710fc..4f643d146 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java @@ -9,11 +9,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-INSTRUCTION.test_all_types.v1") -public class TestAllTypesInstruction { +public class TestAllTypesInstruction implements EntryEntity { /** * Test all types/Test all types/section 2/section 3/Test all types/Current Activity/partial date */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java index 994328670..76095747f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java @@ -18,11 +18,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.test_all_types.v1") -public class TestAllTypesObservation { +public class TestAllTypesObservation implements EntryEntity { /** * Test all types/Test all types/Cualquier evento/text */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java index 53e833ef3..8b8e3700e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java @@ -5,10 +5,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-SECTION.test_all_types.v1") -public class TestAllTypesSection { +public class TestAllTypesSection implements LocatableEntity { /** * Test all types/Test all types/section 2/section 3/Test all types */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java index 530c3b0e2..84c93253a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java @@ -14,6 +14,7 @@ import org.ehrbase.client.annotations.Template; import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.BefundObservation; import org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition.FallidentifikationCluster; +import org.ehrbase.client.classgenerator.interfaces.CompositionEntity; import org.ehrbase.client.classgenerator.shareddefinition.Category; import org.ehrbase.client.classgenerator.shareddefinition.Language; import org.ehrbase.client.classgenerator.shareddefinition.Setting; @@ -23,7 +24,7 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.report-result.v1") @Template("Virologischer Befund") -public class VirologischerBefundComposition { +public class VirologischerBefundComposition implements CompositionEntity { /** * Virologischer Befund/context/Bericht-ID */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java index 58e1dae43..3bb613e09 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.anatomical_location.v1") -public class AnatomischeLokalisationCluster { +public class AnatomischeLokalisationCluster implements LocatableEntity { /** * Virologischer Befund/Befund/Jedes Ereignis/Probe/Anatomische Lokalisation/Name der Körperstelle */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java index d5e09406a..22095e07c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java @@ -1,17 +1,25 @@ package org.ehrbase.client.classgenerator.examples.virologischerbefundcomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity -public class BefundAnforderungElement { +public class BefundAnforderungElement implements LocatableEntity { /** * Virologischer Befund/Befund/Details der Testanforderung/Anforderung */ @Path("/value|value") private String value; + /** + * Virologischer Befund/Befund/Details der Testanforderung/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + public void setValue(String value) { this.value = value; } @@ -19,4 +27,12 @@ public void setValue(String value) { public String getValue() { return this.value ; } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java index 04d05740b..acfbb2d5b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java @@ -10,11 +10,12 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; import org.ehrbase.client.classgenerator.shareddefinition.Language; @Entity @Archetype("openEHR-EHR-OBSERVATION.laboratory_test_result.v1") -public class BefundObservation { +public class BefundObservation implements EntryEntity { /** * Virologischer Befund/Befund/Jedes Ereignis/Labortest-Bezeichnung */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java index 8f245d818..24e7aa6ce 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") -public class EinsenderstandortCluster { +public class EinsenderstandortCluster implements LocatableEntity { /** * Virologischer Befund/Befund/Details der Testanforderung/Einsenderstandort/Standorttyp */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java index f85743d31..e65a73f46 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java @@ -7,10 +7,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") -public class EmpfangerstandortCluster { +public class EmpfangerstandortCluster implements LocatableEntity { /** * Virologischer Befund/Befund/Empfängerstandort/Standorttyp */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java index 66abe1dd8..526b42dfd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java @@ -5,10 +5,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.case_identification.v0") -public class FallidentifikationCluster { +public class FallidentifikationCluster implements LocatableEntity { /** * Virologischer Befund/context/Fallidentifikation/Fall-Kennung */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java index ea4eec148..e2c05fcab 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java @@ -5,10 +5,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_panel.v0") -public class KulturCluster { +public class KulturCluster implements LocatableEntity { /** * Virologischer Befund/Befund/Jedes Ereignis/Kultur/Pro Virus */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java index e997c55c3..818ae736f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java @@ -10,10 +10,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") -public class ProVirusCluster { +public class ProVirusCluster implements LocatableEntity { /** * Virologischer Befund/Befund/Jedes Ereignis/Kultur/Pro Virus/Analyseergebnis-Reihenfolge */ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java index 6ba0c941a..87cfe47f5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java @@ -9,10 +9,11 @@ import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity @Archetype("openEHR-EHR-CLUSTER.specimen.v1") -public class ProbeCluster { +public class ProbeCluster implements LocatableEntity { /** * Virologischer Befund/Befund/Jedes Ereignis/Probe/Probenart */ diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java index 35b17b247..a930e289f 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java @@ -19,6 +19,11 @@ package org.ehrbase.client.classgenerator; +import com.nedap.archie.rm.archetyped.Locatable; +import com.nedap.archie.rm.composition.Composition; +import com.nedap.archie.rm.composition.Entry; +import com.nedap.archie.rm.datastructures.IntervalEvent; +import com.nedap.archie.rm.datastructures.PointEvent; import com.nedap.archie.rm.datatypes.CodePhrase; import com.nedap.archie.rminfo.ArchieRMInfoLookup; import com.squareup.javapoet.AnnotationSpec; @@ -39,6 +44,12 @@ import org.ehrbase.client.annotations.Path; import org.ehrbase.client.annotations.Template; import org.ehrbase.client.classgenerator.config.RmClassGeneratorConfig; +import org.ehrbase.client.classgenerator.interfaces.CompositionEntity; +import org.ehrbase.client.classgenerator.interfaces.EntryEntity; +import org.ehrbase.client.classgenerator.interfaces.IntervalEventEntity; +import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; +import org.ehrbase.client.classgenerator.interfaces.PointEventEntity; +import org.ehrbase.client.classgenerator.interfaces.RMEntity; import org.ehrbase.client.classgenerator.shareddefinition.Category; import org.ehrbase.client.classgenerator.shareddefinition.Language; import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @@ -47,6 +58,7 @@ import org.ehrbase.client.classgenerator.shareddefinition.Transition; import org.ehrbase.client.openehrclient.VersionUid; import org.ehrbase.serialisation.util.SnakeCase; +import org.ehrbase.serialisation.walker.Walker; import org.ehrbase.terminology.client.terminology.TermDefinition; import org.ehrbase.terminology.client.terminology.ValueSet; import org.ehrbase.util.reflection.ReflectionHelper; @@ -62,6 +74,7 @@ import javax.lang.model.element.Modifier; import java.lang.reflect.Field; +import java.lang.reflect.Type; import java.util.Arrays; import java.util.Collections; import java.util.Deque; @@ -155,27 +168,16 @@ private TypeSpec.Builder build(ClassGeneratorContext context, WebTemplateNode ne classBuilder.addAnnotation(archetypeAnnotation); } + classBuilder.addSuperinterface(findRMInterface(next)); + if (next.getChildren().stream().anyMatch(n -> n.getRmType().equals("EVENT"))) { WebTemplateNode event = next.getChildren().stream().filter(n -> n.getRmType().equals("EVENT")).findAny().get(); - WebTemplateNode pointEvent = new WebTemplateNode(event); - WebTemplateNode intervalEvent = new WebTemplateNode(event); - pointEvent.setRmType("POINT_EVENT"); - intervalEvent.setRmType("INTERVAL_EVENT"); - WebTemplateNode width = new WebTemplateNode(); - width.setId("width"); - width.setName("width"); - width.setRmType("DV_DURATION"); - width.setMax(1); - width.setAqlPath(event.getAqlPath() + "/width"); - intervalEvent.getChildren().add(width); - WebTemplateNode math = new WebTemplateNode(); - math.setId("math_function"); - math.setName("math_function"); - math.setRmType("DV_CODED_TEXT"); - math.setMax(1); - math.setAqlPath(event.getAqlPath() + "/math_function"); - intervalEvent.getChildren().add(math); + + Walker.EventHelper eventHelper = new Walker.EventHelper(event).invoke(); + WebTemplateNode pointEvent = eventHelper.getPointEvent(); + WebTemplateNode intervalEvent = eventHelper.getIntervalEvent(); + next.getChildren().add(intervalEvent); next.getChildren().add(pointEvent); next.getChildren().remove(event); @@ -283,6 +285,26 @@ private TypeSpec.Builder build(ClassGeneratorContext context, WebTemplateNode ne return classBuilder; } + private Type findRMInterface(WebTemplateNode next) { + + Class classToBeCreated = RM_INFO_LOOKUP.getClassToBeCreated(next.getRmType()); + + if (Composition.class.isAssignableFrom(classToBeCreated)) { + return CompositionEntity.class; + } else if (Entry.class.isAssignableFrom(classToBeCreated)) { + return EntryEntity.class; + } else if (IntervalEvent.class.isAssignableFrom(classToBeCreated)) { + return IntervalEventEntity.class; + } else if (PointEvent.class.isAssignableFrom(classToBeCreated)) { + return PointEventEntity.class; + } else if (Locatable.class.isAssignableFrom(classToBeCreated)) { + return LocatableEntity.class; + } else { + + return RMEntity.class; + } + } + private Deque pushToUnfiltered( ClassGeneratorContext context, WebTemplateNode node) { @@ -335,10 +357,7 @@ private WebTemplateNode buildRelativeNode(ClassGeneratorContext context, WebTemp matching.forEach( n -> { String relativPath = - FlatPath.removeStart( - new FlatPath(n.getAqlPath()), - new FlatPath(context.nodeDeque.peek().getAqlPath())) - .toString(); + context.nodeDeque.peek().buildRelativPath(n); n.setAqlPath(relativPath); }); return relativeNode; @@ -411,6 +430,8 @@ private Class extractClass(WebTemplateNode endNode) { case "BOOLEAN": return Boolean.class; case "INTEGER": + return Integer.class; + case "LONG": return Long.class; default: return RM_INFO_LOOKUP.getClass(endNode.getRmType()); @@ -494,8 +515,7 @@ private void addField( .addAnnotation( AnnotationSpec.builder(Path.class).addMember(Path.VALUE, "$S", path).build()) .addModifiers(Modifier.PRIVATE) - .addJavadoc( - buildFieldJavadoc(context, node)); + .addJavadoc(buildFieldJavadoc(context, node)); if (addChoiceAnnotation) { builder.addAnnotation(Choice.class); @@ -510,7 +530,8 @@ private void addField( private String buildFieldJavadoc(ClassGeneratorContext context, WebTemplateNode node) { StringJoiner joiner = new StringJoiner("/"); - for (Iterator it = context.unFilteredNodeDeque.descendingIterator(); it.hasNext(); ) { + for (Iterator it = context.unFilteredNodeDeque.descendingIterator(); + it.hasNext(); ) { WebTemplateNode n = it.next(); if (!List.of( "HISTORY", @@ -520,7 +541,7 @@ private String buildFieldJavadoc(ClassGeneratorContext context, WebTemplateNode "ITEM_TABLE", "ITEM_STRUCTURE", "ELEMENT") - .contains(n.getRmType())) { + .contains(n.getRmType())) { joiner.add(n.getName()); } } diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java b/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java index ea719fd6d..6971ca838 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/DefaultNamingStrategy.java @@ -19,6 +19,8 @@ package org.ehrbase.client.classgenerator; +import com.nedap.archie.rminfo.ArchieRMInfoLookup; +import com.nedap.archie.rminfo.RMTypeInfo; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.CaseUtils; @@ -34,6 +36,7 @@ public class DefaultNamingStrategy implements NamingStrategy { + private static final ArchieRMInfoLookup RM_INFO_LOOKUP = ArchieRMInfoLookup.getInstance(); public static final String TERM_DIVIDER = "_"; private ClassGeneratorConfig config; @@ -160,7 +163,7 @@ public String buildFieldName(ClassGeneratorContext context, String path, WebTemp String attributeName = new FlatPath(path).getLast().getAttributeName(); if (!context.nodeDeque.isEmpty()) { - if (StringUtils.isBlank(attributeName) || List.of("defining_code","value").contains(attributeName) ) { + if ((StringUtils.isBlank(attributeName)|| List.of("defining_code","value").contains(attributeName)) && !isEntityAttribute(context,node) ) { name = makeNameUnique(context, node); } else { name = replaceElementName(context, node); @@ -173,7 +176,7 @@ public String buildFieldName(ClassGeneratorContext context, String path, WebTemp if (name.equals("value")) { name = context.nodeDeque.peek().getName(); } - if (context.nodeDeque.peek().getRmType().equals("ELEMENT")) { + if (context.nodeDeque.peek().getRmType().equals("ELEMENT") && !name.equals("feeder_audit")) { name = "value"; } @@ -194,6 +197,13 @@ public String buildFieldName(ClassGeneratorContext context, String path, WebTemp return fieldName; } + private boolean isEntityAttribute(ClassGeneratorContext context, WebTemplateNode node) { + FlatPath relativPath = new FlatPath( context.nodeDeque.peek().buildRelativPath(node)); + RMTypeInfo typeInfo = RM_INFO_LOOKUP.getTypeInfo(context.nodeDeque.peek().getRmType()); + + return relativPath.getChild() == null && typeInfo != null && typeInfo.getAttributes().containsKey(relativPath.getName()); + } + private String normalise(String name, boolean capitalizeFirstLetter) { if (StringUtils.isBlank(name) || name.equals("_")) { return RandomStringUtils.randomAlphabetic(10); diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java b/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java index 26034674e..4fb9ea82a 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/FlattFilter.java @@ -73,6 +73,7 @@ protected boolean skip(WebTemplateNode node, WebTemplate context, Deque derDiagnoseDefiningCode = - generate - .getClasses() + generate.getClasses() .get("org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition") .stream() .filter(t -> t.name.equals("NameDesProblemsDerDiagnoseDefiningCode")) @@ -342,7 +340,7 @@ public void testGenerateEpisode() throws IOException, XmlException { "upperIncluded", "healthCareFacility", "feederAudit", - "feederAudit"); + "feederAudit", "feederAudit", "feederAudit"); writeFiles(generate); } @@ -452,7 +450,7 @@ public void testGenerateSmICS() throws IOException, XmlException { "feederAudit", "feederAudit", "feederAudit", - "feederAudit"); + "feederAudit","feederAudit","feederAudit","feederAudit","feederAudit","feederAudit"); writeFiles(generate); } @@ -473,7 +471,7 @@ public void testGenerateD4LQuestionnaire() throws IOException, XmlException { .flatMap(List::stream) .collect(Collectors.toList()); - assertThat(fieldSpecs).size().isEqualTo(285); + assertThat(fieldSpecs).size().isEqualTo(286); } @Test @@ -688,7 +686,7 @@ public void testGenerateMultiOccurrence() throws IOException, XmlException { new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), - new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit")); + new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"),new Tuple("sampleCount", "java.lang.Long")); writeFiles(generate); } @@ -814,7 +812,7 @@ public void testGenerateVirologyFinding() throws IOException, XmlException { "feederAudit", "feederAudit", "feederAudit", - "feederAudit"); + "feederAudit", "feederAudit"); writeFiles(generate); } @@ -835,7 +833,7 @@ public void testGenerateCorona() throws IOException, XmlException { .flatMap(List::stream) .collect(Collectors.toList()); - assertThat(fieldSpecs).size().isEqualTo(340); + assertThat(fieldSpecs).size().isEqualTo(347); writeFiles(generate); } @@ -861,7 +859,7 @@ public void testGenerateCoronaOptimizerSettingSection() throws IOException, XmlE .flatMap(List::stream) .collect(Collectors.toList()); - assertThat(fieldSpecs).size().isEqualTo(332); + assertThat(fieldSpecs).size().isEqualTo(339); writeFiles(generate); } @@ -887,7 +885,7 @@ public void testGenerateCoronaOptimizerSettingAll() throws IOException, XmlExcep .flatMap(List::stream) .collect(Collectors.toList()); - assertThat(fieldSpecs).size().isEqualTo(296); + assertThat(fieldSpecs).size().isEqualTo(303); writeFiles(generate); } @@ -973,7 +971,7 @@ public void testGenerateReactCare() throws IOException, XmlException { .flatMap(List::stream) .collect(Collectors.toList()); - assertThat(fieldSpecs).size().isEqualTo(390); + assertThat(fieldSpecs).size().isEqualTo(407); writeFiles(generate); } diff --git a/serialisation/pom.xml b/serialisation/pom.xml index 6b699bb4d..d009e296e 100644 --- a/serialisation/pom.xml +++ b/serialisation/pom.xml @@ -102,10 +102,6 @@ assertj-core test - - com.github.ehrbase.openEHR_SDK - test-data - com.google.code.gson gson diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java b/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java index 4d94371f0..f89618ffe 100644 --- a/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java +++ b/serialisation/src/main/java/org/ehrbase/serialisation/walker/Walker.java @@ -21,25 +21,19 @@ import com.nedap.archie.rm.RMObject; import com.nedap.archie.rm.archetyped.Locatable; -import com.nedap.archie.rm.archetyped.Pathable; import com.nedap.archie.rm.composition.Composition; import com.nedap.archie.rm.composition.EventContext; import com.nedap.archie.rm.composition.IsmTransition; -import com.nedap.archie.rm.datastructures.Element; import com.nedap.archie.rm.datavalues.quantity.DvInterval; import com.nedap.archie.rminfo.ArchieRMInfoLookup; import com.nedap.archie.rminfo.RMTypeInfo; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.ImmutableTriple; -import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Triple; import org.ehrbase.serialisation.jsonencoding.CanonicalJson; -import org.ehrbase.util.exception.SdkException; import org.ehrbase.webtemplate.model.WebTemplate; import org.ehrbase.webtemplate.model.WebTemplateInput; import org.ehrbase.webtemplate.model.WebTemplateNode; -import org.ehrbase.webtemplate.parser.FlatPath; import java.util.ArrayList; import java.util.Collection; @@ -93,22 +87,10 @@ private void handle(Context context) { if (children.stream().anyMatch(n -> n.getRmType().equals("EVENT"))) { WebTemplateNode event = children.stream().filter(n -> n.getRmType().equals("EVENT")).findAny().get(); - WebTemplateNode pointEvent = new WebTemplateNode(event); - WebTemplateNode intervalEvent = new WebTemplateNode(event); - pointEvent.setRmType("POINT_EVENT"); - intervalEvent.setRmType("INTERVAL_EVENT"); - WebTemplateNode width = new WebTemplateNode(); - width.setId("width"); - width.setRmType("DV_DURATION"); - width.setMax(1); - width.setAqlPath(event.getAqlPath() + "/width"); - intervalEvent.getChildren().add(width); - WebTemplateNode math = new WebTemplateNode(); - math.setId("math_function"); - math.setRmType("DV_CODED_TEXT"); - math.setMax(1); - math.setAqlPath(event.getAqlPath() + "/math_function"); - intervalEvent.getChildren().add(math); + + EventHelper eventHelper = new EventHelper(event).invoke(); + WebTemplateNode pointEvent = eventHelper.getPointEvent(); + WebTemplateNode intervalEvent = eventHelper.getIntervalEvent(); choices.put(intervalEvent.getAqlPath(), List.of(intervalEvent, pointEvent)); children.add(intervalEvent); children.add(pointEvent); @@ -233,4 +215,54 @@ protected String buildNamePath(Context context) { return sb.toString(); } + public static class EventHelper { + private WebTemplateNode event; + private WebTemplateNode pointEvent; + private WebTemplateNode intervalEvent; + + public EventHelper(WebTemplateNode event) { + this.event = event; + } + + public WebTemplateNode getPointEvent() { + return pointEvent; + } + + public WebTemplateNode getIntervalEvent() { + return intervalEvent; + } + + public EventHelper invoke() { + pointEvent = new WebTemplateNode(event); + intervalEvent = new WebTemplateNode(event); + pointEvent.setRmType("POINT_EVENT"); + intervalEvent.setRmType("INTERVAL_EVENT"); + + WebTemplateNode width = new WebTemplateNode(); + width.setId("width"); + width.setName("width"); + width.setRmType("DV_DURATION"); + width.setMax(1); + width.setAqlPath(event.getAqlPath() + "/width"); + intervalEvent.getChildren().add(width); + + WebTemplateNode math = new WebTemplateNode(); + math.setId("math_function"); + math.setName("math_function"); + math.setRmType("DV_CODED_TEXT"); + math.setMax(1); + math.setAqlPath(event.getAqlPath() + "/math_function"); + intervalEvent.getChildren().add(math); + + WebTemplateNode sampleCount = new WebTemplateNode(); + sampleCount.setId("sample_count"); + sampleCount.setName("sample_count"); + sampleCount.setRmType("LONG"); + sampleCount.setMax(1); + sampleCount.setAqlPath(event.getAqlPath() + "/sample_count"); + intervalEvent.getChildren().add(sampleCount); + + return this; + } + } } diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml index 57f149328..d694a351a 100644 --- a/test-coverage/pom.xml +++ b/test-coverage/pom.xml @@ -22,10 +22,6 @@ com.github.ehrbase.openEHR_SDK generator - - com.github.ehrbase.openEHR_SDK - aql - com.github.ehrbase.openEHR_SDK response-dto diff --git a/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java b/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java index 47e15ba08..3bb05a15d 100644 --- a/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java +++ b/web-template/src/main/java/org/ehrbase/webtemplate/filter/Filter.java @@ -97,7 +97,7 @@ protected void preHandle(WebTemplateNode node) { node.getChildren().add(ismTransitionList.get(0)); } - if (node.getRmType().equals("ELEMENT") && node.getChildren().size() == 3 && node.getChildren().stream().map(WebTemplateNode::getRmType).collect(Collectors.toList()).containsAll(List.of("DV_TEXT", "DV_CODED_TEXT"))) { + if (node.getRmType().equals("ELEMENT") && node.getChildren().size() == 4 && node.getChildren().stream().map(WebTemplateNode::getRmType).collect(Collectors.toList()).containsAll(List.of("DV_TEXT", "DV_CODED_TEXT"))) { WebTemplateNode merged = node.findChildById(node.getId(false)).orElseThrow(); node.getChildren().clear(); node.getChildren().add(merged); diff --git a/web-template/src/main/java/org/ehrbase/webtemplate/model/WebTemplateNode.java b/web-template/src/main/java/org/ehrbase/webtemplate/model/WebTemplateNode.java index 734acd46b..8aa047717 100644 --- a/web-template/src/main/java/org/ehrbase/webtemplate/model/WebTemplateNode.java +++ b/web-template/src/main/java/org/ehrbase/webtemplate/model/WebTemplateNode.java @@ -228,6 +228,12 @@ public Optional findChildById(String id) { return children.stream().filter(n -> n.getId().equals(id)).findAny(); } + public String buildRelativPath(WebTemplateNode child){ + return FlatPath.removeStart( + new FlatPath(child.getAqlPath()), + new FlatPath(this.getAqlPath())) + .toString(); + } public List findMatching(Predicate filter) { List matching = diff --git a/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java b/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java index 0f9eaa6e2..9b36e4106 100644 --- a/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java +++ b/web-template/src/main/java/org/ehrbase/webtemplate/parser/OPTParser.java @@ -322,13 +322,13 @@ private void addRMAttributes( && (Locatable.class.isAssignableFrom(typeInfo.getJavaClass()) || EventContext.class.isAssignableFrom(typeInfo.getJavaClass()) || DvInterval.class.isAssignableFrom(typeInfo.getJavaClass()) - || IsmTransition.class.isAssignableFrom(typeInfo.getJavaClass())) - && !Element.class.isAssignableFrom(typeInfo.getJavaClass())) { + || IsmTransition.class.isAssignableFrom(typeInfo.getJavaClass()))) { node.getChildren() .addAll( typeInfo.getAttributes().values().stream() .filter(s -> !s.isComputed()) + .filter(s -> !Element.class.isAssignableFrom(typeInfo.getJavaClass()) || s.getRmName().equals("feeder_audit")) .filter(s -> !List.of("value").contains(s.getRmName())) .filter(s -> !Locatable.class.isAssignableFrom(s.getTypeInCollection())) .map(i -> buildNodeForAttribute(i, aqlPath, termDefinitionMap)) From 9cf111f2414cb5a0fd5e04af7a3d9b10d61d2ecd Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Tue, 8 Dec 2020 15:46:21 +0100 Subject: [PATCH 36/54] add shared fields to choices see https://github.com/ehrbase/project_management/issues/424 --- .../BerichtBeliebigesEreignisChoice.java | 16 ++ ...ichteHistorieBeliebigesEreignisChoice.java | 20 +++ ...ichteHistorieBeliebigesEreignisChoice.java | 20 +++ ...itereSymptomeBeliebigesEreignisChoice.java | 16 ++ .../KorpergewichtAnyEventEnChoice.java | 31 ++++ ...ichteHistorieBeliebigesEreignisChoice.java | 20 +++ ...itereSymptomeBeliebigesEreignisChoice.java | 16 ++ .../BodyTemperatureAnyEventChoice.java | 40 +++++ .../client/classgenerator/ClassGenerator.java | 149 ++++++++++++------ .../classgenerator/ClassGeneratorTest.java | 23 ++- 10 files changed, 296 insertions(+), 55 deletions(-) diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisChoice.java index 5f794b9e9..8af9cb3c9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisChoice.java @@ -1,4 +1,20 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; +import java.time.temporal.TemporalAccessor; +import java.util.List; + public interface BerichtBeliebigesEreignisChoice { + TemporalAccessor getTimeValue(); + + void setTimeValue(TemporalAccessor timeValue); + + FeederAudit getFeederAudit(); + + void setFeederAudit(FeederAudit feederAudit); + + List getSpezifischesSymptomAnzeichen(); + + void setSpezifischesSymptomAnzeichen( + List spezifischesSymptomAnzeichen); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java index d2e9340ab..efa44ac84 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java @@ -1,4 +1,24 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +import java.time.temporal.TemporalAccessor; +import java.util.List; + public interface GeschichteHistorieBeliebigesEreignisChoice { + List getGeschichte(); + + void setGeschichte(List geschichte); + + FeederAudit getFeederAudit(); + + void setFeederAudit(FeederAudit feederAudit); + + TemporalAccessor getTimeValue(); + + void setTimeValue(TemporalAccessor timeValue); + + List getStrukturierteAngabe(); + + void setStrukturierteAngabe(List strukturierteAngabe); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java index fde9d227f..a8cf11e28 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java @@ -1,4 +1,24 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +import java.time.temporal.TemporalAccessor; +import java.util.List; + public interface GeschichteHistorieBeliebigesEreignisChoice { + List getGeschichte(); + + void setGeschichte(List geschichte); + + FeederAudit getFeederAudit(); + + void setFeederAudit(FeederAudit feederAudit); + + TemporalAccessor getTimeValue(); + + void setTimeValue(TemporalAccessor timeValue); + + List getStrukturierteAngabe(); + + void setStrukturierteAngabe(List strukturierteAngabe); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java index 12452f03c..8957071f1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java @@ -1,4 +1,20 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; +import java.time.temporal.TemporalAccessor; +import java.util.List; + public interface WeitereSymptomeBeliebigesEreignisChoice { + FeederAudit getFeederAudit(); + + void setFeederAudit(FeederAudit feederAudit); + + TemporalAccessor getTimeValue(); + + void setTimeValue(TemporalAccessor timeValue); + + List getSpezifischesSymptomAnzeichen(); + + void setSpezifischesSymptomAnzeichen( + List spezifischesSymptomAnzeichen); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java index 23aa3b305..4153033b1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java @@ -1,4 +1,35 @@ package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; +import java.time.temporal.TemporalAccessor; +import java.util.List; + public interface KorpergewichtAnyEventEnChoice { + Double getGewichtMagnitude(); + + void setGewichtMagnitude(Double gewichtMagnitude); + + String getGewichtUnits(); + + void setGewichtUnits(String gewichtUnits); + + TemporalAccessor getTimeValue(); + + void setTimeValue(TemporalAccessor timeValue); + + FeederAudit getFeederAudit(); + + void setFeederAudit(FeederAudit feederAudit); + + List getConfoundingFactorsEn(); + + void setConfoundingFactorsEn(List confoundingFactorsEn); + + String getCommentEnValue(); + + void setCommentEnValue(String commentEnValue); + + StateOfDressEnDefiningCode getStateOfDressEnDefiningCode(); + + void setStateOfDressEnDefiningCode(StateOfDressEnDefiningCode stateOfDressEnDefiningCode); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java index 0e0258ddc..d0865e3bb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java @@ -1,4 +1,24 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +import java.time.temporal.TemporalAccessor; +import java.util.List; + public interface GeschichteHistorieBeliebigesEreignisChoice { + FeederAudit getFeederAudit(); + + void setFeederAudit(FeederAudit feederAudit); + + List getGeschichte(); + + void setGeschichte(List geschichte); + + TemporalAccessor getTimeValue(); + + void setTimeValue(TemporalAccessor timeValue); + + List getStrukturierteAngabe(); + + void setStrukturierteAngabe(List strukturierteAngabe); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java index adb51777b..13cd8c51b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java @@ -1,4 +1,20 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; +import java.time.temporal.TemporalAccessor; +import java.util.List; + public interface WeitereSymptomeBeliebigesEreignisChoice { + FeederAudit getFeederAudit(); + + void setFeederAudit(FeederAudit feederAudit); + + List getSpezifischesSymptomAnzeichen(); + + void setSpezifischesSymptomAnzeichen( + List spezifischesSymptomAnzeichen); + + TemporalAccessor getTimeValue(); + + void setTimeValue(TemporalAccessor timeValue); } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventChoice.java index 2f2c73fba..e61827103 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventChoice.java @@ -1,4 +1,44 @@ package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; +import com.nedap.archie.rm.archetyped.FeederAudit; +import com.nedap.archie.rm.datastructures.Cluster; +import java.time.temporal.TemporalAccessor; +import java.util.List; + public interface BodyTemperatureAnyEventChoice { + Double getTemperatureMagnitude(); + + void setTemperatureMagnitude(Double temperatureMagnitude); + + Cluster getExertion(); + + void setExertion(Cluster exertion); + + String getDescriptionOfThermalStressValue(); + + void setDescriptionOfThermalStressValue(String descriptionOfThermalStressValue); + + TemporalAccessor getTimeValue(); + + void setTimeValue(TemporalAccessor timeValue); + + FeederAudit getFeederAudit(); + + void setFeederAudit(FeederAudit feederAudit); + + Long getCurrentDayOfMenstrualCycleMagnitude(); + + void setCurrentDayOfMenstrualCycleMagnitude(Long currentDayOfMenstrualCycleMagnitude); + + List getEnvironmentalConditions(); + + void setEnvironmentalConditions(List environmentalConditions); + + BodyTemperatureBodyExposureChoice getBodyExposure(); + + void setBodyExposure(BodyTemperatureBodyExposureChoice bodyExposure); + + String getTemperatureUnits(); + + void setTemperatureUnits(String temperatureUnits); } diff --git a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java index a930e289f..d9e96fee9 100644 --- a/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java +++ b/generator/src/main/java/org/ehrbase/client/classgenerator/ClassGenerator.java @@ -33,9 +33,28 @@ import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; +import java.lang.reflect.Field; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Deque; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.StringJoiner; +import java.util.stream.Collectors; +import javax.lang.model.element.Modifier; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.SetUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.reflect.FieldUtils; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; @@ -72,21 +91,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.lang.model.element.Modifier; -import java.lang.reflect.Field; -import java.lang.reflect.Type; -import java.util.Arrays; -import java.util.Collections; -import java.util.Deque; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.StringJoiner; -import java.util.stream.Collectors; - public class ClassGenerator { private static final ArchieRMInfoLookup RM_INFO_LOOKUP = ArchieRMInfoLookup.getInstance(); @@ -140,8 +144,8 @@ private void addVersionUid(TypeSpec.Builder classBuilder) { .addAnnotation(Id.class) .build(); classBuilder.addField(versionUid); - classBuilder.addMethod(buildGetter(versionUid)); - classBuilder.addMethod(buildSetter(versionUid)); + classBuilder.addMethod(buildGetter(versionUid, false)); + classBuilder.addMethod(buildSetter(versionUid, false)); } private TypeSpec.Builder build(ClassGeneratorContext context, WebTemplateNode next) { @@ -224,11 +228,42 @@ private TypeSpec.Builder build(ClassGeneratorContext context, WebTemplateNode ne interfaceClassName = ClassName.get(interfacePackage, interfaceSpec.name); } else { - interfaceSpec = + + List> builders = new ArrayList<>(); + for (WebTemplateNode child : choice) { + TypeSpec.Builder build = build(context, child); + builders.add(new ImmutablePair<>(build, child)); + } + + TypeSpec.Builder interfaceBuilder = TypeSpec.interfaceBuilder( defaultNamingStrategy.buildClassName(context, choice.get(0), true, false)) - .addModifiers(Modifier.PUBLIC) - .build(); + .addModifiers(Modifier.PUBLIC); + + Set cowmenField = null; + for (Set fields : + builders.stream() + .map(Pair::getLeft) + .map(s -> s.fieldSpecs) + .map(HashSet::new) + .collect(Collectors.toList())) { + if (cowmenField == null) { + cowmenField = fields; + } else { + cowmenField = SetUtils.intersection(cowmenField, fields); + } + } + if (cowmenField == null) { + cowmenField = Collections.emptySet(); + } + cowmenField.forEach( + f -> { + interfaceBuilder.addMethod(buildGetter(f, true)); + + interfaceBuilder.addMethod(buildSetter(f, true)); + }); + + interfaceSpec = interfaceBuilder.build(); context.currentTypeSpec.put(relativeNode, interfaceSpec); String interfacePackage = @@ -239,16 +274,18 @@ private TypeSpec.Builder build(ClassGeneratorContext context, WebTemplateNode ne context.classes.put(interfacePackage, interfaceSpec); interfaceClassName = ClassName.get(interfacePackage, interfaceSpec.name); - for (WebTemplateNode child : choice) { - TypeSpec.Builder build = build(context, child); - build - .addSuperinterface(interfaceClassName) - .addAnnotation( - AnnotationSpec.builder(OptionFor.class) - .addMember(OptionFor.VALUE, "$S", child.getRmType()) - .build()); - context.classes.put(interfacePackage, build.build()); - } + TypeName finalInterfaceClassName = interfaceClassName; + builders.forEach( + pair -> { + TypeSpec.Builder builder = + pair.getKey() + .addSuperinterface(finalInterfaceClassName) + .addAnnotation( + AnnotationSpec.builder(OptionFor.class) + .addMember(OptionFor.VALUE, "$S", pair.getRight().getRmType()) + .build()); + context.classes.put(interfacePackage, builder.build()); + }); } if (choice.stream().anyMatch(WebTemplateNode::isMulti)) { interfaceClassName = @@ -356,8 +393,7 @@ private WebTemplateNode buildRelativeNode(ClassGeneratorContext context, WebTemp matching.add(relativeNode); matching.forEach( n -> { - String relativPath = - context.nodeDeque.peek().buildRelativPath(n); + String relativPath = context.nodeDeque.peek().buildRelativPath(n); n.setAqlPath(relativPath); }); return relativeNode; @@ -524,8 +560,8 @@ private void addField( FieldSpec fieldSpec = builder.build(); classBuilder.addField(fieldSpec); - classBuilder.addMethod(buildSetter(fieldSpec)); - classBuilder.addMethod(buildGetter(fieldSpec)); + classBuilder.addMethod(buildSetter(fieldSpec, false)); + classBuilder.addMethod(buildGetter(fieldSpec, false)); } private String buildFieldJavadoc(ClassGeneratorContext context, WebTemplateNode node) { @@ -593,10 +629,10 @@ private TypeSpec buildEnumValueSet( .build()); }); - enumBuilder.addMethod(buildGetter(fieldSpec1)); - enumBuilder.addMethod(buildGetter(fieldSpec2)); - enumBuilder.addMethod(buildGetter(fieldSpec3)); - enumBuilder.addMethod(buildGetter(fieldSpec4)); + enumBuilder.addMethod(buildGetter(fieldSpec1, false)); + enumBuilder.addMethod(buildGetter(fieldSpec2, false)); + enumBuilder.addMethod(buildGetter(fieldSpec3, false)); + enumBuilder.addMethod(buildGetter(fieldSpec4, false)); return enumBuilder.build(); } @@ -610,26 +646,39 @@ private MethodSpec buildConstructor(FieldSpec... fieldSpecs) { return builder.build(); } - private MethodSpec buildSetter(FieldSpec fieldSpec) { + private MethodSpec buildSetter(FieldSpec fieldSpec, boolean isAbstract) { - return MethodSpec.methodBuilder("set" + StringUtils.capitalize(fieldSpec.name)) - .addModifiers(Modifier.PUBLIC) - .addStatement(" this.$N = $N", fieldSpec.name, fieldSpec.name) - .addParameter(fieldSpec.type, fieldSpec.name) - .build(); + MethodSpec.Builder builder = + MethodSpec.methodBuilder("set" + StringUtils.capitalize(fieldSpec.name)); + + builder.addModifiers(Modifier.PUBLIC); + if (isAbstract) { + builder.addModifiers(Modifier.ABSTRACT); + } else { + builder.addStatement(" this.$N = $N", fieldSpec.name, fieldSpec.name); + } + builder.addParameter(fieldSpec.type, fieldSpec.name).build(); + return builder.build(); } - private MethodSpec buildGetter(FieldSpec fieldSpec) { + private MethodSpec buildGetter(FieldSpec fieldSpec, boolean isAbbstract) { String prefix; if (Boolean.class.getTypeName().equals(fieldSpec.type.toString())) { prefix = "is"; } else { prefix = "get"; } - return MethodSpec.methodBuilder(prefix + StringUtils.capitalize(fieldSpec.name)) - .addModifiers(Modifier.PUBLIC) - .addStatement(" return this.$N ", fieldSpec.name) - .returns(fieldSpec.type) - .build(); + + MethodSpec.Builder builder = + MethodSpec.methodBuilder(prefix + StringUtils.capitalize(fieldSpec.name)); + + builder.addModifiers(Modifier.PUBLIC); + if (isAbbstract) { + builder.addModifiers(Modifier.ABSTRACT); + } else { + builder.addStatement(" return this.$N ", fieldSpec.name); + } + builder.returns(fieldSpec.type); + return builder.build(); } } diff --git a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java index 4cfb1666f..b24adc053 100644 --- a/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java +++ b/generator/src/test/java/org/ehrbase/client/classgenerator/ClassGeneratorTest.java @@ -257,7 +257,11 @@ public void testGenerateAltEvents() throws IOException, XmlException { new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), - new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), new Tuple("sampleCount", "java.lang.Long"), new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit")); + new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), + new Tuple("sampleCount", "java.lang.Long"), + new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), + new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), + new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit")); writeFiles(generate); } @@ -340,7 +344,9 @@ public void testGenerateEpisode() throws IOException, XmlException { "upperIncluded", "healthCareFacility", "feederAudit", - "feederAudit", "feederAudit", "feederAudit"); + "feederAudit", + "feederAudit", + "feederAudit"); writeFiles(generate); } @@ -450,7 +456,12 @@ public void testGenerateSmICS() throws IOException, XmlException { "feederAudit", "feederAudit", "feederAudit", - "feederAudit","feederAudit","feederAudit","feederAudit","feederAudit","feederAudit"); + "feederAudit", + "feederAudit", + "feederAudit", + "feederAudit", + "feederAudit", + "feederAudit"); writeFiles(generate); } @@ -686,7 +697,8 @@ public void testGenerateMultiOccurrence() throws IOException, XmlException { new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), - new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"),new Tuple("sampleCount", "java.lang.Long")); + new Tuple("feederAudit", "com.nedap.archie.rm.archetyped.FeederAudit"), + new Tuple("sampleCount", "java.lang.Long")); writeFiles(generate); } @@ -812,7 +824,8 @@ public void testGenerateVirologyFinding() throws IOException, XmlException { "feederAudit", "feederAudit", "feederAudit", - "feederAudit", "feederAudit"); + "feederAudit", + "feederAudit"); writeFiles(generate); } From 747c139be5843ed608305b1b5bbb21fd69809864 Mon Sep 17 00:00:00 2001 From: Stefan Spiska Date: Wed, 9 Dec 2020 11:41:20 +0100 Subject: [PATCH 37/54] add generated Annotation to dtos see https://github.com/ehrbase/project_management/issues/424 --- client/pom.xml | 4 ++++ .../flattener/DtoFromCompositionWalker.java | 1 - .../CoronaAnamneseComposition.java | 6 +++++ .../definition/AdresseCluster.java | 6 +++++ .../BerichtBeliebigesEreignisChoice.java | 6 +++++ ...erichtBeliebigesEreignisIntervalEvent.java | 6 +++++ .../BerichtBeliebigesEreignisPointEvent.java | 6 +++++ ...htSpezifischesSymptomAnzeichenCluster.java | 6 +++++ .../definition/BeschaftigungCluster.java | 6 +++++ ...ertungDesGesundheitsrisikosEvaluation.java | 6 +++++ ...enstleistungAktuelleAktivitatActivity.java | 6 +++++ ...leistungGrundFurDieAnforderungElement.java | 6 +++++ .../definition/DienstleistungInstruction.java | 6 +++++ ...creeningSpezifischeMedikamenteCluster.java | 6 +++++ ...ichteHistorieBeliebigesEreignisChoice.java | 6 +++++ ...storieBeliebigesEreignisIntervalEvent.java | 6 +++++ ...eHistorieBeliebigesEreignisPointEvent.java | 6 +++++ .../GeschichteHistorieGeschichteElement.java | 6 +++++ .../GeschichteHistorieObservation.java | 6 +++++ .../HistorieDerReiseObservation.java | 6 +++++ .../KorpertemperaturStorfaktorenElement.java | 23 ++++++++++++++----- .../definition/OrganisationCluster.java | 6 +++++ .../definition/ProblemDiagnoseEvaluation.java | 6 +++++ ...onovirusDiagnostischeSicherheitChoice.java | 7 ++++++ ...rusDiagnostischeSicherheitDvCodedText.java | 6 +++++ ...onovirusDiagnostischeSicherheitDvText.java | 6 +++++ ...iebigesIntervallereignisIntervalEvent.java | 6 +++++ .../ReisefallBestimmteReiseCluster.java | 6 +++++ .../ReisefallBestimmtesReisezielCluster.java | 6 +++++ .../definition/ReisefallObservation.java | 6 +++++ .../definition/WohnsituationEvaluation.java | 6 +++++ .../definition/WohnstatteCluster.java | 6 +++++ .../CoronaAnamneseComposition.java | 6 +++++ .../definition/AdresseCluster.java | 6 +++++ ...AndereAktuelleErkrankungenObservation.java | 6 +++++ ...ltInGesundheitseinrichtungObservation.java | 6 +++++ .../definition/BeschaftigungCluster.java | 6 +++++ ...ertungDesGesundheitsrisikosEvaluation.java | 6 +++++ .../ChronischeErkrankungenObservation.java | 6 +++++ ...enstleistungAktuelleAktivitatActivity.java | 6 +++++ ...leistungGrundFurDieAnforderungElement.java | 6 +++++ .../definition/DienstleistungInstruction.java | 6 +++++ .../definition/DurchfallObservation.java | 6 +++++ ...derErhohteKorpertemperaturObservation.java | 6 +++++ ...genZumMedikationsScreeningObservation.java | 6 +++++ ...creeningSpezifischeMedikamenteCluster.java | 6 +++++ ...ichteHistorieBeliebigesEreignisChoice.java | 6 +++++ ...storieBeliebigesEreignisIntervalEvent.java | 6 +++++ ...eHistorieBeliebigesEreignisPointEvent.java | 6 +++++ .../GeschichteHistorieGeschichteElement.java | 6 +++++ .../GeschichteHistorieObservation.java | 6 +++++ .../GestorterGeruchssinnObservation.java | 6 +++++ .../GestorterGeschmackssinnObservation.java | 6 +++++ .../GesundheitsbezogenerBerufEvaluation.java | 6 +++++ .../definition/HeiserkeitObservation.java | 6 +++++ .../HistorieDerReiseObservation.java | 6 +++++ .../definition/HustenObservation.java | 6 +++++ .../KorpertemperaturObservation.java | 6 +++++ .../KorpertemperaturStorfaktorenElement.java | 6 +++++ .../definition/OrganisationCluster.java | 6 +++++ .../PersonenkontaktObservation.java | 6 +++++ .../definition/ProblemDiagnoseEvaluation.java | 6 +++++ ...onovirusDiagnostischeSicherheitChoice.java | 7 ++++++ ...rusDiagnostischeSicherheitDvCodedText.java | 6 +++++ ...onovirusDiagnostischeSicherheitDvText.java | 6 +++++ .../ProblemDiganoseCoronovirusEvaluation.java | 6 +++++ ...iebigesIntervallereignisIntervalEvent.java | 6 +++++ .../ReisefallBestimmteReiseCluster.java | 6 +++++ .../ReisefallBestimmtesReisezielCluster.java | 6 +++++ .../definition/ReisefallObservation.java | 6 +++++ .../definition/SchnupfenObservation.java | 6 +++++ .../definition/StandortCluster.java | 6 +++++ .../definition/StatusCluster.java | 6 +++++ ...itereSymptomeBeliebigesEreignisChoice.java | 6 +++++ ...mptomeBeliebigesEreignisIntervalEvent.java | 6 +++++ ...eSymptomeBeliebigesEreignisPointEvent.java | 6 +++++ .../WeitereSymptomeObservation.java | 6 +++++ ...meSpezifischesSymptomAnzeichenCluster.java | 6 +++++ .../definition/WohnsituationEvaluation.java | 6 +++++ .../definition/WohnstatteCluster.java | 6 +++++ .../AlternativeEventsComposition.java | 6 +++++ .../KorpergewichtAnyEventEnChoice.java | 8 +++++++ .../KorpergewichtAnyEventEnIntervalEvent.java | 6 +++++ .../KorpergewichtAnyEventEnPointEvent.java | 6 +++++ .../KorpergewichtBirthEnPointEvent.java | 6 +++++ ...pergewichtConfoundingFactorsEnElement.java | 6 +++++ .../definition/KorpergewichtObservation.java | 6 +++++ .../BefundDerBlutgasanalyseComposition.java | 6 +++++ .../KohlendioxidpartialdruckCluster.java | 6 +++++ .../definition/LaborergebnisObservation.java | 6 +++++ .../definition/PhWertCluster.java | 6 +++++ .../SauerstoffpartialdruckCluster.java | 6 +++++ .../SauerstoffsattigungCluster.java | 6 +++++ .../CoronaAnamneseComposition.java | 6 +++++ .../definition/AdresseCluster.java | 6 +++++ .../definition/AllgemeineAngabenSection.java | 6 +++++ ...AndereAktuelleErkrankungenObservation.java | 6 +++++ ...ltInGesundheitseinrichtungObservation.java | 6 +++++ .../definition/BeschaftigungCluster.java | 6 +++++ ...ertungDesGesundheitsrisikosEvaluation.java | 6 +++++ .../ChronischeErkrankungenObservation.java | 6 +++++ ...enstleistungAktuelleAktivitatActivity.java | 6 +++++ ...leistungGrundFurDieAnforderungElement.java | 6 +++++ .../definition/DienstleistungInstruction.java | 6 +++++ .../definition/DurchfallObservation.java | 6 +++++ ...derErhohteKorpertemperaturObservation.java | 6 +++++ ...genZumMedikationsScreeningObservation.java | 6 +++++ ...creeningSpezifischeMedikamenteCluster.java | 6 +++++ ...ichteHistorieBeliebigesEreignisChoice.java | 6 +++++ ...storieBeliebigesEreignisIntervalEvent.java | 6 +++++ ...eHistorieBeliebigesEreignisPointEvent.java | 6 +++++ .../GeschichteHistorieGeschichteElement.java | 6 +++++ .../GeschichteHistorieObservation.java | 6 +++++ .../GestorterGeruchssinnObservation.java | 6 +++++ .../GestorterGeschmackssinnObservation.java | 6 +++++ .../GesundheitsbezogenerBerufEvaluation.java | 6 +++++ .../definition/HeiserkeitObservation.java | 6 +++++ .../HistorieDerReiseObservation.java | 6 +++++ .../definition/HustenObservation.java | 6 +++++ .../definition/KontaktSection.java | 6 +++++ .../KorpertemperaturObservation.java | 6 +++++ .../KorpertemperaturStorfaktorenElement.java | 6 +++++ .../definition/OrganisationCluster.java | 6 +++++ .../PersonenkontaktObservation.java | 6 +++++ .../definition/ProblemDiagnoseEvaluation.java | 6 +++++ ...onovirusDiagnostischeSicherheitChoice.java | 7 ++++++ ...rusDiagnostischeSicherheitDvCodedText.java | 6 +++++ ...onovirusDiagnostischeSicherheitDvText.java | 6 +++++ .../ProblemDiganoseCoronovirusEvaluation.java | 6 +++++ ...iebigesIntervallereignisIntervalEvent.java | 6 +++++ .../ReisefallBestimmteReiseCluster.java | 6 +++++ .../ReisefallBestimmtesReisezielCluster.java | 6 +++++ .../definition/ReisefallObservation.java | 6 +++++ .../definition/RisikogebietSection.java | 6 +++++ .../definition/SchnupfenObservation.java | 6 +++++ .../definition/StandortCluster.java | 6 +++++ .../definition/StatusCluster.java | 6 +++++ .../definition/SymptomeSection.java | 6 +++++ ...itereSymptomeBeliebigesEreignisChoice.java | 6 +++++ ...mptomeBeliebigesEreignisIntervalEvent.java | 6 +++++ ...eSymptomeBeliebigesEreignisPointEvent.java | 6 +++++ .../WeitereSymptomeObservation.java | 6 +++++ ...meSpezifischesSymptomAnzeichenCluster.java | 6 +++++ .../definition/WohnsituationEvaluation.java | 6 +++++ .../definition/WohnstatteCluster.java | 6 +++++ .../DiagnoseComposition.java | 6 +++++ .../AnatomischeLokalisationCluster.java | 6 +++++ ...thogeneseAtiologieDerKrankheitElement.java | 6 +++++ ...eneseBeschreibungDesEntstehensElement.java | 6 +++++ .../definition/AtiopathogeneseCluster.java | 6 +++++ .../AtiopathogeneseValueChoice.java | 7 ++++++ .../AtiopathogeneseValueDvCodedText.java | 6 +++++ .../AtiopathogeneseValueDvText.java | 6 +++++ .../definition/DiagnosedetailsCluster.java | 6 +++++ .../definition/FallidentifikationCluster.java | 6 +++++ ...DiagnoseDiagnostischeSicherheitChoice.java | 7 ++++++ ...oseDiagnostischeSicherheitDvCodedText.java | 6 +++++ ...DiagnoseDiagnostischeSicherheitDvText.java | 6 +++++ .../definition/ProblemDiagnoseEvaluation.java | 6 +++++ .../ProblemDiagnoseSchweregradChoice.java | 7 ++++++ ...ProblemDiagnoseSchweregradDvCodedText.java | 6 +++++ .../ProblemDiagnoseSchweregradDvText.java | 6 +++++ ...aseBloodPressureSimpleDeV0Composition.java | 6 +++++ ...loodPressureTrainingSampleObservation.java | 6 +++++ .../DeviceDetailsTrainingSampleCluster.java | 6 +++++ ...EhrbaseMultiOccurrenceDeV1Composition.java | 6 +++++ .../BodyTemperatureAnyEventChoice.java | 9 ++++++++ .../BodyTemperatureAnyEventIntervalEvent.java | 6 +++++ .../BodyTemperatureAnyEventPointEvent.java | 6 +++++ .../BodyTemperatureBodyExposureChoice.java | 7 ++++++ ...odyTemperatureBodyExposureDvCodedText.java | 6 +++++ .../BodyTemperatureBodyExposureDvText.java | 6 +++++ ...emperatureLocationOfMeasurementChoice.java | 7 ++++++ ...atureLocationOfMeasurementDvCodedText.java | 6 +++++ ...emperatureLocationOfMeasurementDvText.java | 6 +++++ .../BodyTemperatureObservation.java | 6 +++++ .../EpisodeOfCareComposition.java | 6 +++++ .../definition/EpisodeofcareAdminEntry.java | 6 +++++ .../EpisodeofcareDiagnosisCluster.java | 6 +++++ .../EpisodeofcareIdentifierElement.java | 6 +++++ .../definition/EpisodeofcareTeamElement.java | 6 +++++ .../OpenEREACTCareComposition.java | 6 +++++ .../definition/AbdomenSymptomCluster.java | 6 +++++ .../definition/AcvpuScaleObservation.java | 6 +++++ .../definition/AllergiesEvaluation.java | 6 +++++ .../definition/AssessmentSection.java | 6 +++++ .../definition/BackgroundSection.java | 6 +++++ .../definition/BloodPressureObservation.java | 6 +++++ .../definition/ChestSymptomCluster.java | 6 +++++ .../definition/Covid19ExposureEvaluation.java | 6 +++++ .../definition/CovidNotesEvaluation.java | 6 +++++ .../definition/CovidSection.java | 6 +++++ .../definition/CovidSymptomsObservation.java | 6 +++++ .../DenwisAgitationIndicatorElement.java | 6 +++++ .../DenwisBreathingIndicatorElement.java | 6 +++++ .../DenwisCirculationIndicatorElement.java | 6 +++++ .../DenwisMentationIndicatorElement.java | 6 +++++ ...DenwisNurseSubjectiveIndicatorElement.java | 6 +++++ .../definition/DenwisObservation.java | 6 +++++ .../DenwisPainIndicatorElement.java | 6 +++++ .../DenwisPatientIndicatorElement.java | 6 +++++ .../DenwisTemperatureIndicatorElement.java | 6 +++++ .../DenwisTrajectoryIndicatorElement.java | 6 +++++ .../definition/DenwisValueChoice.java | 7 ++++++ .../definition/DenwisValueChoice2.java | 7 ++++++ .../definition/DenwisValueChoice3.java | 7 ++++++ .../definition/DenwisValueChoice4.java | 7 ++++++ .../definition/DenwisValueChoice5.java | 7 ++++++ .../definition/DenwisValueChoice6.java | 7 ++++++ .../definition/DenwisValueDvCodedText.java | 6 +++++ .../definition/DenwisValueDvCodedText2.java | 6 +++++ .../definition/DenwisValueDvCodedText3.java | 6 +++++ .../definition/DenwisValueDvCodedText4.java | 6 +++++ .../definition/DenwisValueDvCodedText5.java | 6 +++++ .../definition/DenwisValueDvCodedText6.java | 6 +++++ .../definition/DenwisValueDvText.java | 6 +++++ .../definition/DenwisValueDvText2.java | 6 +++++ .../definition/DenwisValueDvText3.java | 6 +++++ .../definition/DenwisValueDvText4.java | 6 +++++ .../definition/DenwisValueDvText5.java | 6 +++++ .../definition/DenwisValueDvText6.java | 6 +++++ .../definition/FirstSymptomsCluster.java | 6 +++++ .../definition/FrailtyObservation.java | 6 +++++ .../definition/HeightObservation.java | 6 +++++ .../definition/KeyCovidSymptomCluster.java | 6 +++++ .../LatestCovid19TestObservation.java | 6 +++++ ...estCovid19TestOverallTestStatusChoice.java | 7 ++++++ ...vid19TestOverallTestStatusDvCodedText.java | 6 +++++ ...estCovid19TestOverallTestStatusDvText.java | 6 +++++ ...tCovid19TestTestRequestDetailsCluster.java | 6 +++++ .../definition/MedicationEvaluation.java | 6 +++++ .../definition/NeuroSymptomCluster.java | 6 +++++ .../definition/News2ScoreObservation.java | 6 +++++ .../definition/News2Section.java | 6 +++++ .../definition/OtherSymptomCluster.java | 6 +++++ .../definition/PastHistoryEvaluation.java | 6 +++++ .../definition/PulseObservation.java | 6 +++++ .../definition/PulseOximetryObservation.java | 6 +++++ .../definition/RecommendationEvaluation.java | 6 +++++ .../RecommendationRecommendationElement.java | 6 +++++ .../definition/RespirationsObservation.java | 6 +++++ .../definition/ResponseSection.java | 6 +++++ .../SepsisScreening999FlagElement.java | 6 +++++ .../SepsisScreeningAmberFlagAcuteElement.java | 6 +++++ ...reeningLikelySourceOfInfectionElement.java | 6 +++++ .../SepsisScreeningObservation.java | 6 +++++ .../SepsisScreeningRedFlagAcuteElement.java | 6 +++++ ...sScreeningRiskFactorsForSepsisElement.java | 6 +++++ .../SepsisScreeningValueChoice.java | 7 ++++++ .../SepsisScreeningValueDvCodedText.java | 6 +++++ .../SepsisScreeningValueDvText.java | 6 +++++ .../definition/SepsisSection.java | 6 +++++ .../definition/ServiceAction.java | 6 +++++ ...ServiceRequestCurrentActivityActivity.java | 6 +++++ .../definition/ServiceRequestInstruction.java | 6 +++++ ...ServiceRequestReasonForRequestElement.java | 6 +++++ .../definition/SituationSection.java | 6 +++++ .../definition/StoryHistoryObservation.java | 6 +++++ .../StoryHistorySoftSignsElement.java | 6 +++++ .../definition/TemperatureObservation.java | 6 +++++ .../definition/WeightObservation.java | 6 +++++ .../PatientenaufenthaltComposition.java | 6 +++++ .../definition/AbteilungsfallCluster.java | 6 +++++ .../definition/DetailsZumBettCluster.java | 6 +++++ .../definition/StandortCluster.java | 6 +++++ .../definition/VersorgungsfallCluster.java | 6 +++++ .../definition/VersorgungsortAdminEntry.java | 6 +++++ .../SchwangerschaftsstatusComposition.java | 6 +++++ .../SchwangerschaftsstatusObservation.java | 6 +++++ .../SmICSBefundComposition.java | 6 +++++ .../definition/AntibiogrammCluster.java | 6 +++++ .../definition/ErregerdetailsCluster.java | 6 +++++ .../ErregerdetailsKeimSubtypElement.java | 6 +++++ ...gerdetailsResistenzmechanismusCluster.java | 6 +++++ ...ertypisierungArtDerTypisierungElement.java | 6 +++++ .../definition/ErregertypisierungCluster.java | 6 +++++ .../ErregertypisierungErgebnisElement.java | 6 +++++ ...EventsummaryBeteiligtePersonenCluster.java | 6 +++++ .../definition/EventsummaryCluster.java | 6 +++++ .../EventsummaryIdDerPersonElement.java | 6 +++++ .../definition/EventsummaryValueChoice.java | 7 ++++++ .../EventsummaryValueDvIdentifier.java | 6 +++++ .../definition/EventsummaryValueDvUri.java | 6 +++++ .../LaboranalytResultatCluster.java | 6 +++++ ...ebnisAnzahlDerErregernachweiseElement.java | 6 +++++ .../definition/SmicsErgebnisObservation.java | 6 +++++ .../definition/StandortCluster.java | 6 +++++ ...StationarerVersorgungsfallComposition.java | 6 +++++ .../definition/AufnahmedatenAdminEntry.java | 6 +++++ .../EntlassungsdatenAdminEntry.java | 6 +++++ .../TestAllTypesEnV1Composition.java | 6 +++++ .../definition/TestAllTypesAction.java | 6 +++++ .../definition/TestAllTypesAdminEntry.java | 6 +++++ .../definition/TestAllTypesChoiceChoice.java | 7 ++++++ .../definition/TestAllTypesChoiceDvCount.java | 6 +++++ .../TestAllTypesChoiceDvQuantity.java | 6 +++++ .../definition/TestAllTypesCluster.java | 6 +++++ .../definition/TestAllTypesEvaluation.java | 6 +++++ .../definition/TestAllTypesInstruction.java | 6 +++++ .../definition/TestAllTypesObservation.java | 6 +++++ .../definition/TestAllTypesSection.java | 6 +++++ .../VirologischerBefundComposition.java | 6 +++++ .../AnatomischeLokalisationCluster.java | 6 +++++ .../definition/BefundAnforderungElement.java | 6 +++++ .../definition/BefundObservation.java | 6 +++++ .../definition/EinsenderstandortCluster.java | 6 +++++ .../definition/EmpfangerstandortCluster.java | 6 +++++ .../definition/FallidentifikationCluster.java | 6 +++++ .../definition/KulturCluster.java | 6 +++++ .../definition/ProVirusCluster.java | 6 +++++ .../definition/ProbeCluster.java | 6 +++++ generator/pom.xml | 12 ++++------ .../client/classgenerator/ClassGenerator.java | 17 ++++++++++++++ .../classgenerator/ClassGeneratorTest.java | 2 +- pom.xml | 5 ++++ 315 files changed, 1919 insertions(+), 16 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 1452759f9..0efd95e99 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -42,6 +42,10 @@ javax.cache cache-api + + javax.annotation + javax.annotation-api + com.github.ehrbase.openEHR_SDK opt-1.4 diff --git a/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java b/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java index 59c6a8d67..3306ed776 100644 --- a/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java +++ b/client/src/main/java/org/ehrbase/client/flattener/DtoFromCompositionWalker.java @@ -36,7 +36,6 @@ import org.ehrbase.serialisation.walker.Context; import org.ehrbase.serialisation.walker.FromCompositionWalker; import org.ehrbase.serialisation.walker.RmPrimitive; -import org.ehrbase.serialisation.walker.RmString; import org.ehrbase.util.exception.SdkException; import org.ehrbase.util.reflection.ReflectionHelper; import org.ehrbase.webtemplate.model.WebTemplateNode; diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/CoronaAnamneseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/CoronaAnamneseComposition.java index 913a36064..7b5faee5d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/CoronaAnamneseComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/CoronaAnamneseComposition.java @@ -10,6 +10,7 @@ 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; @@ -42,6 +43,11 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.report.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.051764300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @Template("Corona_Anamnese") public class CoronaAnamneseComposition implements CompositionEntity { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseCluster.java index 450ae59d7..50c7f8667 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/AdresseCluster.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -9,6 +10,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.address_cc.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.105283900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class AdresseCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Adresse/Stadt diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisChoice.java index 8af9cb3c9..391a84f1f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisChoice.java @@ -3,7 +3,13 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.time.temporal.TemporalAccessor; import java.util.List; +import javax.annotation.processing.Generated; +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.136288100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface BerichtBeliebigesEreignisChoice { TemporalAccessor getTimeValue(); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisIntervalEvent.java index c5bde4a37..119ef7d1a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisIntervalEvent.java @@ -5,6 +5,7 @@ import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; @@ -12,6 +13,11 @@ import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.125284700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("INTERVAL_EVENT") public class BerichtBeliebigesEreignisIntervalEvent implements IntervalEventEntity, BerichtBeliebigesEreignisChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisPointEvent.java index 61f933550..53132ad9e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtBeliebigesEreignisPointEvent.java @@ -3,12 +3,18 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.time.temporal.TemporalAccessor; import java.util.List; +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.PointEventEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.135285200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("POINT_EVENT") public class BerichtBeliebigesEreignisPointEvent implements PointEventEntity, BerichtBeliebigesEreignisChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtSpezifischesSymptomAnzeichenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtSpezifischesSymptomAnzeichenCluster.java index f5d879c25..2dec518a1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtSpezifischesSymptomAnzeichenCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BerichtSpezifischesSymptomAnzeichenCluster.java @@ -4,11 +4,17 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.132283300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class BerichtSpezifischesSymptomAnzeichenCluster implements LocatableEntity { /** * Bericht/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungCluster.java index 7cef9954f..116affa0f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BeschaftigungCluster.java @@ -4,6 +4,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; 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.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.occupation_record.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.103285100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class BeschaftigungCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Berufsbezeichnung/Rolle diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java index 6ce2569fc..ce05b9e57 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.health_risk.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.112283200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class BewertungDesGesundheitsrisikosEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Gesundheitsrisiko diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java index 5fe643cf4..4dc8299cd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java @@ -5,11 +5,17 @@ import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; import java.lang.String; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.119287+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DienstleistungAktuelleAktivitatActivity implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Name der Dienstleistung diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java index f8f1b56af..a78752515 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.120286700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DienstleistungGrundFurDieAnforderungElement implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Grund für die Anforderung diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstruction.java index 260d7c53f..265bbd745 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/DienstleistungInstruction.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-INSTRUCTION.service_request.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.119287+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DienstleistungInstruction implements EntryEntity { /** * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java index e8aa1ce2c..e71a4a24e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.099285500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Spezifische Medikamente/Name des Medikaments diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java index efa44ac84..23f352f28 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java @@ -4,7 +4,13 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.time.temporal.TemporalAccessor; import java.util.List; +import javax.annotation.processing.Generated; +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.056764900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface GeschichteHistorieBeliebigesEreignisChoice { List getGeschichte(); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java index ef60db3fb..4f812978f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java @@ -6,6 +6,7 @@ import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; @@ -13,6 +14,11 @@ import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.054764600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("INTERVAL_EVENT") public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements IntervalEventEntity, GeschichteHistorieBeliebigesEreignisChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java index c2aa4d691..eaea84ad7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java @@ -4,12 +4,18 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.time.temporal.TemporalAccessor; import java.util.List; +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.PointEventEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.055764400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("POINT_EVENT") public class GeschichteHistorieBeliebigesEreignisPointEvent implements PointEventEntity, GeschichteHistorieBeliebigesEreignisChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java index a988d24ae..f6b411400 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.054764600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class GeschichteHistorieGeschichteElement implements LocatableEntity { /** * Bericht/Geschichte/Historie/Beliebiges Ereignis/Geschichte diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java index 1e204d998..96fc2663b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; 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; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.story.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.053764300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class GeschichteHistorieObservation implements EntryEntity { /** * Bericht/Geschichte/Historie/origin diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java index ed68a57a2..b1718e9d0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.travel_history.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.080765100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class HistorieDerReiseObservation implements EntryEntity { /** * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Aufenthalt in den letzten 14 Tage in einem der Risikogebiete für Coronainfektion oder Kontakt zu Menschen, die dort waren diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java index 05bcf8db1..9de8967e9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java @@ -1,33 +1,44 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.066763500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class KorpertemperaturStorfaktorenElement implements LocatableEntity { - /** Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Störfaktoren */ + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Störfaktoren + */ @Path("/value|value") private String value; - /** Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/feeder_audit */ + /** + * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/feeder_audit + */ @Path("/feeder_audit") private FeederAudit feederAudit; public void setValue(String value) { - this.value = value; + this.value = value; } public String getValue() { - return this.value; + return this.value ; } public void setFeederAudit(FeederAudit feederAudit) { - this.feederAudit = feederAudit; + this.feederAudit = feederAudit; } public FeederAudit getFeederAudit() { - return this.feederAudit; + return this.feederAudit ; } } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationCluster.java index ffa7ca632..2710c5d5c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/OrganisationCluster.java @@ -4,6 +4,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; 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.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.organisation_cc.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.104285200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class OrganisationCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Identifier diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java index 36a67a0c2..69cb58a14 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; 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.Path; @@ -13,6 +14,11 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.problem_diagnosis.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.096282700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ProblemDiagnoseEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Problem/Diagnose/Name des Problems/ der Diagnose diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java index ae867e53b..a2326642c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java @@ -1,4 +1,11 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +import javax.annotation.processing.Generated; + +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.124286700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java index 06e0f439d..4abe54e4a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.definition; +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 = "2020-12-09T11:37:53.123286+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_CODED_TEXT") public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText implements RMEntity, ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java index 37522387e..f61c0d1a0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingalls.coronaanamnesecomposition.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 = "2020-12-09T11:37:53.124286700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_TEXT") public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText implements RMEntity, ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java index 9ca4d66e3..245ace6fa 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java @@ -5,12 +5,18 @@ import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.IntervalEventEntity; import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.085276+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ReisefallBeliebigesIntervallereignisIntervalEvent implements IntervalEventEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Letzte Reise? diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java index 2320ce70f..c4fa85374 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java @@ -4,11 +4,17 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.time.temporal.TemporalAccessor; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.086285500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ReisefallBestimmteReiseCluster implements LocatableEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java index c7da04d56..bdad7a827 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java @@ -4,11 +4,17 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.087287+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ReisefallBestimmtesReisezielCluster implements LocatableEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/Land diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservation.java index 47b507fe8..034b3f060 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/ReisefallObservation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; 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.Path; @@ -13,6 +14,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.travel_event.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.084767+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ReisefallObservation implements EntryEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluation.java index f3bd617de..41067e61e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnsituationEvaluation.java @@ -6,6 +6,7 @@ import java.lang.Long; import java.lang.String; 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.living_arrangement.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.109283600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class WohnsituationEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Wohnsituation/Beschreibung diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteCluster.java index 54b70b4d3..d7a09e4bd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingalls/coronaanamnesecomposition/definition/WohnstatteCluster.java @@ -4,6 +4,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.Long; 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.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.dwelling.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.110283900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class WohnstatteCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Wohnsituation/Wohnstätte/Anzahl der Schlafzimmer diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/CoronaAnamneseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/CoronaAnamneseComposition.java index 73ec06779..782459572 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/CoronaAnamneseComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/CoronaAnamneseComposition.java @@ -8,6 +8,7 @@ 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; @@ -45,6 +46,11 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.report.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.366285600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @Template("Corona_Anamnese") public class CoronaAnamneseComposition implements CompositionEntity { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseCluster.java index 5156ef2c6..08e729e9c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AdresseCluster.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -9,6 +10,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.address_cc.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.415284600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class AdresseCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Adresse/Stadt diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java index c69a93d77..4de23d9a2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.406286100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class AndereAktuelleErkrankungenObservation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java index 300f1031d..7717e8117 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.exposure_assessment.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.395283900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class AufenthaltInGesundheitseinrichtungObservation implements EntryEntity { /** * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Beliebiges Ereignis/*Agent (en) diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungCluster.java index 4a933bc7f..df18f60ea 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BeschaftigungCluster.java @@ -4,6 +4,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; 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.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.occupation_record.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.413284900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class BeschaftigungCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Berufsbezeichnung/Rolle diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java index 294be6f52..1fa102048 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.health_risk.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.419286300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class BewertungDesGesundheitsrisikosEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Gesundheitsrisiko diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java index 80b7728b4..f3fcce846 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.408285900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ChronischeErkrankungenObservation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Chronische Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java index 489770636..53984b00c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java @@ -5,11 +5,17 @@ import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; import java.lang.String; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.424285500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DienstleistungAktuelleAktivitatActivity implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Name der Dienstleistung diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java index 1a4a1f00e..c7eb4a2f1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.424285500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DienstleistungGrundFurDieAnforderungElement implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Grund für die Anforderung diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstruction.java index 9b0fcf0ce..e1875c607 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DienstleistungInstruction.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-INSTRUCTION.service_request.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.424285500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DienstleistungInstruction implements EntryEntity { /** * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservation.java index 59de6b124..62c5e0441 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/DurchfallObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.383285900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DurchfallObservation implements EntryEntity { /** * Bericht/Symptome/Durchfall/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java index 5d676b1c0..c43c34404 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.376283700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class FieberOderErhohteKorpertemperaturObservation implements EntryEntity { /** * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java index 107f67b38..107715cab 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java @@ -7,6 +7,7 @@ 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.Path; @@ -15,6 +16,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.medication_use.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.411285600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class FragebogenZumMedikationsScreeningObservation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Medikamente in Verwendung? diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java index 5f87210ec..739f41f41 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.411285600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Spezifische Medikamente/Name des Medikaments diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java index a8cf11e28..cfb847230 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java @@ -4,7 +4,13 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.time.temporal.TemporalAccessor; import java.util.List; +import javax.annotation.processing.Generated; +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.369286100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface GeschichteHistorieBeliebigesEreignisChoice { List getGeschichte(); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java index 8eac7f15b..f3272f3c5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java @@ -6,6 +6,7 @@ import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; @@ -13,6 +14,11 @@ import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.368286200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("INTERVAL_EVENT") public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements IntervalEventEntity, GeschichteHistorieBeliebigesEreignisChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java index 9da3a1378..0a0a534b8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java @@ -4,12 +4,18 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.time.temporal.TemporalAccessor; import java.util.List; +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.PointEventEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.369286100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("POINT_EVENT") public class GeschichteHistorieBeliebigesEreignisPointEvent implements PointEventEntity, GeschichteHistorieBeliebigesEreignisChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java index c5149b85c..0838f7997 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.368286200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class GeschichteHistorieGeschichteElement implements LocatableEntity { /** * Bericht/Geschichte/Historie/Beliebiges Ereignis/Geschichte diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java index 2eaafe522..c6da4260e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; 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; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.story.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.368286200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class GeschichteHistorieObservation implements EntryEntity { /** * Bericht/Geschichte/Historie/origin diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java index fd1905836..086ad5ed1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.380284700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class GestorterGeruchssinnObservation implements EntryEntity { /** * Bericht/Symptome/Gestörter Geruchssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java index aec8b96a2..b8af99e1c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.382286500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class GestorterGeschmackssinnObservation implements EntryEntity { /** * Bericht/Symptome/Gestörter Geschmackssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java index 606ba8a63..c5ecde5f8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; 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.Path; @@ -13,6 +14,11 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.occupation_summary.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.413284900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class GesundheitsbezogenerBerufEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigungsstatus diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservation.java index b31f9dc73..87b4213ab 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HeiserkeitObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.375283400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class HeiserkeitObservation implements EntryEntity { /** * Bericht/Symptome/Heiserkeit/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java index 4aee9ed1f..269f13b21 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; 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.Path; @@ -13,6 +14,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.travel_history.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.397285200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class HistorieDerReiseObservation implements EntryEntity { /** * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Aufenthalt in den letzten 14 Tage in einem der Risikogebiete für Coronainfektion oder Kontakt zu Menschen, die dort waren diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservation.java index 7bdc058c5..9d48041f9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/HustenObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.372286100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class HustenObservation implements EntryEntity { /** * Bericht/Symptome/Husten/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservation.java index 125d5958d..d3a2880f3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturObservation.java @@ -7,6 +7,7 @@ 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.Path; @@ -15,6 +16,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.body_temperature.v2") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.378285800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class KorpertemperaturObservation implements EntryEntity { /** * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Temperatur diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java index 43f957717..b868f32ac 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.378285800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class KorpertemperaturStorfaktorenElement implements LocatableEntity { /** * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Störfaktoren diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationCluster.java index 477858c0d..11ff9e75c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/OrganisationCluster.java @@ -4,6 +4,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; 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.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.organisation_cc.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.414284600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class OrganisationCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Identifier diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservation.java index 4fdce78e8..38e96eb2f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/PersonenkontaktObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.exposure_assessment.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.392287300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class PersonenkontaktObservation implements EntryEntity { /** * Bericht/Kontakt/Personenkontakt/Beliebiges Ereignis/*Agent (en) diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java index 606d29d23..cb9fc0f83 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; 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.Path; @@ -13,6 +14,11 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.problem_diagnosis.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.409286200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ProblemDiagnoseEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Problem/Diagnose/Name des Problems/ der Diagnose diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java index 7d7d2fd44..b7ff9e178 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java @@ -1,4 +1,11 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +import javax.annotation.processing.Generated; + +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.423285400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java index 39a1a3b2b..f43604f19 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; +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 = "2020-12-09T11:37:53.422285500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_CODED_TEXT") public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText implements RMEntity, ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java index 4e0cddb91..7804d2042 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.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 = "2020-12-09T11:37:53.423285400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_TEXT") public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText implements RMEntity, ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java index 8919e29ea..d4e0e0f9e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java @@ -6,6 +6,7 @@ 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; @@ -15,6 +16,11 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.421286200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ProblemDiganoseCoronovirusEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Name des Problems/ der Diagnose diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java index 22c2cc2c1..0cabf25dc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java @@ -5,12 +5,18 @@ import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.IntervalEventEntity; import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.401285400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ReisefallBeliebigesIntervallereignisIntervalEvent implements IntervalEventEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Letzte Reise? diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java index 2d4962d4a..7a5585032 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java @@ -4,11 +4,17 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.time.temporal.TemporalAccessor; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.402287900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ReisefallBestimmteReiseCluster implements LocatableEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java index bc60471fe..d753a7bca 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java @@ -4,11 +4,17 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.403287500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ReisefallBestimmtesReisezielCluster implements LocatableEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/Land diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservation.java index 68f40274b..0881f3f2d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/ReisefallObservation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; 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.Path; @@ -13,6 +14,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.travel_event.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.400286100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ReisefallObservation implements EntryEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservation.java index 26db7590a..ce0f44d69 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/SchnupfenObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.374284100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class SchnupfenObservation implements EntryEntity { /** * Bericht/Symptome/Schnupfen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortCluster.java index d725cf952..20819498e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StandortCluster.java @@ -4,6 +4,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; 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.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.398284300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class StandortCluster implements LocatableEntity { /** * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Ortsbeschreibung/Standort/Standortbeschreibung diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusCluster.java index fb9de207d..64dec3b8e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/StatusCluster.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.exampleoptimizersettingsections.coronaanamnesecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -8,6 +9,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.problem_qualifier.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.422285500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class StatusCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Status/Diagnosestatus diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java index 8957071f1..0cf1be634 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java @@ -3,7 +3,13 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.time.temporal.TemporalAccessor; import java.util.List; +import javax.annotation.processing.Generated; +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.390285400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface WeitereSymptomeBeliebigesEreignisChoice { FeederAudit getFeederAudit(); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java index 4914ddced..0a44d13d0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java @@ -5,6 +5,7 @@ import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; @@ -12,6 +13,11 @@ import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.387286700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("INTERVAL_EVENT") public class WeitereSymptomeBeliebigesEreignisIntervalEvent implements IntervalEventEntity, WeitereSymptomeBeliebigesEreignisChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java index 783a6402d..bc3423672 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java @@ -3,12 +3,18 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.time.temporal.TemporalAccessor; import java.util.List; +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.PointEventEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.389287+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("POINT_EVENT") public class WeitereSymptomeBeliebigesEreignisPointEvent implements PointEventEntity, WeitereSymptomeBeliebigesEreignisChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java index 79f71117c..cdebd0fa5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; 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; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.385285300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class WeitereSymptomeObservation implements EntryEntity { /** * Bericht/Symptome/Weitere Symptome/origin diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java index 5d36270f5..9614f7da3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java @@ -4,11 +4,17 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.387286700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class WeitereSymptomeSpezifischesSymptomAnzeichenCluster implements LocatableEntity { /** * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluation.java index 55f4e0c88..af167db7c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnsituationEvaluation.java @@ -6,6 +6,7 @@ import java.lang.Long; import java.lang.String; 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.living_arrangement.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.417284900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class WohnsituationEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Wohnsituation/Beschreibung diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteCluster.java index 13c1522da..f8e876632 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/exampleoptimizersettingsections/coronaanamnesecomposition/definition/WohnstatteCluster.java @@ -4,6 +4,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.Long; 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.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.dwelling.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.418286800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class WohnstatteCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Wohnsituation/Wohnstätte/Anzahl der Schlafzimmer diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java index e8e265eba..bd26ad9ca 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/AlternativeEventsComposition.java @@ -8,6 +8,7 @@ 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; @@ -23,6 +24,11 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.report.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:49.949760600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @Template("AlternativeEvents") public class AlternativeEventsComposition implements CompositionEntity { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java index 4153033b1..75aedab98 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnChoice.java @@ -1,9 +1,17 @@ package org.ehrbase.client.classgenerator.examples.alternativeeventscomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import java.lang.Double; +import java.lang.String; import java.time.temporal.TemporalAccessor; import java.util.List; +import javax.annotation.processing.Generated; +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:50.075758800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface KorpergewichtAnyEventEnChoice { Double getGewichtMagnitude(); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java index b6fba6092..d6ff9c8b5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnIntervalEvent.java @@ -7,6 +7,7 @@ import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; @@ -14,6 +15,11 @@ import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:50.057758400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("INTERVAL_EVENT") public class KorpergewichtAnyEventEnIntervalEvent implements IntervalEventEntity, KorpergewichtAnyEventEnChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java index 16a789d11..04837100a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtAnyEventEnPointEvent.java @@ -5,12 +5,18 @@ import java.lang.String; import java.time.temporal.TemporalAccessor; import java.util.List; +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.PointEventEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:50.069759+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("POINT_EVENT") public class KorpergewichtAnyEventEnPointEvent implements PointEventEntity, KorpergewichtAnyEventEnChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java index cb8c92a72..06a8919d5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtBirthEnPointEvent.java @@ -5,11 +5,17 @@ import java.lang.String; import java.time.temporal.TemporalAccessor; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.PointEventEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:50.027758400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class KorpergewichtBirthEnPointEvent implements PointEventEntity { /** * Bericht/Körpergewicht/*Birth(en)/Gewicht diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java index f2f291a43..039fb488f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtConfoundingFactorsEnElement.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:50.041757900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class KorpergewichtConfoundingFactorsEnElement implements LocatableEntity { /** * Bericht/Körpergewicht/*Birth(en)/*Confounding factors(en) diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java index d1a197f7c..cae8cb894 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/alternativeeventscomposition/definition/KorpergewichtObservation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; 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; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.body_weight.v2") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:50.019760200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class KorpergewichtObservation implements EntryEntity { /** * Bericht/Körpergewicht/*Birth(en) diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java index af733ea41..e44e7cb4f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/BefundDerBlutgasanalyseComposition.java @@ -8,6 +8,7 @@ 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; @@ -24,6 +25,11 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.registereintrag.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.251760800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @Template("Befund der Blutgasanalyse") public class BefundDerBlutgasanalyseComposition implements CompositionEntity { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java index 45d771ce8..7f63a026b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/KohlendioxidpartialdruckCluster.java @@ -5,6 +5,7 @@ import java.lang.Double; import java.lang.String; 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.Path; @@ -12,6 +13,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.256762+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class KohlendioxidpartialdruckCluster implements LocatableEntity { /** * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Kohlendioxidpartialdruck/untersuchter Analyt diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java index 89ed92182..570a63356 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/LaborergebnisObservation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; 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.Path; @@ -13,6 +14,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.laboratory_test_result.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.255761200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class LaborergebnisObservation implements EntryEntity { /** * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Labortest-Bezeichnung diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java index ec40e8b0d..5aab07cdc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/PhWertCluster.java @@ -5,6 +5,7 @@ import java.lang.Double; import java.lang.String; 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.Path; @@ -12,6 +13,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.262759700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class PhWertCluster implements LocatableEntity { /** * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/pH-Wert/untersuchter Analyt diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java index 8486544c1..dc844b816 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffpartialdruckCluster.java @@ -5,6 +5,7 @@ import java.lang.Double; import java.lang.String; 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.Path; @@ -12,6 +13,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.259761300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class SauerstoffpartialdruckCluster implements LocatableEntity { /** * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Sauerstoffpartialdruck/untersuchter Analyt diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java index 275a7d8c8..f4fbca6e1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/befundderblutgasanalysecomposition/definition/SauerstoffsattigungCluster.java @@ -5,6 +5,7 @@ import java.lang.Double; import java.lang.String; 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.Path; @@ -12,6 +13,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.264761300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class SauerstoffsattigungCluster implements LocatableEntity { /** * Befund der Blutgasanalyse/Laborergebnis/Jedes Ereignis/Sauerstoffsättigung/untersuchter Analyt diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java index 5f0d728cd..0c21bb9f5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/CoronaAnamneseComposition.java @@ -8,6 +8,7 @@ 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; @@ -27,6 +28,11 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.report.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.558762500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @Template("Corona_Anamnese") public class CoronaAnamneseComposition implements CompositionEntity { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java index 978e2b1c7..38acaa313 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AdresseCluster.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -9,6 +10,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.address_cc.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.631764500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class AdresseCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Adresse/Stadt diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java index 9c288e79c..521a81263 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AllgemeineAngabenSection.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; 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.Path; @@ -9,6 +10,11 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.618762300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class AllgemeineAngabenSection implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java index 44e908097..4926811c5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AndereAktuelleErkrankungenObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.619762700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class AndereAktuelleErkrankungenObservation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Andere aktuelle Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java index 483553b27..65406ef11 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AufenthaltInGesundheitseinrichtungObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.exposure_assessment.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.601762700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class AufenthaltInGesundheitseinrichtungObservation implements EntryEntity { /** * Bericht/Kontakt/Aufenthalt in Gesundheitseinrichtung/Beliebiges Ereignis/*Agent (en) diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java index 552866500..cc889c06d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BeschaftigungCluster.java @@ -4,6 +4,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; 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.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.occupation_record.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.629763600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class BeschaftigungCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Berufsbezeichnung/Rolle diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java index a20793e3c..5ae46e103 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/BewertungDesGesundheitsrisikosEvaluation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.health_risk.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.636762900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class BewertungDesGesundheitsrisikosEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Bewertung des Gesundheitsrisikos/Gesundheitsrisiko diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java index a6d094324..7dd8f29a6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ChronischeErkrankungenObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.621762300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ChronischeErkrankungenObservation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Chronische Erkrankungen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java index 6323af0e6..a324aad2c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungAktuelleAktivitatActivity.java @@ -5,11 +5,17 @@ import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; import java.lang.String; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.643763200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DienstleistungAktuelleAktivitatActivity implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Name der Dienstleistung diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java index d561c0a8a..649b3e953 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungGrundFurDieAnforderungElement.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.644764+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DienstleistungGrundFurDieAnforderungElement implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität/Grund für die Anforderung diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java index b725a3d37..1906f86f9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DienstleistungInstruction.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-INSTRUCTION.service_request.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.643763200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DienstleistungInstruction implements EntryEntity { /** * Bericht/Allgemeine Angaben/Dienstleistung/Aktuelle Aktivität diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java index 365637f9f..d4bc4fac4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DurchfallObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.587761800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DurchfallObservation implements EntryEntity { /** * Bericht/Symptome/Durchfall/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java index 13b4520bb..b77fac6a9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FieberOderErhohteKorpertemperaturObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.577761400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class FieberOderErhohteKorpertemperaturObservation implements EntryEntity { /** * Bericht/Symptome/Fieber oder erhöhte Körpertemperatur/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java index a92d4883b..0af9e0fa4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningObservation.java @@ -7,6 +7,7 @@ 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.Path; @@ -15,6 +16,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.medication_use.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.624763800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class FragebogenZumMedikationsScreeningObservation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Medikamente in Verwendung? diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java index 396c8e284..296644b9b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.625766100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class FragebogenZumMedikationsScreeningSpezifischeMedikamenteCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Fragebogen zum Medikations-Screening/Beliebiges Ereignis/Spezifische Medikamentenklasse/Spezifische Medikamente/Name des Medikaments diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java index d0865e3bb..95f1d24db 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisChoice.java @@ -4,7 +4,13 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.time.temporal.TemporalAccessor; import java.util.List; +import javax.annotation.processing.Generated; +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.563762+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface GeschichteHistorieBeliebigesEreignisChoice { FeederAudit getFeederAudit(); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java index e9653bb82..c99cd178d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisIntervalEvent.java @@ -6,6 +6,7 @@ import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; @@ -13,6 +14,11 @@ import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.561762500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("INTERVAL_EVENT") public class GeschichteHistorieBeliebigesEreignisIntervalEvent implements IntervalEventEntity, GeschichteHistorieBeliebigesEreignisChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java index 003931571..d1df7d4b2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieBeliebigesEreignisPointEvent.java @@ -4,12 +4,18 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.time.temporal.TemporalAccessor; import java.util.List; +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.PointEventEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.562762100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("POINT_EVENT") public class GeschichteHistorieBeliebigesEreignisPointEvent implements PointEventEntity, GeschichteHistorieBeliebigesEreignisChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java index 870f05ade..113046d73 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieGeschichteElement.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.561762500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class GeschichteHistorieGeschichteElement implements LocatableEntity { /** * Bericht/Geschichte/Historie/Beliebiges Ereignis/Geschichte diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java index a00a80147..6d826ba12 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GeschichteHistorieObservation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; 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; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.story.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.560762800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class GeschichteHistorieObservation implements EntryEntity { /** * Bericht/Geschichte/Historie/origin diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java index d824ec683..425e875ca 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeruchssinnObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.582760700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class GestorterGeruchssinnObservation implements EntryEntity { /** * Bericht/Symptome/Gestörter Geruchssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java index 7a345a844..86a340f4e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GestorterGeschmackssinnObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.585761600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class GestorterGeschmackssinnObservation implements EntryEntity { /** * Bericht/Symptome/Gestörter Geschmackssinn/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java index 82f473863..5bcdc63eb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/GesundheitsbezogenerBerufEvaluation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; 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.Path; @@ -13,6 +14,11 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.occupation_summary.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.628762400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class GesundheitsbezogenerBerufEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigungsstatus diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java index a7c95e23c..201fa25bf 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HeiserkeitObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.574763400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class HeiserkeitObservation implements EntryEntity { /** * Bericht/Symptome/Heiserkeit/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java index db46168b6..e1cec426f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HistorieDerReiseObservation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; 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.Path; @@ -13,6 +14,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.travel_history.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.605761800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class HistorieDerReiseObservation implements EntryEntity { /** * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Aufenthalt in den letzten 14 Tage in einem der Risikogebiete für Coronainfektion oder Kontakt zu Menschen, die dort waren diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java index 2e63d4f83..6cd18bbdf 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/HustenObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.569760900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class HustenObservation implements EntryEntity { /** * Bericht/Symptome/Husten/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java index b4e8509a0..8649b7c3b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KontaktSection.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -8,6 +9,11 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.597764300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class KontaktSection implements LocatableEntity { /** * Bericht/Kontakt/Personenkontakt diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java index dba5a97bd..6239c6f70 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturObservation.java @@ -7,6 +7,7 @@ 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.Path; @@ -15,6 +16,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.body_temperature.v2") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.579760800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class KorpertemperaturObservation implements EntryEntity { /** * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Temperatur diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java index 77f1a9378..0c88db6c8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KorpertemperaturStorfaktorenElement.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.580760800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class KorpertemperaturStorfaktorenElement implements LocatableEntity { /** * Bericht/Symptome/Körpertemperatur/Beliebiges Ereignis/Störfaktoren diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java index 52e60d3e9..e61bc6fa2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/OrganisationCluster.java @@ -4,6 +4,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; 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.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.organisation_cc.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.630763800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class OrganisationCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Gesundheitsbezogener Beruf/Beschäftigung/Organisation/Identifier diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java index 83a427e9f..a82d7c552 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PersonenkontaktObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.exposure_assessment.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.597764300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class PersonenkontaktObservation implements EntryEntity { /** * Bericht/Kontakt/Personenkontakt/Beliebiges Ereignis/*Agent (en) diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java index 6d963ee3e..e3aae71e1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiagnoseEvaluation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; 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.Path; @@ -13,6 +14,11 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.problem_diagnosis.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.623764500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ProblemDiagnoseEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Problem/Diagnose/Name des Problems/ der Diagnose diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java index 254a3d0c0..3e69900b4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice.java @@ -1,4 +1,11 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +import javax.annotation.processing.Generated; + +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.642763300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java index 645e7b2a8..172910353 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; +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 = "2020-12-09T11:37:52.642763300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_CODED_TEXT") public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvCodedText implements RMEntity, ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java index f94644b3d..6b3cfa2e9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.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 = "2020-12-09T11:37:52.642763300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_TEXT") public class ProblemDiganoseCoronovirusDiagnostischeSicherheitDvText implements RMEntity, ProblemDiganoseCoronovirusDiagnostischeSicherheitChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java index 5420522c1..ae16617d0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ProblemDiganoseCoronovirusEvaluation.java @@ -6,6 +6,7 @@ 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; @@ -15,6 +16,11 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.problem_diagnosis_covid.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.640762+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ProblemDiganoseCoronovirusEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Name des Problems/ der Diagnose diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java index c0ee56dc4..aa2b4caed 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBeliebigesIntervallereignisIntervalEvent.java @@ -5,12 +5,18 @@ import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.IntervalEventEntity; import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.610762500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ReisefallBeliebigesIntervallereignisIntervalEvent implements IntervalEventEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Letzte Reise? diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java index c0c96a6c6..1ae9ede0e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmteReiseCluster.java @@ -4,11 +4,17 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.time.temporal.TemporalAccessor; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.611763700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ReisefallBestimmteReiseCluster implements LocatableEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java index 82f79792e..1ff5b365a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallBestimmtesReisezielCluster.java @@ -4,11 +4,17 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.612763300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ReisefallBestimmtesReisezielCluster implements LocatableEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis/Bestimmte Reise/Bestimmtes Reiseziel/Land diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java index 282301e7f..7496f3b33 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReisefallObservation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; 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.Path; @@ -13,6 +14,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.travel_event.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.609761200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ReisefallObservation implements EntryEntity { /** * Bericht/Risikogebiet/Reisefall/Beliebiges Intervallereignis diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java index fddb5493c..f0503260d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/RisikogebietSection.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; 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.Path; @@ -9,6 +10,11 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.604762700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class RisikogebietSection implements LocatableEntity { /** * Bericht/Risikogebiet/Historie der Reise diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java index 0cdaf3403..1ed290afd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SchnupfenObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.572763300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class SchnupfenObservation implements EntryEntity { /** * Bericht/Symptome/Schnupfen/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java index dff306a4b..3b8bb8087 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StandortCluster.java @@ -4,6 +4,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; 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.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.606761900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class StandortCluster implements LocatableEntity { /** * Bericht/Risikogebiet/Historie der Reise/Jedes Ereignis/Ortsbeschreibung/Standort/Standortbeschreibung diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java index 30a015c2a..5d094e48f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/StatusCluster.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -8,6 +9,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.problem_qualifier.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.640762+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class StatusCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Problem/Diganose Coronovirus/Status/Diagnosestatus diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java index a5a1cf8d4..3d71172b3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/SymptomeSection.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.coronaanamnesecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -8,6 +9,11 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.568761700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class SymptomeSection implements LocatableEntity { /** * Bericht/Symptome/Husten diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java index 13cd8c51b..29c244483 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisChoice.java @@ -3,7 +3,13 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.time.temporal.TemporalAccessor; import java.util.List; +import javax.annotation.processing.Generated; +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.594765200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface WeitereSymptomeBeliebigesEreignisChoice { FeederAudit getFeederAudit(); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java index 839ba412b..7c56e4a7f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisIntervalEvent.java @@ -5,6 +5,7 @@ import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; import org.ehrbase.client.annotations.Path; @@ -12,6 +13,11 @@ import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.590761+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("INTERVAL_EVENT") public class WeitereSymptomeBeliebigesEreignisIntervalEvent implements IntervalEventEntity, WeitereSymptomeBeliebigesEreignisChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java index bd2a146dc..79d10d79a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeBeliebigesEreignisPointEvent.java @@ -3,12 +3,18 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.time.temporal.TemporalAccessor; import java.util.List; +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.PointEventEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.593763400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("POINT_EVENT") public class WeitereSymptomeBeliebigesEreignisPointEvent implements PointEventEntity, WeitereSymptomeBeliebigesEreignisChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java index d136e9323..be627e1c6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeObservation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; 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; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.symptom_sign_screening.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.590761+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class WeitereSymptomeObservation implements EntryEntity { /** * Bericht/Symptome/Weitere Symptome/origin diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java index 4909d2458..590b10da9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WeitereSymptomeSpezifischesSymptomAnzeichenCluster.java @@ -4,11 +4,17 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.591761100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class WeitereSymptomeSpezifischesSymptomAnzeichenCluster implements LocatableEntity { /** * Bericht/Symptome/Weitere Symptome/Beliebiges Ereignis/Spezifisches Symptom/Anzeichen/Bezeichnung des Symptoms oder Anzeichens. diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java index 3b3acdee5..0deaf81d0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnsituationEvaluation.java @@ -6,6 +6,7 @@ import java.lang.Long; import java.lang.String; 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.living_arrangement.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.634762900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class WohnsituationEvaluation implements EntryEntity { /** * Bericht/Allgemeine Angaben/Wohnsituation/Beschreibung diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java index 7e737c3ed..b58d02edd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/WohnstatteCluster.java @@ -4,6 +4,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.Long; 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.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.dwelling.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.634762900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class WohnstatteCluster implements LocatableEntity { /** * Bericht/Allgemeine Angaben/Wohnsituation/Wohnstätte/Anzahl der Schlafzimmer diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java index d5ebae2b9..1c3d213af 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/DiagnoseComposition.java @@ -7,6 +7,7 @@ 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; @@ -23,6 +24,11 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.report.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.381760600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @Template("Diagnose") public class DiagnoseComposition implements CompositionEntity { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java index 9ceb57083..786e57dad 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AnatomischeLokalisationCluster.java @@ -4,6 +4,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; 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.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.anatomical_location.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.384761900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class AnatomischeLokalisationCluster implements LocatableEntity { /** * COVID-19-Diagnose/Problem/Diagnose/Anatomische Lokalisation/Name der Körperstelle diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java index 8c53ebb7f..eec25c275 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseAtiologieDerKrankheitElement.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.390760500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class AtiopathogeneseAtiologieDerKrankheitElement implements LocatableEntity { /** * COVID-19-Diagnose/Problem/Diagnose/Ätiopathogenese/feeder_audit diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java index bd295a268..545b7a9f0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseBeschreibungDesEntstehensElement.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.393760800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class AtiopathogeneseBeschreibungDesEntstehensElement implements LocatableEntity { /** * COVID-19-Diagnose/Problem/Diagnose/Ätiopathogenese/Beschreibung des Entstehens diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java index 941595839..c96e2bdc7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseCluster.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; 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.Path; @@ -9,6 +10,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.etiology.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.390760500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class AtiopathogeneseCluster implements LocatableEntity { /** * COVID-19-Diagnose/Problem/Diagnose/Ätiopathogenese/Ätiologie der Krankheit diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueChoice.java index 0d9980666..58de132e6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueChoice.java @@ -1,4 +1,11 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import javax.annotation.processing.Generated; + +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.392761500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface AtiopathogeneseValueChoice { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java index 0e473dfaa..1b8b7d536 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvCodedText.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +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 = "2020-12-09T11:37:52.391761400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_CODED_TEXT") public class AtiopathogeneseValueDvCodedText implements RMEntity, AtiopathogeneseValueChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java index c588f9512..6803ed75e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/AtiopathogeneseValueDvText.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.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 = "2020-12-09T11:37:52.392761500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_TEXT") public class AtiopathogeneseValueDvText implements RMEntity, AtiopathogeneseValueChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java index 8374a91ba..900ac9627 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/DiagnosedetailsCluster.java @@ -3,6 +3,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.Boolean; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -10,6 +11,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.diagnose_details.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.386760900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DiagnosedetailsCluster implements LocatableEntity { /** * COVID-19-Diagnose/Problem/Diagnose/Diagnosedetails/Begründung von Ausnahmen diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java index 2d22aec59..e696fb43a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/FallidentifikationCluster.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -9,6 +10,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.case_identification.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.381760600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class FallidentifikationCluster implements LocatableEntity { /** * COVID-19-Diagnose/context/Fallidentifikation/Fall-Kennung diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitChoice.java index 0315f86e9..46bfb6dc1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitChoice.java @@ -1,4 +1,11 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import javax.annotation.processing.Generated; + +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.396762500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface ProblemDiagnoseDiagnostischeSicherheitChoice { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java index 194d9913e..8711d73c5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvCodedText.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +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 = "2020-12-09T11:37:52.395761300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_CODED_TEXT") public class ProblemDiagnoseDiagnostischeSicherheitDvCodedText implements RMEntity, ProblemDiagnoseDiagnostischeSicherheitChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java index 9d92d6a7b..adbc780be 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseDiagnostischeSicherheitDvText.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.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 = "2020-12-09T11:37:52.396762500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_TEXT") public class ProblemDiagnoseDiagnostischeSicherheitDvText implements RMEntity, ProblemDiagnoseDiagnostischeSicherheitChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java index 044a5a606..3f3eba43f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseEvaluation.java @@ -6,6 +6,7 @@ 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; @@ -15,6 +16,11 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.problem_diagnosis.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.383761+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ProblemDiagnoseEvaluation implements EntryEntity { /** * COVID-19-Diagnose/Problem/Diagnose/Name des Problems/ der Diagnose diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradChoice.java index e7ad2f230..58c882148 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradChoice.java @@ -1,4 +1,11 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +import javax.annotation.processing.Generated; + +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.398763300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface ProblemDiagnoseSchweregradChoice { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java index d7d4b6fe1..e2de59c30 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvCodedText.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.definition; +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 = "2020-12-09T11:37:52.397762800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_CODED_TEXT") public class ProblemDiagnoseSchweregradDvCodedText implements RMEntity, ProblemDiagnoseSchweregradChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java index 39358fb7e..674647d42 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/diagnosecomposition/definition/ProblemDiagnoseSchweregradDvText.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.diagnosecomposition.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 = "2020-12-09T11:37:52.397762800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_TEXT") public class ProblemDiagnoseSchweregradDvText implements RMEntity, ProblemDiagnoseSchweregradChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java index 6a7e02cb2..e61b88b8f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/EhrbaseBloodPressureSimpleDeV0Composition.java @@ -7,6 +7,7 @@ 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; @@ -23,6 +24,11 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.sample_encounter.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.099761+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @Template("ehrbase_blood_pressure_simple.de.v0") public class EhrbaseBloodPressureSimpleDeV0Composition implements CompositionEntity { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java index 5f01cde16..3401e741b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/BloodPressureTrainingSampleObservation.java @@ -7,6 +7,7 @@ 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.Path; @@ -15,6 +16,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.sample_blood_pressure.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.103759300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class BloodPressureTrainingSampleObservation implements EntryEntity { /** * Encounter (training sample)/Blood pressure (Training sample)/Baseline reading/Systolic diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java index e6b2f6792..30f86329a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasebloodpressuresimpledev0composition/definition/DeviceDetailsTrainingSampleCluster.java @@ -4,6 +4,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; import java.time.temporal.TemporalAccessor; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.sample_device.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.100768500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DeviceDetailsTrainingSampleCluster implements LocatableEntity { /** * Encounter (training sample)/context/Admin detail/Device details (training sample)/Name diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java index 091061934..7da163dc4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/EhrbaseMultiOccurrenceDeV1Composition.java @@ -8,6 +8,7 @@ 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; @@ -23,6 +24,11 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.encounter.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.159759700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @Template("ehrbase_multi_occurrence.de.v1") public class EhrbaseMultiOccurrenceDeV1Composition implements CompositionEntity { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventChoice.java index e61827103..2357738de 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventChoice.java @@ -2,9 +2,18 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; +import java.lang.Double; +import java.lang.Long; +import java.lang.String; import java.time.temporal.TemporalAccessor; import java.util.List; +import javax.annotation.processing.Generated; +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.167759200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface BodyTemperatureAnyEventChoice { Double getTemperatureMagnitude(); diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java index 48104719c..377d51b21 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventIntervalEvent.java @@ -8,6 +8,7 @@ import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; @@ -16,6 +17,11 @@ import org.ehrbase.client.classgenerator.shareddefinition.MathFunction; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.164760800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("INTERVAL_EVENT") public class BodyTemperatureAnyEventIntervalEvent implements IntervalEventEntity, BodyTemperatureAnyEventChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java index 12b3fc67c..73613a852 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureAnyEventPointEvent.java @@ -7,6 +7,7 @@ import java.lang.String; import java.time.temporal.TemporalAccessor; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.OptionFor; @@ -14,6 +15,11 @@ import org.ehrbase.client.classgenerator.interfaces.PointEventEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.166760700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("POINT_EVENT") public class BodyTemperatureAnyEventPointEvent implements PointEventEntity, BodyTemperatureAnyEventChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureChoice.java index 0eba59b01..368eb026d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureChoice.java @@ -1,4 +1,11 @@ package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; +import javax.annotation.processing.Generated; + +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.166760700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface BodyTemperatureBodyExposureChoice { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvCodedText.java index 89e0fb44e..e8f326384 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvCodedText.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; +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 = "2020-12-09T11:37:51.165759900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_CODED_TEXT") public class BodyTemperatureBodyExposureDvCodedText implements RMEntity, BodyTemperatureBodyExposureChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java index e658d92ac..6de40358c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureBodyExposureDvText.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.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 = "2020-12-09T11:37:51.165759900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_TEXT") public class BodyTemperatureBodyExposureDvText implements RMEntity, BodyTemperatureBodyExposureChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementChoice.java index 9ad06b1cc..153c78d44 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementChoice.java @@ -1,4 +1,11 @@ package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; +import javax.annotation.processing.Generated; + +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.163762200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface BodyTemperatureLocationOfMeasurementChoice { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvCodedText.java index 278a76c7c..7905721e0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvCodedText.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.definition; +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 = "2020-12-09T11:37:51.162760100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_CODED_TEXT") public class BodyTemperatureLocationOfMeasurementDvCodedText implements RMEntity, BodyTemperatureLocationOfMeasurementChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java index 264050390..ddfb8dd7d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureLocationOfMeasurementDvText.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.ehrbasemultioccurrencedev1composition.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 = "2020-12-09T11:37:51.163762200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_TEXT") public class BodyTemperatureLocationOfMeasurementDvText implements RMEntity, BodyTemperatureLocationOfMeasurementChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java index b445f2d45..9f7c65317 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/ehrbasemultioccurrencedev1composition/definition/BodyTemperatureObservation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; 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; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.body_temperature.v2") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.161759400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class BodyTemperatureObservation implements EntryEntity { /** * Encounter/Body temperature/origin diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java index 503cc9181..ae9c9faba 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/EpisodeOfCareComposition.java @@ -7,6 +7,7 @@ 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; @@ -22,6 +23,11 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.versorgungsfall.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.335761100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @Template("EpisodeOfCare") public class EpisodeOfCareComposition implements CompositionEntity { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java index 49c277c0a..95526cc06 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareAdminEntry.java @@ -7,6 +7,7 @@ import java.net.URI; 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.Path; @@ -15,6 +16,11 @@ @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.episodeofcare.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.336760400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class EpisodeofcareAdminEntry implements EntryEntity { /** * EpisodeOfCare/Episodeofcare/identifier diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java index 086ddb11c..87c2fd099 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareDiagnosisCluster.java @@ -4,11 +4,17 @@ import com.nedap.archie.rm.datavalues.DvEHRURI; import java.lang.Long; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.338761+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class EpisodeofcareDiagnosisCluster implements LocatableEntity { /** * EpisodeOfCare/Episodeofcare/diagnosis/diagnosis entry diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java index 10a6984a3..cc22c9046 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareIdentifierElement.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datavalues.DvIdentifier; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.336760400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class EpisodeofcareIdentifierElement implements LocatableEntity { /** * EpisodeOfCare/Episodeofcare/identifier diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java index d60f0baf0..1d719efbf 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/EpisodeofcareTeamElement.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.net.URI; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.340762+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class EpisodeofcareTeamElement implements LocatableEntity { /** * EpisodeOfCare/Episodeofcare/team diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java index 4658efa13..ff955384b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/OpenEREACTCareComposition.java @@ -8,6 +8,7 @@ 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; @@ -26,6 +27,11 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.encounter.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.524761300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @Template("open_eREACT-Care") public class OpenEREACTCareComposition implements CompositionEntity { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java index 957cbb799..d0a1b8d90 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AbdomenSymptomCluster.java @@ -4,6 +4,7 @@ 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; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.616764100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class AbdomenSymptomCluster implements LocatableEntity { /** * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Abdomen symptom/Symptom/Sign name diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java index 68d4808f5..151f8ade4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AcvpuScaleObservation.java @@ -6,6 +6,7 @@ import com.nedap.archie.rm.generic.PartyProxy; 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.acvpu.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.665763100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class AcvpuScaleObservation implements EntryEntity { /** * open_eREACT-Care/Assessment/NEWS2/ACVPU scale/Any point in time event/ACVPU diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java index 4ad1c30ed..5dc1c337a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AllergiesEvaluation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; 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.Path; @@ -13,6 +14,11 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.541761900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class AllergiesEvaluation implements EntryEntity { /** * open_eREACT-Care/Background/Allergies/Synopsis diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java index 6a7b2347b..dfeb16cb2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/AssessmentSection.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -8,6 +9,11 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.559761500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class AssessmentSection implements LocatableEntity { /** * open_eREACT-Care/Assessment/DENWIS diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java index bd9a8c069..0b0f1f1a8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BackgroundSection.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -8,6 +9,11 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.532762500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class BackgroundSection implements LocatableEntity { /** * open_eREACT-Care/Background/Height diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java index 30219a110..122940f62 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/BloodPressureObservation.java @@ -7,6 +7,7 @@ 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.Path; @@ -15,6 +16,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.blood_pressure.v2") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.668761600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class BloodPressureObservation implements EntryEntity { /** * open_eREACT-Care/Assessment/NEWS2/Blood pressure/Any event/Systolic diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java index 4a2886926..17b957abf 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ChestSymptomCluster.java @@ -4,6 +4,7 @@ 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; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.614762400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ChestSymptomCluster implements LocatableEntity { /** * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Chest symptom/Symptom/Sign name diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java index 72ace1364..e4c7dd2a2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/Covid19ExposureEvaluation.java @@ -4,6 +4,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; 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.Path; @@ -12,6 +13,11 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.health_risk-covid.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.627762100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class Covid19ExposureEvaluation implements EntryEntity { /** * open_eREACT-Care/Assessment/Covid/Covid-19 exposure/Health risk diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java index 53d940802..78cea6edc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidNotesEvaluation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; 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.Path; @@ -13,6 +14,11 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.643763600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class CovidNotesEvaluation implements EntryEntity { /** * open_eREACT-Care/Assessment/Covid/Covid notes/Synopsis diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java index cfeda1c12..f7eeb04ce 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSection.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -8,6 +9,11 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.600759700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class CovidSection implements LocatableEntity { /** * open_eREACT-Care/Assessment/Covid/Covid symptoms diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java index 3d53dd0b6..f647f904f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/CovidSymptomsObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.story.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.605760500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class CovidSymptomsObservation implements EntryEntity { /** * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Story diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java index 993bfb5ff..96f36ef7e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisAgitationIndicatorElement.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.569762500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DenwisAgitationIndicatorElement implements LocatableEntity { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/feeder_audit diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java index c6caa9b95..c025e7825 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisBreathingIndicatorElement.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.563760300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DenwisBreathingIndicatorElement implements LocatableEntity { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/Breathing indicator diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java index 7936902ca..ae9b06eaa 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisCirculationIndicatorElement.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.564760500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DenwisCirculationIndicatorElement implements LocatableEntity { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/Circulation indicator diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java index 5a1ac811a..8ea51ddab 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisMentationIndicatorElement.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.567763100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DenwisMentationIndicatorElement implements LocatableEntity { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/feeder_audit diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java index 35e6f388b..b009c2417 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisNurseSubjectiveIndicatorElement.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.576761600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DenwisNurseSubjectiveIndicatorElement implements LocatableEntity { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/feeder_audit diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java index 4ab45a40c..4a101bd29 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisObservation.java @@ -9,6 +9,7 @@ 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.Path; @@ -17,6 +18,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.denwis.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.562760600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DenwisObservation implements EntryEntity { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/Q1 Breathing diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java index df47a6989..d35fd1809 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPainIndicatorElement.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.570764100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DenwisPainIndicatorElement implements LocatableEntity { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/feeder_audit diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java index 6922cd06c..395c8719d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisPatientIndicatorElement.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.574763200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DenwisPatientIndicatorElement implements LocatableEntity { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/feeder_audit diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java index 79ddaf745..fb1a26bb4 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTemperatureIndicatorElement.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.565760600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DenwisTemperatureIndicatorElement implements LocatableEntity { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/feeder_audit diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java index 03c9ee12e..dd709956a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisTrajectoryIndicatorElement.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.572761400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DenwisTrajectoryIndicatorElement implements LocatableEntity { /** * open_eREACT-Care/Assessment/DENWIS/Point in time/feeder_audit diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice.java index f5090eda1..497685b64 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice.java @@ -1,4 +1,11 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import javax.annotation.processing.Generated; + +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.566761800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface DenwisValueChoice { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice2.java index 7811059ec..7c179e6e3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice2.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice2.java @@ -1,4 +1,11 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import javax.annotation.processing.Generated; + +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.568762400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface DenwisValueChoice2 { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice3.java index dec67cc7d..30f9b290a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice3.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice3.java @@ -1,4 +1,11 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import javax.annotation.processing.Generated; + +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.571763800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface DenwisValueChoice3 { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice4.java index 5f32501e4..21c52bdbc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice4.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice4.java @@ -1,4 +1,11 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import javax.annotation.processing.Generated; + +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.573762500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface DenwisValueChoice4 { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice5.java index 188762530..e7b29ec6d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice5.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice5.java @@ -1,4 +1,11 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import javax.annotation.processing.Generated; + +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.575762600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface DenwisValueChoice5 { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice6.java index b58b44c78..ef69cd8b2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice6.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueChoice6.java @@ -1,4 +1,11 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import javax.annotation.processing.Generated; + +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.577764100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface DenwisValueChoice6 { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java index 2a1a9da23..29f082d1d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +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 = "2020-12-09T11:37:51.566761800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_CODED_TEXT") public class DenwisValueDvCodedText implements RMEntity, DenwisValueChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java index 73bc92bad..f11c37c52 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText2.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +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 = "2020-12-09T11:37:51.568762400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_CODED_TEXT") public class DenwisValueDvCodedText2 implements RMEntity, DenwisValueChoice2 { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java index f853de21f..c19aa0909 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText3.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +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 = "2020-12-09T11:37:51.571763800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_CODED_TEXT") public class DenwisValueDvCodedText3 implements RMEntity, DenwisValueChoice3 { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java index 935ab6203..e7be50748 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText4.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +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 = "2020-12-09T11:37:51.572761400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_CODED_TEXT") public class DenwisValueDvCodedText4 implements RMEntity, DenwisValueChoice4 { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java index 927376d22..3ff9737c9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText5.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +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 = "2020-12-09T11:37:51.575762600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_CODED_TEXT") public class DenwisValueDvCodedText5 implements RMEntity, DenwisValueChoice5 { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java index a99d57ce0..16be035ce 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvCodedText6.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +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 = "2020-12-09T11:37:51.577764100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_CODED_TEXT") public class DenwisValueDvCodedText6 implements RMEntity, DenwisValueChoice6 { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java index 7147113d8..0d67a3200 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.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 = "2020-12-09T11:37:51.566761800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_TEXT") public class DenwisValueDvText implements RMEntity, DenwisValueChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java index e7d0d9c00..0830de704 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText2.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.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 = "2020-12-09T11:37:51.568762400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_TEXT") public class DenwisValueDvText2 implements RMEntity, DenwisValueChoice2 { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java index 9a442c7fa..a937c952f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText3.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.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 = "2020-12-09T11:37:51.571763800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_TEXT") public class DenwisValueDvText3 implements RMEntity, DenwisValueChoice3 { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java index 73d424609..8a9126627 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText4.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.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 = "2020-12-09T11:37:51.573762500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_TEXT") public class DenwisValueDvText4 implements RMEntity, DenwisValueChoice4 { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java index 687b8db99..cf88ccdef 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText5.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.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 = "2020-12-09T11:37:51.575762600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_TEXT") public class DenwisValueDvText5 implements RMEntity, DenwisValueChoice5 { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java index ce3b256fd..d327d0ab1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/DenwisValueDvText6.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.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 = "2020-12-09T11:37:51.577764100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_TEXT") public class DenwisValueDvText6 implements RMEntity, DenwisValueChoice6 { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java index b6f84d860..7a05ed9a6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FirstSymptomsCluster.java @@ -7,6 +7,7 @@ import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.606761+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class FirstSymptomsCluster implements LocatableEntity { /** * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/First symptoms/Symptom/Sign name diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java index acf81bdc8..e86021c03 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/FrailtyObservation.java @@ -6,6 +6,7 @@ import com.nedap.archie.rm.generic.PartyProxy; 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.clinical_frailty_scale.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.537763+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class FrailtyObservation implements EntryEntity { /** * open_eREACT-Care/Background/Frailty/Any point in time event/Assessment diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java index 110337f18..f6f5fa4cb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/HeightObservation.java @@ -8,6 +8,7 @@ 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.Path; @@ -16,6 +17,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.height.v2") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.533763500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class HeightObservation implements EntryEntity { /** * open_eREACT-Care/Background/Height/Any event/Height/Length diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java index 109397750..e68d0f8aa 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/KeyCovidSymptomCluster.java @@ -4,6 +4,7 @@ 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; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.610762500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class KeyCovidSymptomCluster implements LocatableEntity { /** * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Key Covid symptom/Symptom/Sign name diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java index 7e5c5d683..9d4f576d9 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestObservation.java @@ -6,6 +6,7 @@ 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; @@ -15,6 +16,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.laboratory_test_result.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.635759700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class LatestCovid19TestObservation implements EntryEntity { /** * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Any event/Test name diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusChoice.java index e264889eb..686433b6b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusChoice.java @@ -1,4 +1,11 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import javax.annotation.processing.Generated; + +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.641760500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface LatestCovid19TestOverallTestStatusChoice { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvCodedText.java index 9e22f2219..acd1f15bb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvCodedText.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +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 = "2020-12-09T11:37:51.640762300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_CODED_TEXT") public class LatestCovid19TestOverallTestStatusDvCodedText implements RMEntity, LatestCovid19TestOverallTestStatusChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java index 10b85f6d1..faa37724f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestOverallTestStatusDvText.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.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 = "2020-12-09T11:37:51.641760500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_TEXT") public class LatestCovid19TestOverallTestStatusDvText implements RMEntity, LatestCovid19TestOverallTestStatusChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java index b20c8acee..b40a37308 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/LatestCovid19TestTestRequestDetailsCluster.java @@ -3,11 +3,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.638759200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class LatestCovid19TestTestRequestDetailsCluster implements LocatableEntity { /** * open_eREACT-Care/Assessment/Covid/Latest Covid-19 test/Test request details/Requester diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java index cfcc7f33a..34d8c5add 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/MedicationEvaluation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; 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.Path; @@ -13,6 +14,11 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.540762100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class MedicationEvaluation implements EntryEntity { /** * open_eREACT-Care/Background/Medication/Synopsis diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java index baa52c46f..6fe690986 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/NeuroSymptomCluster.java @@ -4,6 +4,7 @@ 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; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.619761500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class NeuroSymptomCluster implements LocatableEntity { /** * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Neuro symptom/Symptom/Sign name diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java index 79977d8f2..ce3c2f879 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2ScoreObservation.java @@ -7,6 +7,7 @@ import java.lang.Long; 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.Path; @@ -15,6 +16,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.news2.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.672763200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class News2ScoreObservation implements EntryEntity { /** * open_eREACT-Care/Assessment/NEWS2/NEWS2 Score/Any point in time event/Respiration rate diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java index ffea28aae..bb174f27e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/News2Section.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -8,6 +9,11 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.650759200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class News2Section implements LocatableEntity { /** * open_eREACT-Care/Assessment/NEWS2/Temperature diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java index 660c64f6f..c9d4900c1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/OtherSymptomCluster.java @@ -4,6 +4,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; 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.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.symptom_sign-cvid.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.622763100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class OtherSymptomCluster implements LocatableEntity { /** * open_eREACT-Care/Assessment/Covid/Covid symptoms/Any event/Other symptom/Symptom/Sign name diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java index 54dc7b97e..81400858d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PastHistoryEvaluation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; 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.Path; @@ -13,6 +14,11 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.clinical_synopsis.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.539762200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class PastHistoryEvaluation implements EntryEntity { /** * open_eREACT-Care/Background/Past history/Synopsis diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java index 2a004c189..3f96b76d6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseObservation.java @@ -7,6 +7,7 @@ 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.Path; @@ -15,6 +16,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.pulse.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.659761200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class PulseObservation implements EntryEntity { /** * open_eREACT-Care/Assessment/NEWS2/Pulse/Any event/Pulse Rate diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java index 4a006a3f5..30670ed1c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/PulseOximetryObservation.java @@ -6,6 +6,7 @@ import com.nedap.archie.rm.generic.PartyProxy; 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.pulse_oximetry.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.655760900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class PulseOximetryObservation implements EntryEntity { /** * open_eREACT-Care/Assessment/NEWS2/Pulse oximetry/Any event/SpO₂ diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java index f6d35fa69..a77c55a7a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationEvaluation.java @@ -4,6 +4,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import com.nedap.archie.rm.generic.PartyProxy; 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.Path; @@ -12,6 +13,11 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.recommendation.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.678762200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class RecommendationEvaluation implements EntryEntity { /** * open_eREACT-Care/Response/Recommendation/Recommendation diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java index 5237c3192..59c232db3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RecommendationRecommendationElement.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.678762200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class RecommendationRecommendationElement implements LocatableEntity { /** * open_eREACT-Care/Response/Recommendation/Recommendation diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java index 5aec7525d..9592806a0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/RespirationsObservation.java @@ -7,6 +7,7 @@ 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.Path; @@ -15,6 +16,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.respiration.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.662763700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class RespirationsObservation implements EntryEntity { /** * open_eREACT-Care/Assessment/NEWS2/Respirations/Any event/Rate diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java index 55170a5b0..cd6f0bae0 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ResponseSection.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; 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.Path; @@ -9,6 +10,11 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.678762200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ResponseSection implements LocatableEntity { /** * open_eREACT-Care/Response/Recommendation diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java index 8ff487cb4..3a7a7df1d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreening999FlagElement.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.588761500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class SepsisScreening999FlagElement implements LocatableEntity { /** * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/999 Flag diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java index 0bdd57c07..380e13441 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningAmberFlagAcuteElement.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.586764600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class SepsisScreeningAmberFlagAcuteElement implements LocatableEntity { /** * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/Amber flag (acute) diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java index 7a66637fb..b376f7002 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningLikelySourceOfInfectionElement.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.583761300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class SepsisScreeningLikelySourceOfInfectionElement implements LocatableEntity { /** * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/feeder_audit diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java index 640a1c759..ae03fcb55 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningObservation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; 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.Path; @@ -13,6 +14,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.sepsis_screening_tool.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.581762800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class SepsisScreeningObservation implements EntryEntity { /** * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/Risk factors for sepsis diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java index 869b97541..5b03bfb0a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRedFlagAcuteElement.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.585763300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class SepsisScreeningRedFlagAcuteElement implements LocatableEntity { /** * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/Red flag (acute) diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java index ed044f07a..370761a1c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningRiskFactorsForSepsisElement.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.582761700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class SepsisScreeningRiskFactorsForSepsisElement implements LocatableEntity { /** * open_eREACT-Care/Assessment/Sepsis/Sepsis screening/Any event/Risk factors for sepsis diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueChoice.java index d6637e372..c1871b8cb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueChoice.java @@ -1,4 +1,11 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +import javax.annotation.processing.Generated; + +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.584763700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface SepsisScreeningValueChoice { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java index 66e250afc..37f3542cd 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvCodedText.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; +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 = "2020-12-09T11:37:51.583761300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_CODED_TEXT") public class SepsisScreeningValueDvCodedText implements RMEntity, SepsisScreeningValueChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java index 1fd375a65..f0cf14906 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisScreeningValueDvText.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.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 = "2020-12-09T11:37:51.584763700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_TEXT") public class SepsisScreeningValueDvText implements RMEntity, SepsisScreeningValueChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java index bf138623a..2933488eb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SepsisSection.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -8,6 +9,11 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.580762700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class SepsisSection implements LocatableEntity { /** * open_eREACT-Care/Assessment/Sepsis/Sepsis screening diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java index 582461bcc..8d5b795b7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceAction.java @@ -7,6 +7,7 @@ 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.Path; @@ -16,6 +17,11 @@ @Entity @Archetype("openEHR-EHR-ACTION.service.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.687763200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ServiceAction implements EntryEntity { /** * open_eREACT-Care/Response/Service/Service name diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java index 6983894de..52fe67534 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestCurrentActivityActivity.java @@ -7,11 +7,17 @@ import java.lang.String; import java.time.temporal.TemporalAccessor; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.682761900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ServiceRequestCurrentActivityActivity implements LocatableEntity { /** * open_eREACT-Care/Response/Service request/Current Activity/Service name diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java index efd8cc977..d0aca8b7e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestInstruction.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-INSTRUCTION.service_request.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.681762500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ServiceRequestInstruction implements EntryEntity { /** * open_eREACT-Care/Response/Service request/Current Activity diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java index 6476ec000..074ccd0ab 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/ServiceRequestReasonForRequestElement.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datavalues.DvCodedText; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.682761900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ServiceRequestReasonForRequestElement implements LocatableEntity { /** * open_eREACT-Care/Response/Service request/Current Activity/Reason for request diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java index 190d05035..8ec61d900 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/SituationSection.java @@ -1,6 +1,7 @@ package org.ehrbase.client.classgenerator.examples.openereactcarecomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -8,6 +9,11 @@ @Entity @Archetype("openEHR-EHR-SECTION.adhoc.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.526762500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class SituationSection implements LocatableEntity { /** * open_eREACT-Care/Situation/Story/History diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java index 19d6fec8a..4e4a7c441 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistoryObservation.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.story.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.527762700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class StoryHistoryObservation implements EntryEntity { /** * open_eREACT-Care/Situation/Story/History/Any event/Soft signs diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java index 4c503dffa..a13641405 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/StoryHistorySoftSignsElement.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.527762700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class StoryHistorySoftSignsElement implements LocatableEntity { /** * open_eREACT-Care/Situation/Story/History/Any event/Soft signs diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java index 5b4b6fb80..11a20ed65 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/TemperatureObservation.java @@ -7,6 +7,7 @@ import java.lang.Double; import java.lang.String; import java.time.temporal.TemporalAccessor; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -15,6 +16,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.body_temperature.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.652761700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class TemperatureObservation implements EntryEntity { /** * open_eREACT-Care/Assessment/NEWS2/Temperature/Any event/Temperature diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java index 6433e6b5c..c6e525473 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/openereactcarecomposition/definition/WeightObservation.java @@ -8,6 +8,7 @@ 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.Path; @@ -16,6 +17,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.body_weight.v2") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:51.535762400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class WeightObservation implements EntryEntity { /** * open_eREACT-Care/Background/Weight/Any event/Weight diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java index 210535330..ba0e4aa4e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/PatientenaufenthaltComposition.java @@ -7,6 +7,7 @@ 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; @@ -24,6 +25,11 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.event_summary.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.901761600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @Template("Patientenaufenthalt") public class PatientenaufenthaltComposition implements CompositionEntity { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java index 6de5db09d..4789d9615 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/AbteilungsfallCluster.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -9,6 +10,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.case_identification.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.902762200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class AbteilungsfallCluster implements LocatableEntity { /** * Patientenaufenthalt/context/Abteilungsfall/Zugehörige Abteilungsfall-Kennung diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java index 930fbe85f..eebcc7b2a 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/DetailsZumBettCluster.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.datavalues.DvIdentifier; import java.lang.String; 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.Path; @@ -12,6 +13,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.device.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.910763+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class DetailsZumBettCluster implements LocatableEntity { /** * Patientenaufenthalt/Versorgungsort/Standort/Details zum Bett/Gerätename diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java index 6aec9bbad..d1b96ab35 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/StandortCluster.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -9,6 +10,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.904762300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class StandortCluster implements LocatableEntity { /** * Patientenaufenthalt/Versorgungsort/Standort/Standorttyp diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java index 4bca9e5f1..dd27fb0de 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsfallCluster.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -9,6 +10,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.case_identification.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.901761600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class VersorgungsfallCluster implements LocatableEntity { /** * Patientenaufenthalt/context/Versorgungsfall/Zugehörige Versorgungsfall-Kennung diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java index f101e379f..06d88aef6 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/patientenaufenthaltcomposition/definition/VersorgungsortAdminEntry.java @@ -4,6 +4,7 @@ import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; import java.time.temporal.TemporalAccessor; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -12,6 +13,11 @@ @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.hospitalization.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.903763200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class VersorgungsortAdminEntry implements EntryEntity { /** * Patientenaufenthalt/Versorgungsort/Beginn diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java index 5a04af5f4..079982470 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/SchwangerschaftsstatusComposition.java @@ -8,6 +8,7 @@ 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; @@ -24,6 +25,11 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.registereintrag.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.339764100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @Template("Schwangerschaftsstatus") public class SchwangerschaftsstatusComposition implements CompositionEntity { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java index 09868fbc0..5800377e3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/schwangerschaftsstatuscomposition/definition/SchwangerschaftsstatusObservation.java @@ -5,6 +5,7 @@ import com.nedap.archie.rm.generic.PartyProxy; 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.Path; @@ -13,6 +14,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.pregnancy_status.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.341763700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class SchwangerschaftsstatusObservation implements EntryEntity { /** * Schwangerschaftsstatus/Schwangerschaftsstatus/Beliebiges Ereignis/Status diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java index 3358d0ed7..befd8f747 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/SmICSBefundComposition.java @@ -7,6 +7,7 @@ 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; @@ -23,6 +24,11 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.report.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.161761700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @Template("SmICS-Befund") public class SmICSBefundComposition implements CompositionEntity { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java index 1eb6d5ded..fcdf2f1a1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/AntibiogrammCluster.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; 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.Path; @@ -9,6 +10,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_panel.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.198764400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class AntibiogrammCluster implements LocatableEntity { /** * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Antibiogramm/Laboranalyt-Resultat diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java index 0873b4e26..341b03111 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsCluster.java @@ -6,6 +6,7 @@ import java.lang.Double; import java.lang.String; 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.Path; @@ -13,6 +14,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.erregerdetails.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.195763300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ErregerdetailsCluster implements LocatableEntity { /** * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Keim Subtyp diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java index af7eac933..af697a31c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsKeimSubtypElement.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.196763100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ErregerdetailsKeimSubtypElement implements LocatableEntity { /** * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Keim Subtyp diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java index b0f1b6a28..7c1b8846e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregerdetailsResistenzmechanismusCluster.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.205764+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ErregerdetailsResistenzmechanismusCluster implements LocatableEntity { /** * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Resistenzmechanismus/Resistenzmechanismus Bezeichnung diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java index 90878f9a5..ff33794b5 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungArtDerTypisierungElement.java @@ -1,11 +1,17 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.209763200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ErregertypisierungArtDerTypisierungElement implements LocatableEntity { /** * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregertypisierung/Art der Typisierung diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java index 36364af24..3dff0257f 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungCluster.java @@ -3,6 +3,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; 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.Path; @@ -10,6 +11,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.molekulare_typisierung.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.208764700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ErregertypisierungCluster implements LocatableEntity { /** * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregertypisierung/Art der Typisierung diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java index 49e62b658..14d7ec92c 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/ErregertypisierungErgebnisElement.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datavalues.encapsulated.DvMultimedia; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.210762600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ErregertypisierungErgebnisElement implements LocatableEntity { /** * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregertypisierung/Ergebnis diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java index a53408590..42a7588bb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryBeteiligtePersonenCluster.java @@ -3,11 +3,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.163761400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class EventsummaryBeteiligtePersonenCluster implements LocatableEntity { /** * SmICS Befund/context/Eventsummary/Beteiligte Personen/Art der Person diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java index b9cedf235..81b1946fb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryCluster.java @@ -3,6 +3,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; 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.Path; @@ -10,6 +11,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.eventsummary.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.162761600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class EventsummaryCluster implements LocatableEntity { /** * SmICS Befund/context/Eventsummary/Fallidentifikation diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java index c36815199..fb8f2fea8 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryIdDerPersonElement.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; import com.nedap.archie.rm.archetyped.FeederAudit; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.164762200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class EventsummaryIdDerPersonElement implements LocatableEntity { /** * SmICS Befund/context/Eventsummary/Beteiligte Personen/feeder_audit diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueChoice.java index e4db29d47..92d3ab73e 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueChoice.java @@ -1,4 +1,11 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; +import javax.annotation.processing.Generated; + +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.164762200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface EventsummaryValueChoice { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java index 224e38e2f..796b5d692 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvIdentifier.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; import com.nedap.archie.rm.datavalues.DvIdentifier; +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 = "2020-12-09T11:37:52.164762200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_IDENTIFIER") public class EventsummaryValueDvIdentifier implements RMEntity, EventsummaryValueChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java index a89c4f4d8..9d75963de 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/EventsummaryValueDvUri.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.smicsbefundcomposition.definition; import java.net.URI; +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 = "2020-12-09T11:37:52.164762200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_URI") public class EventsummaryValueDvUri implements RMEntity, EventsummaryValueChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java index 470a0e10d..07435a510 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/LaboranalytResultatCluster.java @@ -5,6 +5,7 @@ import java.lang.Double; import java.lang.String; 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.Path; @@ -12,6 +13,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.199763700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class LaboranalytResultatCluster implements LocatableEntity { /** * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Erregerdetails/Antibiogramm/Laboranalyt-Resultat/Antibiotikum diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java index 753c9676f..ab9a851ce 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisAnzahlDerErregernachweiseElement.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.Long; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.192764600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class SmicsErgebnisAnzahlDerErregernachweiseElement implements LocatableEntity { /** * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Eigenschaften des beteiligten Erregers/Anzahl der Erregernachweise diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java index 0f1b5da1e..0fa0e1404 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/SmicsErgebnisObservation.java @@ -7,6 +7,7 @@ import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; 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.Path; @@ -15,6 +16,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.smics_befund.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.170763400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class SmicsErgebnisObservation implements EntryEntity { /** * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/SmICS Ergebniskategorie diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java index 10eee09b7..d9076a167 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/smicsbefundcomposition/definition/StandortCluster.java @@ -4,6 +4,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; 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.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.173764100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class StandortCluster implements LocatableEntity { /** * SmICS Befund/SmICS-Ergebnis/Jedes Ereignis/Standort/Standorttyp diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java index 9f712992f..6ebf754aa 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/StationarerVersorgungsfallComposition.java @@ -8,6 +8,7 @@ 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; @@ -25,6 +26,11 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.fall.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.956767400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @Template("Stationärer Versorgungsfall") public class StationarerVersorgungsfallComposition implements CompositionEntity { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java index fa0299950..6f9be5a24 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/AufnahmedatenAdminEntry.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.admission.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.957764900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class AufnahmedatenAdminEntry implements EntryEntity { /** * Stationärer Versorgungsfall/Aufnahmedaten/Versorgungsfallgrund diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java index 911db6698..9968b5cdc 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/stationarerversorgungsfallcomposition/definition/EntlassungsdatenAdminEntry.java @@ -6,6 +6,7 @@ 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.discharge_summary.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:52.959763200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class EntlassungsdatenAdminEntry implements EntryEntity { /** * Stationärer Versorgungsfall/Entlassungsdaten/Art der Entlassung diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java index 1d1574b59..0b1cc7038 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/TestAllTypesEnV1Composition.java @@ -7,6 +7,7 @@ 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; @@ -25,6 +26,11 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.test_all_types.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:50.960759900+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @Template("test_all_types.en.v1") public class TestAllTypesEnV1Composition implements CompositionEntity { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java index 7eb7f8090..01e5a71b7 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAction.java @@ -4,6 +4,7 @@ import com.nedap.archie.rm.generic.PartyProxy; 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.Path; @@ -13,6 +14,11 @@ @Entity @Archetype("openEHR-EHR-ACTION.test_all_types.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:50.986760500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class TestAllTypesAction implements EntryEntity { /** * Test all types/Test all types/section 2/section 3/Test all types/Test all types diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java index dcbb330da..1a0458944 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesAdminEntry.java @@ -3,6 +3,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.Long; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-ADMIN_ENTRY.test_all_types.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:50.990761700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class TestAllTypesAdminEntry implements EntryEntity { /** * Test all types/Test all types/section 2/Test all types/count 3 diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceChoice.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceChoice.java index f850dac65..b26a172ad 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceChoice.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceChoice.java @@ -1,4 +1,11 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; +import javax.annotation.processing.Generated; + +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:50.978761100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public interface TestAllTypesChoiceChoice { } diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java index 5c3128bb2..064974587 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvCount.java @@ -1,12 +1,18 @@ package org.ehrbase.client.classgenerator.examples.testalltypesenv1composition.definition; import java.lang.Long; +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 = "2020-12-09T11:37:50.978761100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_COUNT") public class TestAllTypesChoiceDvCount implements RMEntity, TestAllTypesChoiceChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java index 5eff10429..1c3b40a98 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesChoiceDvQuantity.java @@ -2,12 +2,18 @@ import java.lang.Double; 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 = "2020-12-09T11:37:50.978761100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @OptionFor("DV_QUANTITY") public class TestAllTypesChoiceDvQuantity implements RMEntity, TestAllTypesChoiceChoice { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java index 2a3846a7e..282b9fb9d 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesCluster.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.Boolean; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -9,6 +10,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.test_all_types.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:50.986760500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class TestAllTypesCluster implements LocatableEntity { /** * Test all types/Test all types/section 2/section 3/Test all types/Test all types/cluster 5/cluster 6/boolean 2 diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java index 525f3d3e4..f2f1fa1c1 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesEvaluation.java @@ -8,6 +8,7 @@ import java.lang.String; import java.net.URI; import java.time.temporal.TemporalAccessor; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; @@ -17,6 +18,11 @@ @Entity @Archetype("openEHR-EHR-EVALUATION.test_all_types.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:50.973760800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class TestAllTypesEvaluation implements EntryEntity { /** * Test all types/Test all types/uri diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java index 4f643d146..cadafb936 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesInstruction.java @@ -6,6 +6,7 @@ import java.lang.String; import java.time.temporal.Temporal; import java.time.temporal.TemporalAccessor; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-INSTRUCTION.test_all_types.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:50.983760100+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class TestAllTypesInstruction implements EntryEntity { /** * Test all types/Test all types/section 2/section 3/Test all types/Current Activity/partial date diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java index 76095747f..64325cc08 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesObservation.java @@ -15,6 +15,7 @@ import java.time.temporal.Temporal; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -23,6 +24,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.test_all_types.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:50.964760500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class TestAllTypesObservation implements EntryEntity { /** * Test all types/Test all types/Cualquier evento/text diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java index 8b8e3700e..1f2fac023 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/testalltypesenv1composition/definition/TestAllTypesSection.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; 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.Path; @@ -9,6 +10,11 @@ @Entity @Archetype("openEHR-EHR-SECTION.test_all_types.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:50.982759400+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class TestAllTypesSection implements LocatableEntity { /** * Test all types/Test all types/section 2/section 3/Test all types diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java index 84c93253a..b75be17a2 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/VirologischerBefundComposition.java @@ -7,6 +7,7 @@ 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; @@ -23,6 +24,11 @@ @Entity @Archetype("openEHR-EHR-COMPOSITION.report-result.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.627286500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) @Template("Virologischer Befund") public class VirologischerBefundComposition implements CompositionEntity { /** diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java index 3bb613e09..a07a01654 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/AnatomischeLokalisationCluster.java @@ -4,6 +4,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; 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.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.anatomical_location.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.631287700+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class AnatomischeLokalisationCluster implements LocatableEntity { /** * Virologischer Befund/Befund/Jedes Ereignis/Probe/Anatomische Lokalisation/Name der Körperstelle diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java index 22095e07c..e41054304 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundAnforderungElement.java @@ -2,11 +2,17 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.LocatableEntity; @Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.636287200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class BefundAnforderungElement implements LocatableEntity { /** * Virologischer Befund/Befund/Details der Testanforderung/Anforderung diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java index acfbb2d5b..80ecb2844 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/BefundObservation.java @@ -7,6 +7,7 @@ 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.Path; @@ -15,6 +16,11 @@ @Entity @Archetype("openEHR-EHR-OBSERVATION.laboratory_test_result.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.629285800+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class BefundObservation implements EntryEntity { /** * Virologischer Befund/Befund/Jedes Ereignis/Labortest-Bezeichnung diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java index 24e7aa6ce..d56f0f7c3 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EinsenderstandortCluster.java @@ -4,6 +4,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; 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.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.637286600+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class EinsenderstandortCluster implements LocatableEntity { /** * Virologischer Befund/Befund/Details der Testanforderung/Einsenderstandort/Standorttyp diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java index e65a73f46..0da5f0f97 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/EmpfangerstandortCluster.java @@ -4,6 +4,7 @@ import com.nedap.archie.rm.datastructures.Cluster; import java.lang.String; 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.Path; @@ -11,6 +12,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.location.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.636287200+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class EmpfangerstandortCluster implements LocatableEntity { /** * Virologischer Befund/Befund/Empfängerstandort/Standorttyp diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java index 526b42dfd..3c7da753b 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/FallidentifikationCluster.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import java.lang.String; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; @@ -9,6 +10,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.case_identification.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.627286500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class FallidentifikationCluster implements LocatableEntity { /** * Virologischer Befund/context/Fallidentifikation/Fall-Kennung diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java index e2c05fcab..f2a8a2deb 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/KulturCluster.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; 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.Path; @@ -9,6 +10,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_panel.v0") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.633287300+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class KulturCluster implements LocatableEntity { /** * Virologischer Befund/Befund/Jedes Ereignis/Kultur/Pro Virus diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java index 818ae736f..d45004f73 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProVirusCluster.java @@ -7,6 +7,7 @@ import java.lang.Long; import java.lang.String; 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.Path; @@ -14,6 +15,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.laboratory_test_analyte.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.634287500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ProVirusCluster implements LocatableEntity { /** * Virologischer Befund/Befund/Jedes Ereignis/Kultur/Pro Virus/Analyseergebnis-Reihenfolge diff --git a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java index 87cfe47f5..6cbf102ff 100644 --- a/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java +++ b/client/src/test/java/org/ehrbase/client/classgenerator/examples/virologischerbefundcomposition/definition/ProbeCluster.java @@ -6,6 +6,7 @@ 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.Path; @@ -13,6 +14,11 @@ @Entity @Archetype("openEHR-EHR-CLUSTER.specimen.v1") +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2020-12-09T11:37:53.630286500+01:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: null" +) public class ProbeCluster implements LocatableEntity { /** * Virologischer Befund/Befund/Jedes Ereignis/Probe/Probenart diff --git a/generator/pom.xml b/generator/pom.xml index 5f5b09663..47ef6d2ef 100644 --- a/generator/pom.xml +++ b/generator/pom.xml @@ -1,5 +1,4 @@ - - - + root com.github.ehrbase.openEHR_SDK @@ -42,7 +40,6 @@ - - org.assertj assertj-core @@ -84,7 +80,6 @@ copy-dependencies -